diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-05 21:09:02 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-05 21:09:02 +0000 |
commit | 76623c12c136f43f24c3966ed4b469e2c0b434b7 (patch) | |
tree | 7c5ec884c25e03e4fea131a4d112a9d0ccfd59b8 /.gitlab/ci/qa.gitlab-ci.yml | |
parent | b042382bbf5a4977c5b5c6b0a9a33f4e8ca8d16d (diff) | |
download | gitlab-ce-76623c12c136f43f24c3966ed4b469e2c0b434b7.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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab/ci/qa.gitlab-ci.yml b/.gitlab/ci/qa.gitlab-ci.yml index c950c219c96..862d1249360 100644 --- a/.gitlab/ci/qa.gitlab-ci.yml +++ b/.gitlab/ci/qa.gitlab-ci.yml @@ -1,5 +1,5 @@ # Make sure to update all the similar conditions in other CI config files if you modify these conditions -.if-canonical-gitlab-schedule: &if-canonical-gitlab-schedule +.if-canonical-dot-com-gitlab-org-group-schedule: &if-canonical-dot-com-gitlab-org-group-schedule if: '$CI_SERVER_HOST == "gitlab.com" && $CI_PROJECT_NAMESPACE == "gitlab-org" && $CI_PIPELINE_SOURCE == "schedule"' # Make sure to update all the similar conditions in other CI config files if you modify these conditions @@ -86,7 +86,7 @@ package-and-qa: - <<: *if-canonical-gitlab-merge-request changes: *code-patterns when: manual - - <<: *if-canonical-gitlab-schedule + - <<: *if-canonical-dot-com-gitlab-org-group-schedule when: on_success needs: ["build-qa-image", "gitlab:assets:compile pull-cache"] allow_failure: true |