diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-17 17:16:34 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-17 17:16:34 +0300 |
| commit | 4ab54c2233e91f60a80e5b6fa2181e6899fdcc3e (patch) | |
| tree | 2b256ff8dfe63dafe7f42b0d995f9e74fd1dc48b /.gitlab/ci/qa.gitlab-ci.yml | |
| parent | bd860c22f6a4b9473cbddd34a53eead8235a7ea1 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab/ci/qa.gitlab-ci.yml')
| -rw-r--r-- | .gitlab/ci/qa.gitlab-ci.yml | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/.gitlab/ci/qa.gitlab-ci.yml b/.gitlab/ci/qa.gitlab-ci.yml index a868316c353..e7362f913a9 100644 --- a/.gitlab/ci/qa.gitlab-ci.yml +++ b/.gitlab/ci/qa.gitlab-ci.yml @@ -1,4 +1,5 @@ .package-and-qa-base: + extends: .default-only image: ruby:2.6-alpine stage: qa dependencies: [] @@ -10,17 +11,16 @@ - install_gitlab_gem - ./scripts/trigger-build omnibus only: - refs: - - branches@gitlab-org/gitlab-foss - - branches@gitlab-org/gitlab + variables: + - $CI_SERVER_HOST == "gitlab.com" && $CI_PROJECT_NAMESPACE == "gitlab-org" package-and-qa-manual: - extends: .package-and-qa-base + extends: + - .package-and-qa-base + - .only-code-changes except: refs: - master - - /(^docs[\/-].+|.+-docs$)/ - - /(^qa[\/-].*|.*-qa$)/ when: manual needs: ["build-qa-image", "gitlab:assets:compile pull-cache"] @@ -34,10 +34,11 @@ package-and-qa-manual:master: needs: ["build-qa-image", "gitlab:assets:compile"] package-and-qa: - extends: .package-and-qa-base - only: + extends: + - .package-and-qa-base + - .only-qa-changes + except: refs: - - /(^qa[\/-].*|.*-qa$)/@gitlab-org/gitlab-foss - - /(^qa[\/-].*|.*-qa$)/@gitlab-org/gitlab + - master needs: ["build-qa-image", "gitlab:assets:compile pull-cache"] allow_failure: true |