diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-09-09 11:45:55 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-09-09 11:45:55 +0300 |
| commit | c92e9b9e7d524ee8e6205557b72fc96bb3ab1cda (patch) | |
| tree | 8319a607997b7c493e291019f2d32a6a7b477dfd /.gitlab | |
| parent | b93d3501fdc450018adae442f3a2bcb514b136b9 (diff) | |
Add latest changes from gitlab-org/gitlab@16-3-stable-ee
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/build-images.gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | .gitlab/ci/rules.gitlab-ci.yml | 10 |
2 files changed, 4 insertions, 8 deletions
diff --git a/.gitlab/ci/build-images.gitlab-ci.yml b/.gitlab/ci/build-images.gitlab-ci.yml index 1361f1fe412..d4a9582ded3 100644 --- a/.gitlab/ci/build-images.gitlab-ci.yml +++ b/.gitlab/ci/build-images.gitlab-ci.yml @@ -34,7 +34,7 @@ build-gdk-image: - .base-image-build-buildx - .build-images:rules:build-gdk-image tags: - - high-cpu + - saas-linux-xlarge-amd64 stage: build-images needs: [] script: diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml index 264950ae1cc..304544468ac 100644 --- a/.gitlab/ci/rules.gitlab-ci.yml +++ b/.gitlab/ci/rules.gitlab-ci.yml @@ -906,17 +906,13 @@ .build-images:rules:build-gdk-image: rules: - if: '$QA_RUN_TESTS_ON_GDK !~ /true|yes|1/i' - when: never + when: manual + allow_failure: true - !reference [".qa:rules:package-and-test-never-run", rules] - <<: *if-default-branch-schedule-nightly # already executed in the 2-hourly schedule when: never - - <<: *if-default-branch-refs # Includes scheduled pipelines - variables: - BUILD_GDK_BASE: "true" - # We want to also rebuild the base image if MRs change certain components. + - <<: *if-default-branch-refs - <<: *if-merge-request - variables: - BUILD_GDK_BASE: "true" changes: *gdk-component-patterns # The rest are included to be consistent with .qa:rules:e2e:test-on-gdk - <<: *if-merge-request-targeting-stable-branch |