Revert "Use Dmitry's code"

This reverts commit 9c2c8f28.

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

@@ -29,7 +29,7 @@ run-dev-fixtures-ee:
   extends:
     - .run-dev-fixtures
     - .dev-fixtures:rules:ee-only
-    - .use-pg12-ee
+    - .use-pg12-es7-ee
   script:
     - cp ee/db/fixtures/development/* $FIXTURE_PATH
     - *run-dev-fixtures-script

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

@@ -275,34 +275,34 @@
     POSTGRES_HOST_AUTH_METHOD: trust
     PG_VERSION: "13"
 
-.use-pg11-ee:
+.use-pg11-es7-ee:
   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.17.0
+    - name: elasticsearch:7.17.6
       command: ["elasticsearch", "-E", "discovery.type=single-node", "-E", "xpack.security.enabled=false"]
   variables:
     POSTGRES_HOST_AUTH_METHOD: trust
     PG_VERSION: "11"
 
-.use-pg12-ee:
+.use-pg12-es7-ee:
   services:
     - name: postgres:12
       command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
     - name: redis:6.0-alpine
-    - name: elasticsearch:7.17.0
+    - name: elasticsearch:7.17.6
       command: ["elasticsearch", "-E", "discovery.type=single-node", "-E", "xpack.security.enabled=false"]
   variables:
     POSTGRES_HOST_AUTH_METHOD: trust
     PG_VERSION: "12"
 
-.use-pg13-ee:
+.use-pg13-es7-ee:
   services:
     - name: postgres:13
       command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
     - name: redis:6.2-alpine
-    - name: elasticsearch:7.17.0
+    - name: elasticsearch:7.17.6
       command: ["elasticsearch", "-E", "discovery.type=single-node", "-E", "xpack.security.enabled=false"]
   variables:
     POSTGRES_HOST_AUTH_METHOD: trust
@@ -313,7 +313,7 @@
     - name: postgres:12
       command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
     - name: redis:6.0-alpine
-    - name: elasticsearch:8.3.3
+    - name: elasticsearch:8.4.1
   variables:
     POSTGRES_HOST_AUTH_METHOD: trust
     PG_VERSION: "12"
@@ -325,7 +325,19 @@
     - name: postgres:12
       command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
     - name: redis:6.0-alpine
-    - name: opensearchproject/opensearch:1.2.4
+    - name: opensearchproject/opensearch:1.3.5
+      alias: elasticsearch
+      command: ["bin/opensearch", "-E", "discovery.type=single-node", "-E", "plugins.security.disabled=true"]
+  variables:
+    POSTGRES_HOST_AUTH_METHOD: trust
+    PG_VERSION: "12"
+
+.use-pg12-opensearch2-ee:
+  services:
+    - name: postgres:12
+      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"]
   variables:

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

@@ -574,11 +574,6 @@ rspec-ee unit pg12 es8:
     - .rspec-ee-base-pg12-es8
     - .rspec-ee-unit-parallel
 
-rspec-ee unit pg12 opensearch1:
-  extends:
-    - .rspec-ee-base-pg12-opensearch1
-    - .rspec-ee-unit-parallel
-
 rspec-ee unit pg12 minimal:
   extends:
     - rspec-ee unit pg12
@@ -602,11 +597,6 @@ rspec-ee integration pg12 es8:
     - .rspec-ee-base-pg12-es8
     - .rspec-ee-integration-parallel
 
-rspec-ee integration pg12 opensearch1:
-  extends:
-    - .rspec-ee-base-pg12-opensearch1
-    - .rspec-ee-integration-parallel
-
 rspec-ee integration pg12 minimal:
   extends:
     - rspec-ee integration pg12
@@ -630,11 +620,6 @@ rspec-ee system pg12 es8:
     - .rspec-ee-base-pg12-es8
     - .rspec-ee-system-parallel
 
-rspec-ee system pg12 opensearch1:
-  extends:
-    - .rspec-ee-base-pg12-opensearch1
-    - .rspec-ee-system-parallel
-
 rspec-ee system pg12 minimal:
   extends:
     - rspec-ee system pg12
@@ -743,6 +728,61 @@ rspec-ee system pg11:
     - .rails:rules:default-branch-schedule-nightly--code-backstage-ee-only
     - .rspec-ee-system-parallel
 
+# PG12
+rspec-ee unit pg12 es7:
+  extends:
+    - .rspec-ee-base-pg12-es7
+    - .rspec-ee-unit-parallel
+    - .rails:rules:default-branch-schedule-nightly--code-backstage-ee-only
+
+rspec-ee unit pg12 opensearch1:
+  extends:
+    - .rspec-ee-base-pg12-opensearch1
+    - .rspec-ee-unit-parallel
+    - .rails:rules:default-branch-schedule-nightly--code-backstage-ee-only
+
+rspec-ee unit pg12 opensearch2:
+  extends:
+    - .rspec-ee-base-pg12-opensearch2
+    - .rspec-ee-unit-parallel
+    - .rails:rules:default-branch-schedule-nightly--code-backstage-ee-only
+
+rspec-ee integration pg12 es7:
+  extends:
+    - .rspec-ee-base-pg12-es7
+    - .rspec-ee-integration-parallel
+    - .rails:rules:default-branch-schedule-nightly--code-backstage-ee-only
+
+rspec-ee integration pg12 opensearch1:
+  extends:
+    - .rspec-ee-base-pg12-opensearch1
+    - .rspec-ee-integration-parallel
+    - .rails:rules:default-branch-schedule-nightly--code-backstage-ee-only
+
+rspec-ee integration pg12 opensearch2:
+  extends:
+    - .rspec-ee-base-pg12-opensearch2
+    - .rspec-ee-integration-parallel
+    - .rails:rules:default-branch-schedule-nightly--code-backstage-ee-only
+
+rspec-ee system pg12 es7:
+  extends:
+    - .rspec-ee-base-pg12-es7
+    - .rspec-ee-system-parallel
+    - .rails:rules:default-branch-schedule-nightly--code-backstage-ee-only
+
+rspec-ee system pg12 opensearch1:
+  extends:
+    - .rspec-ee-base-pg12-opensearch1
+    - .rspec-ee-system-parallel
+    - .rails:rules:default-branch-schedule-nightly--code-backstage-ee-only
+
+rspec-ee system pg12 opensearch2:
+  extends:
+    - .rspec-ee-base-pg12-opensearch2
+    - .rspec-ee-system-parallel
+    - .rails:rules:default-branch-schedule-nightly--code-backstage-ee-only
+
 # PG13
 rspec-ee migration pg13:
   extends:

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

@@ -109,12 +109,18 @@ include:
 .rspec-ee-base-pg11:
   extends:
     - .rspec-base
-    - .use-pg11-ee
+    - .use-pg11-es7-ee
 
 .rspec-ee-base-pg12:
   extends:
     - .rspec-base
-    - .use-pg12-ee
+    - .use-pg12-es7-ee
+
+.rspec-ee-base-pg12-es7:
+  extends:
+    - .rspec-base
+    - .use-pg12-es7-ee
+    - .rails:rules:run-search-tests
 
 .rspec-ee-base-pg12-es8:
   extends:
@@ -128,10 +134,16 @@ include:
     - .use-pg12-opensearch1-ee
     - .rails:rules:run-search-tests
 
+.rspec-ee-base-pg12-opensearch2:
+  extends:
+    - .rspec-base
+    - .use-pg12-opensearch2-ee
+    - .rails:rules:run-search-tests
+
 .rspec-ee-base-pg13:
   extends:
     - .rspec-base
-    - .use-pg13-ee
+    - .use-pg13-es7-ee
 
 .db-job-base:
   extends:

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

@@ -573,6 +573,8 @@
   rules:
     - <<: *if-merge-request-labels-group-global-search
       changes: *search-backend-patterns
+    - <<: *if-merge-request-labels-group-global-search
+      changes: *ci-patterns
 
 .rails:rules:ee-and-foss-default-rules:
   rules: