diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-16 03:13:10 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-16 03:13:10 +0000 |
commit | 766a6a66d3122b3e0227203cfff45a17ecd233bb (patch) | |
tree | 3ebc995101ff53930ab4955f69a37d18577f6814 /.gitlab/ci/setup.gitlab-ci.yml | |
parent | d089b5729e472d68256aa39fade51e7ed99f042b (diff) | |
download | gitlab-ce-766a6a66d3122b3e0227203cfff45a17ecd233bb.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab/ci/setup.gitlab-ci.yml')
-rw-r--r-- | .gitlab/ci/setup.gitlab-ci.yml | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/.gitlab/ci/setup.gitlab-ci.yml b/.gitlab/ci/setup.gitlab-ci.yml index 7c4ffafce1c..4c674f38939 100644 --- a/.gitlab/ci/setup.gitlab-ci.yml +++ b/.gitlab/ci/setup.gitlab-ci.yml @@ -41,13 +41,21 @@ gitlab_git_test: script: - spec/support/prepare-gitlab-git-test-for-commit --check-for-changes -no_ee_check: +no-ee-check: extends: - .minimal-job - - .setup:rules:no_ee_check + - .setup:rules:no-ee-check stage: test script: - - scripts/no-ee-check + - scripts/no-dir-check ee + +no-jh-check: + extends: + - .minimal-job + - .setup:rules:no-jh-check + stage: test + script: + - scripts/no-dir-check jh verify-tests-yml: extends: |