diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-21 18:10:40 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-21 18:10:40 +0300 |
| commit | 10b6df25f1b23883bad078ada777307aea08402a (patch) | |
| tree | 35c2106fd8b0a445773b6dd0bc3e3a67f7fe25f3 /.gitlab | |
| parent | 6c44b676312eb6cdffadef45f9ca3e29a8cc92ab (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/cng/main.gitlab-ci.yml | 4 | ||||
| -rw-r--r-- | .gitlab/ci/release-environments/main.gitlab-ci.yml | 4 | ||||
| -rw-r--r-- | .gitlab/ci/review-apps/main.gitlab-ci.yml | 5 |
3 files changed, 10 insertions, 3 deletions
diff --git a/.gitlab/ci/cng/main.gitlab-ci.yml b/.gitlab/ci/cng/main.gitlab-ci.yml index 325b06d59cd..bee502e3b0b 100644 --- a/.gitlab/ci/cng/main.gitlab-ci.yml +++ b/.gitlab/ci/cng/main.gitlab-ci.yml @@ -9,7 +9,7 @@ stages: include: - local: .gitlab/ci/global.gitlab-ci.yml -review-build-cng-env: +.review-build-cng-env: image: ${GITLAB_DEPENDENCY_PROXY_ADDRESS}ruby:${RUBY_VERSION}-alpine3.16 stage: prepare needs: @@ -34,7 +34,7 @@ review-build-cng-env: expire_in: 7 days when: always -review-build-cng: +.review-build-cng: stage: prepare inherit: variables: false diff --git a/.gitlab/ci/release-environments/main.gitlab-ci.yml b/.gitlab/ci/release-environments/main.gitlab-ci.yml index 7eb67509301..ff15673d48d 100644 --- a/.gitlab/ci/release-environments/main.gitlab-ci.yml +++ b/.gitlab/ci/release-environments/main.gitlab-ci.yml @@ -3,9 +3,13 @@ include: - local: .gitlab/ci/cng/main.gitlab-ci.yml review-build-cng-env: + extends: + - .review-build-cng-env allow_failure: true review-build-cng: + extends: + - .review-build-cng needs: ["review-build-cng-env"] variables: IMAGE_TAG_EXT: "-${CI_COMMIT_SHORT_SHA}" diff --git a/.gitlab/ci/review-apps/main.gitlab-ci.yml b/.gitlab/ci/review-apps/main.gitlab-ci.yml index c5f56076ce7..9955c2cf27a 100644 --- a/.gitlab/ci/review-apps/main.gitlab-ci.yml +++ b/.gitlab/ci/review-apps/main.gitlab-ci.yml @@ -30,11 +30,14 @@ dont-interrupt-me: review-build-cng-env: extends: + - .review-build-cng-env - .default-retry - .review:rules:review-build-cng review-build-cng: - extends: .review:rules:review-build-cng + extends: + - .review-build-cng + - .review:rules:review-build-cng needs: ["review-build-cng-env"] .review-workflow-base: |