From b301755d38b7bb3525db9daf111bfa22df257217 Mon Sep 17 00:00:00 2001 From: Alexey Gutkin Date: Sun, 29 Oct 2023 15:18:19 +0100 Subject: [PATCH 1/5] migration-to-gitops-repo --- .circleci/config.yml | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f008534..b2d2d0e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -112,16 +112,13 @@ jobs: - *load_version - *install_deps - run: git config --global user.email "sonario@rookout.com" && git config --global user.name "sonariorobot" - - run: git clone -b staging git@github.com:Rookout/gitops-demo.git - - run: PUBLISH_VERSION=$(echo $NEW_VERSION | sed 's/inner-999/1/g') yq -i -v '.tutorialJava.image.tag = strenv(PUBLISH_VERSION)' gitops-demo/argocd/apps/values.yaml - - run: cd gitops-demo && git add argocd/apps/values.yaml - - run: cd gitops-demo && git commit -m "update tutorial-java $NEW_VERSION" - - run: cd gitops-demo && git push https://sonariorobot:$GITHUB_TOKEN@github.com/Rookout/gitops-demo.git staging - - run: cd gitops-demo && git checkout production && git pull - - run: PUBLISH_VERSION=$(echo $NEW_VERSION | sed 's/inner-999/1/g') yq -i -v '.tutorialJava.image.tag = strenv(PUBLISH_VERSION)' gitops-demo/argocd/apps/values.yaml - - run: cd gitops-demo && git add argocd/apps/values.yaml - - run: cd gitops-demo && git commit -m "update tutorial-java $NEW_VERSION" - - run: cd gitops-demo && git push https://sonariorobot:$GITHUB_TOKEN@github.com/Rookout/gitops-demo.git production + - run: git clone git@github.com:Rookout/gitops.git + - run: PUBLISH_VERSION=$(echo $NEW_VERSION | sed 's/inner-999/1/g') yq eval -i -v '.apps[] |= select(.chart.name == "tutorial-java").helmValues.image.tag = strenv(PUBLISH_VERSION)' apps/demo/staging/apps.yaml + - run: PUBLISH_VERSION=$(echo $NEW_VERSION | sed 's/inner-999/1/g') yq eval -i -v '.apps[] |= select(.chart.name == "tutorial-java").helmValues.image.tag = strenv(PUBLISH_VERSION)' apps/demo/production/apps.yaml + - run: cd gitops && git add apps/demo/staging/apps.yaml apps/demo/production/apps.yaml + - run: cd gitops && git commit -m "update tutorial-java $NEW_VERSION" + - run: cd gitops && git push https://sonariorobot:$GITHUB_TOKEN@github.com/Rookout/gitops.git + test_demo_servers_up: docker: From fa048b46116f5c62a78f0bb1b4d768f8f8a62adf Mon Sep 17 00:00:00 2001 From: Alexey Gutkin Date: Sun, 29 Oct 2023 15:49:12 +0100 Subject: [PATCH 2/5] handle multiple java tutorials --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b2d2d0e..3eedc91 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -113,8 +113,8 @@ jobs: - *install_deps - run: git config --global user.email "sonario@rookout.com" && git config --global user.name "sonariorobot" - run: git clone git@github.com:Rookout/gitops.git - - run: PUBLISH_VERSION=$(echo $NEW_VERSION | sed 's/inner-999/1/g') yq eval -i -v '.apps[] |= select(.chart.name == "tutorial-java").helmValues.image.tag = strenv(PUBLISH_VERSION)' apps/demo/staging/apps.yaml - - run: PUBLISH_VERSION=$(echo $NEW_VERSION | sed 's/inner-999/1/g') yq eval -i -v '.apps[] |= select(.chart.name == "tutorial-java").helmValues.image.tag = strenv(PUBLISH_VERSION)' apps/demo/production/apps.yaml + - run: PUBLISH_VERSION=$(echo $NEW_VERSION | sed 's/inner-999/1/g') yq eval -i -v '.apps[] |= select(.chart.name == "tutorial-java" and (.releaseName == null or .releaseName != "dynatrace-java")).helmValues.image.tag = strenv(PUBLISH_VERSION)' apps/demo/staging/apps.yaml + - run: PUBLISH_VERSION=$(echo $NEW_VERSION | sed 's/inner-999/1/g') yq eval -i -v '.apps[] |= select(.chart.name == "tutorial-java" and (.releaseName == null or .releaseName != "dynatrace-java")).helmValues.image.tag = strenv(PUBLISH_VERSION)' apps/demo/production/apps.yaml - run: cd gitops && git add apps/demo/staging/apps.yaml apps/demo/production/apps.yaml - run: cd gitops && git commit -m "update tutorial-java $NEW_VERSION" - run: cd gitops && git push https://sonariorobot:$GITHUB_TOKEN@github.com/Rookout/gitops.git From 7e6b3ed31212d75220eac7ae8156eefbf6d1268f Mon Sep 17 00:00:00 2001 From: Alexey Gutkin Date: Sun, 29 Oct 2023 16:00:56 +0100 Subject: [PATCH 3/5] handle multiple java tutorials --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3eedc91..014cdb8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -113,8 +113,8 @@ jobs: - *install_deps - run: git config --global user.email "sonario@rookout.com" && git config --global user.name "sonariorobot" - run: git clone git@github.com:Rookout/gitops.git - - run: PUBLISH_VERSION=$(echo $NEW_VERSION | sed 's/inner-999/1/g') yq eval -i -v '.apps[] |= select(.chart.name == "tutorial-java" and (.releaseName == null or .releaseName != "dynatrace-java")).helmValues.image.tag = strenv(PUBLISH_VERSION)' apps/demo/staging/apps.yaml - - run: PUBLISH_VERSION=$(echo $NEW_VERSION | sed 's/inner-999/1/g') yq eval -i -v '.apps[] |= select(.chart.name == "tutorial-java" and (.releaseName == null or .releaseName != "dynatrace-java")).helmValues.image.tag = strenv(PUBLISH_VERSION)' apps/demo/production/apps.yaml + - run: PUBLISH_VERSION=$(echo $NEW_VERSION | sed 's/inner-999/1/g') yq eval -i -v '.apps[] |= select(.chart.name == "tutorial-java" and .releaseName == null).helmValues.image.tag = strenv(PUBLISH_VERSION)' apps/demo/staging/apps.yaml + - run: PUBLISH_VERSION=$(echo $NEW_VERSION | sed 's/inner-999/1/g') yq eval -i -v '.apps[] |= select(.chart.name == "tutorial-java" and .releaseName == null).helmValues.image.tag = strenv(PUBLISH_VERSION)' apps/demo/production/apps.yaml - run: cd gitops && git add apps/demo/staging/apps.yaml apps/demo/production/apps.yaml - run: cd gitops && git commit -m "update tutorial-java $NEW_VERSION" - run: cd gitops && git push https://sonariorobot:$GITHUB_TOKEN@github.com/Rookout/gitops.git From 192a94cf6e3ee9496cdee05c8258c74d39bba8c4 Mon Sep 17 00:00:00 2001 From: Alexey Gutkin Date: Mon, 30 Oct 2023 13:03:13 +0100 Subject: [PATCH 4/5] handle multiple java tutorials --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 014cdb8..7c1fcde 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -113,8 +113,8 @@ jobs: - *install_deps - run: git config --global user.email "sonario@rookout.com" && git config --global user.name "sonariorobot" - run: git clone git@github.com:Rookout/gitops.git - - run: PUBLISH_VERSION=$(echo $NEW_VERSION | sed 's/inner-999/1/g') yq eval -i -v '.apps[] |= select(.chart.name == "tutorial-java" and .releaseName == null).helmValues.image.tag = strenv(PUBLISH_VERSION)' apps/demo/staging/apps.yaml - - run: PUBLISH_VERSION=$(echo $NEW_VERSION | sed 's/inner-999/1/g') yq eval -i -v '.apps[] |= select(.chart.name == "tutorial-java" and .releaseName == null).helmValues.image.tag = strenv(PUBLISH_VERSION)' apps/demo/production/apps.yaml + - run: PUBLISH_VERSION=$(echo $NEW_VERSION | sed 's/inner-999/1/g') yq eval -i -v '.apps[] |= select(.releaseName == "tutorial-java").helmValues.image.tag = strenv(PUBLISH_VERSION)' apps/demo/staging/apps.yaml + - run: PUBLISH_VERSION=$(echo $NEW_VERSION | sed 's/inner-999/1/g') yq eval -i -v '.apps[] |= select(.releaseName == "tutorial-java").helmValues.image.tag = strenv(PUBLISH_VERSION)' apps/demo/production/apps.yaml - run: cd gitops && git add apps/demo/staging/apps.yaml apps/demo/production/apps.yaml - run: cd gitops && git commit -m "update tutorial-java $NEW_VERSION" - run: cd gitops && git push https://sonariorobot:$GITHUB_TOKEN@github.com/Rookout/gitops.git From d66b1fab9359e891d7efaed9dc19761eb96cfe2f Mon Sep 17 00:00:00 2001 From: Alexey Gutkin Date: Tue, 31 Oct 2023 13:01:07 +0100 Subject: [PATCH 5/5] fix-path --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7c1fcde..3b2b56f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -113,8 +113,8 @@ jobs: - *install_deps - run: git config --global user.email "sonario@rookout.com" && git config --global user.name "sonariorobot" - run: git clone git@github.com:Rookout/gitops.git - - run: PUBLISH_VERSION=$(echo $NEW_VERSION | sed 's/inner-999/1/g') yq eval -i -v '.apps[] |= select(.releaseName == "tutorial-java").helmValues.image.tag = strenv(PUBLISH_VERSION)' apps/demo/staging/apps.yaml - - run: PUBLISH_VERSION=$(echo $NEW_VERSION | sed 's/inner-999/1/g') yq eval -i -v '.apps[] |= select(.releaseName == "tutorial-java").helmValues.image.tag = strenv(PUBLISH_VERSION)' apps/demo/production/apps.yaml + - run: PUBLISH_VERSION=$(echo $NEW_VERSION | sed 's/inner-999/1/g') yq eval -i -v '.apps[] |= select(.releaseName == "tutorial-java").helmValues.image.tag = strenv(PUBLISH_VERSION)' gitops/apps/demo/staging/apps.yaml + - run: PUBLISH_VERSION=$(echo $NEW_VERSION | sed 's/inner-999/1/g') yq eval -i -v '.apps[] |= select(.releaseName == "tutorial-java").helmValues.image.tag = strenv(PUBLISH_VERSION)' gitops/apps/demo/production/apps.yaml - run: cd gitops && git add apps/demo/staging/apps.yaml apps/demo/production/apps.yaml - run: cd gitops && git commit -m "update tutorial-java $NEW_VERSION" - run: cd gitops && git push https://sonariorobot:$GITHUB_TOKEN@github.com/Rookout/gitops.git