From 6c768f84ae3275c08b00e971f6e06e42734b3e10 Mon Sep 17 00:00:00 2001 From: Marco Wettstein Date: Tue, 21 Sep 2021 14:12:17 +0200 Subject: [PATCH 01/10] fix: asdf --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ce03460..2275379 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,7 +13,7 @@ docker-build-pipeline: image: docker:20 variables: CACHE_IMAGE_TAG: cache - IMAGE_TAG: $CI_COMMIT_SHA + IMAGE_TAG: $CI_COMMIT_REF_NAME IMAGE_NAME: $CI_REGISTRY_IMAGE/pipeline DOCKER_DIR: "./dockerfiles/pipeline" @@ -25,7 +25,7 @@ docker-build-docker-in-docker: image: docker:20 variables: CACHE_IMAGE_TAG: cache - IMAGE_TAG: $CI_COMMIT_SHA + IMAGE_TAG: $CI_COMMIT_REF_NAME IMAGE_NAME: $CI_REGISTRY_IMAGE/docker-build DOCKER_DIR: "./dockerfiles/docker-build" extends: @@ -38,7 +38,7 @@ replacePipelineImageTag: - git config --global user.email "pipeline@panter.ch" - git config --global user.name "Gitlab Runner" - ls *.yml - - 'sed -i "s/PIPELINE_IMAGE_TAG:.*/PIPELINE_IMAGE_TAG: $CI_COMMIT_SHA/g" *.yml' + - 'sed -i "s/PIPELINE_IMAGE_TAG:.*/PIPELINE_IMAGE_TAG: $CI_COMMIT_REF_NAME/g" *.yml' - git status - git commit -a -m "adjust PIPELINE_IMAGE_TAG" - git push "https://release-bot:${GL_TOKEN}@${CI_REPOSITORY_URL#*@}" "HEAD:${CI_COMMIT_REF_NAME}" -o ci.skip -- GitLab From 070915ffbe1f4f8c71a04eabf0e1e1aa99c4976c Mon Sep 17 00:00:00 2001 From: Marco Wettstein Date: Tue, 21 Sep 2021 14:14:17 +0200 Subject: [PATCH 02/10] fix --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2275379..61b0d70 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -56,3 +56,5 @@ stages: release: extends: .release + variables: + GIT_STRATEGY: clone # freshly -- GitLab From 06cd3ea9167b8ec707372ddf2832e6ba429a0730 Mon Sep 17 00:00:00 2001 From: Marco Wettstein Date: Tue, 21 Sep 2021 14:15:10 +0200 Subject: [PATCH 03/10] fix again --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 61b0d70..f78491e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,7 +13,7 @@ docker-build-pipeline: image: docker:20 variables: CACHE_IMAGE_TAG: cache - IMAGE_TAG: $CI_COMMIT_REF_NAME + IMAGE_TAG: $CI_COMMIT_SHA IMAGE_NAME: $CI_REGISTRY_IMAGE/pipeline DOCKER_DIR: "./dockerfiles/pipeline" @@ -25,7 +25,7 @@ docker-build-docker-in-docker: image: docker:20 variables: CACHE_IMAGE_TAG: cache - IMAGE_TAG: $CI_COMMIT_REF_NAME + IMAGE_TAG: $CI_COMMIT_SHA IMAGE_NAME: $CI_REGISTRY_IMAGE/docker-build DOCKER_DIR: "./dockerfiles/docker-build" extends: @@ -38,10 +38,10 @@ replacePipelineImageTag: - git config --global user.email "pipeline@panter.ch" - git config --global user.name "Gitlab Runner" - ls *.yml - - 'sed -i "s/PIPELINE_IMAGE_TAG:.*/PIPELINE_IMAGE_TAG: $CI_COMMIT_REF_NAME/g" *.yml' + - 'sed -i "s/PIPELINE_IMAGE_TAG:.*/PIPELINE_IMAGE_TAG: $CI_COMMIT_SHA/g" *.yml' - git status - git commit -a -m "adjust PIPELINE_IMAGE_TAG" - - git push "https://release-bot:${GL_TOKEN}@${CI_REPOSITORY_URL#*@}" "HEAD:${CI_COMMIT_REF_NAME}" -o ci.skip + - git push "https://release-bot:${GL_TOKEN}@${CI_REPOSITORY_URL#*@}" "HEAD:${CI_COMMIT_SHA}" -o ci.skip test: extends: -- GitLab From af09a28f4dbea0fe3f762c080cc7a968b2681aef Mon Sep 17 00:00:00 2001 From: Marco Wettstein Date: Tue, 21 Sep 2021 14:16:11 +0200 Subject: [PATCH 04/10] fix --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f78491e..330c44f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -41,7 +41,7 @@ replacePipelineImageTag: - 'sed -i "s/PIPELINE_IMAGE_TAG:.*/PIPELINE_IMAGE_TAG: $CI_COMMIT_SHA/g" *.yml' - git status - git commit -a -m "adjust PIPELINE_IMAGE_TAG" - - git push "https://release-bot:${GL_TOKEN}@${CI_REPOSITORY_URL#*@}" "HEAD:${CI_COMMIT_SHA}" -o ci.skip + - git push "https://release-bot:${GL_TOKEN}@${CI_REPOSITORY_URL#*@}" "HEAD:${CI_COMMIT_REF_NAME}" -o ci.skip test: extends: -- GitLab From 183e1b1b0b5fa95c4943accc57c7cfc144167779 Mon Sep 17 00:00:00 2001 From: Marco Wettstein Date: Tue, 21 Sep 2021 14:16:31 +0200 Subject: [PATCH 05/10] test --- .gitlab-ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 330c44f..e5ad87a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -37,9 +37,8 @@ replacePipelineImageTag: script: - git config --global user.email "pipeline@panter.ch" - git config --global user.name "Gitlab Runner" - - ls *.yml + - echo "fix $CI_COMMIT_REF_NAME" - 'sed -i "s/PIPELINE_IMAGE_TAG:.*/PIPELINE_IMAGE_TAG: $CI_COMMIT_SHA/g" *.yml' - - git status - git commit -a -m "adjust PIPELINE_IMAGE_TAG" - git push "https://release-bot:${GL_TOKEN}@${CI_REPOSITORY_URL#*@}" "HEAD:${CI_COMMIT_REF_NAME}" -o ci.skip -- GitLab From 072e6fb6503d2fa2f7dff45a419e21f30d3aa0a1 Mon Sep 17 00:00:00 2001 From: Marco Wettstein Date: Tue, 21 Sep 2021 14:17:09 +0200 Subject: [PATCH 06/10] now? --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e5ad87a..0b62f41 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -37,7 +37,7 @@ replacePipelineImageTag: script: - git config --global user.email "pipeline@panter.ch" - git config --global user.name "Gitlab Runner" - - echo "fix $CI_COMMIT_REF_NAME" + - echo "fix $CI_COMMIT_REF_NAME, $CI_COMMIT_REF_SLUG" - 'sed -i "s/PIPELINE_IMAGE_TAG:.*/PIPELINE_IMAGE_TAG: $CI_COMMIT_SHA/g" *.yml' - git commit -a -m "adjust PIPELINE_IMAGE_TAG" - git push "https://release-bot:${GL_TOKEN}@${CI_REPOSITORY_URL#*@}" "HEAD:${CI_COMMIT_REF_NAME}" -o ci.skip -- GitLab From bf78070eb84b64b8f3b8382a717f6c8bfab906de Mon Sep 17 00:00:00 2001 From: Marco Wettstein Date: Tue, 21 Sep 2021 14:17:54 +0200 Subject: [PATCH 07/10] fix --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0b62f41..480554e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,7 +13,7 @@ docker-build-pipeline: image: docker:20 variables: CACHE_IMAGE_TAG: cache - IMAGE_TAG: $CI_COMMIT_SHA + IMAGE_TAG: $CI_COMMIT_REF_SLUG IMAGE_NAME: $CI_REGISTRY_IMAGE/pipeline DOCKER_DIR: "./dockerfiles/pipeline" @@ -25,7 +25,7 @@ docker-build-docker-in-docker: image: docker:20 variables: CACHE_IMAGE_TAG: cache - IMAGE_TAG: $CI_COMMIT_SHA + IMAGE_TAG: $CI_COMMIT_REF_SLUG IMAGE_NAME: $CI_REGISTRY_IMAGE/docker-build DOCKER_DIR: "./dockerfiles/docker-build" extends: @@ -37,8 +37,8 @@ replacePipelineImageTag: script: - git config --global user.email "pipeline@panter.ch" - git config --global user.name "Gitlab Runner" - - echo "fix $CI_COMMIT_REF_NAME, $CI_COMMIT_REF_SLUG" - - 'sed -i "s/PIPELINE_IMAGE_TAG:.*/PIPELINE_IMAGE_TAG: $CI_COMMIT_SHA/g" *.yml' + - echo "update pipeline image to use $CI_COMMIT_REF_SLUG" + - 'sed -i "s/PIPELINE_IMAGE_TAG:.*/PIPELINE_IMAGE_TAG: $CI_COMMIT_REF_SLUG/g" *.yml' - git commit -a -m "adjust PIPELINE_IMAGE_TAG" - git push "https://release-bot:${GL_TOKEN}@${CI_REPOSITORY_URL#*@}" "HEAD:${CI_COMMIT_REF_NAME}" -o ci.skip -- GitLab From 19b3ab5bab80502a8a8dc206b987215676ebd256 Mon Sep 17 00:00:00 2001 From: Gitlab Runner Date: Tue, 21 Sep 2021 12:18:32 +0000 Subject: [PATCH 08/10] adjust PIPELINE_IMAGE_TAG --- helm-chart.yml | 2 +- monorepo.yml | 2 +- panter-kubernetes-base.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/helm-chart.yml b/helm-chart.yml index b4399ce..4880df0 100644 --- a/helm-chart.yml +++ b/helm-chart.yml @@ -11,7 +11,7 @@ image: variables: HELM_EXPERIMENTAL_OCI: 1 AUTO_RELEASE: "true" - PIPELINE_IMAGE_TAG: ddf7b25a11fa19ad634d0b34f194a2ff4b9a225e + PIPELINE_IMAGE_TAG: f-asdf stages: - lint diff --git a/monorepo.yml b/monorepo.yml index b7fcb78..a371ab8 100644 --- a/monorepo.yml +++ b/monorepo.yml @@ -12,7 +12,7 @@ include: - /includes/open-mr.yml variables: - PIPELINE_IMAGE_TAG: ddf7b25a11fa19ad634d0b34f194a2ff4b9a225e + PIPELINE_IMAGE_TAG: f-asdf image: git.panter.ch:5001/catladder/gitlab-ci/pipeline:$PIPELINE_IMAGE_TAG diff --git a/panter-kubernetes-base.yml b/panter-kubernetes-base.yml index 725a507..5f7d567 100644 --- a/panter-kubernetes-base.yml +++ b/panter-kubernetes-base.yml @@ -12,7 +12,7 @@ include: - /includes/open-mr.yml variables: - PIPELINE_IMAGE_TAG: ddf7b25a11fa19ad634d0b34f194a2ff4b9a225e + PIPELINE_IMAGE_TAG: f-asdf CUSTOMER_NAME: panter APP_NAME: demo COMPONENT_NAME: web -- GitLab From 31911afcc994284d7eda0b91ad43815d5190c864 Mon Sep 17 00:00:00 2001 From: Marco Wettstein Date: Tue, 21 Sep 2021 14:19:06 +0200 Subject: [PATCH 09/10] hash again --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 480554e..70faada 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,7 +13,7 @@ docker-build-pipeline: image: docker:20 variables: CACHE_IMAGE_TAG: cache - IMAGE_TAG: $CI_COMMIT_REF_SLUG + IMAGE_TAG: $CI_COMMIT_SHA IMAGE_NAME: $CI_REGISTRY_IMAGE/pipeline DOCKER_DIR: "./dockerfiles/pipeline" @@ -25,7 +25,7 @@ docker-build-docker-in-docker: image: docker:20 variables: CACHE_IMAGE_TAG: cache - IMAGE_TAG: $CI_COMMIT_REF_SLUG + IMAGE_TAG: $CI_COMMIT_SHA IMAGE_NAME: $CI_REGISTRY_IMAGE/docker-build DOCKER_DIR: "./dockerfiles/docker-build" extends: @@ -37,8 +37,8 @@ replacePipelineImageTag: script: - git config --global user.email "pipeline@panter.ch" - git config --global user.name "Gitlab Runner" - - echo "update pipeline image to use $CI_COMMIT_REF_SLUG" - - 'sed -i "s/PIPELINE_IMAGE_TAG:.*/PIPELINE_IMAGE_TAG: $CI_COMMIT_REF_SLUG/g" *.yml' + - echo "update pipeline image to use $CI_COMMIT_SHA" + - 'sed -i "s/PIPELINE_IMAGE_TAG:.*/PIPELINE_IMAGE_TAG: $CI_COMMIT_SHA/g" *.yml' - git commit -a -m "adjust PIPELINE_IMAGE_TAG" - git push "https://release-bot:${GL_TOKEN}@${CI_REPOSITORY_URL#*@}" "HEAD:${CI_COMMIT_REF_NAME}" -o ci.skip -- GitLab From 18bd93491a1eabe3fdc09812230a4408cb85161a Mon Sep 17 00:00:00 2001 From: Gitlab Runner Date: Tue, 21 Sep 2021 12:19:32 +0000 Subject: [PATCH 10/10] adjust PIPELINE_IMAGE_TAG --- helm-chart.yml | 2 +- monorepo.yml | 2 +- panter-kubernetes-base.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/helm-chart.yml b/helm-chart.yml index 4880df0..a6d37bf 100644 --- a/helm-chart.yml +++ b/helm-chart.yml @@ -11,7 +11,7 @@ image: variables: HELM_EXPERIMENTAL_OCI: 1 AUTO_RELEASE: "true" - PIPELINE_IMAGE_TAG: f-asdf + PIPELINE_IMAGE_TAG: 31911afcc994284d7eda0b91ad43815d5190c864 stages: - lint diff --git a/monorepo.yml b/monorepo.yml index a371ab8..0e16f9b 100644 --- a/monorepo.yml +++ b/monorepo.yml @@ -12,7 +12,7 @@ include: - /includes/open-mr.yml variables: - PIPELINE_IMAGE_TAG: f-asdf + PIPELINE_IMAGE_TAG: 31911afcc994284d7eda0b91ad43815d5190c864 image: git.panter.ch:5001/catladder/gitlab-ci/pipeline:$PIPELINE_IMAGE_TAG diff --git a/panter-kubernetes-base.yml b/panter-kubernetes-base.yml index 5f7d567..020ca25 100644 --- a/panter-kubernetes-base.yml +++ b/panter-kubernetes-base.yml @@ -12,7 +12,7 @@ include: - /includes/open-mr.yml variables: - PIPELINE_IMAGE_TAG: f-asdf + PIPELINE_IMAGE_TAG: 31911afcc994284d7eda0b91ad43815d5190c864 CUSTOMER_NAME: panter APP_NAME: demo COMPONENT_NAME: web -- GitLab