Stop testing PG9 and PG10

This follows the long-term PG testing plan at
https://docs.gitlab.com/ee/development/pipelines.html#long-term-plan.
Signed-off-by: Rémy Coutable <remy@rymai.me>

.gitlab/ci/dev-fixtures.gitlab-ci.yml

@@ -3,9 +3,9 @@
     - .default-retry
     - .default-cache
     - .default-before_script
-    - .use-pg9
+    - .use-pg11
   stage: test
-  needs: ["setup-test-env pg9"]
+  needs: ["setup-test-env pg11"]
   variables:
     FIXTURE_PATH: "db/fixtures/development"
     SEED_CYCLE_ANALYTICS: "true"
@@ -26,7 +26,7 @@ run-dev-fixtures-ee:
   extends:
     - .run-dev-fixtures
     - .dev-fixtures:rules:ee-only
-    - .use-pg9-ee
+    - .use-pg11-ee
   script:
     - scripts/gitaly-test-spawn
     - cp ee/db/fixtures/development/* $FIXTURE_PATH

.gitlab/ci/docs.gitlab-ci.yml

@@ -65,9 +65,9 @@ graphql-reference-verify:
     - .default-cache
     - .default-before_script
     - .docs:rules:graphql-reference-verify
-    - .use-pg9
+    - .use-pg11
   stage: test
-  needs: ["setup-test-env pg9"]
+  needs: ["setup-test-env pg11"]
   script:
     - bundle exec rake gitlab:graphql:check_docs
     - bundle exec rake gitlab:graphql:check_schema

.gitlab/ci/frontend.gitlab-ci.yml

@@ -138,9 +138,9 @@ compile-assets pull-cache as-if-foss:
     - .default-retry
     - .default-cache
     - .default-before_script
-    - .use-pg9
+    - .use-pg11
   stage: fixtures
-  needs: ["setup-test-env pg9", "compile-assets pull-cache"]
+  needs: ["setup-test-env pg11", "compile-assets pull-cache"]
   script:
     - date
     - scripts/gitaly-test-spawn

.gitlab/ci/global.gitlab-ci.yml

@@ -38,28 +38,6 @@
     paths:
       - node_modules/
 
-.use-pg9:
-  image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.6-golang-1.14-git-2.26-lfs-2.9-chrome-73.0-node-12.x-yarn-1.21-postgresql-9.6-graphicsmagick-1.3.34"
-  services:
-    - name: postgres:9.6.17
-      command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
-    - name: redis:alpine
-  variables:
-    POSTGRES_HOST_AUTH_METHOD: trust
-  cache:
-    key: "debian-stretch-ruby-2.6.6-pg9-node-12.x"
-
-.use-pg10:
-  image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.6-golang-1.14-git-2.26-lfs-2.9-chrome-73.0-node-12.x-yarn-1.21-postgresql-10-graphicsmagick-1.3.34"
-  services:
-    - name: postgres:10.12
-      command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
-    - name: redis:alpine
-  variables:
-    POSTGRES_HOST_AUTH_METHOD: trust
-  cache:
-    key: "debian-stretch-ruby-2.6.6-pg10-node-12.x"
-
 .use-pg11:
   image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.6-golang-1.14-git-2.26-lfs-2.9-chrome-73.0-node-12.x-yarn-1.21-postgresql-11-graphicsmagick-1.3.34"
   services:
@@ -71,30 +49,6 @@
   cache:
     key: "debian-stretch-ruby-2.6.6-pg11-node-12.x"
 
-.use-pg9-ee:
-  image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.6-golang-1.14-git-2.26-lfs-2.9-chrome-73.0-node-12.x-yarn-1.21-postgresql-9.6-graphicsmagick-1.3.34"
-  services:
-    - name: postgres:9.6.17
-      command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
-    - name: redis:alpine
-    - name: elasticsearch:6.4.2
-  variables:
-    POSTGRES_HOST_AUTH_METHOD: trust
-  cache:
-    key: "debian-stretch-ruby-2.6.6-pg9-node-12.x"
-
-.use-pg10-ee:
-  image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.6-golang-1.14-git-2.26-lfs-2.9-chrome-73.0-node-12.x-yarn-1.21-postgresql-10-graphicsmagick-1.3.34"
-  services:
-    - name: postgres:10.12
-      command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
-    - name: redis:alpine
-    - name: elasticsearch:6.4.2
-  variables:
-    POSTGRES_HOST_AUTH_METHOD: trust
-  cache:
-    key: "debian-stretch-ruby-2.6.6-pg10-node-12.x"
-
 .use-pg11-ee:
   image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.6-golang-1.14-git-2.26-lfs-2.9-chrome-73.0-node-12.x-yarn-1.21-postgresql-11-graphicsmagick-1.3.34"
   services:

.gitlab/ci/memory.gitlab-ci.yml

@@ -8,7 +8,7 @@
 memory-static:
   extends: .only-code-memory-job-base
   stage: test
-  needs: ["setup-test-env pg9"]
+  needs: ["setup-test-env pg11"]
   variables:
     SETUP_DB: "false"
   script:
@@ -37,9 +37,9 @@ memory-static:
 memory-on-boot:
   extends:
     - .only-code-memory-job-base
-    - .use-pg9
+    - .use-pg11
   stage: test
-  needs: ["setup-test-env pg9", "compile-assets pull-cache"]
+  needs: ["setup-test-env pg11", "compile-assets pull-cache"]
   variables:
     NODE_ENV: "production"
     RAILS_ENV: "production"

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

 .rails:needs:setup-and-assets:
-  needs: ["setup-test-env pg9", "compile-assets pull-cache"]
+  needs: ["setup-test-env pg11", "compile-assets pull-cache"]
 
 .rails-job-base:
   extends:
@@ -26,22 +26,10 @@
     policy: pull-push
 
 setup-test-env pg11:
-  extends:
-    - .base-setup-test-env
-    - .rails:rules:master-push--master-schedule-2-hourly--code-backstage
-    - .use-pg11
-
-setup-test-env pg10:
-  extends:
-    - .base-setup-test-env
-    - .rails:rules:master-schedule-nightly--code-backstage
-    - .use-pg10
-
-setup-test-env pg9:
   extends:
     - .base-setup-test-env
     - .rails:rules:default-refs-code-backstage-qa
-    - .use-pg9
+    - .use-pg11
 
 static-analysis:
   extends:
@@ -55,7 +43,7 @@ static-analysis:
   script:
     - scripts/static-analysis
   cache:
-    key: "ruby-2.6.6-pg9-rubocop"
+    key: "ruby-2.6.6-pg11-rubocop"
     paths:
       - vendor/ruby
       - tmp/rubocop_cache
@@ -75,7 +63,7 @@ downtime_check:
 .rspec-base:
   extends: .rails-job-base
   stage: test
-  needs: ["setup-test-env pg9", "retrieve-tests-metadata", "compile-assets pull-cache"]
+  needs: ["setup-test-env pg11", "retrieve-tests-metadata", "compile-assets pull-cache"]
   script:
     - source scripts/rspec_helpers.sh
     - rspec_paralellized_job "--tag ~quarantine --tag ~geo --tag ~level:migration"
@@ -93,37 +81,37 @@ downtime_check:
     reports:
       junit: junit_rspec.xml
 
-.rspec-base-pg9:
+.rspec-base-pg11:
   extends:
     - .rspec-base
     - .rails:rules:ee-and-foss
-    - .use-pg9
+    - .use-pg11
 
 .rspec-base-migration:
   script:
     - source scripts/rspec_helpers.sh
     - rspec_paralellized_job "--tag ~quarantine --tag ~geo --tag level:migration"
 
-rspec migration pg9:
+rspec migration pg11:
   extends:
-    - .rspec-base-pg9
+    - .rspec-base-pg11
     - .rspec-base-migration
   parallel: 5
 
-rspec unit pg9:
-  extends: .rspec-base-pg9
+rspec unit pg11:
+  extends: .rspec-base-pg11
   parallel: 20
 
-rspec integration pg9:
-  extends: .rspec-base-pg9
+rspec integration pg11:
+  extends: .rspec-base-pg11
   parallel: 8
 
-rspec system pg9:
-  extends: .rspec-base-pg9
+rspec system pg11:
+  extends: .rspec-base-pg11
   parallel: 24
 
 rspec fast_spec_helper:
-  extends: .rspec-base-pg9
+  extends: .rspec-base-pg11
   script:
     - bin/rspec spec/fast_spec_helper.rb
 
@@ -131,9 +119,9 @@ rspec fast_spec_helper:
   extends:
     - .rails-job-base
     - .rails:rules:ee-and-foss
-    - .use-pg9
+    - .use-pg11
   stage: test
-  needs: ["setup-test-env pg9"]
+  needs: ["setup-test-env pg11"]
 
 db:migrate:reset:
   extends: .db-job-base
@@ -204,18 +192,18 @@ rspec:coverage:
   # We cannot use needs since it would mean needing 84 jobs (since most are parallelized)
   # so we use `dependencies` here.
   dependencies:
-    - setup-test-env pg9
-    - rspec migration pg9
-    - rspec unit pg9
-    - rspec integration pg9
-    - rspec system pg9
-    - rspec-ee migration pg9
-    - rspec-ee unit pg9
-    - rspec-ee integration pg9
-    - rspec-ee system pg9
-    - rspec-ee unit pg9 geo
-    - rspec-ee integration pg9 geo
-    - rspec-ee system pg9 geo
+    - setup-test-env pg11
+    - rspec migration pg11
+    - rspec unit pg11
+    - rspec integration pg11
+    - rspec system pg11
+    - rspec-ee migration pg11
+    - rspec-ee unit pg11
+    - rspec-ee integration pg11
+    - rspec-ee system pg11
+    - rspec-ee unit pg11 geo
+    - rspec-ee integration pg11 geo
+    - rspec-ee system pg11 geo
     - memory-static
     - memory-on-boot
   variables:
@@ -243,52 +231,52 @@ rspec:coverage:
     - .rspec-base
     - .rails:rules:ee-only
 
-.rspec-base-pg9-as-if-foss:
+.rspec-base-pg11-as-if-foss:
   extends:
     - .rspec-base-ee
     - .as-if-foss
-    - .use-pg9
-  needs: ["setup-test-env pg9", "retrieve-tests-metadata", "compile-assets pull-cache as-if-foss"]
+    - .use-pg11
+  needs: ["setup-test-env pg11", "retrieve-tests-metadata", "compile-assets pull-cache as-if-foss"]
 
-.rspec-ee-base-pg9:
+.rspec-ee-base-pg11:
   extends:
     - .rspec-base-ee
-    - .use-pg9-ee
+    - .use-pg11-ee
 
-rspec migration pg9-as-if-foss:
+rspec migration pg11-as-if-foss:
   extends:
-    - .rspec-base-pg9-as-if-foss
+    - .rspec-base-pg11-as-if-foss
     - .rspec-base-migration
   parallel: 5
 
-rspec unit pg9-as-if-foss:
-  extends: .rspec-base-pg9-as-if-foss
+rspec unit pg11-as-if-foss:
+  extends: .rspec-base-pg11-as-if-foss
   parallel: 20
 
-rspec integration pg9-as-if-foss:
-  extends: .rspec-base-pg9-as-if-foss
+rspec integration pg11-as-if-foss:
+  extends: .rspec-base-pg11-as-if-foss
   parallel: 8
 
-rspec system pg9-as-if-foss:
-  extends: .rspec-base-pg9-as-if-foss
+rspec system pg11-as-if-foss:
+  extends: .rspec-base-pg11-as-if-foss
   parallel: 24
 
-rspec-ee migration pg9:
+rspec-ee migration pg11:
   extends:
-    - .rspec-ee-base-pg9
+    - .rspec-ee-base-pg11
     - .rspec-base-migration
   parallel: 2
 
-rspec-ee unit pg9:
-  extends: .rspec-ee-base-pg9
+rspec-ee unit pg11:
+  extends: .rspec-ee-base-pg11
   parallel: 10
 
-rspec-ee integration pg9:
-  extends: .rspec-ee-base-pg9
+rspec-ee integration pg11:
+  extends: .rspec-ee-base-pg11
   parallel: 4
 
-rspec-ee system pg9:
-  extends: .rspec-ee-base-pg9
+rspec-ee system pg11:
+  extends: .rspec-ee-base-pg11
   parallel: 6
 
 .rspec-ee-base-geo:
@@ -298,20 +286,20 @@ rspec-ee system pg9:
     - scripts/prepare_postgres_fdw.sh
     - rspec_paralellized_job "--tag ~quarantine --tag geo"
 
-.rspec-ee-base-geo-pg9:
+.rspec-ee-base-geo-pg11:
   extends:
     - .rspec-ee-base-geo
-    - .use-pg9-ee
+    - .use-pg11-ee
 
-rspec-ee unit pg9 geo:
-  extends: .rspec-ee-base-geo-pg9
+rspec-ee unit pg11 geo:
+  extends: .rspec-ee-base-geo-pg11
   parallel: 2
 
-rspec-ee integration pg9 geo:
-  extends: .rspec-ee-base-geo-pg9
+rspec-ee integration pg11 geo:
+  extends: .rspec-ee-base-geo-pg11
 
-rspec-ee system pg9 geo:
-  extends: .rspec-ee-base-geo-pg9
+rspec-ee system pg11 geo:
+  extends: .rspec-ee-base-geo-pg11
 
 db:rollback geo:
   extends:
@@ -322,117 +310,3 @@ db:rollback geo:
     - bundle exec rake geo:db:migrate
 # EE: default refs (MRs, master, schedules) jobs #
 ##################################################
-
-####################################################################
-# EE/FOSS: master non-scheduled and master 2-hourly scheduled jobs #
-.rspec-base-pg11:
-  extends:
-    - .rspec-base
-    - .rails:rules:master-push--master-schedule-2-hourly--code-backstage
-    - .use-pg11
-  needs: ["setup-test-env pg11", "retrieve-tests-metadata", "compile-assets pull-cache"]
-
-rspec migration pg11:
-  extends:
-    - .rspec-base-pg11
-    - .rspec-base-migration
-  parallel: 5
-
-rspec unit pg11:
-  extends: .rspec-base-pg11
-  parallel: 20
-
-rspec integration pg11:
-  extends: .rspec-base-pg11
-  parallel: 8
-
-rspec system pg11:
-  extends: .rspec-base-pg11
-  parallel: 24
-# EE/FOSS: master non-scheduled and master 2-hourly scheduled jobs #
-####################################################################
-
-###############################################################
-# EE: master non-scheduled and master 2-hourly scheduled jobs #
-.rspec-ee-base-pg11:
-  extends:
-    - .rspec-base-ee
-    - .use-pg11-ee
-  needs: ["setup-test-env pg11", "retrieve-tests-metadata", "compile-assets pull-cache"]
-
-rspec-ee migration pg11:
-  extends:
-    - .rspec-ee-base-pg11
-    - .rspec-base-migration
-    - .rails:rules:master-push--master-schedule-2-hourly--code-backstage
-  parallel: 2
-
-rspec-ee unit pg11:
-  extends:
-    - .rspec-ee-base-pg11
-    - .rails:rules:master-push--master-schedule-2-hourly--code-backstage
-  parallel: 10
-
-rspec-ee integration pg11:
-  extends:
-    - .rspec-ee-base-pg11
-    - .rails:rules:master-push--master-schedule-2-hourly--code-backstage
-  parallel: 4
-
-rspec-ee system pg11:
-  extends:
-    - .rspec-ee-base-pg11
-    - .rails:rules:master-push--master-schedule-2-hourly--code-backstage
-  parallel: 6
-# EE: master non-scheduled and master 2-hourly scheduled jobs #
-###############################################################
-
-##########################################
-# EE/FOSS: master nightly scheduled jobs #
-.rspec-base-pg10:
-  extends:
-    - .rspec-base
-    - .rails:rules:master-schedule-nightly--code-backstage
-    - .use-pg10
-  needs: ["setup-test-env pg10", "retrieve-tests-metadata", "compile-assets pull-cache"]
-
-rspec migration pg10:
-  extends:
-    - .rspec-base-pg10
-    - .rspec-base-migration
-  parallel: 5
-
-rspec unit pg10:
-  extends: .rspec-base-pg10
-  parallel: 20
-
-rspec integration pg10:
-  extends: .rspec-base-pg10
-  parallel: 8
-
-rspec system pg10:
-  extends: .rspec-base-pg10
-  parallel: 24
-# EE/FOSS: master nightly scheduled jobs #
-##########################################
-
-##############################
-# EE: nightly scheduled jobs #
-.rspec-ee-base-geo-pg10:
-  extends:
-    - .rspec-ee-base-geo
-    - .use-pg10-ee
-    - .rails:rules:master-schedule-nightly--code-backstage-ee-only
-  needs: ["setup-test-env pg10", "retrieve-tests-metadata", "compile-assets pull-cache"]
-
-rspec-ee unit pg10 geo:
-  extends: .rspec-ee-base-geo-pg10
-  parallel: 2
-
-rspec-ee integration pg10 geo:
-  extends: .rspec-ee-base-geo-pg10
-
-rspec-ee system pg10 geo:
-  extends: .rspec-ee-base-geo-pg10
-# EE: nightly scheduled jobs #
-##############################

.gitlab/ci/rules.gitlab-ci.yml

@@ -384,28 +384,6 @@
     - <<: *if-default-refs
       changes: *code-backstage-qa-patterns
 
-.rails:rules:master-push--master-schedule-2-hourly--code-backstage:
-  rules:
-    - <<: *if-master-push
-      changes: *code-backstage-patterns
-    - <<: *if-master-schedule-2-hourly
-    - <<: *if-merge-request
-      changes: [".gitlab/ci/rails.gitlab-ci.yml"]
-
-.rails:rules:master-schedule-nightly--code-backstage:
-  rules:
-    - <<: *if-master-schedule-nightly
-    - <<: *if-merge-request
-      changes: [".gitlab/ci/rails.gitlab-ci.yml"]
-
-.rails:rules:master-schedule-nightly--code-backstage-ee-only:
-  rules:
-    - <<: *if-not-ee
-      when: never
-    - <<: *if-master-schedule-nightly
-    - <<: *if-merge-request
-      changes: [".gitlab/ci/rails.gitlab-ci.yml"]
-
 .rails:rules:ee-only:
   rules:
     - <<: *if-not-ee

.gitlab/ci/setup.gitlab-ci.yml

@@ -7,7 +7,7 @@ cache gems:
     - .default-before_script
     - .setup:rules:cache-gems
   stage: test
-  needs: ["setup-test-env pg9"]
+  needs: ["setup-test-env pg11"]
   variables:
     SETUP_DB: "false"
   script:

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

@@ -32,18 +32,18 @@ update-tests-metadata:
     - .test-metadata:rules:update-tests-metadata
   stage: post-test
   dependencies:
-    - setup-test-env pg9
-    - rspec migration pg9
-    - rspec unit pg9
-    - rspec integration pg9
-    - rspec system pg9
-    - rspec-ee migration pg9
-    - rspec-ee unit pg9
-    - rspec-ee integration pg9
-    - rspec-ee system pg9
-    - rspec-ee unit pg9 geo
-    - rspec-ee integration pg9 geo
-    - rspec-ee system pg9 geo
+    - setup-test-env pg11
+    - rspec migration pg11
+    - rspec unit pg11
+    - rspec integration pg11
+    - rspec system pg11
+    - rspec-ee migration pg11
+    - rspec-ee unit pg11
+    - rspec-ee integration pg11
+    - rspec-ee system pg11
+    - rspec-ee unit pg11 geo
+    - rspec-ee integration pg11 geo
+    - rspec-ee system pg11 geo
   cache:
     policy: push
   script:

doc/development/pipelines.md

@@ -70,11 +70,7 @@ that are scoped to a single [configuration parameter](../ci/yaml/README.md#confi
 | `.default-retry` | Allows a job to [retry](../ci/yaml/README.md#retry) upon `unknown_failure`, `api_failure`, `runner_system_failure`, `job_execution_timeout`, or `stuck_or_timeout_failure`. |
 | `.default-before_script` | Allows a job to use a default `before_script` definition suitable for Ruby/Rails tasks that may need a database running (e.g. tests). |
 | `.default-cache` | Allows a job to use a default `cache` definition suitable for Ruby/Rails and frontend tasks. |
-| `.use-pg9` | Allows a job to use the `postgres:9.6.17` and `redis:alpine` services. |
-| `.use-pg10` | Allows a job to use the `postgres:10.12` and `redis:alpine` services. |
 | `.use-pg11` | Allows a job to use the `postgres:11.6` and `redis:alpine` services. |
-| `.use-pg9-ee` | Same as `.use-pg9` but also use the `docker.elastic.co/elasticsearch/elasticsearch:6.4.2` services. |
-| `.use-pg10-ee` | Same as `.use-pg10` but also use the `docker.elastic.co/elasticsearch/elasticsearch:6.4.2` services. |
 | `.use-pg11-ee` | Same as `.use-pg11` but also use the `docker.elastic.co/elasticsearch/elasticsearch:6.4.2` services. |
 | `.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'` environment variable. |
@@ -159,10 +155,9 @@ request, be sure to start the `dont-interrupt-me` job before pushing.
 
 | Where? | PG version |
 | ------ | ------ |
-| MRs | 9.6 |
-| `master` (non-scheduled pipelines) | 9.6 / 11 |
-| 2-hourly scheduled pipelines | 9.6 / 11 |
-| Nightly scheduled pipeline | 9.6 / 10 |
+| MRs | 11 |
+| `master` (non-scheduled pipelines) | 11 |
+| 2-hourly scheduled pipelines | 11 |
 
 ### Long-term plan