Leverage the new cache policies in .gitlab-ci.yml
Signed-off-by: Rémy Coutable <remy@rymai.me>
This commit is contained in:
Rémy Coutable
parent
c6ee1776e8
commit
bcd1a3a066
|
|
@ -1,10 +1,20 @@
|
|||
image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.3.3-golang-1.8-git-2.7-phantomjs-2.1-node-7.1-postgresql-9.6"
|
||||
|
||||
cache:
|
||||
.default-cache: &default-cache
|
||||
key: "ruby-233-with-yarn"
|
||||
paths:
|
||||
- vendor/ruby
|
||||
- .yarn-cache/
|
||||
- vendor/ruby
|
||||
- .yarn-cache/
|
||||
|
||||
.push-cache: &push-cache
|
||||
cache:
|
||||
<<: *default-cache
|
||||
policy: push
|
||||
|
||||
.pull-cache: &pull-cache
|
||||
cache:
|
||||
<<: *default-cache
|
||||
policy: pull
|
||||
|
||||
variables:
|
||||
MYSQL_ALLOW_EMPTY_PASSWORD: "1"
|
||||
|
|
@ -24,11 +34,11 @@ before_script:
|
|||
- source scripts/prepare_build.sh
|
||||
|
||||
stages:
|
||||
- build
|
||||
- prepare
|
||||
- test
|
||||
- post-test
|
||||
- pages
|
||||
- build
|
||||
- prepare
|
||||
- test
|
||||
- post-test
|
||||
- pages
|
||||
|
||||
# Predefined scopes
|
||||
.dedicated-runner: &dedicated-runner
|
||||
|
|
@ -41,10 +51,6 @@ stages:
|
|||
SETUP_DB: "false"
|
||||
USE_BUNDLE_INSTALL: "false"
|
||||
KNAPSACK_S3_BUCKET: "gitlab-ce-cache"
|
||||
cache:
|
||||
key: "knapsack"
|
||||
paths:
|
||||
- knapsack/
|
||||
artifacts:
|
||||
expire_in: 31d
|
||||
paths:
|
||||
|
|
@ -79,8 +85,9 @@ stages:
|
|||
- /(^docs[\/-].*|.*-docs$)/
|
||||
|
||||
.rspec-knapsack: &rspec-knapsack
|
||||
stage: test
|
||||
<<: *dedicated-runner
|
||||
<<: *pull-cache
|
||||
stage: test
|
||||
script:
|
||||
- JOB_NAME=( $CI_JOB_NAME )
|
||||
- export CI_NODE_INDEX=${JOB_NAME[-2]}
|
||||
|
|
@ -110,8 +117,9 @@ stages:
|
|||
<<: *except-docs
|
||||
|
||||
.spinach-knapsack: &spinach-knapsack
|
||||
stage: test
|
||||
<<: *dedicated-runner
|
||||
<<: *pull-cache
|
||||
stage: test
|
||||
script:
|
||||
- JOB_NAME=( $CI_JOB_NAME )
|
||||
- export CI_NODE_INDEX=${JOB_NAME[-2]}
|
||||
|
|
@ -157,6 +165,7 @@ build-package:
|
|||
SETUP_DB: "false"
|
||||
USE_BUNDLE_INSTALL: "false"
|
||||
stage: build
|
||||
cache: {}
|
||||
when: manual
|
||||
script:
|
||||
- scripts/trigger-build
|
||||
|
|
@ -170,6 +179,11 @@ knapsack:
|
|||
<<: *dedicated-runner
|
||||
<<: *except-docs
|
||||
stage: prepare
|
||||
cache:
|
||||
key: knapsack
|
||||
paths:
|
||||
- knapsack/
|
||||
policy: pull
|
||||
script:
|
||||
- mkdir -p knapsack/${CI_PROJECT_NAME}/
|
||||
- wget -O $KNAPSACK_RSPEC_SUITE_REPORT_PATH http://${KNAPSACK_S3_BUCKET}.s3.amazonaws.com/$KNAPSACK_RSPEC_SUITE_REPORT_PATH || rm $KNAPSACK_RSPEC_SUITE_REPORT_PATH
|
||||
|
|
@ -182,6 +196,11 @@ update-knapsack:
|
|||
<<: *dedicated-runner
|
||||
<<: *only-canonical-masters
|
||||
stage: post-test
|
||||
cache:
|
||||
key: knapsack
|
||||
paths:
|
||||
- knapsack/
|
||||
policy: push
|
||||
script:
|
||||
- retry gem install fog-aws mime-types
|
||||
- scripts/merge-reports ${KNAPSACK_RSPEC_SUITE_REPORT_PATH} knapsack/${CI_PROJECT_NAME}/rspec-pg_node_*.json
|
||||
|
|
@ -193,6 +212,7 @@ setup-test-env:
|
|||
<<: *use-pg
|
||||
<<: *dedicated-runner
|
||||
<<: *except-docs
|
||||
<<: *push-cache
|
||||
stage: prepare
|
||||
script:
|
||||
- node --version
|
||||
|
|
@ -273,6 +293,7 @@ spinach-mysql 4 5: *spinach-knapsack-mysql
|
|||
|
||||
# Static analysis jobs
|
||||
.ruby-static-analysis: &ruby-static-analysis
|
||||
<<: *pull-cache
|
||||
variables:
|
||||
SIMPLECOV: "false"
|
||||
SETUP_DB: "false"
|
||||
|
|
@ -281,6 +302,7 @@ spinach-mysql 4 5: *spinach-knapsack-mysql
|
|||
<<: *ruby-static-analysis
|
||||
<<: *dedicated-runner
|
||||
<<: *except-docs
|
||||
<<: *pull-cache
|
||||
stage: test
|
||||
script:
|
||||
- bundle exec rake $CI_JOB_NAME
|
||||
|
|
@ -297,9 +319,9 @@ static-analysis:
|
|||
# - Check validity of relative links
|
||||
# - Make sure cURL examples in API docs use the full switches
|
||||
docs lint:
|
||||
<<: *dedicated-runner
|
||||
image: "registry.gitlab.com/gitlab-org/gitlab-build-images:nanoc-bootstrap-ruby-2.4-alpine"
|
||||
stage: test
|
||||
<<: *dedicated-runner
|
||||
cache: {}
|
||||
dependencies: []
|
||||
before_script: []
|
||||
|
|
@ -342,9 +364,10 @@ ee_compat_check:
|
|||
|
||||
# DB migration, rollback, and seed jobs
|
||||
.db-migrate-reset: &db-migrate-reset
|
||||
stage: test
|
||||
<<: *dedicated-runner
|
||||
<<: *except-docs
|
||||
<<: *pull-cache
|
||||
stage: test
|
||||
script:
|
||||
- bundle exec rake db:migrate:reset
|
||||
|
||||
|
|
@ -357,11 +380,12 @@ db:migrate:reset-mysql:
|
|||
<<: *use-mysql
|
||||
|
||||
.migration-paths: &migration-paths
|
||||
stage: test
|
||||
<<: *dedicated-runner
|
||||
<<: *only-canonical-masters
|
||||
<<: *pull-cache
|
||||
stage: test
|
||||
variables:
|
||||
SETUP_DB: "false"
|
||||
<<: *only-canonical-masters
|
||||
script:
|
||||
- git fetch origin v8.14.10
|
||||
- git checkout -f FETCH_HEAD
|
||||
|
|
@ -382,9 +406,10 @@ migration:path-mysql:
|
|||
<<: *use-mysql
|
||||
|
||||
.db-rollback: &db-rollback
|
||||
stage: test
|
||||
<<: *dedicated-runner
|
||||
<<: *except-docs
|
||||
<<: *pull-cache
|
||||
stage: test
|
||||
script:
|
||||
- bundle exec rake db:rollback STEP=120
|
||||
- bundle exec rake db:migrate
|
||||
|
|
@ -398,9 +423,10 @@ db:rollback-mysql:
|
|||
<<: *use-mysql
|
||||
|
||||
.db-seed_fu: &db-seed_fu
|
||||
stage: test
|
||||
<<: *dedicated-runner
|
||||
<<: *except-docs
|
||||
<<: *pull-cache
|
||||
stage: test
|
||||
variables:
|
||||
SIZE: "1"
|
||||
SETUP_DB: "false"
|
||||
|
|
@ -425,9 +451,10 @@ db:seed_fu-mysql:
|
|||
|
||||
# Frontend-related jobs
|
||||
gitlab:assets:compile:
|
||||
stage: test
|
||||
<<: *dedicated-runner
|
||||
<<: *except-docs
|
||||
<<: *pull-cache
|
||||
stage: test
|
||||
dependencies: []
|
||||
variables:
|
||||
NODE_ENV: "production"
|
||||
|
|
@ -445,14 +472,15 @@ gitlab:assets:compile:
|
|||
name: webpack-report
|
||||
expire_in: 31d
|
||||
paths:
|
||||
- webpack-report/
|
||||
- webpack-report/
|
||||
|
||||
karma:
|
||||
image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.3.3-golang-1.8-git-2.7-chrome-59.0-node-7.1-postgresql-9.6"
|
||||
stage: test
|
||||
<<: *use-pg
|
||||
<<: *dedicated-runner
|
||||
<<: *except-docs
|
||||
<<: *pull-cache
|
||||
image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.3.3-golang-1.8-git-2.7-chrome-59.0-node-7.1-postgresql-9.6"
|
||||
stage: test
|
||||
variables:
|
||||
BABEL_ENV: "coverage"
|
||||
CHROME_LOG_FILE: "chrome_debug.log"
|
||||
|
|
@ -470,6 +498,7 @@ karma:
|
|||
|
||||
codeclimate:
|
||||
<<: *except-docs
|
||||
<<: *pull-cache
|
||||
before_script: []
|
||||
image: docker:latest
|
||||
stage: test
|
||||
|
|
@ -485,10 +514,11 @@ codeclimate:
|
|||
paths: [codeclimate.json]
|
||||
|
||||
coverage:
|
||||
stage: post-test
|
||||
services: []
|
||||
<<: *dedicated-runner
|
||||
<<: *except-docs
|
||||
<<: *pull-cache
|
||||
stage: post-test
|
||||
services: []
|
||||
variables:
|
||||
SETUP_DB: "false"
|
||||
USE_BUNDLE_INSTALL: "true"
|
||||
|
|
@ -505,6 +535,7 @@ coverage:
|
|||
lint:javascript:report:
|
||||
<<: *dedicated-runner
|
||||
<<: *except-docs
|
||||
<<: *pull-cache
|
||||
stage: post-test
|
||||
before_script: []
|
||||
script:
|
||||
|
|
@ -517,9 +548,10 @@ lint:javascript:report:
|
|||
- eslint-report.html
|
||||
|
||||
pages:
|
||||
<<: *dedicated-runner
|
||||
<<: *pull-cache
|
||||
before_script: []
|
||||
stage: pages
|
||||
<<: *dedicated-runner
|
||||
dependencies:
|
||||
- coverage
|
||||
- karma
|
||||
|
|
@ -543,6 +575,7 @@ pages:
|
|||
# rubygems.org in the future.
|
||||
cache gems:
|
||||
<<: *dedicated-runner
|
||||
<<: *pull-cache
|
||||
only:
|
||||
- tags
|
||||
variables:
|
||||
|
|
@ -557,8 +590,9 @@ cache gems:
|
|||
- master@gitlab-org/gitlab-ee
|
||||
|
||||
gitlab_git_test:
|
||||
<<: *pull-cache
|
||||
<<: *except-docs
|
||||
variables:
|
||||
SETUP_DB: "false"
|
||||
script:
|
||||
- spec/support/prepare-gitlab-git-test-for-commit --check-for-changes
|
||||
<<: *except-docs
|
||||
|
|
|
|||
Loading…
Reference in New Issue