diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-23 18:06:32 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-23 18:06:32 +0300 |
commit | 6f9edd1a4c4942d3d13ec54793cfae56164b1a0a (patch) | |
tree | f118f4a1dcad2db7b35ab15157e16eef56eba860 /.gitlab/ci | |
parent | 94e614c94c0a42e261e6af88c89461d90f3330c0 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab/ci')
-rw-r--r-- | .gitlab/ci/qa.gitlab-ci.yml | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/.gitlab/ci/qa.gitlab-ci.yml b/.gitlab/ci/qa.gitlab-ci.yml index d07b9a1055c..6e6939824ec 100644 --- a/.gitlab/ci/qa.gitlab-ci.yml +++ b/.gitlab/ci/qa.gitlab-ci.yml @@ -24,17 +24,6 @@ package-and-qa-manual: when: manual needs: ["build-qa-image", "gitlab:assets:compile pull-cache"] -package-and-qa-manual:master: - extends: - - .package-and-qa-base - - .only-code-qa-changes - only: - refs: - - master@gitlab-org/gitlab-foss - - master@gitlab-org/gitlab - when: manual - needs: ["build-qa-image", "gitlab:assets:compile"] - package-and-qa: extends: - .package-and-qa-base @@ -44,3 +33,14 @@ package-and-qa: - master needs: ["build-qa-image", "gitlab:assets:compile pull-cache"] allow_failure: true + +schedule:package-and-qa: + extends: + - .package-and-qa-base + - .only-code-qa-changes + only: + refs: + - schedules@gitlab-org/gitlab + - schedules@gitlab-org/gitlab-foss + needs: ["build-qa-image", "gitlab:assets:compile"] + allow_failure: true |