diff options
Diffstat (limited to '.gitlab/ci/qa.gitlab-ci.yml')
| -rw-r--r-- | .gitlab/ci/qa.gitlab-ci.yml | 31 |
1 files changed, 24 insertions, 7 deletions
diff --git a/.gitlab/ci/qa.gitlab-ci.yml b/.gitlab/ci/qa.gitlab-ci.yml index ee9e467886a..ac2a70dda0b 100644 --- a/.gitlab/ci/qa.gitlab-ci.yml +++ b/.gitlab/ci/qa.gitlab-ci.yml @@ -1,10 +1,8 @@ -package-and-qa: +.package-and-qa-base: image: ruby:2.6-alpine - stage: review # So even if review-deploy failed we can still run this - when: manual - before_script: [] + stage: qa + needs: ["build-qa-image", "gitlab:assets:compile pull-cache"] dependencies: [] - cache: {} variables: GIT_DEPTH: "1" retry: 0 @@ -13,5 +11,24 @@ package-and-qa: - install_gitlab_gem - ./scripts/trigger-build omnibus only: - - /.+/@gitlab-org/gitlab-ce - - /.+/@gitlab-org/gitlab-ee + - branches@gitlab-org/gitlab-ce + - branches@gitlab-org/gitlab-ee + except: + - master + +package-and-qa-manual: + extends: + - .package-and-qa-base + - .except-docs-qa + when: manual + except: + - master + - /(^docs[\/-].+|.+-docs$)/ + - /(^qa[\/-].*|.*-qa$) + +package-and-qa: + extends: .package-and-qa-base + allow_failure: true + only: + - /(^qa[\/-].*|.*-qa$)/@gitlab-org/gitlab-ce + - /(^qa[\/-].*|.*-qa$)/@gitlab-org/gitlab-ee |