diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-14 09:06:20 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-14 09:06:20 +0000 |
| commit | 4fe2bdc9b6d36a86c61bfefb7258bd99ecb7af96 (patch) | |
| tree | 4e2c07548b8951b9c1646931e94a9427dd253c3c /.gitlab/ci/qa.gitlab-ci.yml | |
| parent | a93dfc1b7e55b118b1cf4a67afeb46556292914c (diff) | |
| download | gitlab-ce-4fe2bdc9b6d36a86c61bfefb7258bd99ecb7af96.tar.gz | |
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 | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/.gitlab/ci/qa.gitlab-ci.yml b/.gitlab/ci/qa.gitlab-ci.yml index ca89c4e2c89..a868316c353 100644 --- a/.gitlab/ci/qa.gitlab-ci.yml +++ b/.gitlab/ci/qa.gitlab-ci.yml @@ -11,8 +11,8 @@ - ./scripts/trigger-build omnibus only: refs: - - branches@gitlab-org/gitlab-ce - - branches@gitlab-org/gitlab-ee + - branches@gitlab-org/gitlab-foss + - branches@gitlab-org/gitlab package-and-qa-manual: extends: .package-and-qa-base @@ -28,8 +28,8 @@ package-and-qa-manual:master: extends: .package-and-qa-base only: refs: - - master@gitlab-org/gitlab-ce - - master@gitlab-org/gitlab-ee + - master@gitlab-org/gitlab-foss + - master@gitlab-org/gitlab when: manual needs: ["build-qa-image", "gitlab:assets:compile"] @@ -37,7 +37,7 @@ package-and-qa: extends: .package-and-qa-base only: refs: - - /(^qa[\/-].*|.*-qa$)/@gitlab-org/gitlab-ce - - /(^qa[\/-].*|.*-qa$)/@gitlab-org/gitlab-ee + - /(^qa[\/-].*|.*-qa$)/@gitlab-org/gitlab-foss + - /(^qa[\/-].*|.*-qa$)/@gitlab-org/gitlab needs: ["build-qa-image", "gitlab:assets:compile pull-cache"] allow_failure: true |