diff options
Diffstat (limited to '.gitlab/ci/rails.gitlab-ci.yml')
-rw-r--r-- | .gitlab/ci/rails.gitlab-ci.yml | 189 |
1 files changed, 83 insertions, 106 deletions
diff --git a/.gitlab/ci/rails.gitlab-ci.yml b/.gitlab/ci/rails.gitlab-ci.yml index a230880fa7d..28ec96b838a 100644 --- a/.gitlab/ci/rails.gitlab-ci.yml +++ b/.gitlab/ci/rails.gitlab-ci.yml @@ -1,5 +1,5 @@ .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: extends: @@ -25,17 +25,17 @@ cache: policy: pull-push -setup-test-env pg10: +setup-test-env pg11: extends: - .base-setup-test-env - .rails:rules:default-refs-code-backstage-qa - - .use-pg10 + - .use-pg11 -setup-test-env pg11: +setup-test-env pg10: extends: - .base-setup-test-env - .rails:rules:master-refs-code-backstage - - .use-pg11 + - .use-pg10 setup-test-env pg9: extends: @@ -55,7 +55,7 @@ static-analysis: script: - scripts/static-analysis cache: - key: "ruby-2.6.5-pg10-rubocop" + key: "ruby-2.6.5-pg11-rubocop" paths: - vendor/ruby - tmp/rubocop_cache @@ -75,7 +75,7 @@ downtime_check: .rspec-base: extends: .rails-job-base 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: - source scripts/rspec_helpers.sh - rspec_paralellized_job "--tag ~quarantine --tag ~geo --tag ~level:migration" @@ -93,48 +93,37 @@ downtime_check: reports: junit: junit_rspec.xml -.rspec-base-quarantine-pg10: - 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: +.rspec-base-pg11: extends: - .rspec-base - .rails:rules:ee-and-foss - - .use-pg10 + - .use-pg11 .rspec-base-migration: script: - source scripts/rspec_helpers.sh - rspec_paralellized_job "--tag ~quarantine --tag ~geo --tag level:migration" -rspec migration pg10: +rspec migration pg11: extends: - - .rspec-base-pg10 + - .rspec-base-pg11 - .rspec-base-migration parallel: 5 -rspec unit pg10: - extends: .rspec-base-pg10 +rspec unit pg11: + extends: .rspec-base-pg11 parallel: 20 -rspec integration pg10: - extends: .rspec-base-pg10 +rspec integration pg11: + extends: .rspec-base-pg11 parallel: 8 -rspec system pg10: - extends: .rspec-base-pg10 +rspec system pg11: + extends: .rspec-base-pg11 parallel: 24 rspec fast_spec_helper: - extends: .rspec-base-pg10 + extends: .rspec-base-pg11 script: - bin/rspec spec/fast_spec_helper.rb @@ -142,9 +131,9 @@ rspec fast_spec_helper: extends: - .rails-job-base - .rails:rules:ee-and-foss - - .use-pg10 + - .use-pg11 stage: test - needs: ["setup-test-env pg10"] + needs: ["setup-test-env pg11"] db:migrate:reset: extends: .db-job-base @@ -213,18 +202,18 @@ rspec:coverage: # We cannot use needs since it would mean needing 84 jobs (since most are parallelized) # so we use `dependencies` here. dependencies: - - setup-test-env pg10 - - rspec migration pg10 - - rspec unit pg10 - - rspec integration pg10 - - rspec system pg10 - - rspec-ee migration pg10 - - rspec-ee unit pg10 - - rspec-ee integration pg10 - - rspec-ee system pg10 - - rspec-ee unit pg10 geo - - rspec-ee integration pg10 geo - - rspec-ee system pg10 geo + - setup-test-env pg11 + - rspec migration pg11 + - rspec unit pg11 + - rspec integration pg11 + - rspec system pg11 + - rspec-ee migration pg11 + - rspec-ee unit pg11 + - rspec-ee integration pg11 + - rspec-ee system pg11 + - rspec-ee unit pg11 geo + - rspec-ee integration pg11 geo + - rspec-ee system pg11 geo - memory-static - memory-on-boot variables: @@ -247,34 +236,29 @@ rspec:coverage: #################### # master-only jobs # -rspec quarantine pg10: - extends: - - .rspec-base-quarantine-pg10 - - .rails:rules:master-refs-code-backstage - -.rspec-base-pg11: +.rspec-base-pg10: extends: - .rspec-base - .rails:rules:master-refs-code-backstage - - .use-pg11 - needs: ["setup-test-env pg11", "retrieve-tests-metadata", "compile-assets pull-cache"] + - .use-pg10 + needs: ["setup-test-env pg10", "retrieve-tests-metadata", "compile-assets pull-cache"] -rspec migration pg11: +rspec migration pg10: extends: - - .rspec-base-pg11 + - .rspec-base-pg10 - .rspec-base-migration parallel: 5 -rspec unit pg11: - extends: .rspec-base-pg11 +rspec unit pg10: + extends: .rspec-base-pg10 parallel: 20 -rspec integration pg11: - extends: .rspec-base-pg11 +rspec integration pg10: + extends: .rspec-base-pg10 parallel: 8 -rspec system pg11: - extends: .rspec-base-pg11 +rspec system pg10: + extends: .rspec-base-pg10 parallel: 24 # master-only jobs # #################### @@ -310,41 +294,34 @@ rspec system pg9: ####################### # EE master-only jobs # -rspec-ee quarantine 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: +.rspec-ee-base-pg10: extends: - .rspec-base-ee - - .use-pg11-ee - needs: ["setup-test-env pg11", "retrieve-tests-metadata", "compile-assets pull-cache"] + - .use-pg10-ee + needs: ["setup-test-env pg10", "retrieve-tests-metadata", "compile-assets pull-cache"] -rspec-ee migration pg11: +rspec-ee migration pg10: extends: - - .rspec-ee-base-pg11 + - .rspec-ee-base-pg10 - .rspec-base-migration - .rails:rules:master-refs-code-backstage parallel: 2 -rspec-ee unit pg11: +rspec-ee unit pg10: extends: - - .rspec-ee-base-pg11 + - .rspec-ee-base-pg10 - .rails:rules:master-refs-code-backstage parallel: 10 -rspec-ee integration pg11: +rspec-ee integration pg10: extends: - - .rspec-ee-base-pg11 + - .rspec-ee-base-pg10 - .rails:rules:master-refs-code-backstage parallel: 4 -rspec-ee system pg11: +rspec-ee system pg10: extends: - - .rspec-ee-base-pg11 + - .rspec-ee-base-pg10 - .rails:rules:master-refs-code-backstage parallel: 6 # EE master-only jobs # @@ -357,52 +334,52 @@ rspec-ee system pg11: - .rspec-base - .rails:rules:ee-only -.rspec-base-pg10-as-if-foss: +.rspec-base-pg11-as-if-foss: extends: - .rspec-base-ee - .as-if-foss - - .use-pg10 - needs: ["setup-test-env pg10", "retrieve-tests-metadata", "compile-assets pull-cache as-if-foss"] + - .use-pg11 + needs: ["setup-test-env pg11", "retrieve-tests-metadata", "compile-assets pull-cache as-if-foss"] -.rspec-ee-base-pg10: +.rspec-ee-base-pg11: extends: - .rspec-base-ee - - .use-pg10-ee + - .use-pg11-ee -rspec migration pg10-as-if-foss: +rspec migration pg11-as-if-foss: extends: - - .rspec-base-pg10-as-if-foss + - .rspec-base-pg11-as-if-foss - .rspec-base-migration parallel: 5 -rspec unit pg10-as-if-foss: - extends: .rspec-base-pg10-as-if-foss +rspec unit pg11-as-if-foss: + extends: .rspec-base-pg11-as-if-foss parallel: 20 -rspec integration pg10-as-if-foss: - extends: .rspec-base-pg10-as-if-foss +rspec integration pg11-as-if-foss: + extends: .rspec-base-pg11-as-if-foss parallel: 8 -rspec system pg10-as-if-foss: - extends: .rspec-base-pg10-as-if-foss +rspec system pg11-as-if-foss: + extends: .rspec-base-pg11-as-if-foss parallel: 24 -rspec-ee migration pg10: +rspec-ee migration pg11: extends: - - .rspec-ee-base-pg10 + - .rspec-ee-base-pg11 - .rspec-base-migration parallel: 2 -rspec-ee unit pg10: - extends: .rspec-ee-base-pg10 +rspec-ee unit pg11: + extends: .rspec-ee-base-pg11 parallel: 10 -rspec-ee integration pg10: - extends: .rspec-ee-base-pg10 +rspec-ee integration pg11: + extends: .rspec-ee-base-pg11 parallel: 4 -rspec-ee system pg10: - extends: .rspec-ee-base-pg10 +rspec-ee system pg11: + extends: .rspec-ee-base-pg11 parallel: 6 .rspec-ee-base-geo: @@ -412,20 +389,20 @@ rspec-ee system pg10: - scripts/prepare_postgres_fdw.sh - rspec_paralellized_job "--tag ~quarantine --tag geo" -.rspec-ee-base-geo-pg10: +.rspec-ee-base-geo-pg11: extends: - .rspec-ee-base-geo - - .use-pg10-ee + - .use-pg11-ee -rspec-ee unit pg10 geo: - extends: .rspec-ee-base-geo-pg10 +rspec-ee unit pg11 geo: + extends: .rspec-ee-base-geo-pg11 parallel: 2 -rspec-ee integration pg10 geo: - extends: .rspec-ee-base-geo-pg10 +rspec-ee integration pg11 geo: + extends: .rspec-ee-base-geo-pg11 -rspec-ee system pg10 geo: - extends: .rspec-ee-base-geo-pg10 +rspec-ee system pg11 geo: + extends: .rspec-ee-base-geo-pg11 db:rollback geo: extends: |