diff --git a/.gitlab/ci/global.gitlab-ci.yml b/.gitlab/ci/global.gitlab-ci.yml
index 5d2be0f03ae281be25a2f783fd8d2f04ee515170..3ae7e961aa50d12fcbf8aaaff6989a8651dd6336 100644
--- a/.gitlab/ci/global.gitlab-ci.yml
+++ b/.gitlab/ci/global.gitlab-ci.yml
@@ -158,15 +158,6 @@
- *node-modules-cache-push
- *assets-cache-push
-.use-pg11:
- image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.7.2.patched-golang-1.16-git-2.31-lfs-2.9-chrome-89-node-14.15-yarn-1.22-postgresql-11-graphicsmagick-1.3.36"
- services:
- - name: postgres:11.6
- command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
- - name: redis:5.0-alpine
- variables:
- POSTGRES_HOST_AUTH_METHOD: trust
-
.use-pg12:
image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.7.2.patched-golang-1.16-git-2.31-lfs-2.9-chrome-89-node-14.15-yarn-1.22-postgresql-12-graphicsmagick-1.3.36"
services:
@@ -176,17 +167,6 @@
variables:
POSTGRES_HOST_AUTH_METHOD: trust
-.use-pg11-ee:
- image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.7.2.patched-golang-1.16-git-2.31-lfs-2.9-chrome-89-node-14.15-yarn-1.22-postgresql-11-graphicsmagick-1.3.36"
- services:
- - name: postgres:11.6
- command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
- - name: redis:5.0-alpine
- - name: elasticsearch:7.11.1
- command: ["elasticsearch", "-E", "discovery.type=single-node"]
- variables:
- POSTGRES_HOST_AUTH_METHOD: trust
-
.use-pg12-ee:
image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.7.2.patched-golang-1.16-git-2.31-lfs-2.9-chrome-89-node-14.15-yarn-1.22-postgresql-12-graphicsmagick-1.3.36"
services:
diff --git a/.gitlab/ci/rails.gitlab-ci.yml b/.gitlab/ci/rails.gitlab-ci.yml
index 3cca098a5c570972b7ef8f2c8de44ebfcb716067..a30c4ebd413a2e9f645a7f4f0977ff1b45dd34b2 100644
--- a/.gitlab/ci/rails.gitlab-ci.yml
+++ b/.gitlab/ci/rails.gitlab-ci.yml
@@ -58,11 +58,6 @@
- !reference [.base-script, script]
- rspec_paralellized_job "--tag ~quarantine --tag ~geo --tag level:migration"
-.rspec-base-pg11:
- extends:
- - .rspec-base
- - .use-pg11
-
.rspec-base-pg12:
extends:
- .rspec-base
@@ -75,11 +70,6 @@
- .use-pg12
needs: ["setup-test-env", "retrieve-tests-metadata", "compile-test-assets as-if-foss", "detect-tests"]
-.rspec-ee-base-pg11:
- extends:
- - .rspec-base
- - .use-pg11-ee
-
.rspec-ee-base-pg12:
extends:
- .rspec-base
@@ -91,11 +81,6 @@
- !reference [.base-script, script]
- rspec_paralellized_job "--tag ~quarantine --tag geo"
-.rspec-ee-base-geo-pg11:
- extends:
- - .rspec-ee-base-geo
- - .use-pg11-ee
-
.rspec-ee-base-geo-pg12:
extends:
- .rspec-ee-base-geo
@@ -298,16 +283,6 @@ rspec system pg12 minimal:
- .minimal-rspec-tests
- .rails:rules:ee-and-foss-system:minimal
-# Dedicated job to test DB library code against PG11.
-# Note that these are already tested against PG12 in the `rspec unit pg12` / `rspec-ee unit pg12` jobs.
-rspec db-library-code pg11:
- extends:
- - .rspec-base-pg11
- - .rails:rules:ee-and-foss-db-library-code
- script:
- - !reference [.base-script, script]
- - rspec_db_library_code
-
rspec fast_spec_helper:
extends:
- .rspec-base-pg12
@@ -668,80 +643,6 @@ db:rollback geo:
# EE: default refs (MRs, default branch, schedules) jobs #
##################################################
-##########################################
-# EE/FOSS: default branch nightly scheduled jobs #
-rspec migration pg11:
- extends:
- - .rspec-base-pg11
- - .rspec-base-migration
- - .rails:rules:default-branch-schedule-nightly--code-backstage
- - .rspec-migration-parallel
-
-rspec unit pg11:
- extends:
- - .rspec-base-pg11
- - .rails:rules:default-branch-schedule-nightly--code-backstage
- - .rspec-unit-parallel
-
-rspec integration pg11:
- extends:
- - .rspec-base-pg11
- - .rails:rules:default-branch-schedule-nightly--code-backstage
- - .rspec-integration-parallel
-
-rspec system pg11:
- extends:
- - .rspec-base-pg11
- - .rails:rules:default-branch-schedule-nightly--code-backstage
- - .rspec-system-parallel
-# EE/FOSS: default branch nightly scheduled jobs #
-##########################################
-
-#####################################
-# EE: default branch nightly scheduled jobs #
-rspec-ee migration pg11:
- extends:
- - .rspec-ee-base-pg11
- - .rspec-base-migration
- - .rails:rules:default-branch-schedule-nightly--code-backstage-ee-only
- - .rspec-ee-migration-parallel
-
-rspec-ee unit pg11:
- extends:
- - .rspec-ee-base-pg11
- - .rails:rules:default-branch-schedule-nightly--code-backstage-ee-only
- - .rspec-ee-unit-parallel
-
-rspec-ee integration pg11:
- extends:
- - .rspec-ee-base-pg11
- - .rails:rules:default-branch-schedule-nightly--code-backstage-ee-only
- - .rspec-ee-integration-parallel
-
-rspec-ee system pg11:
- extends:
- - .rspec-ee-base-pg11
- - .rails:rules:default-branch-schedule-nightly--code-backstage-ee-only
- - .rspec-ee-system-parallel
-
-rspec-ee unit pg11 geo:
- extends:
- - .rspec-ee-base-geo-pg11
- - .rails:rules:default-branch-schedule-nightly--code-backstage-ee-only
- - .rspec-ee-unit-geo-parallel
-
-rspec-ee integration pg11 geo:
- extends:
- - .rspec-ee-base-geo-pg11
- - .rails:rules:default-branch-schedule-nightly--code-backstage-ee-only
-
-rspec-ee system pg11 geo:
- extends:
- - .rspec-ee-base-geo-pg11
- - .rails:rules:default-branch-schedule-nightly--code-backstage-ee-only
-# EE: default branch nightly scheduled jobs #
-#####################################
-
##################################################
# EE: Canonical MR pipelines
rspec fail-fast:
diff --git a/doc/development/pipelines.md b/doc/development/pipelines.md
index a3c9d77f573afea55f3cae8c88aa7b1ec71f35b7..367fa6591500a9379d31a48f6c5384dc2e350c26 100644
--- a/doc/development/pipelines.md
+++ b/doc/development/pipelines.md
@@ -480,11 +480,7 @@ because of 2 reasons:
### PostgreSQL versions testing
Our test suite runs against PG12 as GitLab.com runs on PG12 and
-[Omnibus defaults to PG12 for new installs and upgrades](https://docs.gitlab.com/omnibus/package-information/postgresql_versions.html),
-Our test suite is currently running against PG11, since GitLab.com still runs on PG11.
-
-We do run our test suite against PG11 on nightly scheduled pipelines as well as upon specific
-database library changes in MRs and `master` pipelines (with the `rspec db-library-code pg11` job).
+[Omnibus defaults to PG12 for new installs and upgrades](https://docs.gitlab.com/omnibus/package-information/postgresql_versions.html).
#### Current versions testing
@@ -502,7 +498,6 @@ We follow the [PostgreSQL versions shipped with Omnibus GitLab](https://docs.git
| PostgreSQL version | 13.11 (April 2021) | 13.12 (May 2021) | 14.0 (June 2021?) |
| -------------------| ---------------------- | ---------------------- | ---------------------- |
| PG12 | `nightly` | MRs/`2-hour`/`nightly` | MRs/`2-hour`/`nightly` |
-| PG11 | MRs/`2-hour`/`nightly` | `nightly` | `nightly` |
### Test jobs
@@ -730,8 +725,6 @@ that are scoped to a single [configuration keyword](../ci/yaml/README.md#job-key
| `.qa-cache` | Allows a job to use a default `cache` definition suitable for QA tasks. |
| `.yarn-cache` | Allows a job to use a default `cache` definition suitable for frontend jobs that do a `yarn install`. |
| `.assets-compile-cache` | Allows a job to use a default `cache` definition suitable for frontend jobs that compile assets. |
-| `.use-pg11` | Allows a job to run the `postgres` 11 and `redis` 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-pg11-ee` | Same as `.use-pg11` 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-pg12` | Allows a job to use the `postgres` 12 and `redis` 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-pg12-ee` | Same as `.use-pg12` 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. |