Commit 74299618 authored by GitLab Bot's avatar GitLab Bot
Browse files

Add latest changes from gitlab-org/gitlab@12-10-stable-ee

parent 5f7be8986bd5
...@@ -38,3 +38,4 @@ exclude_paths: ...@@ -38,3 +38,4 @@ exclude_paths:
- backups/ - backups/
- coverage-javascript/ - coverage-javascript/
- plugins/ - plugins/
- file_hooks/
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
- .default-retry - .default-retry
- .default-cache - .default-cache
- .default-before_script - .default-before_script
- .use-pg10 - .use-pg11
stage: test stage: test
needs: ["setup-test-env pg10"] needs: ["setup-test-env pg11"]
variables: variables:
FIXTURE_PATH: "db/fixtures/development" FIXTURE_PATH: "db/fixtures/development"
SEED_CYCLE_ANALYTICS: "true" SEED_CYCLE_ANALYTICS: "true"
...@@ -26,7 +26,7 @@ run-dev-fixtures-ee: ...@@ -26,7 +26,7 @@ run-dev-fixtures-ee:
extends: extends:
- .run-dev-fixtures - .run-dev-fixtures
- .dev-fixtures:rules:ee-only - .dev-fixtures:rules:ee-only
- .use-pg10-ee - .use-pg11-ee
script: script:
- scripts/gitaly-test-spawn - scripts/gitaly-test-spawn
- cp ee/db/fixtures/development/* $FIXTURE_PATH - cp ee/db/fixtures/development/* $FIXTURE_PATH
......
...@@ -66,9 +66,9 @@ graphql-reference-verify: ...@@ -66,9 +66,9 @@ graphql-reference-verify:
- .default-cache - .default-cache
- .default-before_script - .default-before_script
- .docs:rules:graphql-reference-verify - .docs:rules:graphql-reference-verify
- .use-pg10 - .use-pg11
stage: test stage: test
needs: ["setup-test-env pg10"] needs: ["setup-test-env pg11"]
script: script:
- bundle exec rake gitlab:graphql:check_docs - bundle exec rake gitlab:graphql:check_docs
- bundle exec rake gitlab:graphql:check_schema - bundle exec rake gitlab:graphql:check_schema
...@@ -129,9 +129,9 @@ compile-assets pull-cache as-if-foss: ...@@ -129,9 +129,9 @@ compile-assets pull-cache as-if-foss:
- .default-retry - .default-retry
- .default-cache - .default-cache
- .default-before_script - .default-before_script
- .use-pg10 - .use-pg11
stage: fixtures stage: fixtures
needs: ["setup-test-env pg10", "compile-assets pull-cache"] needs: ["setup-test-env pg11", "compile-assets pull-cache"]
script: script:
- date - date
- scripts/gitaly-test-spawn - scripts/gitaly-test-spawn
...@@ -289,7 +289,7 @@ webpack-dev-server: ...@@ -289,7 +289,7 @@ webpack-dev-server:
- .default-cache - .default-cache
- .frontend:rules:default-frontend-jobs - .frontend:rules:default-frontend-jobs
stage: test stage: test
needs: ["setup-test-env pg10", "compile-assets pull-cache"] needs: ["setup-test-env pg11", "compile-assets pull-cache"]
variables: variables:
WEBPACK_MEMORY_TEST: "true" WEBPACK_MEMORY_TEST: "true"
WEBPACK_VENDOR_DLL: "true" WEBPACK_VENDOR_DLL: "true"
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
# Jobs that only need to pull cache # Jobs that only need to pull cache
.default-cache: .default-cache:
cache: cache:
key: "debian-stretch-ruby-2.6.5-pg10-node-12.x" key: "debian-stretch-ruby-2.6.5-pg11-node-12.x"
paths: paths:
- .go/pkg/mod - .go/pkg/mod
- vendor/ruby - vendor/ruby
...@@ -98,6 +98,14 @@ ...@@ -98,6 +98,14 @@
cache: cache:
key: "debian-stretch-ruby-2.6.5-pg11-node-12.x" key: "debian-stretch-ruby-2.6.5-pg11-node-12.x"
# Pin kaniko to v0.16.0 due to https://github.com/GoogleContainerTools/kaniko/issues/1162
.use-kaniko:
image:
name: gcr.io/kaniko-project/executor:debug-v0.16.0
entrypoint: [""]
before_script:
- echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
.as-if-foss: .as-if-foss:
variables: variables:
FOSS_ONLY: '1' FOSS_ONLY: '1'
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
memory-static: memory-static:
extends: .only-code-memory-job-base extends: .only-code-memory-job-base
stage: test stage: test
needs: ["setup-test-env pg10"] needs: ["setup-test-env pg11"]
variables: variables:
SETUP_DB: "false" SETUP_DB: "false"
script: script:
...@@ -36,9 +36,9 @@ memory-static: ...@@ -36,9 +36,9 @@ memory-static:
memory-on-boot: memory-on-boot:
extends: extends:
- .only-code-memory-job-base - .only-code-memory-job-base
- .use-pg10 - .use-pg11
stage: test stage: test
needs: ["setup-test-env pg10", "compile-assets pull-cache"] needs: ["setup-test-env pg11", "compile-assets pull-cache"]
variables: variables:
NODE_ENV: "production" NODE_ENV: "production"
RAILS_ENV: "production" RAILS_ENV: "production"
......
.rails:needs:setup-and-assets: .rails:needs:setup-and-assets:
needs: ["setup-test-env pg10", "compile-assets pull-cache"] needs: ["setup-test-env pg11", "compile-assets pull-cache"]
.rails-job-base: .rails-job-base:
extends: extends:
...@@ -25,17 +25,17 @@ ...@@ -25,17 +25,17 @@
cache: cache:
policy: pull-push policy: pull-push
setup-test-env pg10: setup-test-env pg11:
extends: extends:
- .base-setup-test-env - .base-setup-test-env
- .rails:rules:default-refs-code-backstage-qa - .rails:rules:default-refs-code-backstage-qa
- .use-pg10 - .use-pg11
setup-test-env pg11: setup-test-env pg10:
extends: extends:
- .base-setup-test-env - .base-setup-test-env
- .rails:rules:master-refs-code-backstage - .rails:rules:master-refs-code-backstage
- .use-pg11 - .use-pg10
setup-test-env pg9: setup-test-env pg9:
extends: extends:
...@@ -55,7 +55,7 @@ static-analysis: ...@@ -55,7 +55,7 @@ static-analysis:
script: script:
- scripts/static-analysis - scripts/static-analysis
cache: cache:
key: "ruby-2.6.5-pg10-rubocop" key: "ruby-2.6.5-pg11-rubocop"
paths: paths:
- vendor/ruby - vendor/ruby
- tmp/rubocop_cache - tmp/rubocop_cache
...@@ -75,7 +75,7 @@ downtime_check: ...@@ -75,7 +75,7 @@ downtime_check:
.rspec-base: .rspec-base:
extends: .rails-job-base extends: .rails-job-base
stage: test stage: test
needs: ["setup-test-env pg10", "retrieve-tests-metadata", "compile-assets pull-cache"] needs: ["setup-test-env pg11", "retrieve-tests-metadata", "compile-assets pull-cache"]
script: script:
- source scripts/rspec_helpers.sh - source scripts/rspec_helpers.sh
- rspec_paralellized_job "--tag ~quarantine --tag ~geo --tag ~level:migration" - rspec_paralellized_job "--tag ~quarantine --tag ~geo --tag ~level:migration"
...@@ -93,48 +93,37 @@ downtime_check: ...@@ -93,48 +93,37 @@ downtime_check:
reports: reports:
junit: junit_rspec.xml junit: junit_rspec.xml
.rspec-base-quarantine-pg10: .rspec-base-pg11:
extends:
- .rspec-base
- .use-pg10
variables:
RSPEC_OPTS: "--tag quarantine -- spec/"
script:
- source scripts/rspec_helpers.sh
- rspec_simple_job "${RSPEC_OPTS}"
allow_failure: true
.rspec-base-pg10:
extends: extends:
- .rspec-base - .rspec-base
- .rails:rules:ee-and-foss - .rails:rules:ee-and-foss
- .use-pg10 - .use-pg11
.rspec-base-migration: .rspec-base-migration:
script: script:
- source scripts/rspec_helpers.sh - source scripts/rspec_helpers.sh
- rspec_paralellized_job "--tag ~quarantine --tag ~geo --tag level:migration" - rspec_paralellized_job "--tag ~quarantine --tag ~geo --tag level:migration"
rspec migration pg10: rspec migration pg11:
extends: extends:
- .rspec-base-pg10 - .rspec-base-pg11
- .rspec-base-migration - .rspec-base-migration
parallel: 5 parallel: 5
rspec unit pg10: rspec unit pg11:
extends: .rspec-base-pg10 extends: .rspec-base-pg11
parallel: 20 parallel: 20
rspec integration pg10: rspec integration pg11:
extends: .rspec-base-pg10 extends: .rspec-base-pg11
parallel: 8 parallel: 8
rspec system pg10: rspec system pg11:
extends: .rspec-base-pg10 extends: .rspec-base-pg11
parallel: 24 parallel: 24
rspec fast_spec_helper: rspec fast_spec_helper:
extends: .rspec-base-pg10 extends: .rspec-base-pg11
script: script:
- bin/rspec spec/fast_spec_helper.rb - bin/rspec spec/fast_spec_helper.rb
...@@ -142,9 +131,9 @@ rspec fast_spec_helper: ...@@ -142,9 +131,9 @@ rspec fast_spec_helper:
extends: extends:
- .rails-job-base - .rails-job-base
- .rails:rules:ee-and-foss - .rails:rules:ee-and-foss
- .use-pg10 - .use-pg11
stage: test stage: test
needs: ["setup-test-env pg10"] needs: ["setup-test-env pg11"]
db:migrate:reset: db:migrate:reset:
extends: .db-job-base extends: .db-job-base
...@@ -213,18 +202,18 @@ rspec:coverage: ...@@ -213,18 +202,18 @@ rspec:coverage:
# We cannot use needs since it would mean needing 84 jobs (since most are parallelized) # We cannot use needs since it would mean needing 84 jobs (since most are parallelized)
# so we use `dependencies` here. # so we use `dependencies` here.
dependencies: dependencies:
- setup-test-env pg10 - setup-test-env pg11
- rspec migration pg10 - rspec migration pg11
- rspec unit pg10 - rspec unit pg11
- rspec integration pg10 - rspec integration pg11
- rspec system pg10 - rspec system pg11
- rspec-ee migration pg10 - rspec-ee migration pg11
- rspec-ee unit pg10 - rspec-ee unit pg11
- rspec-ee integration pg10 - rspec-ee integration pg11
- rspec-ee system pg10 - rspec-ee system pg11
- rspec-ee unit pg10 geo - rspec-ee unit pg11 geo
- rspec-ee integration pg10 geo - rspec-ee integration pg11 geo
- rspec-ee system pg10 geo - rspec-ee system pg11 geo
- memory-static - memory-static
- memory-on-boot - memory-on-boot
variables: variables:
...@@ -247,34 +236,29 @@ rspec:coverage: ...@@ -247,34 +236,29 @@ rspec:coverage:
#################### ####################
# master-only jobs # # master-only jobs #
rspec quarantine pg10: .rspec-base-pg10:
extends:
- .rspec-base-quarantine-pg10
- .rails:rules:master-refs-code-backstage
.rspec-base-pg11:
extends: extends:
- .rspec-base - .rspec-base
- .rails:rules:master-refs-code-backstage - .rails:rules:master-refs-code-backstage
- .use-pg11 - .use-pg10
needs: ["setup-test-env pg11", "retrieve-tests-metadata", "compile-assets pull-cache"] needs: ["setup-test-env pg10", "retrieve-tests-metadata", "compile-assets pull-cache"]
rspec migration pg11: rspec migration pg10:
extends: extends:
- .rspec-base-pg11 - .rspec-base-pg10
- .rspec-base-migration - .rspec-base-migration
parallel: 5 parallel: 5
rspec unit pg11: rspec unit pg10:
extends: .rspec-base-pg11 extends: .rspec-base-pg10
parallel: 20 parallel: 20
rspec integration pg11: rspec integration pg10:
extends: .rspec-base-pg11 extends: .rspec-base-pg10
parallel: 8 parallel: 8
rspec system pg11: rspec system pg10:
extends: .rspec-base-pg11 extends: .rspec-base-pg10
parallel: 24 parallel: 24
# master-only jobs # # master-only jobs #
#################### ####################
...@@ -310,41 +294,34 @@ rspec system pg9: ...@@ -310,41 +294,34 @@ rspec system pg9:
####################### #######################
# EE master-only jobs # # EE master-only jobs #
rspec-ee quarantine pg10: .rspec-ee-base-pg10:
extends:
- .rspec-base-quarantine-pg10
- .rails:rules:master-refs-code-backstage-ee-only
variables:
RSPEC_OPTS: "--tag quarantine -- ee/spec/"
.rspec-ee-base-pg11:
extends: extends:
- .rspec-base-ee - .rspec-base-ee
- .use-pg11-ee - .use-pg10-ee
needs: ["setup-test-env pg11", "retrieve-tests-metadata", "compile-assets pull-cache"] needs: ["setup-test-env pg10", "retrieve-tests-metadata", "compile-assets pull-cache"]
rspec-ee migration pg11: rspec-ee migration pg10:
extends: extends:
- .rspec-ee-base-pg11 - .rspec-ee-base-pg10
- .rspec-base-migration - .rspec-base-migration
- .rails:rules:master-refs-code-backstage - .rails:rules:master-refs-code-backstage
parallel: 2 parallel: 2
rspec-ee unit pg11: rspec-ee unit pg10:
extends: extends:
- .rspec-ee-base-pg11 - .rspec-ee-base-pg10
- .rails:rules:master-refs-code-backstage - .rails:rules:master-refs-code-backstage
parallel: 10 parallel: 10
rspec-ee integration pg11: rspec-ee integration pg10:
extends: extends:
- .rspec-ee-base-pg11 - .rspec-ee-base-pg10
- .rails:rules:master-refs-code-backstage - .rails:rules:master-refs-code-backstage
parallel: 4 parallel: 4
rspec-ee system pg11: rspec-ee system pg10:
extends: extends:
- .rspec-ee-base-pg11 - .rspec-ee-base-pg10
- .rails:rules:master-refs-code-backstage - .rails:rules:master-refs-code-backstage
parallel: 6 parallel: 6
# EE master-only jobs # # EE master-only jobs #
...@@ -357,52 +334,52 @@ rspec-ee system pg11: ...@@ -357,52 +334,52 @@ rspec-ee system pg11:
- .rspec-base - .rspec-base
- .rails:rules:ee-only - .rails:rules:ee-only
.rspec-base-pg10-as-if-foss: .rspec-base-pg11-as-if-foss:
extends: extends:
- .rspec-base-ee - .rspec-base-ee
- .as-if-foss - .as-if-foss
- .use-pg10 - .use-pg11
needs: ["setup-test-env pg10", "retrieve-tests-metadata", "compile-assets pull-cache as-if-foss"] needs: ["setup-test-env pg11", "retrieve-tests-metadata", "compile-assets pull-cache as-if-foss"]
.rspec-ee-base-pg10: .rspec-ee-base-pg11:
extends: extends:
- .rspec-base-ee - .rspec-base-ee
- .use-pg10-ee - .use-pg11-ee
rspec migration pg10-as-if-foss: rspec migration pg11-as-if-foss:
extends: extends:
- .rspec-base-pg10-as-if-foss - .rspec-base-pg11-as-if-foss
- .rspec-base-migration - .rspec-base-migration
parallel: 5 parallel: 5
rspec unit pg10-as-if-foss: rspec unit pg11-as-if-foss:
extends: .rspec-base-pg10-as-if-foss extends: .rspec-base-pg11-as-if-foss
parallel: 20 parallel: 20
rspec integration pg10-as-if-foss: rspec integration pg11-as-if-foss:
extends: .rspec-base-pg10-as-if-foss extends: .rspec-base-pg11-as-if-foss
parallel: 8 parallel: 8
rspec system pg10-as-if-foss: rspec system pg11-as-if-foss:
extends: .rspec-base-pg10-as-if-foss extends: .rspec-base-pg11-as-if-foss
parallel: 24 parallel: 24
rspec-ee migration pg10: rspec-ee migration pg11:
extends: extends:
- .rspec-ee-base-pg10 - .rspec-ee-base-pg11
- .rspec-base-migration - .rspec-base-migration
parallel: 2 parallel: 2
rspec-ee unit pg10: rspec-ee unit pg11:
extends: .rspec-ee-base-pg10 extends: .rspec-ee-base-pg11
parallel: 10 parallel: 10
rspec-ee integration pg10: rspec-ee integration pg11:
extends: .rspec-ee-base-pg10 extends: .rspec-ee-base-pg11
parallel: 4 parallel: 4
rspec-ee system pg10: rspec-ee system pg11:
extends: .rspec-ee-base-pg10 extends: .rspec-ee-base-pg11
parallel: 6 parallel: 6
.rspec-ee-base-geo: .rspec-ee-base-geo:
...@@ -412,20 +389,20 @@ rspec-ee system pg10: ...@@ -412,20 +389,20 @@ rspec-ee system pg10:
- scripts/prepare_postgres_fdw.sh - scripts/prepare_postgres_fdw.sh
- rspec_paralellized_job "--tag ~quarantine --tag geo" - rspec_paralellized_job "--tag ~quarantine --tag geo"
.rspec-ee-base-geo-pg10: .rspec-ee-base-geo-pg11:
extends: extends:
- .rspec-ee-base-geo - .rspec-ee-base-geo
- .use-pg10-ee - .use-pg11-ee
rspec-ee unit pg10 geo: rspec-ee unit pg11 geo:
extends: .rspec-ee-base-geo-pg10 extends: .rspec-ee-base-geo-pg11
parallel: 2 parallel: 2
rspec-ee integration pg10 geo: rspec-ee integration pg11 geo:
extends: .rspec-ee-base-geo-pg10 extends: .rspec-ee-base-geo-pg11
rspec-ee system pg10 geo: rspec-ee system pg11 geo:
extends: .rspec-ee-base-geo-pg10 extends: .rspec-ee-base-geo-pg11
db:rollback geo: db:rollback geo:
extends: extends:
......
...@@ -8,17 +8,14 @@ ...@@ -8,17 +8,14 @@
build-qa-image: build-qa-image:
extends: extends:
- .review-docker - .use-kaniko
- .default-retry
- .review:rules:mr-and-schedule-auto - .review:rules:mr-and-schedule-auto
stage: prepare stage: prepare
script: script:
- '[[ ! -d "ee/" ]] || export GITLAB_EDITION="ee"' - '[[ ! -d "ee/" ]] || export GITLAB_EDITION="ee"'
- export QA_MASTER_IMAGE="${CI_REGISTRY}/${CI_PROJECT_PATH}/gitlab/gitlab-${GITLAB_EDITION}-qa:master" - export QA_IMAGE="${CI_REGISTRY}/${CI_PROJECT_PATH}/gitlab-${GITLAB_EDITION}-qa:${CI_COMMIT_REF_SLUG}"