Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-03-28 21:15:00 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2023-03-28 21:15:00 +0300
commit14059114eb35b29cf83aa1b715158c96c55ab388 (patch)
treeb9b96e6bb66e3b1caf900bdce664a234087a4848 /.gitlab
parentee7db70e1185876e97eca97ce8efabfc64c360b9 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab')
-rw-r--r--.gitlab/ci/ci-templates.gitlab-ci.yml2
-rw-r--r--.gitlab/ci/dev-fixtures.gitlab-ci.yml4
-rw-r--r--.gitlab/ci/frontend.gitlab-ci.yml2
-rw-r--r--.gitlab/ci/glfm.gitlab-ci.yml2
-rw-r--r--.gitlab/ci/global.gitlab-ci.yml91
-rw-r--r--.gitlab/ci/memory.gitlab-ci.yml2
-rw-r--r--.gitlab/ci/preflight.gitlab-ci.yml2
-rw-r--r--.gitlab/ci/rails.gitlab-ci.yml639
-rw-r--r--.gitlab/ci/rails/rspec-foss-impact.gitlab-ci.yml.erb2
-rw-r--r--.gitlab/ci/rails/shared.gitlab-ci.yml54
-rw-r--r--.gitlab/ci/rules.gitlab-ci.yml9
-rw-r--r--.gitlab/ci/setup.gitlab-ci.yml2
-rw-r--r--.gitlab/ci/static-analysis.gitlab-ci.yml2
-rw-r--r--.gitlab/ci/test-metadata.gitlab-ci.yml20
14 files changed, 534 insertions, 299 deletions
diff --git a/.gitlab/ci/ci-templates.gitlab-ci.yml b/.gitlab/ci/ci-templates.gitlab-ci.yml
index d6e2fdf2fbe..c6681db9685 100644
--- a/.gitlab/ci/ci-templates.gitlab-ci.yml
+++ b/.gitlab/ci/ci-templates.gitlab-ci.yml
@@ -4,7 +4,7 @@ templates-shellcheck:
- .default-before_script
- .default-retry
- .ruby-cache
- - .use-pg13
+ - .use-pg14
stage: test
needs:
- setup-test-env
diff --git a/.gitlab/ci/dev-fixtures.gitlab-ci.yml b/.gitlab/ci/dev-fixtures.gitlab-ci.yml
index 0ff469d7114..f89456a18fb 100644
--- a/.gitlab/ci/dev-fixtures.gitlab-ci.yml
+++ b/.gitlab/ci/dev-fixtures.gitlab-ci.yml
@@ -3,7 +3,7 @@
- .default-retry
- .rails-cache
- .default-before_script
- - .use-pg12
+ - .use-pg13
stage: test
needs: ["setup-test-env"]
variables:
@@ -29,7 +29,7 @@ run-dev-fixtures-ee:
extends:
- .run-dev-fixtures
- .dev-fixtures:rules:ee-only
- - .use-pg12-es7-ee
+ - .use-pg13-es7-ee
script:
- cp ee/db/fixtures/development/* $FIXTURE_PATH
- *run-dev-fixtures-script
diff --git a/.gitlab/ci/frontend.gitlab-ci.yml b/.gitlab/ci/frontend.gitlab-ci.yml
index 88dbd1649b0..76fae2f00cd 100644
--- a/.gitlab/ci/frontend.gitlab-ci.yml
+++ b/.gitlab/ci/frontend.gitlab-ci.yml
@@ -122,7 +122,7 @@ retrieve-frontend-fixtures:
- .default-retry
- .default-before_script
- .rails-cache
- - .use-pg12
+ - .use-pg13
stage: fixtures
needs: ["setup-test-env", "retrieve-tests-metadata"]
variables:
diff --git a/.gitlab/ci/glfm.gitlab-ci.yml b/.gitlab/ci/glfm.gitlab-ci.yml
index 6ff60f24730..008bb03de25 100644
--- a/.gitlab/ci/glfm.gitlab-ci.yml
+++ b/.gitlab/ci/glfm.gitlab-ci.yml
@@ -2,7 +2,7 @@ glfm-verify:
extends:
- .rails-job-base
- .glfm:rules:glfm-verify
- - .use-pg12
+ - .use-pg13
stage: test
needs: ["setup-test-env"]
script:
diff --git a/.gitlab/ci/global.gitlab-ci.yml b/.gitlab/ci/global.gitlab-ci.yml
index 24dfec40f6b..87daccf2c8a 100644
--- a/.gitlab/ci/global.gitlab-ci.yml
+++ b/.gitlab/ci/global.gitlab-ci.yml
@@ -231,7 +231,6 @@
- *node-modules-cache # We don't push this cache as it's already rebuilt by `update-assets-compile-*-cache`
- *storybook-node-modules-cache-push
-
.use-pg12:
services:
- name: postgres:12
@@ -250,6 +249,15 @@
POSTGRES_HOST_AUTH_METHOD: trust
PG_VERSION: "13"
+.use-pg14:
+ services:
+ - name: postgres:14
+ command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
+ - name: redis:6.2-alpine
+ variables:
+ POSTGRES_HOST_AUTH_METHOD: trust
+ PG_VERSION: "14"
+
.use-pg12-es7-ee:
services:
- name: postgres:12
@@ -280,9 +288,24 @@
ZOEKT_INDEX_BASE_URL: http://zoekt-ci-image:6060
ZOEKT_SEARCH_BASE_URL: http://zoekt-ci-image:6070
-.use-pg12-es8-ee:
+.use-pg14-es7-ee:
services:
- - name: postgres:12
+ - name: postgres:14
+ command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
+ - name: redis:6.2-alpine
+ - name: elasticsearch:7.17.6
+ command: ["elasticsearch", "-E", "discovery.type=single-node", "-E", "xpack.security.enabled=false"]
+ - name: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:zoekt-ci-image-1.0
+ alias: zoekt-ci-image
+ variables:
+ POSTGRES_HOST_AUTH_METHOD: trust
+ PG_VERSION: "14"
+ ZOEKT_INDEX_BASE_URL: http://zoekt-ci-image:6060
+ ZOEKT_SEARCH_BASE_URL: http://zoekt-ci-image:6070
+
+.use-pg13-es8-ee:
+ services:
+ - name: postgres:13
command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
- name: redis:6.0-alpine
- name: elasticsearch:8.6.2
@@ -290,15 +313,31 @@
alias: zoekt-ci-image
variables:
POSTGRES_HOST_AUTH_METHOD: trust
- PG_VERSION: "12"
+ PG_VERSION: "13"
ES_SETTING_DISCOVERY_TYPE: "single-node"
ES_SETTING_XPACK_SECURITY_ENABLED: "false"
ZOEKT_INDEX_BASE_URL: http://zoekt-ci-image:6060
ZOEKT_SEARCH_BASE_URL: http://zoekt-ci-image:6070
-.use-pg12-opensearch1-ee:
+.use-pg14-es8-ee:
services:
- - name: postgres:12
+ - name: postgres:14
+ command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
+ - name: redis:6.0-alpine
+ - name: elasticsearch:8.6.2
+ - name: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:zoekt-ci-image-1.0
+ alias: zoekt-ci-image
+ variables:
+ POSTGRES_HOST_AUTH_METHOD: trust
+ PG_VERSION: "14"
+ ES_SETTING_DISCOVERY_TYPE: "single-node"
+ ES_SETTING_XPACK_SECURITY_ENABLED: "false"
+ ZOEKT_INDEX_BASE_URL: http://zoekt-ci-image:6060
+ ZOEKT_SEARCH_BASE_URL: http://zoekt-ci-image:6070
+
+.use-pg13-opensearch1-ee:
+ services:
+ - name: postgres:13
command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
- name: redis:6.0-alpine
- name: opensearchproject/opensearch:1.3.5
@@ -308,13 +347,13 @@
alias: zoekt-ci-image
variables:
POSTGRES_HOST_AUTH_METHOD: trust
- PG_VERSION: "12"
+ PG_VERSION: "13"
ZOEKT_INDEX_BASE_URL: http://zoekt-ci-image:6060
ZOEKT_SEARCH_BASE_URL: http://zoekt-ci-image:6070
-.use-pg12-opensearch2-ee:
+.use-pg13-opensearch2-ee:
services:
- - name: postgres:12
+ - name: postgres:13
command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
- name: redis:6.0-alpine
- name: opensearchproject/opensearch:2.2.1
@@ -324,7 +363,39 @@
alias: zoekt-ci-image
variables:
POSTGRES_HOST_AUTH_METHOD: trust
- PG_VERSION: "12"
+ PG_VERSION: "13"
+ ZOEKT_INDEX_BASE_URL: http://zoekt-ci-image:6060
+ ZOEKT_SEARCH_BASE_URL: http://zoekt-ci-image:6070
+
+.use-pg14-opensearch1-ee:
+ services:
+ - name: postgres:14
+ command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
+ - name: redis:6.0-alpine
+ - name: opensearchproject/opensearch:1.3.5
+ alias: elasticsearch
+ command: ["bin/opensearch", "-E", "discovery.type=single-node", "-E", "plugins.security.disabled=true"]
+ - name: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:zoekt-ci-image-1.0
+ alias: zoekt-ci-image
+ variables:
+ POSTGRES_HOST_AUTH_METHOD: trust
+ PG_VERSION: "14"
+ ZOEKT_INDEX_BASE_URL: http://zoekt-ci-image:6060
+ ZOEKT_SEARCH_BASE_URL: http://zoekt-ci-image:6070
+
+.use-pg14-opensearch2-ee:
+ services:
+ - name: postgres:14
+ command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
+ - name: redis:6.0-alpine
+ - name: opensearchproject/opensearch:2.2.1
+ alias: elasticsearch
+ command: ["bin/opensearch", "-E", "discovery.type=single-node", "-E", "plugins.security.disabled=true"]
+ - name: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:zoekt-ci-image-1.0
+ alias: zoekt-ci-image
+ variables:
+ POSTGRES_HOST_AUTH_METHOD: trust
+ PG_VERSION: "14"
ZOEKT_INDEX_BASE_URL: http://zoekt-ci-image:6060
ZOEKT_SEARCH_BASE_URL: http://zoekt-ci-image:6070
diff --git a/.gitlab/ci/memory.gitlab-ci.yml b/.gitlab/ci/memory.gitlab-ci.yml
index 5d6b90d107d..afef2b11ee7 100644
--- a/.gitlab/ci/memory.gitlab-ci.yml
+++ b/.gitlab/ci/memory.gitlab-ci.yml
@@ -20,7 +20,7 @@ memory-on-boot:
extends:
- .only-code-memory-job-base
- .production
- - .use-pg12
+ - .use-pg13
stage: test
needs: ["setup-test-env", "compile-test-assets"]
variables:
diff --git a/.gitlab/ci/preflight.gitlab-ci.yml b/.gitlab/ci/preflight.gitlab-ci.yml
index 8c1cb44807a..526492a75c7 100644
--- a/.gitlab/ci/preflight.gitlab-ci.yml
+++ b/.gitlab/ci/preflight.gitlab-ci.yml
@@ -23,7 +23,7 @@ rails-production-server-boot:
- .production
- .ruby-cache
- .setup:rules:rails-production-server-boot
- - .use-pg12
+ - .use-pg13
variables:
BUNDLE_WITHOUT: "development:test"
BUNDLE_WITH: "production"
diff --git a/.gitlab/ci/rails.gitlab-ci.yml b/.gitlab/ci/rails.gitlab-ci.yml
index 0049917ce81..393f7c2f6a7 100644
--- a/.gitlab/ci/rails.gitlab-ci.yml
+++ b/.gitlab/ci/rails.gitlab-ci.yml
@@ -67,163 +67,173 @@ update-gitaly-binaries-cache:
- export BUNDLE_WITHOUT="${BUNDLE_WITHOUT}:default:test:puma:kerberos:metrics:omnibus:ed25519"
- bundle_install_script
-rspec migration pg12:
+rspec migration pg13:
extends:
- - .rspec-base-pg12
+ - .rspec-base-pg13
- .rspec-base-migration
- .rails:rules:ee-and-foss-migration
- .rspec-migration-parallel
-rspec migration pg12 predictive:
+rspec migration pg13 predictive:
extends:
- - rspec migration pg12
+ - rspec migration pg13
- .predictive-rspec-tests
- .rails:rules:ee-and-foss-migration:predictive
-rspec background_migration pg12:
+rspec background_migration pg13:
extends:
- - .rspec-base-pg12
+ - .rspec-base-pg13
- .rspec-base-migration
- .rails:rules:ee-and-foss-background-migration
- .rspec-background-migration-parallel
-rspec background_migration pg12 predictive:
+rspec background_migration pg13 predictive:
extends:
- - rspec background_migration pg12
+ - rspec background_migration pg13
- .predictive-rspec-tests
- .rails:rules:ee-and-foss-background-migration:predictive
-rspec migration pg12 single-db:
+rspec migration pg13 single-db:
extends:
- - rspec migration pg12
+ - rspec migration pg13
- .single-db-rspec
- .rails:rules:single-db
-rspec background_migration pg12 single-db:
+rspec background_migration pg13 single-db:
extends:
- - rspec background_migration pg12
+ - rspec background_migration pg13
- .single-db-rspec
- .rails:rules:single-db
-rspec migration pg12 single-db-ci-connection:
+rspec migration pg13 single-db-ci-connection:
extends:
- - rspec migration pg12
+ - rspec migration pg13
- .single-db-ci-connection-rspec
- .rails:rules:single-db-ci-connection
-rspec background_migration pg12 single-db-ci-connection:
+rspec background_migration pg13 single-db-ci-connection:
extends:
- - rspec background_migration pg12
+ - rspec background_migration pg13
- .single-db-ci-connection-rspec
- .rails:rules:single-db-ci-connection
-rspec migration pg12 praefect:
+rspec migration pg13 praefect:
extends:
- - rspec migration pg12
+ - rspec migration pg13
- .praefect-with-db
- .rails:rules:praefect-with-db
-rspec background_migration pg12 praefect:
+rspec background_migration pg13 praefect:
extends:
- - rspec background_migration pg12
+ - rspec background_migration pg13
- .praefect-with-db
- .rails:rules:praefect-with-db
-rspec unit pg12:
+rspec unit pg13:
extends:
- - .rspec-base-pg12
+ - .rspec-base-pg13
- .rails:rules:ee-and-foss-unit
- .rspec-unit-parallel
-rspec unit pg12 predictive:
+rspec unit pg13 predictive:
extends:
- - rspec unit pg12
+ - rspec unit pg13
- .predictive-rspec-tests
- .rails:rules:ee-and-foss-unit:predictive
-rspec unit pg12 single-db:
+rspec unit pg13 single-db:
extends:
- - rspec unit pg12
+ - rspec unit pg13
- .single-db-rspec
- .rails:rules:single-db
-rspec unit pg12 single-db-ci-connection:
+rspec unit pg13 single-db-ci-connection:
extends:
- - rspec unit pg12
+ - rspec unit pg13
- .single-db-ci-connection-rspec
- .rails:rules:single-db-ci-connection
-rspec unit pg12 praefect:
+rspec unit pg13 praefect:
extends:
- - rspec unit pg12
+ - rspec unit pg13
- .praefect-with-db
- .rails:rules:praefect-with-db
-rspec integration pg12:
+rspec integration pg13:
extends:
- - .rspec-base-pg12
+ - .rspec-base-pg13
- .rails:rules:ee-and-foss-integration
- .rspec-integration-parallel
-rspec integration pg12 predictive:
+rspec integration pg13 predictive:
extends:
- - rspec integration pg12
+ - rspec integration pg13
- .predictive-rspec-tests
- .rails:rules:ee-and-foss-integration:predictive
-rspec integration pg12 single-db:
+rspec integration pg13 single-db:
extends:
- - rspec integration pg12
+ - rspec integration pg13
- .single-db-rspec
- .rails:rules:single-db
-rspec integration pg12 single-db-ci-connection:
+rspec integration pg13 single-db-ci-connection:
extends:
- - rspec integration pg12
+ - rspec integration pg13
- .single-db-ci-connection-rspec
- .rails:rules:single-db-ci-connection
-rspec integration pg12 praefect:
+rspec integration pg13 praefect:
extends:
- - rspec integration pg12
+ - rspec integration pg13
- .praefect-with-db
- .rails:rules:praefect-with-db
-rspec system pg12:
+rspec system pg13:
extends:
- - .rspec-base-pg12
+ - .rspec-base-pg13
- .rails:rules:ee-and-foss-system
- .rspec-system-parallel
variables:
DEBUG_GITLAB_TRANSACTION_STACK: "true"
-rspec system pg12 predictive:
+rspec system pg13 predictive:
extends:
- - rspec system pg12
+ - rspec system pg13
- .predictive-rspec-tests
- .rails:rules:ee-and-foss-system:predictive
-rspec system pg12 single-db:
+rspec system pg13 single-db:
extends:
- - rspec system pg12
+ - rspec system pg13
- .single-db-rspec
- .rails:rules:single-db
-rspec system pg12 single-db-ci-connection:
+rspec system pg13 single-db-ci-connection:
extends:
- - rspec system pg12
+ - rspec system pg13
- .single-db-ci-connection-rspec
- .rails:rules:single-db-ci-connection
-rspec system pg12 praefect:
+rspec system pg13 praefect:
extends:
- - rspec system pg12
+ - rspec system pg13
- .praefect-with-db
- .rails:rules:praefect-with-db
-rspec fast_spec_helper:
+# Dedicated job to test DB library code against PG12.
+# Note that these are already tested against PG12 in the `rspec unit pg12` / `rspec-ee unit pg12` jobs.
+rspec db-library-code pg12:
extends:
- .rspec-base-pg12
+ - .rails:rules:ee-and-foss-db-library-code
+ script:
+ - !reference [.base-script, script]
+ - rspec_db_library_code
+
+rspec fast_spec_helper:
+ extends:
+ - .rspec-base-pg13
- .rails:rules:ee-and-foss-fast_spec_helper
script:
- fast_spec_helper_specs=$(git grep -l -E '^require.*fast_spec_helper')
@@ -258,16 +268,16 @@ rspec:deprecations:
# We cannot use needs since it would mean needing 84 jobs (since most are parallelized)
# so we use `dependencies` here.
dependencies:
- - rspec migration pg12
- - rspec background_migration pg12
- - rspec unit pg12
- - rspec integration pg12
- - rspec system pg12
- - rspec-ee migration pg12
- - rspec-ee background_migration pg12
- - rspec-ee unit pg12
- - rspec-ee integration pg12
- - rspec-ee system pg12
+ - rspec migration pg13
+ - rspec background_migration pg13
+ - rspec unit pg13
+ - rspec integration pg13
+ - rspec system pg13
+ - rspec-ee migration pg13
+ - rspec-ee background_migration pg13
+ - rspec-ee unit pg13
+ - rspec-ee integration pg13
+ - rspec-ee system pg13
variables:
SETUP_DB: "false"
script:
@@ -290,76 +300,76 @@ rspec:coverage:
dependencies:
- setup-test-env
# FOSS/EE jobs
- - rspec migration pg12
- - rspec background_migration pg12
- - rspec unit pg12
- - rspec integration pg12
- - rspec system pg12
+ - rspec migration pg13
+ - rspec background_migration pg13
+ - rspec unit pg13
+ - rspec integration pg13
+ - rspec system pg13
# FOSS/EE predictive jobs
- - rspec migration pg12 predictive
- - rspec background_migration pg12 predictive
- - rspec unit pg12 predictive
- - rspec integration pg12 predictive
- - rspec system pg12 predictive
+ - rspec migration pg13 predictive
+ - rspec background_migration pg13 predictive
+ - rspec unit pg13 predictive
+ - rspec integration pg13 predictive
+ - rspec system pg13 predictive
# FOSS/EE single-db jobs
- - rspec migration pg12 single-db
- - rspec background_migration pg12 single-db
- - rspec unit pg12 single-db
- - rspec integration pg12 single-db
- - rspec system pg12 single-db
+ - rspec migration pg13 single-db
+ - rspec background_migration pg13 single-db
+ - rspec unit pg13 single-db
+ - rspec integration pg13 single-db
+ - rspec system pg13 single-db
# FOSS/EE single-db-ci-connection jobs
- - rspec migration pg12 single-db-ci-connection
- - rspec background_migration pg12 single-db-ci-connection
- - rspec unit pg12 single-db-ci-connection
- - rspec integration pg12 single-db-ci-connection
- - rspec system pg12 single-db-ci-connection
+ - rspec migration pg13 single-db-ci-connection
+ - rspec background_migration pg13 single-db-ci-connection
+ - rspec unit pg13 single-db-ci-connection
+ - rspec integration pg13 single-db-ci-connection
+ - rspec system pg13 single-db-ci-connection
# EE jobs
- - rspec-ee migration pg12
- - rspec-ee background_migration pg12
- - rspec-ee unit pg12
- - rspec-ee integration pg12
- - rspec-ee system pg12
+ - rspec-ee migration pg13
+ - rspec-ee background_migration pg13
+ - rspec-ee unit pg13
+ - rspec-ee integration pg13
+ - rspec-ee system pg13
# EE predictive jobs
- - rspec-ee migration pg12 predictive
- - rspec-ee background_migration pg12 predictive
- - rspec-ee unit pg12 predictive
- - rspec-ee integration pg12 predictive
- - rspec-ee system pg12 predictive
+ - rspec-ee migration pg13 predictive
+ - rspec-ee background_migration pg13 predictive
+ - rspec-ee unit pg13 predictive
+ - rspec-ee integration pg13 predictive
+ - rspec-ee system pg13 predictive
# EE single-db jobs
- - rspec-ee migration pg12 single-db
- - rspec-ee background_migration pg12 single-db
- - rspec-ee unit pg12 single-db
- - rspec-ee integration pg12 single-db
- - rspec-ee system pg12 single-db
+ - rspec-ee migration pg13 single-db
+ - rspec-ee background_migration pg13 single-db
+ - rspec-ee unit pg13 single-db
+ - rspec-ee integration pg13 single-db
+ - rspec-ee system pg13 single-db
# EE single-db-ci-connection jobs
- - rspec-ee migration pg12 single-db-ci-connection
- - rspec-ee background_migration pg12 single-db-ci-connection
- - rspec-ee unit pg12 single-db-ci-connection
- - rspec-ee integration pg12 single-db-ci-connection
- - rspec-ee system pg12 single-db-ci-connection
+ - rspec-ee migration pg13 single-db-ci-connection
+ - rspec-ee background_migration pg13 single-db-ci-connection
+ - rspec-ee unit pg13 single-db-ci-connection
+ - rspec-ee integration pg13 single-db-ci-connection
+ - rspec-ee system pg13 single-db-ci-connection
# Memory jobs
- memory-on-boot
# As-if-FOSS jobs
- - rspec migration pg12-as-if-foss
- - rspec migration pg12-as-if-foss predictive
- - rspec migration pg12-as-if-foss single-db
- - rspec migration pg12-as-if-foss single-db-ci-connection
- - rspec background_migration pg12-as-if-foss
- - rspec background_migration pg12-as-if-foss predictive
- - rspec background_migration pg12-as-if-foss single-db
- - rspec background_migration pg12-as-if-foss single-db-ci-connection
- - rspec unit pg12-as-if-foss
- - rspec unit pg12-as-if-foss predictive
- - rspec unit pg12-as-if-foss single-db
- - rspec unit pg12-as-if-foss single-db-ci-connection
- - rspec integration pg12-as-if-foss
- - rspec integration pg12-as-if-foss predictive
- - rspec integration pg12-as-if-foss single-db
- - rspec integration pg12-as-if-foss single-db-ci-connection
- - rspec system pg12-as-if-foss
- - rspec system pg12-as-if-foss predictive
- - rspec system pg12-as-if-foss single-db
- - rspec system pg12-as-if-foss single-db-ci-connection
+ - rspec migration pg13-as-if-foss
+ - rspec migration pg13-as-if-foss predictive
+ - rspec migration pg13-as-if-foss single-db
+ - rspec migration pg13-as-if-foss single-db-ci-connection
+ - rspec background_migration pg13-as-if-foss
+ - rspec background_migration pg13-as-if-foss predictive
+ - rspec background_migration pg13-as-if-foss single-db
+ - rspec background_migration pg13-as-if-foss single-db-ci-connection
+ - rspec unit pg13-as-if-foss
+ - rspec unit pg13-as-if-foss predictive
+ - rspec unit pg13-as-if-foss single-db
+ - rspec unit pg13-as-if-foss single-db-ci-connection
+ - rspec integration pg13-as-if-foss
+ - rspec integration pg13-as-if-foss predictive
+ - rspec integration pg13-as-if-foss single-db
+ - rspec integration pg13-as-if-foss single-db-ci-connection
+ - rspec system pg13-as-if-foss
+ - rspec system pg13-as-if-foss predictive
+ - rspec system pg13-as-if-foss single-db
+ - rspec system pg13-as-if-foss single-db-ci-connection
script:
- run_timed_command "bundle exec scripts/merge-simplecov"
coverage: '/LOC \((\d+\.\d+%)\) covered.$/'
@@ -437,274 +447,274 @@ rspec:flaky-tests-report:
##################################################
# EE: default refs (MRs, default branch, schedules) jobs #
-rspec migration pg12-as-if-foss:
+rspec migration pg13-as-if-foss:
extends:
- - .rspec-base-pg12-as-if-foss
+ - .rspec-base-pg13-as-if-foss
- .rspec-base-migration
- .rails:rules:as-if-foss-migration
- .rspec-migration-parallel
-rspec migration pg12-as-if-foss predictive:
+rspec migration pg13-as-if-foss predictive:
extends:
- - rspec migration pg12-as-if-foss
+ - rspec migration pg13-as-if-foss
- .predictive-rspec-tests
- .rails:rules:as-if-foss-migration:predictive
-rspec background_migration pg12-as-if-foss:
+rspec background_migration pg13-as-if-foss:
extends:
- - .rspec-base-pg12-as-if-foss
+ - .rspec-base-pg13-as-if-foss
- .rspec-base-migration
- .rails:rules:as-if-foss-background-migration
- .rspec-background-migration-parallel
-rspec background_migration pg12-as-if-foss predictive:
+rspec background_migration pg13-as-if-foss predictive:
extends:
- - rspec background_migration pg12-as-if-foss
+ - rspec background_migration pg13-as-if-foss
- .predictive-rspec-tests
- .rails:rules:as-if-foss-background-migration:predictive
-rspec migration pg12-as-if-foss single-db:
+rspec migration pg13-as-if-foss single-db:
extends:
- - rspec migration pg12-as-if-foss
+ - rspec migration pg13-as-if-foss
- .single-db-rspec
- .rails:rules:single-db
-rspec background_migration pg12-as-if-foss single-db:
+rspec background_migration pg13-as-if-foss single-db:
extends:
- - rspec background_migration pg12-as-if-foss
+ - rspec background_migration pg13-as-if-foss
- .single-db-rspec
- .rails:rules:single-db
-rspec migration pg12-as-if-foss single-db-ci-connection:
+rspec migration pg13-as-if-foss single-db-ci-connection:
extends:
- - rspec migration pg12-as-if-foss
+ - rspec migration pg13-as-if-foss
- .single-db-ci-connection-rspec
- .rails:rules:single-db-ci-connection
-rspec background_migration pg12-as-if-foss single-db-ci-connection:
+rspec background_migration pg13-as-if-foss single-db-ci-connection:
extends:
- - rspec background_migration pg12-as-if-foss
+ - rspec background_migration pg13-as-if-foss
- .single-db-ci-connection-rspec
- .rails:rules:single-db-ci-connection
-rspec unit pg12-as-if-foss:
+rspec unit pg13-as-if-foss:
extends:
- - .rspec-base-pg12-as-if-foss
+ - .rspec-base-pg13-as-if-foss
- .rails:rules:as-if-foss-unit
- .rspec-unit-parallel
-rspec unit pg12-as-if-foss predictive:
+rspec unit pg13-as-if-foss predictive:
extends:
- - rspec unit pg12-as-if-foss
+ - rspec unit pg13-as-if-foss
- .predictive-rspec-tests
- .rails:rules:as-if-foss-unit:predictive
-rspec unit pg12-as-if-foss single-db:
+rspec unit pg13-as-if-foss single-db:
extends:
- - rspec unit pg12-as-if-foss
+ - rspec unit pg13-as-if-foss
- .single-db-rspec
- .rails:rules:single-db
-rspec unit pg12-as-if-foss single-db-ci-connection:
+rspec unit pg13-as-if-foss single-db-ci-connection:
extends:
- - rspec unit pg12-as-if-foss
+ - rspec unit pg13-as-if-foss
- .single-db-ci-connection-rspec
- .rails:rules:single-db-ci-connection
-rspec integration pg12-as-if-foss:
+rspec integration pg13-as-if-foss:
extends:
- - .rspec-base-pg12-as-if-foss
+ - .rspec-base-pg13-as-if-foss
- .rails:rules:as-if-foss-integration
- .rspec-integration-parallel
-rspec integration pg12-as-if-foss predictive:
+rspec integration pg13-as-if-foss predictive:
extends:
- - rspec integration pg12-as-if-foss
+ - rspec integration pg13-as-if-foss
- .predictive-rspec-tests
- .rails:rules:as-if-foss-integration:predictive
-rspec integration pg12-as-if-foss single-db:
+rspec integration pg13-as-if-foss single-db:
extends:
- - rspec integration pg12-as-if-foss
+ - rspec integration pg13-as-if-foss
- .single-db-rspec
- .rails:rules:single-db
-rspec integration pg12-as-if-foss single-db-ci-connection:
+rspec integration pg13-as-if-foss single-db-ci-connection:
extends:
- - rspec integration pg12-as-if-foss
+ - rspec integration pg13-as-if-foss
- .single-db-ci-connection-rspec
- .rails:rules:single-db-ci-connection
-rspec system pg12-as-if-foss:
+rspec system pg13-as-if-foss:
extends:
- - .rspec-base-pg12-as-if-foss
+ - .rspec-base-pg13-as-if-foss
- .rails:rules:as-if-foss-system
- .rspec-system-parallel
-rspec system pg12-as-if-foss predictive:
+rspec system pg13-as-if-foss predictive:
extends:
- - rspec system pg12-as-if-foss
+ - rspec system pg13-as-if-foss
- .predictive-rspec-tests
- .rails:rules:as-if-foss-system:predictive
-rspec system pg12-as-if-foss single-db:
+rspec system pg13-as-if-foss single-db:
extends:
- - rspec system pg12-as-if-foss
+ - rspec system pg13-as-if-foss
- .single-db-rspec
- .rails:rules:single-db
-rspec system pg12-as-if-foss single-db-ci-connection:
+rspec system pg13-as-if-foss single-db-ci-connection:
extends:
- - rspec system pg12-as-if-foss
+ - rspec system pg13-as-if-foss
- .single-db-ci-connection-rspec
- .rails:rules:single-db-ci-connection
-rspec-ee migration pg12:
+rspec-ee migration pg13:
extends:
- - .rspec-ee-base-pg12
+ - .rspec-ee-base-pg13
- .rspec-base-migration
- .rails:rules:ee-only-migration
- .rspec-ee-migration-parallel
-rspec-ee migration pg12 predictive:
+rspec-ee migration pg13 predictive:
extends:
- - rspec-ee migration pg12
+ - rspec-ee migration pg13
- .predictive-rspec-tests
- .rails:rules:ee-only-migration:predictive
-rspec-ee background_migration pg12:
+rspec-ee background_migration pg13:
extends:
- - .rspec-ee-base-pg12
+ - .rspec-ee-base-pg13
- .rspec-base-migration
- .rails:rules:ee-only-background-migration
- .rspec-ee-background-migration-parallel
-rspec-ee background_migration pg12 predictive:
+rspec-ee background_migration pg13 predictive:
extends:
- - rspec-ee background_migration pg12
+ - rspec-ee background_migration pg13
- .predictive-rspec-tests
- .rails:rules:ee-only-background-migration:predictive
-rspec-ee migration pg12 single-db:
+rspec-ee migration pg13 single-db:
extends:
- - rspec-ee migration pg12
+ - rspec-ee migration pg13
- .single-db-rspec
- .rails:rules:single-db
-rspec-ee background_migration pg12 single-db:
+rspec-ee background_migration pg13 single-db:
extends:
- - rspec-ee background_migration pg12
+ - rspec-ee background_migration pg13
- .single-db-rspec
- .rails:rules:single-db
-rspec-ee migration pg12 single-db-ci-connection:
+rspec-ee migration pg13 single-db-ci-connection:
extends:
- - rspec-ee migration pg12
+ - rspec-ee migration pg13
- .single-db-ci-connection-rspec
- .rails:rules:single-db-ci-connection
-rspec-ee background_migration pg12 single-db-ci-connection:
+rspec-ee background_migration pg13 single-db-ci-connection:
extends:
- - rspec-ee background_migration pg12
+ - rspec-ee background_migration pg13
- .single-db-ci-connection-rspec
- .rails:rules:single-db-ci-connection
-rspec-ee migration pg12 praefect:
+rspec-ee migration pg13 praefect:
extends:
- - rspec migration pg12
+ - rspec migration pg13
- .praefect-with-db
- .rails:rules:praefect-with-db
-rspec-ee background_migration pg12 praefect:
+rspec-ee background_migration pg13 praefect:
extends:
- - rspec background_migration pg12
+ - rspec background_migration pg13
- .praefect-with-db
- .rails:rules:praefect-with-db
-rspec-ee unit pg12:
+rspec-ee unit pg13:
extends:
- - .rspec-ee-base-pg12
+ - .rspec-ee-base-pg13
- .rails:rules:ee-only-unit
- .rspec-ee-unit-parallel
-rspec-ee unit pg12 es8:
+rspec-ee unit pg13 es8:
extends:
- - .rspec-ee-base-pg12-es8
+ - .rspec-ee-base-pg13-es8
- .rspec-ee-unit-parallel
-rspec-ee unit pg12 predictive:
+rspec-ee unit pg13 predictive:
extends:
- - rspec-ee unit pg12
+ - rspec-ee unit pg13
- .predictive-rspec-tests
- .rails:rules:ee-only-unit:predictive
-rspec-ee unit pg12 single-db:
+rspec-ee unit pg13 single-db:
extends:
- - rspec-ee unit pg12
+ - rspec-ee unit pg13
- .single-db-rspec
- .rails:rules:single-db
-rspec-ee unit pg12 single-db-ci-connection:
+rspec-ee unit pg13 single-db-ci-connection:
extends:
- - rspec-ee unit pg12
+ - rspec-ee unit pg13
- .single-db-ci-connection-rspec
- .rails:rules:single-db-ci-connection
-rspec-ee integration pg12:
+rspec-ee integration pg13:
extends:
- - .rspec-ee-base-pg12
+ - .rspec-ee-base-pg13
- .rails:rules:ee-only-integration
- .rspec-ee-integration-parallel
-rspec-ee integration pg12 es8:
+rspec-ee integration pg13 es8:
extends:
- - .rspec-ee-base-pg12-es8
+ - .rspec-ee-base-pg13-es8
- .rspec-ee-integration-parallel
-rspec-ee integration pg12 predictive:
+rspec-ee integration pg13 predictive:
extends:
- - rspec-ee integration pg12
+ - rspec-ee integration pg13
- .predictive-rspec-tests
- .rails:rules:ee-only-integration:predictive
-rspec-ee integration pg12 single-db:
+rspec-ee integration pg13 single-db:
extends:
- - rspec-ee integration pg12
+ - rspec-ee integration pg13
- .single-db-rspec
- .rails:rules:single-db
-rspec-ee integration pg12 single-db-ci-connection:
+rspec-ee integration pg13 single-db-ci-connection:
extends:
- - rspec-ee integration pg12
+ - rspec-ee integration pg13
- .single-db-ci-connection-rspec
- .rails:rules:single-db-ci-connection
-rspec-ee system pg12:
+rspec-ee system pg13:
extends:
- - .rspec-ee-base-pg12
+ - .rspec-ee-base-pg13
- .rails:rules:ee-only-system
- .rspec-ee-system-parallel
-rspec-ee system pg12 es8:
+rspec-ee system pg13 es8:
extends:
- - .rspec-ee-base-pg12-es8
+ - .rspec-ee-base-pg13-es8
- .rspec-ee-system-parallel
-rspec-ee system pg12 predictive:
+rspec-ee system pg13 predictive:
extends:
- - rspec-ee system pg12
+ - rspec-ee system pg13
- .predictive-rspec-tests
- .rails:rules:ee-only-system:predictive
-rspec-ee system pg12 single-db:
+rspec-ee system pg13 single-db:
extends:
- - rspec-ee system pg12
+ - rspec-ee system pg13
- .single-db-rspec
- .rails:rules:single-db
-rspec-ee system pg12 single-db-ci-connection:
+rspec-ee system pg13 single-db-ci-connection:
extends:
- - rspec-ee system pg12
+ - rspec-ee system pg13
- .single-db-ci-connection-rspec
- .rails:rules:single-db-ci-connection
# EE: default refs (MRs, default branch, schedules) jobs #
@@ -713,36 +723,69 @@ rspec-ee system pg12 single-db-ci-connection:
##########################################
# EE/FOSS: default branch nightly scheduled jobs #
-# PG13
-rspec migration pg13:
+# PG12
+rspec migration pg12:
extends:
- - .rspec-base-pg13
+ - .rspec-base-pg12
+ - .rspec-base-migration
+ - .rails:rules:rspec-on-pg12
+ - .rspec-migration-parallel
+
+rspec background_migration pg12:
+ extends:
+ - .rspec-base-pg12
+ - .rspec-base-migration
+ - .rails:rules:rspec-on-pg12
+ - .rspec-background-migration-parallel
+
+rspec unit pg12:
+ extends:
+ - .rspec-base-pg12
+ - .rails:rules:rspec-on-pg12
+ - .rspec-unit-parallel
+
+rspec integration pg12:
+ extends:
+ - .rspec-base-pg12
+ - .rails:rules:rspec-on-pg12
+ - .rspec-integration-parallel
+
+rspec system pg12:
+ extends:
+ - .rspec-base-pg12
+ - .rails:rules:rspec-on-pg12
+ - .rspec-system-parallel
+
+# PG14
+rspec migration pg14:
+ extends:
+ - .rspec-base-pg14
- .rspec-base-migration
- .rails:rules:default-branch-schedule-nightly--code-backstage
- .rspec-migration-parallel
-rspec background_migration pg13:
+rspec background_migration pg14:
extends:
- - .rspec-base-pg13
+ - .rspec-base-pg14
- .rspec-base-migration
- .rails:rules:default-branch-schedule-nightly--code-backstage
- .rspec-background-migration-parallel
-rspec unit pg13:
+rspec unit pg14:
extends:
- - .rspec-base-pg13
+ - .rspec-base-pg14
- .rails:rules:default-branch-schedule-nightly--code-backstage
- .rspec-unit-parallel
-rspec integration pg13:
+rspec integration pg14:
extends:
- - .rspec-base-pg13
+ - .rspec-base-pg14
- .rails:rules:default-branch-schedule-nightly--code-backstage
- .rspec-integration-parallel
-rspec system pg13:
+rspec system pg14:
extends:
- - .rspec-base-pg13
+ - .rspec-base-pg14
- .rails:rules:default-branch-schedule-nightly--code-backstage
- .rspec-system-parallel
# EE/FOSS: default branch nightly scheduled jobs #
@@ -752,68 +795,152 @@ rspec system pg13:
# EE: default branch nightly scheduled jobs #
# PG12
-rspec-ee unit pg12 opensearch1:
+rspec-ee migration pg12:
+ extends:
+ - .rspec-ee-base-pg12
+ - .rspec-base-migration
+ - .rails:rules:default-branch-schedule-nightly--code-backstage-ee-only
+ - .rspec-ee-migration-parallel
+
+rspec-ee background_migration pg12:
+ extends:
+ - .rspec-ee-base-pg12
+ - .rspec-base-migration
+ - .rails:rules:default-branch-schedule-nightly--code-backstage-ee-only
+ - .rspec-ee-background-migration-parallel
+
+rspec-ee unit pg12:
extends:
- - .rspec-ee-base-pg12-opensearch1
+ - .rspec-ee-base-pg12
+ - .rails:rules:default-branch-schedule-nightly--code-backstage-ee-only
- .rspec-ee-unit-parallel
-rspec-ee unit pg12 opensearch2:
+rspec-ee integration pg12:
extends:
- - .rspec-ee-base-pg12-opensearch2
+ - .rspec-ee-base-pg12
+ - .rails:rules:default-branch-schedule-nightly--code-backstage-ee-only
+ - .rspec-ee-integration-parallel
+
+rspec-ee system pg12:
+ extends:
+ - .rspec-ee-base-pg12
+ - .rails:rules:default-branch-schedule-nightly--code-backstage-ee-only
+ - .rspec-ee-system-parallel
+
+# PG13
+rspec-ee unit pg13 opensearch1:
+ extends:
+ - .rspec-ee-base-pg13-opensearch1
+ - .rspec-ee-unit-parallel
+
+rspec-ee unit pg13 opensearch2:
+ extends:
+ - .rspec-ee-base-pg13-opensearch2
- .rspec-ee-unit-parallel
-rspec-ee integration pg12 opensearch1:
+rspec-ee integration pg13 opensearch1:
extends:
- - .rspec-ee-base-pg12-opensearch1
+ - .rspec-ee-base-pg13-opensearch1
- .rspec-ee-integration-parallel
-rspec-ee integration pg12 opensearch2:
+rspec-ee integration pg13 opensearch2:
extends:
- - .rspec-ee-base-pg12-opensearch2
+ - .rspec-ee-base-pg13-opensearch2
- .rspec-ee-integration-parallel
-rspec-ee system pg12 opensearch1:
+rspec-ee system pg13 opensearch1:
extends:
- - .rspec-ee-base-pg12-opensearch1
+ - .rspec-ee-base-pg13-opensearch1
- .rspec-ee-system-parallel
-rspec-ee system pg12 opensearch2:
+rspec-ee system pg13 opensearch2:
extends:
- - .rspec-ee-base-pg12-opensearch2
+ - .rspec-ee-base-pg13-opensearch2
- .rspec-ee-system-parallel
-# PG13
-rspec-ee migration pg13:
+# PG14
+rspec-ee unit pg14 opensearch1:
extends:
- - .rspec-ee-base-pg13
+ - .rspec-ee-base-pg14-opensearch1
+ - .rspec-ee-unit-parallel
+ - .rails:rules:default-branch-schedule-nightly--code-backstage-ee-only
+
+rspec-ee unit pg14 opensearch2:
+ extends:
+ - .rspec-ee-base-pg14-opensearch2
+ - .rspec-ee-unit-parallel
+ - .rails:rules:default-branch-schedule-nightly--code-backstage-ee-only
+
+rspec-ee integration pg14 opensearch1:
+ extends:
+ - .rspec-ee-base-pg14-opensearch1
+ - .rspec-ee-integration-parallel
+ - .rails:rules:default-branch-schedule-nightly--code-backstage-ee-only
+
+rspec-ee integration pg14 opensearch2:
+ extends:
+ - .rspec-ee-base-pg14-opensearch2
+ - .rspec-ee-integration-parallel
+ - .rails:rules:default-branch-schedule-nightly--code-backstage-ee-only
+
+rspec-ee system pg14 opensearch1:
+ extends:
+ - .rspec-ee-base-pg14-opensearch1
+ - .rspec-ee-system-parallel
+ - .rails:rules:default-branch-schedule-nightly--code-backstage-ee-only
+
+rspec-ee system pg14 opensearch2:
+ extends:
+ - .rspec-ee-base-pg14-opensearch2
+ - .rspec-ee-system-parallel
+ - .rails:rules:default-branch-schedule-nightly--code-backstage-ee-only
+
+rspec-ee migration pg14:
+ extends:
+ - .rspec-ee-base-pg14
- .rspec-base-migration
- .rails:rules:default-branch-schedule-nightly--code-backstage-ee-only
- .rspec-ee-migration-parallel
-rspec-ee background_migration pg13:
+rspec-ee background_migration pg14:
extends:
- - .rspec-ee-base-pg13
+ - .rspec-ee-base-pg14
- .rspec-base-migration
- .rails:rules:default-branch-schedule-nightly--code-backstage-ee-only
- .rspec-ee-background-migration-parallel
-rspec-ee unit pg13:
+rspec-ee unit pg14:
extends:
- - .rspec-ee-base-pg13
+ - .rspec-ee-base-pg14
- .rails:rules:default-branch-schedule-nightly--code-backstage-ee-only
- .rspec-ee-unit-parallel
-rspec-ee integration pg13:
+rspec-ee unit pg14 es8:
extends:
- - .rspec-ee-base-pg13
+ - .rspec-ee-base-pg14-es8
+ - .rspec-ee-unit-parallel
+
+rspec-ee integration pg14:
+ extends:
+ - .rspec-ee-base-pg14
- .rails:rules:default-branch-schedule-nightly--code-backstage-ee-only
- .rspec-ee-integration-parallel
-rspec-ee system pg13:
+rspec-ee integration pg14 es8:
extends:
- - .rspec-ee-base-pg13
+ - .rspec-ee-base-pg14-es8
+ - .rspec-ee-integration-parallel
+
+rspec-ee system pg14:
+ extends:
+ - .rspec-ee-base-pg14
- .rails:rules:default-branch-schedule-nightly--code-backstage-ee-only
- .rspec-ee-system-parallel
+
+rspec-ee system pg14 es8:
+ extends:
+ - .rspec-ee-base-pg14-es8
+ - .rspec-ee-system-parallel
# EE: default branch nightly scheduled jobs #
#####################################
@@ -830,15 +957,15 @@ rspec-ee system pg13:
rspec fail-fast:
extends:
- - .rspec-base-pg12
- - .rspec-fail-fast # extends from .rspec-fail-fast last to override script from .rspec-base-pg12
+ - .rspec-base-pg13
+ - .rspec-fail-fast # extends from .rspec-fail-fast last to override script from .rspec-base-pg13
variables:
MATCHING_TESTS_PATH: "${RSPEC_MATCHING_TESTS_FOSS_PATH}"
rspec-ee fail-fast:
extends:
- - .rspec-ee-base-pg12
- - .rspec-fail-fast # extends from .rspec-fail-fast last to override script from .rspec-ee-base-pg12
+ - .rspec-ee-base-pg13
+ - .rspec-fail-fast # extends from .rspec-fail-fast last to override script from .rspec-ee-base-pg13
variables:
MATCHING_TESTS_PATH: "${RSPEC_MATCHING_TESTS_EE_PATH}"
@@ -894,7 +1021,7 @@ fail-pipeline-early:
script:
- fail_pipeline_early
-.base-rspec-pg12-rerun-previous-failed-tests:
+.base-rspec-pg13-rerun-previous-failed-tests:
extends:
- .rails:rules:rerun-previous-failed-tests
stage: test
@@ -903,17 +1030,17 @@ fail-pipeline-early:
- !reference [.base-script, script]
- rspec_rerun_previous_failed_tests "${PREVIOUS_FAILED_TESTS_FILE}"
-rspec rspec-pg12-rerun-previous-failed-tests:
+rspec rspec-pg13-rerun-previous-failed-tests:
extends:
- - .rspec-base-pg12
- - .base-rspec-pg12-rerun-previous-failed-tests
+ - .rspec-base-pg13
+ - .base-rspec-pg13-rerun-previous-failed-tests
variables:
PREVIOUS_FAILED_TESTS_FILE: tmp/previous_failed_tests/rspec_failed_tests.txt
-rspec rspec-ee-pg12-rerun-previous-failed-tests:
+rspec rspec-ee-pg13-rerun-previous-failed-tests:
extends:
- - .rspec-ee-base-pg12
- - .base-rspec-pg12-rerun-previous-failed-tests
+ - .rspec-ee-base-pg13
+ - .base-rspec-pg13-rerun-previous-failed-tests
variables:
PREVIOUS_FAILED_TESTS_FILE: tmp/previous_failed_tests/rspec_ee_failed_files.txt
# EE: Canonical MR pipelines
diff --git a/.gitlab/ci/rails/rspec-foss-impact.gitlab-ci.yml.erb b/.gitlab/ci/rails/rspec-foss-impact.gitlab-ci.yml.erb
index 02b7d61a4fa..38d964af62a 100644
--- a/.gitlab/ci/rails/rspec-foss-impact.gitlab-ci.yml.erb
+++ b/.gitlab/ci/rails/rspec-foss-impact.gitlab-ci.yml.erb
@@ -22,7 +22,7 @@ dont-interrupt-me:
- echo "This jobs makes sure this pipeline won't be interrupted! See https://docs.gitlab.com/ee/ci/yaml/#interruptible."
.base-rspec-foss-impact:
- extends: .rspec-base-pg12-as-if-foss
+ extends: .rspec-base-pg13-as-if-foss
needs:
- pipeline: $PARENT_PIPELINE_ID
job: detect-tests
diff --git a/.gitlab/ci/rails/shared.gitlab-ci.yml b/.gitlab/ci/rails/shared.gitlab-ci.yml
index 0fa65b0be90..62e8547fa5a 100644
--- a/.gitlab/ci/rails/shared.gitlab-ci.yml
+++ b/.gitlab/ci/rails/shared.gitlab-ci.yml
@@ -105,11 +105,16 @@ include:
- .rspec-base
- .use-pg12
-.rspec-base-pg12-as-if-foss:
+.rspec-base-pg13:
+ extends:
+ - .rspec-base
+ - .use-pg13
+
+.rspec-base-pg13-as-if-foss:
extends:
- .rspec-base
- .as-if-foss
- - .use-pg12
+ - .use-pg13
needs:
- job: "setup-test-env"
- job: "retrieve-tests-metadata"
@@ -117,44 +122,67 @@ include:
- job: "detect-tests"
optional: true
-.rspec-base-pg13:
+.rspec-base-pg14:
extends:
- .rspec-base
- - .use-pg13
+ - .use-pg14
.rspec-ee-base-pg12:
extends:
- .rspec-base
- .use-pg12-es7-ee
-.rspec-ee-base-pg12-es8:
+.rspec-ee-base-pg13:
extends:
- .rspec-base
- - .use-pg12-es8-ee
+ - .use-pg13-es7-ee
+
+.rspec-ee-base-pg13-es8:
+ extends:
+ - .rspec-base
+ - .use-pg13-es8-ee
- .rails:rules:run-search-tests
-.rspec-ee-base-pg12-opensearch1:
+.rspec-ee-base-pg13-opensearch1:
extends:
- .rspec-base
- - .use-pg12-opensearch1-ee
+ - .use-pg13-opensearch1-ee
- .rails:rules:run-search-tests
-.rspec-ee-base-pg12-opensearch2:
+.rspec-ee-base-pg13-opensearch2:
extends:
- .rspec-base
- - .use-pg12-opensearch2-ee
+ - .use-pg13-opensearch2-ee
- .rails:rules:run-search-tests
-.rspec-ee-base-pg13:
+.rspec-ee-base-pg14:
extends:
- .rspec-base
- - .use-pg13-es7-ee
+ - .use-pg14-es7-ee
+
+.rspec-ee-base-pg14-es8:
+ extends:
+ - .rspec-base
+ - .use-pg14-es8-ee
+ - .rails:rules:run-search-tests
+
+.rspec-ee-base-pg14-opensearch1:
+ extends:
+ - .rspec-base
+ - .use-pg14-opensearch1-ee
+ - .rails:rules:run-search-tests
+
+.rspec-ee-base-pg14-opensearch2:
+ extends:
+ - .rspec-base
+ - .use-pg14-opensearch2-ee
+ - .rails:rules:run-search-tests
.db-job-base:
extends:
- .rails-job-base
- .rails:rules:ee-and-foss-migration
- - .use-pg12
+ - .use-pg13
stage: test
needs: ["setup-test-env"]
# rspec job base specs
diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml
index 7fdb2ad41ec..6eab6472ed1 100644
--- a/.gitlab/ci/rules.gitlab-ci.yml
+++ b/.gitlab/ci/rules.gitlab-ci.yml
@@ -85,6 +85,9 @@
.if-merge-request-labels-run-review-app: &if-merge-request-labels-run-review-app
if: '$CI_MERGE_REQUEST_LABELS =~ /pipeline:run-review-app/'
+.if-merge-request-labels-run-on-pg12: &if-merge-request-labels-run-on-pg12
+ if: '$CI_MERGE_REQUEST_LABELS =~ /pipeline:run-on-pg12/'
+
.if-merge-request-labels-skip-undercoverage: &if-merge-request-labels-skip-undercoverage
if: '$CI_MERGE_REQUEST_LABELS =~ /pipeline:skip-undercoverage/'
@@ -1668,6 +1671,7 @@
- <<: *if-default-refs
changes: *db-library-patterns
- <<: *if-merge-request-labels-run-all-rspec
+ - <<: *if-merge-request-labels-run-on-pg12
.rails:rules:ee-mr-and-default-branch-only:
rules:
@@ -1757,6 +1761,11 @@
- <<: *if-merge-request
changes: *backend-patterns
+.rails:rules:rspec-on-pg12:
+ rules:
+ - <<: *if-merge-request-labels-run-on-pg12
+ - !reference [".rails:rules:default-branch-schedule-nightly--code-backstage-default-rules", rules]
+
.rails:rules:default-branch-schedule-nightly--code-backstage-default-rules:
rules:
- <<: *if-default-branch-schedule-nightly
diff --git a/.gitlab/ci/setup.gitlab-ci.yml b/.gitlab/ci/setup.gitlab-ci.yml
index 9620f0b87bd..35172faa6df 100644
--- a/.gitlab/ci/setup.gitlab-ci.yml
+++ b/.gitlab/ci/setup.gitlab-ci.yml
@@ -83,7 +83,7 @@ verify-approvals:
generate-frontend-fixtures-mapping:
extends:
- .setup:rules:generate-frontend-fixtures-mapping
- - .use-pg12
+ - .use-pg13
- .rails-cache
needs: ["setup-test-env"]
stage: prepare
diff --git a/.gitlab/ci/static-analysis.gitlab-ci.yml b/.gitlab/ci/static-analysis.gitlab-ci.yml
index d546c79aab9..b9c9200d78b 100644
--- a/.gitlab/ci/static-analysis.gitlab-ci.yml
+++ b/.gitlab/ci/static-analysis.gitlab-ci.yml
@@ -45,7 +45,7 @@ static-verification-with-database:
- .static-analysis-base
- .rubocop-job-cache
- .static-analysis:rules:static-verification-with-database
- - .use-pg12
+ - .use-pg13
script:
- bundle exec rake lint:static_verification_with_database
variables:
diff --git a/.gitlab/ci/test-metadata.gitlab-ci.yml b/.gitlab/ci/test-metadata.gitlab-ci.yml
index 176a0b67d66..20d768c9e90 100644
--- a/.gitlab/ci/test-metadata.gitlab-ci.yml
+++ b/.gitlab/ci/test-metadata.gitlab-ci.yml
@@ -32,17 +32,17 @@ update-tests-metadata:
- retrieve-tests-metadata
- generate-frontend-fixtures-mapping
- setup-test-env
- - rspec migration pg12
+ - rspec migration pg13
- rspec-all frontend_fixture
- - rspec unit pg12
- - rspec integration pg12
- - rspec system pg12
- - rspec background_migration pg12
- - rspec-ee migration pg12
- - rspec-ee unit pg12
- - rspec-ee integration pg12
- - rspec-ee system pg12
- - rspec-ee background_migration pg12
+ - rspec unit pg13
+ - rspec integration pg13
+ - rspec system pg13
+ - rspec background_migration pg13
+ - rspec-ee migration pg13
+ - rspec-ee unit pg13
+ - rspec-ee integration pg13
+ - rspec-ee system pg13
+ - rspec-ee background_migration pg13
script:
- run_timed_command "retry gem install fog-aws mime-types activesupport rspec_profiling postgres-copy --no-document"
- source ./scripts/rspec_helpers.sh