summaryrefslogtreecommitdiff
path: root/.gitlab/ci/review.gitlab-ci.yml
diff options
context:
space:
mode:
Diffstat (limited to '.gitlab/ci/review.gitlab-ci.yml')
-rw-r--r--.gitlab/ci/review.gitlab-ci.yml24
1 files changed, 7 insertions, 17 deletions
diff --git a/.gitlab/ci/review.gitlab-ci.yml b/.gitlab/ci/review.gitlab-ci.yml
index 3cbfa32d9a5..78431e3d842 100644
--- a/.gitlab/ci/review.gitlab-ci.yml
+++ b/.gitlab/ci/review.gitlab-ci.yml
@@ -1,15 +1,3 @@
-.review-only: &review-only
- only:
- refs:
- - branches@gitlab-org/gitlab-ce
- - branches@gitlab-org/gitlab-ee
- kubernetes: active
- except:
- refs:
- - master
- - /^\d+-\d+-auto-deploy-\d+$/
- - /(^docs[\/-].+|.+-docs$)/
-
.review-schedules-only: &review-schedules-only
only:
refs:
@@ -24,8 +12,9 @@
- /(^docs[\/-].+|.+-docs$)/
.review-base: &review-base
- extends: .dedicated-runner
- <<: *review-only
+ extends:
+ - .dedicated-runner
+ - .review-only
image: registry.gitlab.com/gitlab-org/gitlab-build-images:gitlab-charts-build-base
cache: {}
dependencies: []
@@ -68,7 +57,7 @@ build-qa-image:
- BUILD_TRIGGER_TOKEN=$REVIEW_APPS_BUILD_TRIGGER_TOKEN ./scripts/trigger-build cng
review-build-cng:
- <<: *review-only
+ extends: .review-only
<<: *review-build-cng-base
schedule:review-build-cng:
@@ -117,8 +106,9 @@ schedule:review-deploy:
<<: *review-schedules-only
review-stop:
- <<: *review-only
- extends: .single-script-job-dedicated-runner
+ extends:
+ - .single-script-job-dedicated-runner
+ - .review-only
image: registry.gitlab.com/gitlab-org/gitlab-build-images:gitlab-charts-build-base
stage: review
when: manual