diff --git a/.gitlab/ci/qa.gitlab-ci.yml b/.gitlab/ci/qa.gitlab-ci.yml index caa7d18c1ee7428fba7f3d810c28c5d2dcd8fcce..8628e1e0a14080ff2e0082b036276a1fdd1f84b0 100644 --- a/.gitlab/ci/qa.gitlab-ci.yml +++ b/.gitlab/ci/qa.gitlab-ci.yml @@ -10,34 +10,31 @@ - install_gitlab_gem - ./scripts/trigger-build omnibus only: - - branches@gitlab-org/gitlab-ce - - branches@gitlab-org/gitlab-ee - except: - - master + refs: + - branches@gitlab-org/gitlab-ce + - branches@gitlab-org/gitlab-ee package-and-qa-manual: - extends: - - .package-and-qa-base - - .except-docs-qa + extends: .package-and-qa-base except: refs: - master - needs: ["build-qa-image", "gitlab:assets:compile pull-cache"] when: manual + needs: ["build-qa-image", "gitlab:assets:compile pull-cache"] package-and-qa-manual:master: - extends: - - .package-and-qa-base - needs: ["build-qa-image", "gitlab:assets:compile"] + extends: .package-and-qa-base only: refs: - master when: manual + needs: ["build-qa-image", "gitlab:assets:compile"] package-and-qa: extends: .package-and-qa-base + only: + refs: + - /(^qa[\/-].*|.*-qa$)/@gitlab-org/gitlab-ce + - /(^qa[\/-].*|.*-qa$)/@gitlab-org/gitlab-ee needs: ["build-qa-image", "gitlab:assets:compile pull-cache"] allow_failure: true - only: - - /(^qa[\/-].*|.*-qa$)/@gitlab-org/gitlab-ce - - /(^qa[\/-].*|.*-qa$)/@gitlab-org/gitlab-ee diff --git a/.gitlab/ci/review.gitlab-ci.yml b/.gitlab/ci/review.gitlab-ci.yml index 360e4433e5731800fd12eb09c483a1a8ae223770..c4a81a021a9869a9f13d98db3592b1617cddfd05 100644 --- a/.gitlab/ci/review.gitlab-ci.yml +++ b/.gitlab/ci/review.gitlab-ci.yml @@ -40,7 +40,7 @@ build-qa-image: extends: - .review-docker - - .except-docs-qa + - .except-docs only: refs: - branches@gitlab-org/gitlab-ce