summaryrefslogtreecommitdiff
path: root/.gitlab
diff options
context:
space:
mode:
authorYorick Peterse <yorick@yorickpeterse.com>2019-08-28 16:32:40 +0200
committerYorick Peterse <yorick@yorickpeterse.com>2019-08-28 16:32:40 +0200
commitc10a328ec575a09ce5dcfd7012591dbdfdaf7cda (patch)
treed7903263f470d7851affee0b5e31856b384845ee /.gitlab
parent8c262bf7d0992dcdc533d8d7c866adb9dc43467a (diff)
downloadgitlab-ce-c10a328ec575a09ce5dcfd7012591dbdfdaf7cda.tar.gz
Don't use ee/.gitlab/ for CI config filesmove-ee-ci-config-to-ce
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.
Diffstat (limited to '.gitlab')
-rw-r--r--.gitlab/ci/ee-specific-checks.gitlab-ci.yml22
1 files changed, 22 insertions, 0 deletions
diff --git a/.gitlab/ci/ee-specific-checks.gitlab-ci.yml b/.gitlab/ci/ee-specific-checks.gitlab-ci.yml
new file mode 100644
index 00000000000..babb89b4606
--- /dev/null
+++ b/.gitlab/ci/ee-specific-checks.gitlab-ci.yml
@@ -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