Merge branch 'move-ee-ci-config-to-ce' into 'master'

Don't use ee/.gitlab/ for CI config files

See merge request gitlab-org/gitlab-ce!32351
This commit is contained in:
Lin Jen-Shin 2019-08-30 13:42:30 +00:00
commit 8e9742edca
2 changed files with 23 additions and 0 deletions

View File

@ -41,3 +41,4 @@ include:
- local: .gitlab/ci/setup.gitlab-ci.yml
- local: .gitlab/ci/test-metadata.gitlab-ci.yml
- local: .gitlab/ci/yaml.gitlab-ci.yml
- local: .gitlab/ci/ee-specific-checks.gitlab-ci.yml

View File

@ -0,0 +1,22 @@
.ee-specific-check:
extends: .default-tags
dependencies: []
only:
- branches@gitlab-org/gitlab-ee
except:
- master
- tags
- /[\d-]+-stable(-ee)?/
- /[\d-]+-auto-deploy-\d{7}/
- /^security-/
- /\bce\-to\-ee\b/
ee-files-location-check:
extends: .ee-specific-check
script:
- scripts/ee-files-location-check
ee-specific-lines-check:
extends: .ee-specific-check
script:
- scripts/ee-specific-lines-check