Add latest changes from gitlab-org/gitlab@master

4 files changed, 76 insertions, 4 deletions

diff --git a/.gitlab/ci/global.gitlab-ci.yml b/.gitlab/ci/global.gitlab-ci.yml
index 4069dfe9a2b..4767f100cf4 100644
--- a/.gitlab/ci/global.gitlab-ci.yml
+++ b/.gitlab/ci/global.gitlab-ci.yml
@@ -246,7 +246,7 @@
       command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
     - name: redis:5.0-alpine
     - name: elasticsearch:7.17.0
-      command: ["elasticsearch", "-E", "discovery.type=single-node"]
+      command: ["elasticsearch", "-E", "discovery.type=single-node", "-E", "xpack.security.enabled=false"]
   variables:
     POSTGRES_HOST_AUTH_METHOD: trust
     PG_VERSION: "11"
@@ -257,7 +257,7 @@
       command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
     - name: redis:6.0-alpine
     - name: elasticsearch:7.17.0
-      command: ["elasticsearch", "-E", "discovery.type=single-node"]
+      command: ["elasticsearch", "-E", "discovery.type=single-node", "-E", "xpack.security.enabled=false"]
   variables:
     POSTGRES_HOST_AUTH_METHOD: trust
     PG_VERSION: "12"
@@ -268,11 +268,35 @@
       command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
     - name: redis:5.0-alpine
     - name: elasticsearch:7.17.0
-      command: ["elasticsearch", "-E", "discovery.type=single-node"]
+      command: ["elasticsearch", "-E", "discovery.type=single-node", "-E", "xpack.security.enabled=false"]
   variables:
     POSTGRES_HOST_AUTH_METHOD: trust
     PG_VERSION: "13"
 
+.use-pg12-es8-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:8.1.1
+  variables:
+    POSTGRES_HOST_AUTH_METHOD: trust
+    PG_VERSION: "12"
+    ES_SETTING_DISCOVERY_TYPE: "single-node"
+    ES_SETTING_XPACK_SECURITY_ENABLED: "false"
+
+.use-pg12-opensearch1-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:1.2.4
+      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-kaniko:
   image:
     name: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:kaniko
diff --git a/.gitlab/ci/rails.gitlab-ci.yml b/.gitlab/ci/rails.gitlab-ci.yml
index 9ca125a0b2a..cbedd83ac95 100644
--- a/.gitlab/ci/rails.gitlab-ci.yml
+++ b/.gitlab/ci/rails.gitlab-ci.yml
@@ -101,6 +101,18 @@
     - .rspec-base
     - .use-pg12-ee
 
+.rspec-ee-base-pg12-es8:
+  extends:
+    - .rspec-base
+    - .use-pg12-es8-ee
+    - .rails:rules:run-search-tests
+
+.rspec-ee-base-pg12-opensearch1:
+  extends:
+    - .rspec-base
+    - .use-pg12-opensearch1-ee
+    - .rails:rules:run-search-tests
+
 .rspec-jh-base-pg12:
   extends:
     - .rspec-base-pg12-as-if-jh
@@ -786,6 +798,16 @@ rspec-ee unit pg12:
     - .rails:rules:ee-only-unit
     - .rspec-ee-unit-parallel
 
+rspec-ee unit pg12 es8:
+  extends:
+    - .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
@@ -804,6 +826,16 @@ rspec-ee integration pg12:
     - .rails:rules:ee-only-integration
     - .rspec-ee-integration-parallel
 
+rspec-ee integration pg12 es8:
+  extends:
+    - .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
@@ -822,6 +854,16 @@ rspec-ee system pg12:
     - .rails:rules:ee-only-system
     - .rspec-ee-system-parallel
 
+rspec-ee system pg12 es8:
+  extends:
+    - .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
diff --git a/.gitlab/ci/review-apps/qa.gitlab-ci.yml b/.gitlab/ci/review-apps/qa.gitlab-ci.yml
index 9ad6a105069..a185d40664e 100644
--- a/.gitlab/ci/review-apps/qa.gitlab-ci.yml
+++ b/.gitlab/ci/review-apps/qa.gitlab-ci.yml
@@ -1,6 +1,6 @@
 include:
   - project: gitlab-org/quality/pipeline-common
-    ref: 0.3.9
+    ref: 0.6.0
     file:
       - /ci/allure-report.yml
       - /ci/knapsack-report.yml
diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml
index 01665aa460b..1423cb7383f 100644
--- a/.gitlab/ci/rules.gitlab-ci.yml
+++ b/.gitlab/ci/rules.gitlab-ci.yml
@@ -76,6 +76,9 @@
 .if-merge-request-labels-jh-contribution: &if-merge-request-labels-jh-contribution
   if: '$CI_MERGE_REQUEST_LABELS =~ /JiHu contribution/'
 
+.if-merge-request-labels-run-search-tests: &if-merge-request-labels-run-search-tests
+  if: '$CI_MERGE_REQUEST_LABELS =~ /group::global search/'
+
 .if-security-merge-request: &if-security-merge-request
   if: '$CI_PROJECT_NAMESPACE == "gitlab-org/security" && $CI_MERGE_REQUEST_IID'
 
@@ -516,6 +519,9 @@
     - <<: *if-security-merge-request
       when: never
 
+.rails:rules:run-search-tests:
+  rules:
+    - <<: *if-merge-request-labels-run-search-tests
 
 .rails:rules:ee-and-foss-default-rules:
   rules: