diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-19 21:08:48 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-19 21:08:48 +0300 |
| commit | dc539af30068062bd6fc2f9c6b478d4a1feb8c23 (patch) | |
| tree | 37dd61148284c624396ba01a94af3663f308561d /.gitlab | |
| parent | 30cd626f8c1028ba096e84349580e0772a34b1af (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/build-images.gitlab-ci.yml | 1 | ||||
| -rw-r--r-- | .gitlab/ci/rules.gitlab-ci.yml | 10 |
2 files changed, 10 insertions, 1 deletions
diff --git a/.gitlab/ci/build-images.gitlab-ci.yml b/.gitlab/ci/build-images.gitlab-ci.yml index 05748cff266..9177913de18 100644 --- a/.gitlab/ci/build-images.gitlab-ci.yml +++ b/.gitlab/ci/build-images.gitlab-ci.yml @@ -27,6 +27,7 @@ build-qa-image as-if-foss: extends: - build-qa-image - .as-if-foss + - .build-images:rules:build-qa-image-as-if-foss build-assets-image: extends: diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml index 9596594ad26..718098fa333 100644 --- a/.gitlab/ci/rules.gitlab-ci.yml +++ b/.gitlab/ci/rules.gitlab-ci.yml @@ -690,7 +690,7 @@ ###################### # Build images rules # ###################### -.build-images:rules:build-qa-image: +.build-images:rules:build-qa-image-merge-requests: rules: - <<: *if-not-canonical-namespace when: never @@ -700,6 +700,10 @@ changes: *ci-build-images-patterns - <<: *if-dot-com-gitlab-org-and-security-merge-request changes: *code-qa-patterns + +.build-images:rules:build-qa-image: + rules: + - !reference [".build-images:rules:build-qa-image-merge-requests", "rules"] - <<: *if-auto-deploy-branches variables: ARCH: amd64,arm64 @@ -712,6 +716,10 @@ - <<: *if-force-ci - <<: *if-ruby2-branch +.build-images:rules:build-qa-image-as-if-foss: + rules: + - !reference [".build-images:rules:build-qa-image-merge-requests", "rules"] + .build-images:rules:build-assets-image: rules: - <<: *if-not-canonical-namespace |