diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-05-03 10:01:41 +0200 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-05-17 17:07:07 +0200 |
| commit | 902bd84b05c8e8386cb49692713ef8a39b6c0e6d (patch) | |
| tree | a5848866e583191cf9c870a5ae8497d377180b0a | |
| parent | 33de07bad2ffbff6894e365e4bb05845ae6f8438 (diff) | |
| download | gitlab-ce-31693-move-db-name-to-last-part-of-job-name.tar.gz | |
Reorganize static analysis and DB-related jobs31693-move-db-name-to-last-part-of-job-name
Signed-off-by: Rémy Coutable <remy@rymai.me>
| -rw-r--r-- | .gitlab-ci.yml | 56 |
1 files changed, 27 insertions, 29 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3c19d4d09c0..e6aa5559d99 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -264,7 +264,7 @@ spinach-mysql 7 10: *spinach-knapsack-mysql spinach-mysql 8 10: *spinach-knapsack-mysql spinach-mysql 9 10: *spinach-knapsack-mysql -# Other generic tests +# Static analysis jobs .ruby-static-analysis: &ruby-static-analysis variables: SIMPLECOV: "false" @@ -333,6 +333,7 @@ ee_compat_check: paths: - ee_compat_check/patches/*.patch +# DB migration, rollback, and seed jobs .db-migrate-reset: &db-migrate-reset stage: test <<: *dedicated-runner @@ -348,6 +349,30 @@ db:migrate:reset-mysql: <<: *db-migrate-reset <<: *use-mysql +.migration-paths: &migration-paths + stage: test + <<: *dedicated-runner + variables: + SETUP_DB: "false" + <<: *only-canonical-masters + script: + - git fetch origin v8.14.10 + - git checkout -f FETCH_HEAD + - bundle install $BUNDLE_INSTALL_FLAGS + - bundle exec rake db:drop db:create db:schema:load db:seed_fu + - git checkout $CI_COMMIT_SHA + - bundle install $BUNDLE_INSTALL_FLAGS + - . scripts/prepare_build.sh + - bundle exec rake db:migrate + +migration:path-pg: + <<: *migration-paths + <<: *use-pg + +migration:path-mysql: + <<: *migration-paths + <<: *use-mysql + .db-rollback: &db-rollback stage: test <<: *dedicated-runner @@ -390,6 +415,7 @@ db:seed_fu-mysql: <<: *db-seed_fu <<: *use-mysql +# Frontend-related jobs gitlab:assets:compile: stage: test <<: *dedicated-runner @@ -427,34 +453,6 @@ karma: paths: - coverage-javascript/ -.migration-paths: &migration-paths - stage: test - <<: *dedicated-runner - variables: - SETUP_DB: "false" - only: - - master@gitlab-org/gitlab-ce - - master@gitlab-org/gitlab-ee - - master@gitlab/gitlabhq - - master@gitlab/gitlab-ee - script: - - git fetch origin v8.14.10 - - git checkout -f FETCH_HEAD - - bundle install $BUNDLE_INSTALL_FLAGS - - bundle exec rake db:drop db:create db:schema:load db:seed_fu - - git checkout $CI_COMMIT_SHA - - bundle install $BUNDLE_INSTALL_FLAGS - - . scripts/prepare_build.sh - - bundle exec rake db:migrate - -migration:path-pg: - <<: *migration-paths - <<: *use-pg - -migration:path-mysql: - <<: *migration-paths - <<: *use-mysql - coverage: stage: post-test services: [] |