diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-23 12:08:38 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-23 12:08:38 +0000 |
| commit | 5ad0cf26551baff8f08af8562a8d45e6ec14d71a (patch) | |
| tree | 57f1a6bad31bcd11efacd3fdfb9cc92f88fb6a86 /.gitlab | |
| parent | f47c768fad17d4c876e96524f83f8306f071db66 (diff) | |
| download | gitlab-ce-5ad0cf26551baff8f08af8562a8d45e6ec14d71a.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/global.gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | .gitlab/ci/qa.gitlab-ci.yml | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/.gitlab/ci/global.gitlab-ci.yml b/.gitlab/ci/global.gitlab-ci.yml index 121ce76d1dd..6943f51047c 100644 --- a/.gitlab/ci/global.gitlab-ci.yml +++ b/.gitlab/ci/global.gitlab-ci.yml @@ -13,7 +13,7 @@ .default-before_script: before_script: - date - - '[ "$FOSS_ONLY" = "1" ] && rm -rf ee/' + - '[ "$FOSS_ONLY" = "1" ] && rm -rf ee/ qa/spec/ee/ qa/qa/specs/features/ee/ qa/qa/ee/ qa/qa/ee.rb' - export GOPATH=$CI_PROJECT_DIR/.go - mkdir -p $GOPATH - source scripts/utils.sh diff --git a/.gitlab/ci/qa.gitlab-ci.yml b/.gitlab/ci/qa.gitlab-ci.yml index effc950f3c8..c950c219c96 100644 --- a/.gitlab/ci/qa.gitlab-ci.yml +++ b/.gitlab/ci/qa.gitlab-ci.yml @@ -40,7 +40,7 @@ paths: - vendor/ruby before_script: - - '[ "$FOSS_ONLY" = "1" ] && rm -rf ee/' + - '[ "$FOSS_ONLY" = "1" ] && rm -rf ee/ qa/spec/ee/ qa/qa/specs/features/ee/ qa/qa/ee/ qa/qa/ee.rb' - cd qa/ - bundle install --clean --jobs=$(nproc) --path=vendor --retry=3 --quiet - bundle check @@ -50,6 +50,13 @@ qa:internal: script: - bundle exec rspec +qa:internal-foss: + extends: + - .qa-job-base + - .only-ee-as-if-foss + script: + - bundle exec rspec + qa:selectors: extends: .qa-job-base script: |