diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 443807bfb90101527d5e707d29b385ecd5500a07..7816ae1391c8ac42358e74c71bbc6492c9538d75 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -121,7 +121,7 @@ workflow:
PIPELINE_NAME: 'Ruby $RUBY_VERSION $CI_COMMIT_BRANCH branch pipeline'
variables:
- PG_VERSION: "13"
+ PG_VERSION: "14"
DEFAULT_CI_IMAGE: "${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images/debian-${DEBIAN_VERSION}-ruby-${RUBY_VERSION}.patched-golang-${GO_VERSION}-rust-${RUST_VERSION}-node-18.16-postgresql-${PG_VERSION}:rubygems-${RUBYGEMS_VERSION}-git-2.36-lfs-2.9-chrome-${CHROME_VERSION}-yarn-1.22-graphicsmagick-1.3.36"
# We set $GITLAB_DEPENDENCY_PROXY to another variable (since it's set at the group level and has higher precedence than .gitlab-ci.yml)
# so that we can override $GITLAB_DEPENDENCY_PROXY_ADDRESS in workflow rules.
diff --git a/.gitlab/ci/ci-templates.gitlab-ci.yml b/.gitlab/ci/ci-templates.gitlab-ci.yml
index c6681db96856c6ca168dba7ce17d60aefe338b1f..a00de8cb533ed74f99b3e67c4d0753908cc7f525 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-pg14
+ - .use-pg15
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 5464e154b3f08fee4fc54065145768678b15eb29..642bad53772ad579cdf544295f6717ccf406012d 100644
--- a/.gitlab/ci/dev-fixtures.gitlab-ci.yml
+++ b/.gitlab/ci/dev-fixtures.gitlab-ci.yml
@@ -3,7 +3,7 @@
- .default-retry
- .ruby-cache
- .default-before_script
- - .use-pg13
+ - .use-pg14
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-pg13-es7-ee
+ - .use-pg14-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 790a91404454823de3b0e0825f96a6e35e82996e..0e630fcd8114d7a6c6f505b6d47437c820f5070a 100644
--- a/.gitlab/ci/frontend.gitlab-ci.yml
+++ b/.gitlab/ci/frontend.gitlab-ci.yml
@@ -129,7 +129,7 @@ retrieve-frontend-fixtures:
- .default-retry
- .default-before_script
- .ruby-cache
- - .use-pg13
+ - .use-pg14
stage: fixtures
needs: ["setup-test-env", "retrieve-tests-metadata", "retrieve-frontend-fixtures"]
variables:
diff --git a/.gitlab/ci/glfm.gitlab-ci.yml b/.gitlab/ci/glfm.gitlab-ci.yml
index 008bb03de251edee071428fb25d61ddab56a98f9..3f9ddaa791c28d7495ae6ccbf93e90fa31dda9f3 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-pg13
+ - .use-pg14
stage: test
needs: ["setup-test-env"]
script:
diff --git a/.gitlab/ci/global.gitlab-ci.yml b/.gitlab/ci/global.gitlab-ci.yml
index 120e5117fb2f14e5a9510234eb93f1b12f633308..39eb005ac2deb87b19d3f4d109c56d132e486072 100644
--- a/.gitlab/ci/global.gitlab-ci.yml
+++ b/.gitlab/ci/global.gitlab-ci.yml
@@ -249,6 +249,18 @@
POSTGRES_HOST_AUTH_METHOD: trust
PG_VERSION: "14"
+.use-pg15:
+ services:
+ - name: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:postgres-15-pgvector-0.4.1
+ command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
+ alias: postgres
+ - name: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:redis-cluster-6.2.12
+ alias: rediscluster # configure connections in config/redis.yml
+ - name: redis:6.2-alpine
+ variables:
+ POSTGRES_HOST_AUTH_METHOD: trust
+ PG_VERSION: "15"
+
.use-pg12-es7-ee:
services:
- name: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:postgres-12-pgvector-0.4.1
@@ -303,6 +315,24 @@
ZOEKT_INDEX_BASE_URL: http://zoekt-ci-image:6060
ZOEKT_SEARCH_BASE_URL: http://zoekt-ci-image:6070
+.use-pg15-es7-ee:
+ services:
+ - name: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:postgres-15-pgvector-0.4.1
+ command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
+ alias: postgres
+ - name: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:redis-cluster-6.2.12
+ alias: rediscluster # configure connections in config/redis.yml
+ - 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: "15"
+ ZOEKT_INDEX_BASE_URL: http://zoekt-ci-image:6060
+ ZOEKT_SEARCH_BASE_URL: http://zoekt-ci-image:6070
+
.use-pg13-es8-ee:
services:
- name: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:postgres-13-pgvector-0.4.1
@@ -341,6 +371,25 @@
ZOEKT_INDEX_BASE_URL: http://zoekt-ci-image:6060
ZOEKT_SEARCH_BASE_URL: http://zoekt-ci-image:6070
+.use-pg15-es8-ee:
+ services:
+ - name: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:postgres-15-pgvector-0.4.1
+ command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
+ alias: postgres
+ - name: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:redis-cluster-6.2.12
+ alias: rediscluster # configure connections in config/redis.yml
+ - 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: "15"
+ 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: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:postgres-13-pgvector-0.4.1
@@ -417,6 +466,44 @@
ZOEKT_INDEX_BASE_URL: http://zoekt-ci-image:6060
ZOEKT_SEARCH_BASE_URL: http://zoekt-ci-image:6070
+.use-pg15-opensearch1-ee:
+ services:
+ - name: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:postgres-15-pgvector-0.4.1
+ command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
+ alias: postgres
+ - name: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:redis-cluster-6.2.12
+ alias: rediscluster # configure connections in config/redis.yml
+ - 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: "15"
+ ZOEKT_INDEX_BASE_URL: http://zoekt-ci-image:6060
+ ZOEKT_SEARCH_BASE_URL: http://zoekt-ci-image:6070
+
+.use-pg15-opensearch2-ee:
+ services:
+ - name: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:postgres-15-pgvector-0.4.1
+ command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
+ alias: postgres
+ - name: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:redis-cluster-6.2.12
+ alias: rediscluster # configure connections in config/redis.yml
+ - 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: "15"
+ ZOEKT_INDEX_BASE_URL: http://zoekt-ci-image:6060
+ ZOEKT_SEARCH_BASE_URL: http://zoekt-ci-image:6070
+
.use-kaniko:
image:
name: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:kaniko
diff --git a/.gitlab/ci/memory.gitlab-ci.yml b/.gitlab/ci/memory.gitlab-ci.yml
index 004188b502cc6d92fe7ce56b2fa8e7bb6cf1f532..33fbed15a2344de287c1bb6623797caf3eb71f3f 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-pg13
+ - .use-pg14
stage: test
needs: ["setup-test-env", "compile-test-assets"]
variables:
diff --git a/.gitlab/ci/rails.gitlab-ci.yml b/.gitlab/ci/rails.gitlab-ci.yml
index 9c3055033575f51af1ed8904d40929648de46e25..f465be5cff3c81858f1967e46479de3c7dc32c3c 100644
--- a/.gitlab/ci/rails.gitlab-ci.yml
+++ b/.gitlab/ci/rails.gitlab-ci.yml
@@ -64,145 +64,145 @@ update-gitaly-binaries-cache:
- export BUNDLE_WITHOUT="${BUNDLE_WITHOUT}:default:test:puma:kerberos:metrics:omnibus:ed25519"
- bundle_install_script
-rspec migration pg13:
+rspec migration pg14:
extends:
- - .rspec-base-pg13
+ - .rspec-base-pg14
- .rspec-base-migration
- .rails:rules:ee-and-foss-migration
- .rspec-migration-parallel
-rspec background_migration pg13:
+rspec background_migration pg14:
extends:
- - .rspec-base-pg13
+ - .rspec-base-pg14
- .rspec-base-migration
- .rails:rules:ee-and-foss-background-migration
- .rspec-background-migration-parallel
-rspec migration pg13 single-db:
+rspec migration pg14 single-db:
extends:
- - rspec migration pg13
+ - rspec migration pg14
- .single-db-rspec
- .rails:rules:single-db
-rspec background_migration pg13 single-db:
+rspec background_migration pg14 single-db:
extends:
- - rspec background_migration pg13
+ - rspec background_migration pg14
- .single-db-rspec
- .rails:rules:single-db
-rspec migration pg13 single-db-ci-connection:
+rspec migration pg14 single-db-ci-connection:
extends:
- - rspec migration pg13
+ - rspec migration pg14
- .single-db-ci-connection-rspec
- .rails:rules:single-db-ci-connection
-rspec background_migration pg13 single-db-ci-connection:
+rspec background_migration pg14 single-db-ci-connection:
extends:
- - rspec background_migration pg13
+ - rspec background_migration pg14
- .single-db-ci-connection-rspec
- .rails:rules:single-db-ci-connection
-rspec migration pg13 praefect:
+rspec migration pg14 praefect:
extends:
- - rspec migration pg13
+ - rspec migration pg14
- .praefect-with-db
- .rails:rules:praefect-with-db
-rspec background_migration pg13 praefect:
+rspec background_migration pg14 praefect:
extends:
- - rspec background_migration pg13
+ - rspec background_migration pg14
- .praefect-with-db
- .rails:rules:praefect-with-db
-rspec unit pg13:
+rspec unit pg14:
extends:
- - .rspec-base-pg13
+ - .rspec-base-pg14
- .rails:rules:ee-and-foss-unit
- .rspec-unit-parallel
-rspec unit pg13 single-redis:
+rspec unit pg14 single-redis:
extends:
- - rspec unit pg13
+ - rspec unit pg14
- .no-redis-cluster
- .rails:rules:single-redis
-rspec unit pg13 single-db:
+rspec unit pg14 single-db:
extends:
- - rspec unit pg13
+ - rspec unit pg14
- .single-db-rspec
- .rails:rules:single-db
-rspec unit pg13 single-db-ci-connection:
+rspec unit pg14 single-db-ci-connection:
extends:
- - rspec unit pg13
+ - rspec unit pg14
- .single-db-ci-connection-rspec
- .rails:rules:single-db-ci-connection
-rspec unit pg13 praefect:
+rspec unit pg14 praefect:
extends:
- - rspec unit pg13
+ - rspec unit pg14
- .praefect-with-db
- .rails:rules:praefect-with-db
-rspec integration pg13:
+rspec integration pg14:
extends:
- - .rspec-base-pg13
+ - .rspec-base-pg14
- .rails:rules:ee-and-foss-integration
- .rspec-integration-parallel
-rspec integration pg13 single-redis:
+rspec integration pg14 single-redis:
extends:
- - rspec integration pg13
+ - rspec integration pg14
- .no-redis-cluster
- .rails:rules:single-redis
-rspec integration pg13 single-db:
+rspec integration pg14 single-db:
extends:
- - rspec integration pg13
+ - rspec integration pg14
- .single-db-rspec
- .rails:rules:single-db
-rspec integration pg13 single-db-ci-connection:
+rspec integration pg14 single-db-ci-connection:
extends:
- - rspec integration pg13
+ - rspec integration pg14
- .single-db-ci-connection-rspec
- .rails:rules:single-db-ci-connection
-rspec integration pg13 praefect:
+rspec integration pg14 praefect:
extends:
- - rspec integration pg13
+ - rspec integration pg14
- .praefect-with-db
- .rails:rules:praefect-with-db
-rspec system pg13:
+rspec system pg14:
extends:
- - .rspec-base-pg13
+ - .rspec-base-pg14
- .rails:rules:ee-and-foss-system
- .rspec-system-parallel
variables:
DEBUG_GITLAB_TRANSACTION_STACK: "true"
-rspec system pg13 single-redis:
+rspec system pg14 single-redis:
extends:
- - rspec system pg13
+ - rspec system pg14
- .no-redis-cluster
- .rails:rules:single-redis
-rspec system pg13 single-db:
+rspec system pg14 single-db:
extends:
- - rspec system pg13
+ - rspec system pg14
- .single-db-rspec
- .rails:rules:single-db
-rspec system pg13 single-db-ci-connection:
+rspec system pg14 single-db-ci-connection:
extends:
- - rspec system pg13
+ - rspec system pg14
- .single-db-ci-connection-rspec
- .rails:rules:single-db-ci-connection
-rspec system pg13 praefect:
+rspec system pg14 praefect:
extends:
- - rspec system pg13
+ - rspec system pg14
- .praefect-with-db
- .rails:rules:praefect-with-db
@@ -216,9 +216,19 @@ rspec db-library-code pg12:
- !reference [.base-script, script]
- rspec_db_library_code
-rspec fast_spec_helper:
+# Dedicated job to test DB library code against PG13.
+# Note that these are already tested against PG13 in the `rspec unit pg13` / `rspec-ee unit pg13` jobs.
+rspec db-library-code pg13:
extends:
- .rspec-base-pg13
+ - .rails:rules:ee-and-foss-db-library-code
+ script:
+ - !reference [.base-script, script]
+ - rspec_db_library_code
+
+rspec fast_spec_helper:
+ extends:
+ - .rspec-base-pg14
- .rails:rules:ee-and-foss-fast_spec_helper
script:
- fast_spec_helper_specs=$(git grep -l -E '^require.*fast_spec_helper')
@@ -253,16 +263,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 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
+ - rspec migration pg14
+ - rspec background_migration pg14
+ - rspec unit pg14
+ - rspec integration pg14
+ - rspec system pg14
+ - rspec-ee migration pg14
+ - rspec-ee background_migration pg14
+ - rspec-ee unit pg14
+ - rspec-ee integration pg14
+ - rspec-ee system pg14
variables:
SETUP_DB: "false"
script:
@@ -285,29 +295,29 @@ rspec:coverage:
dependencies:
- setup-test-env
# FOSS/EE jobs
- - rspec migration pg13
- - rspec background_migration pg13
- - rspec unit pg13
- - rspec unit pg13 single-redis
- - rspec integration pg13
- - rspec integration pg13 single-redis
- - rspec system pg13
- - rspec system pg13 single-redis
+ - rspec migration pg14
+ - rspec background_migration pg14
+ - rspec unit pg14
+ - rspec unit pg14 single-redis
+ - rspec integration pg14
+ - rspec integration pg14 single-redis
+ - rspec system pg14
+ - rspec system pg14 single-redis
# as-if-foss jobs
- - rspec migration pg13-as-if-foss
- - rspec background_migration pg13-as-if-foss
- - rspec unit pg13-as-if-foss
- - rspec integration pg13-as-if-foss
- - rspec system pg13-as-if-foss
+ - rspec migration pg14-as-if-foss
+ - rspec background_migration pg14-as-if-foss
+ - rspec unit pg14-as-if-foss
+ - rspec integration pg14-as-if-foss
+ - rspec system pg14-as-if-foss
# EE jobs
- - rspec-ee migration pg13
- - rspec-ee background_migration pg13
- - rspec-ee unit pg13
- - rspec-ee unit pg13 single-redis
- - rspec-ee integration pg13
- - rspec-ee integration pg13 single-redis
- - rspec-ee system pg13
- - rspec-ee system pg13 single-redis
+ - rspec-ee migration pg14
+ - rspec-ee background_migration pg14
+ - rspec-ee unit pg14
+ - rspec-ee unit pg14 single-redis
+ - rspec-ee integration pg14
+ - rspec-ee integration pg14 single-redis
+ - rspec-ee system pg14
+ - rspec-ee system pg14 single-redis
# Memory jobs
- memory-on-boot
script:
@@ -437,232 +447,232 @@ rspec-ee:predictive:trigger:
- artifact: "${RSPEC_PREDICTIVE_PIPELINE_TEMPLATE_YML}-ee.yml"
job: rspec-predictive:pipeline-generate
-rspec migration pg13-as-if-foss:
+rspec migration pg14-as-if-foss:
extends:
- - .rspec-base-pg13-as-if-foss
+ - .rspec-base-pg14-as-if-foss
- .rspec-base-migration
- .rails:rules:as-if-foss-migration
- .rspec-migration-parallel
-rspec background_migration pg13-as-if-foss:
+rspec background_migration pg14-as-if-foss:
extends:
- - .rspec-base-pg13-as-if-foss
+ - .rspec-base-pg14-as-if-foss
- .rspec-base-migration
- .rails:rules:as-if-foss-background-migration
- .rspec-background-migration-parallel
-rspec migration pg13-as-if-foss single-db:
+rspec migration pg14-as-if-foss single-db:
extends:
- - rspec migration pg13-as-if-foss
+ - rspec migration pg14-as-if-foss
- .single-db-rspec
- .rails:rules:single-db
-rspec background_migration pg13-as-if-foss single-db:
+rspec background_migration pg14-as-if-foss single-db:
extends:
- - rspec background_migration pg13-as-if-foss
+ - rspec background_migration pg14-as-if-foss
- .single-db-rspec
- .rails:rules:single-db
-rspec migration pg13-as-if-foss single-db-ci-connection:
+rspec migration pg14-as-if-foss single-db-ci-connection:
extends:
- - rspec migration pg13-as-if-foss
+ - rspec migration pg14-as-if-foss
- .single-db-ci-connection-rspec
- .rails:rules:single-db-ci-connection
-rspec background_migration pg13-as-if-foss single-db-ci-connection:
+rspec background_migration pg14-as-if-foss single-db-ci-connection:
extends:
- - rspec background_migration pg13-as-if-foss
+ - rspec background_migration pg14-as-if-foss
- .single-db-ci-connection-rspec
- .rails:rules:single-db-ci-connection
-rspec unit pg13-as-if-foss:
+rspec unit pg14-as-if-foss:
extends:
- - .rspec-base-pg13-as-if-foss
+ - .rspec-base-pg14-as-if-foss
- .rails:rules:as-if-foss-unit
- .rspec-unit-parallel
-rspec unit pg13-as-if-foss single-db:
+rspec unit pg14-as-if-foss single-db:
extends:
- - rspec unit pg13-as-if-foss
+ - rspec unit pg14-as-if-foss
- .single-db-rspec
- .rails:rules:single-db
-rspec unit pg13-as-if-foss single-db-ci-connection:
+rspec unit pg14-as-if-foss single-db-ci-connection:
extends:
- - rspec unit pg13-as-if-foss
+ - rspec unit pg14-as-if-foss
- .single-db-ci-connection-rspec
- .rails:rules:single-db-ci-connection
-rspec integration pg13-as-if-foss:
+rspec integration pg14-as-if-foss:
extends:
- - .rspec-base-pg13-as-if-foss
+ - .rspec-base-pg14-as-if-foss
- .rails:rules:as-if-foss-integration
- .rspec-integration-parallel
-rspec integration pg13-as-if-foss single-db:
+rspec integration pg14-as-if-foss single-db:
extends:
- - rspec integration pg13-as-if-foss
+ - rspec integration pg14-as-if-foss
- .single-db-rspec
- .rails:rules:single-db
-rspec integration pg13-as-if-foss single-db-ci-connection:
+rspec integration pg14-as-if-foss single-db-ci-connection:
extends:
- - rspec integration pg13-as-if-foss
+ - rspec integration pg14-as-if-foss
- .single-db-ci-connection-rspec
- .rails:rules:single-db-ci-connection
-rspec system pg13-as-if-foss:
+rspec system pg14-as-if-foss:
extends:
- - .rspec-base-pg13-as-if-foss
+ - .rspec-base-pg14-as-if-foss
- .rails:rules:as-if-foss-system
- .rspec-system-parallel
-rspec system pg13-as-if-foss single-db:
+rspec system pg14-as-if-foss single-db:
extends:
- - rspec system pg13-as-if-foss
+ - rspec system pg14-as-if-foss
- .single-db-rspec
- .rails:rules:single-db
-rspec system pg13-as-if-foss single-db-ci-connection:
+rspec system pg14-as-if-foss single-db-ci-connection:
extends:
- - rspec system pg13-as-if-foss
+ - rspec system pg14-as-if-foss
- .single-db-ci-connection-rspec
- .rails:rules:single-db-ci-connection
-rspec-ee migration pg13:
+rspec-ee migration pg14:
extends:
- - .rspec-ee-base-pg13
+ - .rspec-ee-base-pg14
- .rspec-base-migration
- .rails:rules:ee-only-migration
- .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:ee-only-background-migration
- .rspec-ee-background-migration-parallel
-rspec-ee migration pg13 single-db:
+rspec-ee migration pg14 single-db:
extends:
- - rspec-ee migration pg13
+ - rspec-ee migration pg14
- .single-db-rspec
- .rails:rules:single-db
-rspec-ee background_migration pg13 single-db:
+rspec-ee background_migration pg14 single-db:
extends:
- - rspec-ee background_migration pg13
+ - rspec-ee background_migration pg14
- .single-db-rspec
- .rails:rules:single-db
-rspec-ee migration pg13 single-db-ci-connection:
+rspec-ee migration pg14 single-db-ci-connection:
extends:
- - rspec-ee migration pg13
+ - rspec-ee migration pg14
- .single-db-ci-connection-rspec
- .rails:rules:single-db-ci-connection
-rspec-ee background_migration pg13 single-db-ci-connection:
+rspec-ee background_migration pg14 single-db-ci-connection:
extends:
- - rspec-ee background_migration pg13
+ - rspec-ee background_migration pg14
- .single-db-ci-connection-rspec
- .rails:rules:single-db-ci-connection
-rspec-ee migration pg13 praefect:
+rspec-ee migration pg14 praefect:
extends:
- - rspec migration pg13
+ - rspec migration pg14
- .praefect-with-db
- .rails:rules:praefect-with-db
-rspec-ee background_migration pg13 praefect:
+rspec-ee background_migration pg14 praefect:
extends:
- - rspec background_migration pg13
+ - rspec background_migration pg14
- .praefect-with-db
- .rails:rules:praefect-with-db
-rspec-ee unit pg13:
+rspec-ee unit pg14:
extends:
- - .rspec-ee-base-pg13
+ - .rspec-ee-base-pg14
- .rails:rules:ee-only-unit
- .rspec-ee-unit-parallel
-rspec-ee unit pg13 es8:
+rspec-ee unit pg14 es8:
extends:
- - .rspec-ee-base-pg13-es8
+ - .rspec-ee-base-pg14-es8
- .rspec-ee-unit-parallel
-rspec-ee unit pg13 single-db:
+rspec-ee unit pg14 single-db:
extends:
- - rspec-ee unit pg13
+ - rspec-ee unit pg14
- .single-db-rspec
- .rails:rules:single-db
-rspec-ee unit pg13 single-redis:
+rspec-ee unit pg14 single-redis:
extends:
- - rspec-ee unit pg13
+ - rspec-ee unit pg14
- .no-redis-cluster
- .rails:rules:single-redis
-rspec-ee unit pg13 single-db-ci-connection:
+rspec-ee unit pg14 single-db-ci-connection:
extends:
- - rspec-ee unit pg13
+ - rspec-ee unit pg14
- .single-db-ci-connection-rspec
- .rails:rules:single-db-ci-connection
-rspec-ee integration pg13:
+rspec-ee integration pg14:
extends:
- - .rspec-ee-base-pg13
+ - .rspec-ee-base-pg14
- .rails:rules:ee-only-integration
- .rspec-ee-integration-parallel
-rspec-ee integration pg13 es8:
+rspec-ee integration pg14 es8:
extends:
- - .rspec-ee-base-pg13-es8
+ - .rspec-ee-base-pg14-es8
- .rspec-ee-integration-parallel
-rspec-ee integration pg13 single-db:
+rspec-ee integration pg14 single-db:
extends:
- - rspec-ee integration pg13
+ - rspec-ee integration pg14
- .single-db-rspec
- .rails:rules:single-db
-rspec-ee integration pg13 single-redis:
+rspec-ee integration pg14 single-redis:
extends:
- - rspec-ee integration pg13
+ - rspec-ee integration pg14
- .no-redis-cluster
- .rails:rules:single-redis
-rspec-ee integration pg13 single-db-ci-connection:
+rspec-ee integration pg14 single-db-ci-connection:
extends:
- - rspec-ee integration pg13
+ - rspec-ee integration pg14
- .single-db-ci-connection-rspec
- .rails:rules:single-db-ci-connection
-rspec-ee system pg13:
+rspec-ee system pg14:
extends:
- - .rspec-ee-base-pg13
+ - .rspec-ee-base-pg14
- .rails:rules:ee-only-system
- .rspec-ee-system-parallel
-rspec-ee system pg13 es8:
+rspec-ee system pg14 es8:
extends:
- - .rspec-ee-base-pg13-es8
+ - .rspec-ee-base-pg14-es8
- .rspec-ee-system-parallel
-rspec-ee system pg13 single-db:
+rspec-ee system pg14 single-db:
extends:
- - rspec-ee system pg13
+ - rspec-ee system pg14
- .single-db-rspec
- .rails:rules:single-db
-rspec-ee system pg13 single-redis:
+rspec-ee system pg14 single-redis:
extends:
- - rspec-ee system pg13
+ - rspec-ee system pg14
- .no-redis-cluster
- .rails:rules:single-redis
-rspec-ee system pg13 single-db-ci-connection:
+rspec-ee system pg14 single-db-ci-connection:
extends:
- - rspec-ee system pg13
+ - rspec-ee system pg14
- .single-db-ci-connection-rspec
- .rails:rules:single-db-ci-connection
# EE: default refs (MRs, default branch, schedules) jobs #
@@ -704,36 +714,69 @@ rspec system pg12:
- .rails:rules:rspec-on-pg12
- .rspec-system-parallel
-# PG14
-rspec migration pg14:
+# PG13
+rspec migration pg13:
extends:
- - .rspec-base-pg14
+ - .rspec-base-pg13
- .rspec-base-migration
- .rails:rules:default-branch-schedule-nightly--code-backstage
- .rspec-migration-parallel
-rspec background_migration pg14:
+rspec background_migration pg13:
extends:
- - .rspec-base-pg14
+ - .rspec-base-pg13
- .rspec-base-migration
- .rails:rules:default-branch-schedule-nightly--code-backstage
- .rspec-background-migration-parallel
-rspec unit pg14:
+rspec unit pg13:
extends:
- - .rspec-base-pg14
+ - .rspec-base-pg13
- .rails:rules:default-branch-schedule-nightly--code-backstage
- .rspec-unit-parallel
-rspec integration pg14:
+rspec integration pg13:
extends:
- - .rspec-base-pg14
+ - .rspec-base-pg13
- .rails:rules:default-branch-schedule-nightly--code-backstage
- .rspec-integration-parallel
-rspec system pg14:
+rspec system pg13:
extends:
- - .rspec-base-pg14
+ - .rspec-base-pg13
+ - .rails:rules:default-branch-schedule-nightly--code-backstage
+ - .rspec-system-parallel
+
+# PG15
+rspec migration pg15:
+ extends:
+ - .rspec-base-pg15
+ - .rspec-base-migration
+ - .rails:rules:default-branch-schedule-nightly--code-backstage
+ - .rspec-migration-parallel
+
+rspec background_migration pg15:
+ extends:
+ - .rspec-base-pg15
+ - .rspec-base-migration
+ - .rails:rules:default-branch-schedule-nightly--code-backstage
+ - .rspec-background-migration-parallel
+
+rspec unit pg15:
+ extends:
+ - .rspec-base-pg15
+ - .rails:rules:default-branch-schedule-nightly--code-backstage
+ - .rspec-unit-parallel
+
+rspec integration pg15:
+ extends:
+ - .rspec-base-pg15
+ - .rails:rules:default-branch-schedule-nightly--code-backstage
+ - .rspec-integration-parallel
+
+rspec system pg15:
+ extends:
+ - .rspec-base-pg15
- .rails:rules:default-branch-schedule-nightly--code-backstage
- .rspec-system-parallel
# EE/FOSS: default branch nightly scheduled jobs #
@@ -843,51 +886,88 @@ rspec-ee system pg14 opensearch2:
- .rspec-ee-system-parallel
- .rails:rules:default-branch-schedule-nightly--code-backstage-ee-only
-rspec-ee migration pg14:
+# PG15
+rspec-ee unit pg15 opensearch1:
extends:
- - .rspec-ee-base-pg14
+ - .rspec-ee-base-pg15-opensearch1
+ - .rspec-ee-unit-parallel
+ - .rails:rules:default-branch-schedule-nightly--code-backstage-ee-only
+
+rspec-ee unit pg15 opensearch2:
+ extends:
+ - .rspec-ee-base-pg15-opensearch2
+ - .rspec-ee-unit-parallel
+ - .rails:rules:default-branch-schedule-nightly--code-backstage-ee-only
+
+rspec-ee integration pg15 opensearch1:
+ extends:
+ - .rspec-ee-base-pg15-opensearch1
+ - .rspec-ee-integration-parallel
+ - .rails:rules:default-branch-schedule-nightly--code-backstage-ee-only
+
+rspec-ee integration pg15 opensearch2:
+ extends:
+ - .rspec-ee-base-pg15-opensearch2
+ - .rspec-ee-integration-parallel
+ - .rails:rules:default-branch-schedule-nightly--code-backstage-ee-only
+
+rspec-ee system pg15 opensearch1:
+ extends:
+ - .rspec-ee-base-pg15-opensearch1
+ - .rspec-ee-system-parallel
+ - .rails:rules:default-branch-schedule-nightly--code-backstage-ee-only
+
+rspec-ee system pg15 opensearch2:
+ extends:
+ - .rspec-ee-base-pg15-opensearch2
+ - .rspec-ee-system-parallel
+ - .rails:rules:default-branch-schedule-nightly--code-backstage-ee-only
+
+rspec-ee migration pg15:
+ extends:
+ - .rspec-ee-base-pg15
- .rspec-base-migration
- .rails:rules:default-branch-schedule-nightly--code-backstage-ee-only
- .rspec-ee-migration-parallel
-rspec-ee background_migration pg14:
+rspec-ee background_migration pg15:
extends:
- - .rspec-ee-base-pg14
+ - .rspec-ee-base-pg15
- .rspec-base-migration
- .rails:rules:default-branch-schedule-nightly--code-backstage-ee-only
- .rspec-ee-background-migration-parallel
-rspec-ee unit pg14:
+rspec-ee unit pg15:
extends:
- - .rspec-ee-base-pg14
+ - .rspec-ee-base-pg15
- .rails:rules:default-branch-schedule-nightly--code-backstage-ee-only
- .rspec-ee-unit-parallel
-rspec-ee unit pg14 es8:
+rspec-ee unit pg15 es8:
extends:
- - .rspec-ee-base-pg14-es8
+ - .rspec-ee-base-pg15-es8
- .rspec-ee-unit-parallel
-rspec-ee integration pg14:
+rspec-ee integration pg15:
extends:
- - .rspec-ee-base-pg14
+ - .rspec-ee-base-pg15
- .rails:rules:default-branch-schedule-nightly--code-backstage-ee-only
- .rspec-ee-integration-parallel
-rspec-ee integration pg14 es8:
+rspec-ee integration pg15 es8:
extends:
- - .rspec-ee-base-pg14-es8
+ - .rspec-ee-base-pg15-es8
- .rspec-ee-integration-parallel
-rspec-ee system pg14:
+rspec-ee system pg15:
extends:
- - .rspec-ee-base-pg14
+ - .rspec-ee-base-pg15
- .rails:rules:default-branch-schedule-nightly--code-backstage-ee-only
- .rspec-ee-system-parallel
-rspec-ee system pg14 es8:
+rspec-ee system pg15 es8:
extends:
- - .rspec-ee-base-pg14-es8
+ - .rspec-ee-base-pg15-es8
- .rspec-ee-system-parallel
# EE: default branch nightly scheduled jobs #
#####################################
@@ -905,14 +985,14 @@ rspec-ee system pg14 es8:
rspec fail-fast:
extends:
- - .rspec-base-pg13
- - .rspec-fail-fast # extends from .rspec-fail-fast last to override script from .rspec-base-pg13
+ - .rspec-base-pg14
+ - .rspec-fail-fast # extends from .rspec-fail-fast last to override script from .rspec-base-pg14
variables:
MATCHING_TESTS_PATH: "${RSPEC_MATCHING_TESTS_FOSS_PATH}"
rspec-ee fail-fast:
extends:
- - .rspec-ee-base-pg13
+ - .rspec-ee-base-pg14
- .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}"
@@ -969,7 +1049,7 @@ fail-pipeline-early:
script:
- fail_pipeline_early
-.base-rspec-pg13-rerun-previous-failed-tests:
+.base-rspec-pg14-rerun-previous-failed-tests:
extends:
- .rails:rules:rerun-previous-failed-tests
stage: test
@@ -978,17 +1058,17 @@ fail-pipeline-early:
- !reference [.base-script, script]
- rspec_rerun_previous_failed_tests "${PREVIOUS_FAILED_TESTS_FILE}"
-rspec rspec-pg13-rerun-previous-failed-tests:
+rspec rspec-pg14-rerun-previous-failed-tests:
extends:
- - .rspec-base-pg13
- - .base-rspec-pg13-rerun-previous-failed-tests
+ - .rspec-base-pg14
+ - .base-rspec-pg14-rerun-previous-failed-tests
variables:
PREVIOUS_FAILED_TESTS_FILE: tmp/previous_failed_tests/rspec_failed_tests.txt
-rspec rspec-ee-pg13-rerun-previous-failed-tests:
+rspec rspec-ee-pg14-rerun-previous-failed-tests:
extends:
- - .rspec-ee-base-pg13
- - .base-rspec-pg13-rerun-previous-failed-tests
+ - .rspec-ee-base-pg14
+ - .base-rspec-pg14-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 84aa67de4c9e6aa7003a3018f75ef3f8f4583903..dc469c302070f976ab8b0481e1163232a221a454 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-pg13-as-if-foss
+ extends: .rspec-base-pg14-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 618c4e3b654c6807b3a7a5e689ef2574f8622c5d..c0ea7d7078a8d5ccef67f89f64ea87a73434db3e 100644
--- a/.gitlab/ci/rails/shared.gitlab-ci.yml
+++ b/.gitlab/ci/rails/shared.gitlab-ci.yml
@@ -109,11 +109,16 @@ include:
- .rspec-base
- .use-pg13
-.rspec-base-pg13-as-if-foss:
+.rspec-base-pg14:
+ extends:
+ - .rspec-base
+ - .use-pg14
+
+.rspec-base-pg14-as-if-foss:
extends:
- .rspec-base
- .as-if-foss
- - .use-pg13
+ - .use-pg14
needs:
- job: "setup-test-env"
- job: "retrieve-tests-metadata"
@@ -121,10 +126,10 @@ include:
- job: "detect-tests"
optional: true
-.rspec-base-pg14:
+.rspec-base-pg15:
extends:
- .rspec-base
- - .use-pg14
+ - .use-pg15
.rspec-ee-base-pg12:
extends:
@@ -177,11 +182,34 @@ include:
- .use-pg14-opensearch2-ee
- .rails:rules:run-search-tests
+.rspec-ee-base-pg15:
+ extends:
+ - .rspec-base
+ - .use-pg15-es7-ee
+
+.rspec-ee-base-pg15-es8:
+ extends:
+ - .rspec-base
+ - .use-pg15-es8-ee
+ - .rails:rules:run-search-tests
+
+.rspec-ee-base-pg15-opensearch1:
+ extends:
+ - .rspec-base
+ - .use-pg15-opensearch1-ee
+ - .rails:rules:run-search-tests
+
+.rspec-ee-base-pg15-opensearch2:
+ extends:
+ - .rspec-base
+ - .use-pg15-opensearch2-ee
+ - .rails:rules:run-search-tests
+
.db-job-base:
extends:
- .rails-job-base
- .rails:rules:ee-and-foss-migration
- - .use-pg13
+ - .use-pg14
stage: test
needs: ["setup-test-env"]
# rspec job base specs
diff --git a/.gitlab/ci/setup.gitlab-ci.yml b/.gitlab/ci/setup.gitlab-ci.yml
index bacd7efce3e9d3845172577b063b60f009743f72..7b7eee6c55b6b9902a4fabb2bc762331e8698d6f 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-pg13
+ - .use-pg14
- .ruby-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 b9c9200d78b3a9a468f8abd6b0b59e4052d67bb4..3d030026e90a0c1ff26f9bd16dfa2c085106bbdd 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-pg13
+ - .use-pg14
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 41fd0b49173fcbe1a21c542b444bee20d99f7db4..3f06fcbce40b7e240b9bc22dca0099f7a2c51ad3 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 pg13
+ - rspec migration pg14
- rspec-all frontend_fixture
- - 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
+ - rspec unit pg14
+ - rspec integration pg14
+ - rspec system pg14
+ - rspec background_migration pg14
+ - rspec-ee migration pg14
+ - rspec-ee unit pg14
+ - rspec-ee integration pg14
+ - rspec-ee system pg14
+ - rspec-ee background_migration pg14
script:
- run_timed_command "retry gem install fog-aws mime-types activesupport rspec_profiling postgres-copy --no-document"
- source ./scripts/rspec_helpers.sh
diff --git a/doc/development/pipelines/index.md b/doc/development/pipelines/index.md
index 383bc338dc5c154fef19f149aaca77b2ee666c10..7c9340b55714aa1a2f94c9cb570912f6090a0786 100644
--- a/doc/development/pipelines/index.md
+++ b/doc/development/pipelines/index.md
@@ -186,8 +186,8 @@ This number can be overridden by setting a CI/CD variable named `RSPEC_FAIL_FAST
## Re-run previously failed tests in merge request pipelines
-In order to reduce the feedback time after resolving failed tests for a merge request, the `rspec rspec-pg13-rerun-previous-failed-tests`
-and `rspec rspec-ee-pg13-rerun-previous-failed-tests` jobs run the failed tests from the previous MR pipeline.
+In order to reduce the feedback time after resolving failed tests for a merge request, the `rspec rspec-pg14-rerun-previous-failed-tests`
+and `rspec rspec-ee-pg14-rerun-previous-failed-tests` jobs run the failed tests from the previous MR pipeline.
This was introduced on August 25th 2021, with <https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69053>.
@@ -195,7 +195,7 @@ This was introduced on August 25th 2021, with <https://gitlab.com/gitlab-org/git
1. The `detect-previous-failed-tests` job (`prepare` stage) detects the test files associated with failed RSpec
jobs from the previous MR pipeline.
-1. The `rspec rspec-pg13-rerun-previous-failed-tests` and `rspec rspec-ee-pg13-rerun-previous-failed-tests` jobs
+1. The `rspec rspec-pg14-rerun-previous-failed-tests` and `rspec rspec-ee-pg14-rerun-previous-failed-tests` jobs
will run the test files gathered by the `detect-previous-failed-tests` job.
```mermaid
@@ -205,8 +205,8 @@ graph LR
end
subgraph "test stage";
- B["rspec rspec-pg13-rerun-previous-failed-tests"];
- C["rspec rspec-ee-pg13-rerun-previous-failed-tests"];
+ B["rspec rspec-pg14-rerun-previous-failed-tests"];
+ C["rspec rspec-ee-pg14-rerun-previous-failed-tests"];
end
A --"artifact: list of test files"--> B & C
@@ -625,22 +625,22 @@ This should let us:
### PostgreSQL versions testing
-Our test suite runs against PG13 as GitLab.com runs on PG13 and
-[Omnibus defaults to PG13 for new installs and upgrades](../../administration/package_information/postgresql_versions.md).
+Our test suite runs against PostgreSQL 14 as GitLab.com runs on PostgreSQL 14 and
+[Omnibus defaults to PG14 for new installs and upgrades](../../administration/package_information/postgresql_versions.md).
-We do run our test suite against PG13 on nightly scheduled pipelines.
+We do run our test suite against PostgreSQL 14 on nightly scheduled pipelines.
-We also run our test suite against PG13 upon specific database library changes in MRs and `main` pipelines (with the `rspec db-library-code pg13` job).
+We also run our test suite against PostgreSQL 12 and PostgreSQL 13 upon specific database library changes in merge requests and `main` pipelines (with the `rspec db-library-code pg12` and `rspec db-library-code pg13` jobs).
#### Current versions testing
| Where? | PostgreSQL version | Ruby version |
|------------------------------------------------------------------------------------------------|-------------------------------------------------|-----------------------|
-| Merge requests | 13 (default version), 12 for DB library changes | 3.0 (default version) |
-| `master` branch commits | 13 (default version), 12 for DB library changes | 3.0 (default version) |
-| `maintenance` scheduled pipelines for the `master` branch (every even-numbered hour) | 13 (default version), 12 for DB library changes | 3.0 (default version) |
-| `maintenance` scheduled pipelines for the `ruby2` branch (every odd-numbered hour), see below. | 13 (default version), 12 for DB library changes | 2.7 |
-| `nightly` scheduled pipelines for the `master` branch | 13 (default version), 12, 14 | 3.0 (default version) |
+| Merge requests | 14 (default version), 13 for DB library changes | 3.0 (default version) |
+| `master` branch commits | 14 (default version), 13 for DB library changes | 3.0 (default version) |
+| `maintenance` scheduled pipelines for the `master` branch (every even-numbered hour) | 14 (default version), 13 for DB library changes | 3.0 (default version) |
+| `maintenance` scheduled pipelines for the `ruby2` branch (every odd-numbered hour), see below. | 14 (default version), 13 for DB library changes | 2.7 |
+| `nightly` scheduled pipelines for the `master` branch | 14 (default version), 12, 13, 15 | 3.0 (default version) |
There are 2 pipeline schedules used for testing Ruby 2.7. One is triggering a
pipeline in `ruby2-sync` branch, which updates the `ruby2` branch with latest
diff --git a/doc/development/pipelines/internals.md b/doc/development/pipelines/internals.md
index 4cdaf50641e2f0178da7e307860c52d03ff1a7e6..35881db8c6d64b6573dfcad829144785462329c8 100644
--- a/doc/development/pipelines/internals.md
+++ b/doc/development/pipelines/internals.md
@@ -140,6 +140,8 @@ that are scoped to a single [configuration keyword](../../ci/yaml/index.md#job-k
| `.use-pg13-ee` | Same as `.use-pg13` but also use an `elasticsearch` service (see [`.gitlab/ci/global.gitlab-ci.yml`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/.gitlab/ci/global.gitlab-ci.yml) for the specific version of the service). |
| `.use-pg14` | Allows a job to use the `postgres` 14, `redis`, and `rediscluster` services (see [`.gitlab/ci/global.gitlab-ci.yml`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/.gitlab/ci/global.gitlab-ci.yml) for the specific versions of the services). |
| `.use-pg14-ee` | Same as `.use-pg14` but also use an `elasticsearch` service (see [`.gitlab/ci/global.gitlab-ci.yml`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/.gitlab/ci/global.gitlab-ci.yml) for the specific version of the service). |
+| `.use-pg15` | Allows a job to use the `postgres` 15, `redis`, and `rediscluster` services (see [`.gitlab/ci/global.gitlab-ci.yml`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/.gitlab/ci/global.gitlab-ci.yml) for the specific versions of the services). |
+| `.use-pg15-ee` | Same as `.use-pg15` but also use an `elasticsearch` service (see [`.gitlab/ci/global.gitlab-ci.yml`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/.gitlab/ci/global.gitlab-ci.yml) for the specific version of the service). |
| `.use-kaniko` | Allows a job to use the `kaniko` tool to build Docker images. |
| `.as-if-foss` | Simulate the FOSS project by setting the `FOSS_ONLY='1'` CI/CD variable. |
| `.use-docker-in-docker` | Allows a job to use Docker in Docker. |
diff --git a/scripts/failed_tests.rb b/scripts/failed_tests.rb
index 0ba454894b77c008876c5ad2c14d456df59e0a18..f828155f6f00fce75ba9a84757f643f60e2555de 100755
--- a/scripts/failed_tests.rb
+++ b/scripts/failed_tests.rb
@@ -12,8 +12,8 @@ class FailedTests
previous_tests_report_path: 'test_results/previous/test_reports.json',
output_directory: 'tmp/previous_failed_tests/',
format: :oneline,
- rspec_pg_regex: /rspec .+ pg13( .+)?/,
- rspec_ee_pg_regex: /rspec-ee .+ pg13( .+)?/
+ rspec_pg_regex: /rspec .+ pg14( .+)?/,
+ rspec_ee_pg_regex: /rspec-ee .+ pg14( .+)?/
}.freeze
def initialize(options)
diff --git a/spec/fixtures/scripts/test_report.json b/spec/fixtures/scripts/test_report.json
index 520ab3a857853499f60202ec25a5a4f16bb3e1ce..820c45c6c5a976215756fa246baad88c1f804444 100644
--- a/spec/fixtures/scripts/test_report.json
+++ b/spec/fixtures/scripts/test_report.json
@@ -1,7 +1,7 @@
{
"suites": [
{
- "name": "rspec unit pg13",
+ "name": "rspec unit pg14",
"total_time": 975.6635620000018,
"total_count": 3811,
"success_count": 3800,
diff --git a/spec/scripts/failed_tests_spec.rb b/spec/scripts/failed_tests_spec.rb
index c9fe6eecd1113677e5371ef8eff8856d98adc8ef..c379d3448a6cd8cb47c2cacc4ebd89c0a19a2ccb 100644
--- a/spec/scripts/failed_tests_spec.rb
+++ b/spec/scripts/failed_tests_spec.rb
@@ -13,7 +13,7 @@
'suites' => [
{
'failed_count' => 1,
- 'name' => 'rspec unit pg13 10/12',
+ 'name' => 'rspec unit pg14 10/12',
'test_cases' => [
{
'status' => 'failed',
@@ -23,7 +23,7 @@
},
{
'failed_count' => 1,
- 'name' => 'rspec-ee unit pg13',
+ 'name' => 'rspec-ee unit pg14',
'test_cases' => [
{
'status' => 'failed',
@@ -33,7 +33,7 @@
},
{
'failed_count' => 1,
- 'name' => 'rspec unit pg14 10/12',
+ 'name' => 'rspec unit pg15 10/12',
'test_cases' => [
{
'status' => 'failed',