Merge branch 'parallelize-geo-specs' into 'master'

Parallelize the RSpec Geo jobs

See merge request gitlab-org/gitlab-ee!12688

.gitlab/ci/rails.gitlab-ci.yml

@@ -337,27 +337,26 @@ coverage:
   <<: *rspec-metadata-ee
   <<: *use-mysql-with-elasticsearch
 
-.rspec-geo-pg-9-6: &rspec-metadata-pg-geo-9-6
+.rspec-geo: &rspec-metadata-geo
   <<: *rspec-metadata
-  <<: *use-pg-9-6
   stage: test
   script:
-    - export NO_KNAPSACK=1
-    - export CACHE_CLASSES=true
+    - JOB_NAME=( $CI_JOB_NAME )
+    - TEST_TOOL=${JOB_NAME[0]}
+    - export KNAPSACK_TEST_FILE_PATTERN="ee/spec/**{,/*/**}/*_spec.rb" KNAPSACK_GENERATE_REPORT=true CACHE_CLASSES=true
+    - export KNAPSACK_REPORT_PATH=knapsack/${CI_PROJECT_NAME}/${TEST_TOOL}_node_${CI_NODE_INDEX}_${CI_NODE_TOTAL}_report.json
+    - cp ${EE_KNAPSACK_RSPEC_SUITE_REPORT_PATH} ${KNAPSACK_REPORT_PATH}
     - source scripts/prepare_postgres_fdw.sh
     - scripts/gitaly-test-spawn
-    - bundle exec rspec --color --format documentation --format RspecJunitFormatter --out junit_rspec.xml --tag geo ee/spec/
+    - knapsack rspec "-Ispec --color --format documentation --format RspecJunitFormatter --out junit_rspec.xml --tag geo"
+
+.rspec-geo-pg-9-6: &rspec-metadata-pg-geo-9-6
+  <<: *rspec-metadata-geo
+  <<: *use-pg-9-6
 
 .rspec-geo-pg-10-2: &rspec-metadata-pg-geo-10-2
-  <<: *rspec-metadata
+  <<: *rspec-metadata-geo
   <<: *use-pg-10-2
-  stage: test
-  script:
-    - export NO_KNAPSACK=1
-    - export CACHE_CLASSES=true
-    - source scripts/prepare_postgres_fdw.sh
-    - scripts/gitaly-test-spawn
-    - bundle exec rspec --color --format documentation --format RspecJunitFormatter --out junit_rspec.xml --tag geo ee/spec/
 
 .migration-paths-upgrade-ce-to-ee: &migration-paths-upgrade-ce-to-ee
   extends: .dedicated-no-docs-and-no-qa-pull-cache-job
@@ -388,27 +387,29 @@ rspec-mysql-ee:
   <<: *only-schedules-master
   parallel: 10
 
-rspec-pg geo:
+rspec-pg-ee geo:
   <<: *rspec-metadata-pg-geo-9-6
+  parallel: 3
   except:
     - /(^geo[\/-].*|.*-geo$)/
     - /(^docs[\/-].*|.*-docs$)/
     - /(^qa[\/-].*|.*-qa$)/
 
-rspec-pg-10 geo:
+rspec-pg-10-ee geo:
   <<: *rspec-metadata-pg-geo-10-2
+  parallel: 3
   except:
     - /(^geo[\/-].*|.*-geo$)/
     - /(^docs[\/-].*|.*-docs$)/
     - /(^qa[\/-].*|.*-qa$)/
 
-quick-rspec-pg geo:
+quick-rspec-pg-ee geo:
   <<: *rspec-metadata-pg-geo-9-6
   stage: quick-test
   only:
     - /(^geo[\/-].*|.*-geo$)/
 
-quick-rspec-pg-10 geo:
+quick-rspec-pg-10-ee geo:
   <<: *rspec-metadata-pg-geo-10-2
   stage: quick-test
   only:

.gitlab/ci/test-metadata.gitlab-ci.yml

@@ -43,7 +43,7 @@ update-tests-metadata:
   script:
     - retry gem install fog-aws mime-types activesupport rspec_profiling postgres-copy --no-document
     - scripts/merge-reports ${KNAPSACK_RSPEC_SUITE_REPORT_PATH} knapsack/${CI_PROJECT_NAME}/rspec-pg_node_*.json
-    - scripts/merge-reports ${EE_KNAPSACK_RSPEC_SUITE_REPORT_PATH} knapsack/${CI_PROJECT_NAME}/rspec-pg-ee_node_*.json
+    - scripts/merge-reports ${EE_KNAPSACK_RSPEC_SUITE_REPORT_PATH} knapsack/${CI_PROJECT_NAME}/rspec-pg-ee_*node_*.json
     - scripts/merge-reports ${FLAKY_RSPEC_SUITE_REPORT_PATH} rspec_flaky/all_*_*.json
     - FLAKY_RSPEC_GENERATE_REPORT=1 scripts/prune-old-flaky-specs ${FLAKY_RSPEC_SUITE_REPORT_PATH}
     - '[[ -z ${TESTS_METADATA_S3_BUCKET} ]] || scripts/sync-reports put $TESTS_METADATA_S3_BUCKET $KNAPSACK_RSPEC_SUITE_REPORT_PATH'