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

These files are not available in CE, resulting in CI pipeline failures
when trying to include these files. Since the job is already configured
to only run on EE, we can just include it in both CE and EE.
This commit is contained in:
Yorick Peterse 2019-08-28 16:32:40 +02:00
parent 8c262bf7d0
commit c10a328ec5
No known key found for this signature in database
GPG Key ID: EDD30D2BEB691AC9
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