From f2f18d73e69019df9dcb15eb7b57a6c4888e6af1 Mon Sep 17 00:00:00 2001 From: Dmytro Makovey Date: Thu, 4 Nov 2021 20:03:53 +0000 Subject: [PATCH 1/7] experiment adding job --- .gitlab-ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5156890bff..b300aeaf18 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -236,6 +236,10 @@ lint_package: - /(^docs[\/-].+|.+-docs$)/ - *com_auto_deploy_branch_ref +detach_me: + stage: prepare + script: echo "Detached yet?" + review_gke: variables: DNS_PROVIDER: "google" -- GitLab From 6200f9c0423d8786a8d5ce31e4253ab12b78b45f Mon Sep 17 00:00:00 2001 From: Dmytro Makovey Date: Thu, 4 Nov 2021 20:07:51 +0000 Subject: [PATCH 2/7] mimick previous "failure" --- .gitlab-ci.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b300aeaf18..c34a9b9893 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -237,8 +237,11 @@ lint_package: - *com_auto_deploy_branch_ref detach_me: - stage: prepare + stage: staging-release script: echo "Detached yet?" + rules: + - if: '$CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH' + when: always review_gke: variables: -- GitLab From 4f876e51e08cc835b3b577d624565a2c09e300da Mon Sep 17 00:00:00 2001 From: Dmytro Makovey Date: Tue, 9 Nov 2021 17:01:29 +0000 Subject: [PATCH 3/7] disable `when: always` --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c34a9b9893..4d657f8bce 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -241,7 +241,7 @@ detach_me: script: echo "Detached yet?" rules: - if: '$CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH' - when: always + # when: always review_gke: variables: -- GitLab From 527019813a47d9e5064bc7937bf625c87e9e1953 Mon Sep 17 00:00:00 2001 From: Mitchell Nielsen Date: Tue, 9 Nov 2021 17:15:26 +0000 Subject: [PATCH 4/7] Apply 1 suggestion(s) to 1 file(s) --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4d657f8bce..e42d128ac9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -240,8 +240,8 @@ detach_me: stage: staging-release script: echo "Detached yet?" rules: - - if: '$CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH' - # when: always + - if: $CI_COMMIT_REF_NAME != $CI_DEFAULT_BRANCH + review_gke: variables: -- GitLab From 143d38378cf06aee531989b646acf98108ce3ff5 Mon Sep 17 00:00:00 2001 From: Dmytro Makovey Date: Tue, 9 Nov 2021 17:26:34 +0000 Subject: [PATCH 5/7] use workflow: to limit pipelines to non-merge ones --- .gitlab-ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e42d128ac9..7c49247952 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -87,6 +87,9 @@ iac-sast: needs: [] before_script: [] +before_script: + - source scripts/ci/autodevops.sh + .auto_deploy_items: - &com_auto_deploy_branch_ref /^[0-9]+-[0-9]+-auto-deploy-[0-9]+$/@gitlab-org/charts/gitlab -- GitLab From c09fada6e0d1abf3bac97bc4d1c2dec270dc3631 Mon Sep 17 00:00:00 2001 From: Dmytro Makovey Date: Tue, 9 Nov 2021 17:34:50 +0000 Subject: [PATCH 6/7] disable `worklfow:` --- .gitlab-ci.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7c49247952..9348fc79e1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -80,9 +80,6 @@ secret_detection: sast: needs: [] before_script: [] -sast: - needs: [] - before_script: [] iac-sast: needs: [] before_script: [] -- GitLab From ee25d088a9399c2d1914d803890f4bd347fde5b4 Mon Sep 17 00:00:00 2001 From: Dmitry Makovey Date: Wed, 30 Nov 2022 07:48:21 -0700 Subject: [PATCH 7/7] remove obsolete code --- .gitlab-ci.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9348fc79e1..c713a23b61 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -84,9 +84,6 @@ iac-sast: needs: [] before_script: [] -before_script: - - source scripts/ci/autodevops.sh - .auto_deploy_items: - &com_auto_deploy_branch_ref /^[0-9]+-[0-9]+-auto-deploy-[0-9]+$/@gitlab-org/charts/gitlab -- GitLab