summaryrefslogtreecommitdiff
path: root/.gitlab/ci/rules.gitlab-ci.yml
diff options
context:
space:
mode:
Diffstat (limited to '.gitlab/ci/rules.gitlab-ci.yml')
-rw-r--r--.gitlab/ci/rules.gitlab-ci.yml6
1 files changed, 3 insertions, 3 deletions
diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml
index 8fcea840cfe..8a730970d9e 100644
--- a/.gitlab/ci/rules.gitlab-ci.yml
+++ b/.gitlab/ci/rules.gitlab-ci.yml
@@ -884,7 +884,8 @@
changes: *ci-build-images-patterns
- <<: *if-default-refs
changes: *code-qa-patterns
- # Rules to support .qa:rules:package-and-test-ee
+ # Rules to support .qa:rules:package-and-test
+ - <<: *if-default-branch-schedule-nightly
- <<: *if-merge-request
changes: *dependency-patterns
- <<: *if-merge-request-labels-run-all-e2e
@@ -902,8 +903,6 @@
rules:
- <<: *if-not-ee
when: never
- - <<: *if-merge-request-labels-pipeline-expedite
- when: never
- !reference [".build-images:rules:build-assets-image", "rules"]
#################
@@ -1076,6 +1075,7 @@
- <<: *if-merge-request-labels-run-all-e2e
- <<: *if-auto-deploy-branches
- <<: *if-ruby2-branch
+ - <<: *if-default-branch-schedule-nightly
- <<: *if-default-refs
changes: *ci-build-images-patterns
- <<: *if-default-refs