summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-10-17 13:09:49 +0200
committerRémy Coutable <remy@rymai.me>2018-03-06 16:22:10 +0100
commitf4c3e82a8c55547f9f72d588917d09049bec4d64 (patch)
treee9f2a8c8f9d004b2e8c0da4313817cb73a20087b /.gitlab-ci.yml
parent6fbeb985d2a57563dfa8f7b31c1b386d1c9cad12 (diff)
downloadgitlab-ce-f4c3e82a8c55547f9f72d588917d09049bec4d64.tar.gz
New .dedicated-no-docs-pull-cache-job and .no-db-job definitions
This should speed up a bit some jobs. Also, use ruby:2.4-alpine image in the flaky-examples-check job Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml235
1 files changed, 99 insertions, 136 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 33f14f24048..5556bf5bc0b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -94,6 +94,26 @@ stages:
- /(^docs[\/-].*|.*-docs$)/
- /(^qa[\/-].*|.*-qa$)/
+# Jobs that only need to pull cache
+.dedicated-no-docs-pull-cache-job: &dedicated-no-docs-pull-cache-job
+ <<: *dedicated-runner
+ <<: *except-docs-and-qa
+ <<: *pull-cache
+ dependencies:
+ - setup-test-env
+ stage: test
+
+# Jobs that do not need a DB
+.dedicated-no-docs-no-db-pull-cache-job: &dedicated-no-docs-no-db-pull-cache-job
+ <<: *dedicated-no-docs-pull-cache-job
+ variables:
+ SETUP_DB: "false"
+
+.rake-exec: &rake-exec
+ <<: *dedicated-no-docs-no-db-pull-cache-job
+ script:
+ - bundle exec rake $CI_JOB_NAME
+
.rspec-metadata: &rspec-metadata
<<: *dedicated-runner
<<: *except-docs-and-qa
@@ -170,21 +190,23 @@ stages:
- master@gitlab/gitlabhq
- master@gitlab/gitlab-ee
-##
-# Trigger a package build in omnibus-gitlab repository
-#
-package-qa:
- <<: *dedicated-runner
- image: ruby:2.4-alpine
- before_script: []
- stage: build
- cache: {}
- when: manual
+.gitlab-setup: &gitlab-setup
+ <<: *dedicated-no-docs-pull-cache-job
+ <<: *use-pg
+ variables:
+ CREATE_DB_USER: "true"
script:
- - scripts/trigger-build-omnibus
- only:
- - //@gitlab-org/gitlab-ce
- - //@gitlab-org/gitlab-ee
+ # Manually clone gitlab-test and only seed this project in
+ # db/fixtures/development/04_project.rb thanks to SIZE=1 below
+ - git clone https://gitlab.com/gitlab-org/gitlab-test.git
+ /home/git/repositories/gitlab-org/gitlab-test.git
+ - scripts/gitaly-test-spawn
+ - force=yes SIZE=1 FIXTURE_PATH="db/fixtures/development" bundle exec rake gitlab:setup
+ artifacts:
+ when: on_failure
+ expire_in: 1d
+ paths:
+ - log/development.log
# Review docs base
.review-docs: &review-docs
@@ -207,6 +229,47 @@ package-qa:
only:
- branches
+# DB migration, rollback, and seed jobs
+.db-migrate-reset: &db-migrate-reset
+ <<: *dedicated-no-docs-pull-cache-job
+ script:
+ - bundle exec rake db:migrate:reset
+
+.migration-paths: &migration-paths
+ <<: *dedicated-no-docs-pull-cache-job
+ variables:
+ CREATE_DB_USER: "true"
+ script:
+ - git fetch https://gitlab.com/gitlab-org/gitlab-ce.git v9.3.0
+ - git checkout -f FETCH_HEAD
+ - bundle install $BUNDLE_INSTALL_FLAGS
+ - date
+ - cp config/gitlab.yml.example config/gitlab.yml
+ - bundle exec rake db:drop db:create db:schema:load db:seed_fu
+ - date
+ - git checkout $CI_COMMIT_SHA
+ - bundle install $BUNDLE_INSTALL_FLAGS
+ - date
+ - . scripts/prepare_build.sh
+ - date
+ - bundle exec rake db:migrate
+
+##
+# Trigger a package build in omnibus-gitlab repository
+#
+package-qa:
+ <<: *dedicated-runner
+ image: ruby:2.4-alpine
+ before_script: []
+ stage: build
+ cache: {}
+ when: manual
+ script:
+ - scripts/trigger-build-omnibus
+ only:
+ - //@gitlab-org/gitlab-ce
+ - //@gitlab-org/gitlab-ee
+
# Trigger a docs build in gitlab-docs
# Useful to preview the docs changes live
review-docs-deploy:
@@ -271,7 +334,7 @@ update-tests-metadata:
flaky-examples-check:
<<: *dedicated-runner
- image: ruby:2.3-alpine
+ image: ruby:2.4-alpine
services: []
before_script: []
variables:
@@ -395,26 +458,11 @@ spinach-pg 1 2: *spinach-metadata-pg
spinach-mysql 0 2: *spinach-metadata-mysql
spinach-mysql 1 2: *spinach-metadata-mysql
-# Static analysis jobs
-.ruby-static-analysis: &ruby-static-analysis
- variables:
- SIMPLECOV: "false"
- SETUP_DB: "false"
-
-.rake-exec: &rake-exec
- <<: *dedicated-runner
- <<: *except-docs-and-qa
- <<: *pull-cache
- <<: *ruby-static-analysis
- stage: test
- script:
- - bundle exec rake $CI_JOB_NAME
-
static-analysis:
- <<: *dedicated-runner
- <<: *except-docs
- <<: *ruby-static-analysis
- stage: test
+ <<: *dedicated-no-docs-no-db-pull-cache-job
+ dependencies:
+ - compile-assets
+ - setup-test-env
script:
- scripts/static-analysis
cache:
@@ -471,15 +519,6 @@ ee_compat_check:
paths:
- ee_compat_check/patches/*.patch
-# DB migration, rollback, and seed jobs
-.db-migrate-reset: &db-migrate-reset
- <<: *dedicated-runner
- <<: *except-docs-and-qa
- <<: *pull-cache
- stage: test
- script:
- - bundle exec rake db:migrate:reset
-
db:migrate:reset-pg:
<<: *db-migrate-reset
<<: *use-pg
@@ -494,29 +533,6 @@ db:check-schema-pg:
script:
- source scripts/schema_changed.sh
-.migration-paths: &migration-paths
- <<: *dedicated-runner
- <<: *except-docs-and-qa
- <<: *pull-cache
- stage: test
- variables:
- SETUP_DB: "false"
- CREATE_DB_USER: "true"
- script:
- - git fetch https://gitlab.com/gitlab-org/gitlab-ce.git v9.3.0
- - git checkout -f FETCH_HEAD
- - bundle install $BUNDLE_INSTALL_FLAGS
- - date
- - cp config/gitlab.yml.example config/gitlab.yml
- - bundle exec rake db:drop db:create db:schema:load db:seed_fu
- - date
- - git checkout $CI_COMMIT_SHA
- - bundle install $BUNDLE_INSTALL_FLAGS
- - date
- - . scripts/prepare_build.sh
- - date
- - bundle exec rake db:migrate
-
migration:path-pg:
<<: *migration-paths
<<: *use-pg
@@ -526,10 +542,7 @@ migration:path-mysql:
<<: *use-mysql
.db-rollback: &db-rollback
- <<: *dedicated-runner
- <<: *except-docs-and-qa
- <<: *pull-cache
- stage: test
+ <<: *dedicated-no-docs-pull-cache-job
script:
- bundle exec rake db:rollback STEP=119
- bundle exec rake db:migrate
@@ -542,27 +555,6 @@ db:rollback-mysql:
<<: *db-rollback
<<: *use-mysql
-.gitlab-setup: &gitlab-setup
- <<: *dedicated-runner
- <<: *except-docs-and-qa
- <<: *pull-cache
- stage: test
- variables:
- SIZE: "1"
- SETUP_DB: "false"
- CREATE_DB_USER: "true"
- FIXTURE_PATH: db/fixtures/development
- script:
- - git clone https://gitlab.com/gitlab-org/gitlab-test.git
- /home/git/repositories/gitlab-org/gitlab-test.git
- - scripts/gitaly-test-spawn
- - force=yes bundle exec rake gitlab:setup
- artifacts:
- when: on_failure
- expire_in: 1d
- paths:
- - log/development.log
-
gitlab:setup-pg:
<<: *gitlab-setup
<<: *use-pg
@@ -573,10 +565,7 @@ gitlab:setup-mysql:
# Frontend-related jobs
gitlab:assets:compile:
- <<: *dedicated-runner
- <<: *except-docs-and-qa
- <<: *pull-cache
- stage: test
+ <<: *dedicated-no-docs-no-db-pull-cache-job
dependencies: []
variables:
NODE_ENV: "production"
@@ -597,20 +586,16 @@ gitlab:assets:compile:
- webpack-report/
karma:
- <<: *dedicated-runner
- <<: *except-docs-and-qa
- <<: *pull-cache
+ <<: *dedicated-no-docs-pull-cache-job
<<: *use-pg
- stage: test
- variables:
- BABEL_ENV: "coverage"
- CHROME_LOG_FILE: "chrome_debug.log"
+ dependencies:
+ - compile-assets
+ - setup-test-env
script:
+ - export BABEL_ENV=coverage CHROME_LOG_FILE=chrome_debug.log
- date
- scripts/gitaly-test-spawn
- date
- - bundle exec rake gettext:po_to_json
- - date
- bundle exec rake karma
coverage: '/^Statements *: (\d+\.\d+%)/'
artifacts:
@@ -618,13 +603,11 @@ karma:
expire_in: 31d
when: always
paths:
- - chrome_debug.log
- - coverage-javascript/
+ - chrome_debug.log
+ - coverage-javascript/
codequality:
- <<: *except-docs
- <<: *pull-cache
- stage: test
+ <<: *dedicated-no-docs-no-db-pull-cache-job
image: docker:latest
before_script: []
services:
@@ -656,11 +639,7 @@ sast:
paths: [gl-sast-report.json]
qa:internal:
- <<: *dedicated-runner
- <<: *except-docs
- stage: test
- variables:
- SETUP_DB: "false"
+ <<: *dedicated-no-docs-no-db-pull-cache-job
services: []
script:
- cd qa/
@@ -668,11 +647,7 @@ qa:internal:
- bundle exec rspec
qa:selectors:
- <<: *dedicated-runner
- <<: *except-docs
- stage: test
- variables:
- SETUP_DB: "false"
+ <<: *dedicated-no-docs-no-db-pull-cache-job
services: []
script:
- cd qa/
@@ -680,14 +655,8 @@ qa:selectors:
- bundle exec bin/qa Test::Sanity::Selectors
coverage:
- <<: *dedicated-runner
- <<: *except-docs-and-qa
- <<: *pull-cache
+ <<: *dedicated-no-docs-no-db-pull-cache-job
stage: post-test
- services: []
- variables:
- SETUP_DB: "false"
- USE_BUNDLE_INSTALL: "true"
script:
- bundle exec scripts/merge-simplecov
coverage: '/LOC \((\d+\.\d+%)\) covered.$/'
@@ -699,9 +668,7 @@ coverage:
- coverage/assets/
lint:javascript:report:
- <<: *dedicated-runner
- <<: *except-docs-and-qa
- <<: *pull-cache
+ <<: *dedicated-no-docs-no-db-pull-cache-job
stage: post-test
dependencies:
- compile-assets
@@ -716,11 +683,10 @@ lint:javascript:report:
name: eslint-report
expire_in: 31d
paths:
- - eslint-report.html
+ - eslint-report.html
pages:
- <<: *dedicated-runner
- <<: *pull-cache
+ <<: *dedicated-no-docs-no-db-pull-cache-job
before_script: []
stage: pages
dependencies:
@@ -745,10 +711,7 @@ pages:
# Insurance in case a gem needed by one of our releases gets yanked from
# rubygems.org in the future.
cache gems:
- <<: *dedicated-runner
- <<: *pull-cache
- variables:
- SETUP_DB: "false"
+ <<: *dedicated-no-docs-no-db-pull-cache-job
script:
- bundle package --all --all-platforms
artifacts: