diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2019-08-26 14:39:48 +0000 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2019-08-26 14:39:48 +0000 |
| commit | 336ef2a98cf74b0a49474816031657efbe14f3b2 (patch) | |
| tree | 534feefbd1b6cb2a36dd24f3bca83feb7fad7c05 | |
| parent | 18206a743f3abf760727f30fbe9d03740d73af16 (diff) | |
| parent | 05fd0259da87b56144faf40cb49eca2c32eef085 (diff) | |
| download | gitlab-ce-336ef2a98cf74b0a49474816031657efbe14f3b2.tar.gz | |
Merge branch 'qa-use-dag-for-package-and-qa-always-job' into 'master'
Use the 'needs' keyword for 'package-and-qa' job
See merge request gitlab-org/gitlab-ce!32085
| -rw-r--r-- | .gitlab/ci/qa.gitlab-ci.yml | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/.gitlab/ci/qa.gitlab-ci.yml b/.gitlab/ci/qa.gitlab-ci.yml index 144e5392e55..69b932801ad 100644 --- a/.gitlab/ci/qa.gitlab-ci.yml +++ b/.gitlab/ci/qa.gitlab-ci.yml @@ -1,7 +1,8 @@ .package-and-qa-base: image: ruby:2.6-alpine - stage: review # So even if review-deploy failed we can still run this + stage: qa before_script: [] + needs: ["build-qa-image", "gitlab:assets:compile pull-cache"] dependencies: [] cache: {} variables: @@ -14,12 +15,16 @@ only: - branches@gitlab-org/gitlab-ce - branches@gitlab-org/gitlab-ee + except: + - master package-and-qa-manual: - extends: - - .package-and-qa-base - - .no-docs-and-no-qa + extends: .package-and-qa-base when: manual + except: + - master + - /(^docs[\/-].+|.+-docs$)/ + - /(^qa[\/-].*|.*-qa$) package-and-qa: extends: .package-and-qa-base |