diff options
Diffstat (limited to '.gitlab/ci/qa.gitlab-ci.yml')
| -rw-r--r-- | .gitlab/ci/qa.gitlab-ci.yml | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/.gitlab/ci/qa.gitlab-ci.yml b/.gitlab/ci/qa.gitlab-ci.yml index ef407081d50..1c271ad8299 100644 --- a/.gitlab/ci/qa.gitlab-ci.yml +++ b/.gitlab/ci/qa.gitlab-ci.yml @@ -31,7 +31,6 @@ qa:selectors-foss: - .only-ee-as-if-foss .package-and-qa-base: - extends: .default-only image: ruby:2.6-alpine stage: qa dependencies: [] @@ -40,35 +39,30 @@ qa:selectors-foss: - source scripts/utils.sh - install_gitlab_gem - ./scripts/trigger-build omnibus - only: - variables: - - $CI_SERVER_HOST == "gitlab.com" && $CI_PROJECT_NAMESPACE =~ /^gitlab-org($|\/)/ # Matches the gitlab-org group or its subgroups package-and-qa-manual: extends: - .package-and-qa-base + - .default-only + - .only:variables-canonical-dot-com + - .except:refs-deploy - .only:changes-code - except: - refs: - - master - - /^\d+-\d+-auto-deploy-\d+$/ when: manual needs: ["build-qa-image", "gitlab:assets:compile pull-cache"] package-and-qa: extends: - .package-and-qa-base + - .default-only + - .only:variables-canonical-dot-com + - .except:refs-master-tags-stable-deploy - .only:changes-qa - except: - refs: - - master - - /^\d+-\d+-auto-deploy-\d+$/ needs: ["build-qa-image", "gitlab:assets:compile pull-cache"] allow_failure: true schedule:package-and-qa: extends: - .package-and-qa-base - - .only:changes-code-qa - - .only-canonical-schedules + - .default-only + - .only:variables_refs-canonical-dot-com-schedules needs: ["build-qa-image", "gitlab:assets:compile pull-cache"] |