diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-24 21:06:05 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-24 21:06:05 +0300 |
| commit | 2ed368929ab5094fec5da8038f723463596a80cf (patch) | |
| tree | aec98d50349b0e9a490db0099253b801b2d1a9ea /.gitlab | |
| parent | f1a5755898e865428c923587402fd965b601c4ea (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/global.gitlab-ci.yml | 1 | ||||
| -rw-r--r-- | .gitlab/ci/review.gitlab-ci.yml | 11 |
2 files changed, 12 insertions, 0 deletions
diff --git a/.gitlab/ci/global.gitlab-ci.yml b/.gitlab/ci/global.gitlab-ci.yml index 70f3620aa79..49dd778f4fb 100644 --- a/.gitlab/ci/global.gitlab-ci.yml +++ b/.gitlab/ci/global.gitlab-ci.yml @@ -100,6 +100,7 @@ refs: - master - /^\d+-\d+-auto-deploy-\d+$/ + - /^[\d-]+-stable(-ee)?$/ .only-review-schedules: only: diff --git a/.gitlab/ci/review.gitlab-ci.yml b/.gitlab/ci/review.gitlab-ci.yml index 9251644911f..01e4b1afdb0 100644 --- a/.gitlab/ci/review.gitlab-ci.yml +++ b/.gitlab/ci/review.gitlab-ci.yml @@ -1,8 +1,15 @@ +.except-deploys: + except: + refs: + - /^[\d-]+-stable(-ee)?$/ + - /^\d+-\d+-auto-deploy-\d+$/ + .review-docker: extends: - .default-tags - .default-retry - .default-only + - .except-deploys image: registry.gitlab.com/gitlab-org/gitlab-build-images:gitlab-qa-alpine services: - docker:19.03.0-dind @@ -36,6 +43,7 @@ schedule:review-cleanup: - .default-only - .only-code-qa-changes - .only-review-schedules + - .except-deploys stage: prepare image: registry.gitlab.com/gitlab-org/gitlab-build-images:gitlab-charts-build-base allow_failure: true @@ -52,6 +60,7 @@ schedule:review-cleanup: extends: - .default-only - .only-code-qa-changes + - .except-deploys image: ruby:2.6-alpine stage: review-prepare before_script: @@ -80,6 +89,7 @@ schedule:review-build-cng: - .default-retry - .default-only - .only-code-qa-changes + - .except-deploys stage: review image: registry.gitlab.com/gitlab-org/gitlab-build-images:gitlab-charts-build-base dependencies: [] @@ -257,6 +267,7 @@ parallel-spec-reports: - .default-only - .only-code-qa-changes - .only-review + - .except-deploys image: ruby:2.6-alpine stage: post-test dependencies: ["review-qa-all"] |