diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-09 21:09:34 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-09 21:09:34 +0300 |
| commit | 7d112a9002182130f6a06f890bb17450b03406f9 (patch) | |
| tree | aaf42b63098935ad2f854a09d244e35352c60713 /.gitlab | |
| parent | d56569ff3e73ae1dbcf93d2530925c4ecb8fd185 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/rules.gitlab-ci.yml | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml index 40b2f3f41d4..264950ae1cc 100644 --- a/.gitlab/ci/rules.gitlab-ci.yml +++ b/.gitlab/ci/rules.gitlab-ci.yml @@ -604,6 +604,18 @@ - "scripts/glfm/**/*" - "scripts/lib/glfm/**/*" +# Certain components require the base e2e GDK image to be rebuilt if they change +.gdk-component-patterns: &gdk-component-patterns + - qa/gdk/**/* + - Gemfile.lock + - yarn.lock + - workhorse/**/* + - VERSION + - GITLAB_WORKHORSE_VERSION + - GITLAB_METRICS_EXPORTER_VERSION + - GITLAB_SHELL_VERSION + - GITALY_SERVER_VERSION + ################## # Conditions set # ################## @@ -905,15 +917,7 @@ - <<: *if-merge-request variables: BUILD_GDK_BASE: "true" - changes: - - qa/gdk/**/* - - Gemfile.lock - - yarn.lock - - workhorse/**/* - - VERSION - - GITLAB_METRICS_EXPORTER_VERSION - - GITLAB_SHELL_VERSION - - GITALY_SERVER_VERSION + changes: *gdk-component-patterns # The rest are included to be consistent with .qa:rules:e2e:test-on-gdk - <<: *if-merge-request-targeting-stable-branch changes: *setup-test-env-patterns @@ -1431,6 +1435,9 @@ changes: *setup-test-env-patterns allow_failure: true - <<: *if-merge-request + # Certain components trigger a rebuild of the e2e GDK image so we want to test it too + changes: *gdk-component-patterns + - <<: *if-merge-request changes: *code-backstage-qa-patterns allow_failure: true - <<: *if-dot-com-gitlab-org-schedule @@ -1567,6 +1574,9 @@ USE_OLD_RUBY_VERSION: 'false' CACHE_EDITION: 'GITLAB_RUBY3_1' - <<: *if-merge-request + # Certain components trigger a rebuild of the e2e GDK image so we want to test it too + changes: *gdk-component-patterns + - <<: *if-merge-request changes: *dependency-patterns - <<: *if-merge-request-labels-run-all-e2e - <<: *if-dot-com-gitlab-org-and-security-merge-request-manual-ff-package-and-e2e |