diff options
author | Robert Speicher <robert@gitlab.com> | 2017-10-19 13:02:16 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2017-10-19 13:02:16 +0000 |
commit | 8a987b6541c008adf654c1efc76e2afcdf0271ba (patch) | |
tree | b5ef71fcc8afd21dbeeff4f7fd6ca9e1cf7bfd8a | |
parent | b5e7035c1a5e89845faada20addff98fdcefbd1e (diff) | |
parent | 27dc49fae0eb925d4e06c0036f58ab5601901cd6 (diff) | |
download | gitlab-ce-8a987b6541c008adf654c1efc76e2afcdf0271ba.tar.gz |
Merge branch 'rc/reduce-duplication-in-tests-metadata-state-job-definition' into 'master'
Improve the .tests-metadata-state definition a bit
See merge request gitlab-org/gitlab-ce!14937
-rw-r--r-- | .gitlab-ci.yml | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fc0d2b71174..5fa54895985 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -49,11 +49,10 @@ stages: - gitlab-org .tests-metadata-state: &tests-metadata-state - services: [] + <<: *dedicated-runner variables: - SETUP_DB: "false" - USE_BUNDLE_INSTALL: "false" TESTS_METADATA_S3_BUCKET: "gitlab-ce-cache" + before_script: [] artifacts: expire_in: 31d paths: @@ -80,6 +79,7 @@ stages: .rspec-metadata: &rspec-metadata <<: *dedicated-runner <<: *pull-cache + <<: *except-docs stage: test script: - JOB_NAME=( $CI_JOB_NAME ) @@ -109,16 +109,15 @@ stages: .rspec-metadata-pg: &rspec-metadata-pg <<: *rspec-metadata <<: *use-pg - <<: *except-docs .rspec-metadata-mysql: &rspec-metadata-mysql <<: *rspec-metadata <<: *use-mysql - <<: *except-docs .spinach-metadata: &spinach-metadata <<: *dedicated-runner <<: *pull-cache + <<: *except-docs stage: test script: - JOB_NAME=( $CI_JOB_NAME ) @@ -141,12 +140,10 @@ stages: .spinach-metadata-pg: &spinach-metadata-pg <<: *spinach-metadata <<: *use-pg - <<: *except-docs .spinach-metadata-mysql: &spinach-metadata-mysql <<: *spinach-metadata <<: *use-mysql - <<: *except-docs .only-canonical-masters: &only-canonical-masters only: @@ -222,7 +219,6 @@ review-docs-cleanup: # Retrieve knapsack and rspec_flaky reports retrieve-tests-metadata: <<: *tests-metadata-state - <<: *dedicated-runner <<: *except-docs stage: prepare cache: @@ -240,7 +236,6 @@ retrieve-tests-metadata: update-tests-metadata: <<: *tests-metadata-state - <<: *dedicated-runner <<: *only-canonical-masters stage: post-test cache: |