diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-04 15:06:38 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-04 15:06:38 +0000 |
commit | 5ecacec30458330df5fa6d591dc58e37afb41cd4 (patch) | |
tree | 58a9c004fdae78cbedbcc616dcfa783a1172eea3 /.gitlab | |
parent | 0d46bf06388d485824bc2f1e736b92b2a8a397e4 (diff) | |
download | gitlab-ce-5ecacec30458330df5fa6d591dc58e37afb41cd4.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab')
-rw-r--r-- | .gitlab/ci/frontend.gitlab-ci.yml | 30 | ||||
-rw-r--r-- | .gitlab/ci/global.gitlab-ci.yml | 5 | ||||
-rw-r--r-- | .gitlab/ci/rails.gitlab-ci.yml | 19 |
3 files changed, 48 insertions, 6 deletions
diff --git a/.gitlab/ci/frontend.gitlab-ci.yml b/.gitlab/ci/frontend.gitlab-ci.yml index 1feda7ed4d4..16b85696727 100644 --- a/.gitlab/ci/frontend.gitlab-ci.yml +++ b/.gitlab/ci/frontend.gitlab-ci.yml @@ -123,7 +123,7 @@ compile-assets pull-cache: - .use-pg9 dependencies: ["compile-assets", "compile-assets pull-cache", "setup-test-env"] -karma: +.karma-base: extends: .only-code-frontend-job-base variables: # we override the max_old_space_size to prevent OOM errors @@ -134,6 +134,9 @@ karma: - scripts/gitaly-test-spawn - date - bundle exec rake karma + +karma: + extends: .karma-base coverage: '/^Statements *: (\d+\.\d+%)/' artifacts: name: coverage-javascript @@ -146,7 +149,12 @@ karma: reports: junit: junit_karma.xml -jest: +karma-foss: + extends: + - .karma-base + - .only-ee-as-if-foss + +.jest-base: extends: .only-code-frontend-job-base script: - scripts/gitaly-test-spawn @@ -154,6 +162,14 @@ jest: - bundle exec rake frontend:fixtures - date - yarn jest --ci --coverage + cache: + key: jest + paths: + - tmp/jest/jest/ + policy: pull-push + +jest: + extends: .jest-base artifacts: name: coverage-frontend expire_in: 31d @@ -164,11 +180,13 @@ jest: - tmp/tests/frontend/ reports: junit: junit_jest.xml + +jest-foss: + extends: + - .jest-base + - .only-ee-as-if-foss cache: - key: jest - paths: - - tmp/jest/jest/ - policy: pull-push + policy: pull .qa-job-base: extends: diff --git a/.gitlab/ci/global.gitlab-ci.yml b/.gitlab/ci/global.gitlab-ci.yml index e082d584b0c..0c0591d3fdc 100644 --- a/.gitlab/ci/global.gitlab-ci.yml +++ b/.gitlab/ci/global.gitlab-ci.yml @@ -149,3 +149,8 @@ variables: - $CI_PROJECT_NAME == "gitlab" - $CI_PROJECT_NAME == "gitlab-ee" # Support former project name for forks/mirrors + +.only-ee-as-if-foss: + extends: .only-ee + variables: + IS_GITLAB_EE: '0' diff --git a/.gitlab/ci/rails.gitlab-ci.yml b/.gitlab/ci/rails.gitlab-ci.yml index c315501b0ba..73b649b4d14 100644 --- a/.gitlab/ci/rails.gitlab-ci.yml +++ b/.gitlab/ci/rails.gitlab-ci.yml @@ -74,6 +74,12 @@ setup-test-env: - .rspec-base - .use-pg9 +.rspec-base-pg9-foss: + extends: + - .rspec-base + - .use-pg9 + - .only-ee-as-if-foss + .rspec-base-pg10: extends: - .rspec-base @@ -84,14 +90,27 @@ rspec unit pg9: extends: .rspec-base-pg9 parallel: 20 +rspec unit pg9-foss: + extends: .rspec-base-pg9-foss + parallel: 20 + rspec integration pg9: extends: .rspec-base-pg9 parallel: 6 +rspec integration pg9-foss: + extends: .rspec-base-pg9-foss + parallel: 6 + rspec system pg9: extends: .rspec-base-pg9 parallel: 24 +# TODO: This requires FOSS assets +# rspec system pg9-foss: +# extends: .rspec-base-pg9-foss +# parallel: 24 + rspec unit pg10: extends: .rspec-base-pg10 parallel: 20 |