From a8f41632d8741cdad4f945221978501ed5fb0d0a Mon Sep 17 00:00:00 2001
From: David Dieulivol <ddieulivol@gitlab.com>
Date: Wed, 17 Apr 2024 15:45:46 +0000
Subject: [PATCH] Align build-gdk-image with the E2E-gdk child pipeline
In particular, we ensure that build-gdk-image doesn't
run if the MR isn't approved.
---
.gitlab/ci/rules.gitlab-ci.yml | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml
index f609336b5198a..b88498c869203 100644
--- a/.gitlab/ci/rules.gitlab-ci.yml
+++ b/.gitlab/ci/rules.gitlab-ci.yml
@@ -955,18 +955,26 @@
- <<: *if-default-branch-schedule-nightly # already executed in the 2-hourly schedule
when: never
- <<: *if-default-branch-refs
+ - <<: *if-merge-request-labels-run-all-e2e
+ - <<: *if-merge-request-labels-run-cs-evaluation
+ - <<: *if-force-ci
+ when: manual
+ # The rest is included to be consistent with .qa:rules:e2e:test-on-gdk
+ # Run tests automatically for MRs that touch QA files
- <<: *if-merge-request
- changes: *gdk-component-patterns
- # The rest are included to be consistent with .qa:rules:e2e:test-on-gdk
+ changes: *qa-patterns
+ # Otherwise, only run tests after the MR is approved
+ - <<: *if-merge-request-not-approved
+ when: never
- <<: *if-merge-request-targeting-stable-branch
changes: *setup-test-env-patterns
- <<: *if-ruby-branch
# We include the job under the matching conditions below, but unlike in .qa:rules:e2e:test-on-gdk we don't need to
# set OMNIBUS_GITLAB_BUILD_ON_ALL_OS when testing against GDK
+ - <<: *if-merge-request
+ changes: *gdk-component-patterns
- <<: *if-merge-request
changes: *dependency-patterns
- - <<: *if-merge-request-labels-run-all-e2e
- - <<: *if-merge-request-labels-run-cs-evaluation
- <<: *if-merge-request
changes: *feature-flag-development-config-patterns
- <<: *if-merge-request
@@ -979,8 +987,6 @@
changes: *code-patterns
- <<: *if-merge-request
changes: *code-qa-patterns
- - <<: *if-force-ci
- when: manual
.build-images:rules:build-assets-image:
rules:
@@ -1667,6 +1673,8 @@
- <<: *if-fork-merge-request
when: never
- <<: *if-merge-request-labels-run-cs-evaluation
+ - <<: *if-merge-request-not-approved
+ when: never
.qa:rules:code-suggestions-eval:
rules:
--
GitLab