diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-24 00:07:52 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-24 00:07:52 +0300 |
commit | 33e1622bfe5afb2eea08ff06e44de490383a93e3 (patch) | |
tree | 121a36cbcf1488fe3e39bead16f0ad591b8e5dda /.gitlab/ci/qa.gitlab-ci.yml | |
parent | 9f2d4a6490ea2ac9af8b640a507c8aff9ef220e8 (diff) |
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 | 49 |
1 files changed, 33 insertions, 16 deletions
diff --git a/.gitlab/ci/qa.gitlab-ci.yml b/.gitlab/ci/qa.gitlab-ci.yml index 3cb5a40a8b5..e9a3cd0da90 100644 --- a/.gitlab/ci/qa.gitlab-ci.yml +++ b/.gitlab/ci/qa.gitlab-ci.yml @@ -1,3 +1,28 @@ +# Make sure to update all the similar conditions in other CI config files if you modify these conditions +.if-canonical-gitlab-and-merge-request: &if-canonical-gitlab-and-merge-request + if: '$CI_SERVER_HOST == "gitlab.com" && $CI_PROJECT_NAMESPACE =~ /^gitlab-org($|\/)/ && $CI_MERGE_REQUEST_IID' + +# Make sure to update all the similar patterns in other CI config files if you modify these patterns +.code-patterns: &code-patterns + - ".gitlab/ci/**/*" + - ".{eslintignore,gitattributes,nvmrc,prettierrc,stylelintrc,yamllint}" + - ".{codeclimate,eslintrc,gitlab-ci,haml-lint,haml-lint_todo,rubocop,rubocop_todo,scss-lint}.yml" + - ".csscomb.json" + - "Dockerfile.assets" + - "*_VERSION" + - "Gemfile{,.lock}" + - "Rakefile" + - "{babel.config,jest.config}.js" + - "config.ru" + - "{package.json,yarn.lock}" + - "{,ee/}{app,bin,config,db,haml_lint,lib,locale,public,scripts,symbol,vendor}/**/*" + - "doc/api/graphql/reference/*" # Files in this folder are auto-generated + +# Make sure to update all the similar patterns in other CI config files if you modify these patterns +.qa-patterns: &qa-patterns + - ".dockerignore" + - "qa/**/*" + .qa-job-base: extends: - .default-tags @@ -40,23 +65,15 @@ qa:selectors-foss: - install_gitlab_gem - ./scripts/trigger-build omnibus -package-and-qa-manual: - extends: - - .package-and-qa-base - - .default-only - - .only:variables-canonical-dot-com - - .except:refs-deploy - - .only:changes-code - 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 + extends: .package-and-qa-base + rules: + - <<: *if-canonical-gitlab-and-merge-request + changes: *qa-patterns + when: on_success + - <<: *if-canonical-gitlab-and-merge-request + changes: *code-patterns + when: manual needs: ["build-qa-image", "gitlab:assets:compile pull-cache"] allow_failure: true |