diff options
| author | blackst0ne <blackst0ne.ru@gmail.com> | 2018-04-05 10:00:32 +1100 |
|---|---|---|
| committer | blackst0ne <blackst0ne.ru@gmail.com> | 2018-04-05 10:00:32 +1100 |
| commit | 4eb39a1b5f94db20598e91b4987401e57517ec1d (patch) | |
| tree | 40dd638cb59fa86317836dc9084743937c253917 | |
| parent | d3a3f31512862cb7317798d8a7e72c58963756b3 (diff) | |
| download | gitlab-ce-blackst0ne-rails5-add-rails5-to-gitlab-ci.tar.gz | |
[Rails5] Add rails5 manual jobs to gitlab-ci.ymlblackst0ne-rails5-add-rails5-to-gitlab-ci
| -rw-r--r-- | .gitlab-ci.yml | 43 |
1 files changed, 19 insertions, 24 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e8ce4acfb66..7642a424ce2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -78,6 +78,19 @@ stages: - mysql:latest - redis:alpine +.rails5-variables: &rails5-variables + script: + - export RAILS5=${RAILS5} + - export BUNDLE_GEMFILE=${BUNDLE_GEMFILE} + +.rails5: &rails5 + allow_failure: true + only: + - /rails5/ + variables: + BUNDLE_GEMFILE: "Gemfile.rails5" + RAILS5: "true" + # Skip all jobs except the ones that begin with 'docs/'. # Used for commits including ONLY documentation changes. # https://docs.gitlab.com/ce/development/writing_documentation.html#testing @@ -118,6 +131,7 @@ stages: <<: *dedicated-runner <<: *except-docs-and-qa <<: *pull-cache + <<: *rails5-variables stage: test script: - JOB_NAME=( $CI_JOB_NAME ) @@ -130,8 +144,6 @@ stages: - export NEW_FLAKY_RSPEC_REPORT_PATH=rspec_flaky/new_${JOB_NAME[0]}_${CI_NODE_INDEX}_${CI_NODE_TOTAL}_report.json - export FLAKY_RSPEC_GENERATE_REPORT=true - export CACHE_CLASSES=true - - export RAILS5=${RAILS5} - - export BUNDLE_GEMFILE=${BUNDLE_GEMFILE} - cp ${KNAPSACK_RSPEC_SUITE_REPORT_PATH} ${KNAPSACK_REPORT_PATH} - '[[ -f $FLAKY_RSPEC_REPORT_PATH ]] || echo "{}" > ${FLAKY_RSPEC_REPORT_PATH}' - '[[ -f $NEW_FLAKY_RSPEC_REPORT_PATH ]] || echo "{}" > ${NEW_FLAKY_RSPEC_REPORT_PATH}' @@ -152,11 +164,7 @@ stages: .rspec-metadata-pg-rails5: &rspec-metadata-pg-rails5 <<: *rspec-metadata-pg - allow_failure: true - when: manual - variables: - BUNDLE_GEMFILE: "Gemfile.rails5" - RAILS5: "true" + <<: *rails5 .rspec-metadata-mysql: &rspec-metadata-mysql <<: *rspec-metadata @@ -164,16 +172,13 @@ stages: .rspec-metadata-mysql-rails5: &rspec-metadata-mysql-rails5 <<: *rspec-metadata-mysql - allow_failure: true - when: manual - variables: - BUNDLE_GEMFILE: "Gemfile.rails5" - RAILS5: "true" + <<: *rails5 .spinach-metadata: &spinach-metadata <<: *dedicated-runner <<: *except-docs-and-qa <<: *pull-cache + <<: *rails5-variables stage: test script: - JOB_NAME=( $CI_JOB_NAME ) @@ -182,8 +187,6 @@ stages: - export KNAPSACK_REPORT_PATH=knapsack/${CI_PROJECT_NAME}/${JOB_NAME[0]}_node_${CI_NODE_INDEX}_${CI_NODE_TOTAL}_report.json - export KNAPSACK_GENERATE_REPORT=true - export CACHE_CLASSES=true - - export RAILS5=${RAILS5} - - export BUNDLE_GEMFILE=${BUNDLE_GEMFILE} - cp ${KNAPSACK_SPINACH_SUITE_REPORT_PATH} ${KNAPSACK_REPORT_PATH} - scripts/gitaly-test-spawn - knapsack spinach "-r rerun" -b || retry '[[ -e tmp/spinach-rerun.txt ]] && bundle exec spinach -b -r rerun $(cat tmp/spinach-rerun.txt)' @@ -201,11 +204,7 @@ stages: .spinach-metadata-pg-rails5: &spinach-metadata-pg-rails5 <<: *spinach-metadata-pg - allow_failure: true - when: manual - variables: - BUNDLE_GEMFILE: "Gemfile.rails5" - RAILS5: "true" + <<: *rails5 .spinach-metadata-mysql: &spinach-metadata-mysql <<: *spinach-metadata @@ -213,11 +212,7 @@ stages: .spinach-metadata-mysql-rails5: &spinach-metadata-mysql-rails5 <<: *spinach-metadata-mysql - allow_failure: true - when: manual - variables: - BUNDLE_GEMFILE: "Gemfile.rails5" - RAILS5: "true" + <<: *rails5 .only-canonical-masters: &only-canonical-masters only: |