Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

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

@@ -468,6 +468,21 @@
     - !reference [.db-services-with-auto-explain, services]
     - !reference [.es8-services, services]
 
+.opensearch-latest-services:
+  services:
+    - !reference [.zoekt-services, services]
+    - name: opensearchproject/opensearch:latest
+      alias: elasticsearch
+      command: ["bin/opensearch", "-E", "discovery.type=single-node", "-E", "plugins.security.disabled=true", "-E", "cluster.routing.allocation.disk.threshold_enabled=false"]
+
+.use-pg16-opensearch-latest-ee:
+  extends:
+    - .use-pg16
+    - .zoekt-variables
+  services:
+    - !reference [.db-services-with-auto-explain, services]
+    - !reference [.opensearch-latest-services, services]
+
 .os1-services:
   services:
     - !reference [.zoekt-services, services]

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

@@ -650,9 +650,15 @@ rspec:merge-auto-explain-logs:
   script:
     - scripts/merge-auto-explain-logs
     - |
-      if [[ -f "$RSPEC_AUTO_EXPLAIN_LOG_PATH" ]] && [[ "$CI_PROJECT_PATH" == "gitlab-org/gitlab" ]] && [[ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]]; then
-        source scripts/gitlab_component_helpers.sh
-        extract_and_upload_fingerprints
+      if [[ -f "$RSPEC_AUTO_EXPLAIN_LOG_PATH" ]] && [[ "$CI_PROJECT_PATH" == "gitlab-org/gitlab" ]]; then
+        if [[ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]]; then
+          # For the default branch (e.g., master), extract and upload fingerprints
+          source scripts/gitlab_component_helpers.sh
+          extract_and_upload_fingerprints
+        else
+          # For MRs, compare against master fingerprints and generate a report
+          scripts/merge_request_query_differ.rb "$RSPEC_AUTO_EXPLAIN_LOG_PATH"
+        fi
       fi
   artifacts:
     name: auto-explain-logs
@@ -1213,6 +1219,35 @@ rspec-ee system pg17:
 # EE: default branch nightly scheduled jobs #
 #####################################
 
+##################################################
+# EE: default branch weekly scheduled jobs #
+# Integration tests with latest OpenSearch versions
+# and the actual PG production version (PG16)
+
+rspec-ee unit pg16 opensearch-latest:
+  extends:
+    - .rspec-base-pg16
+    - .rspec-ee-base-pg16-opensearch-latest
+    - .rspec-ee-unit-parallel
+    - .rails:rules:default-branch-schedule-weekly--code-backstage-ee-only
+
+rspec-ee integration pg16 opensearch-latest:
+  extends:
+    - .rspec-base-pg16
+    - .rspec-ee-base-pg16-opensearch-latest
+    - .rspec-ee-integration-parallel
+    - .rails:rules:default-branch-schedule-weekly--code-backstage-ee-only
+
+rspec-ee system pg16 opensearch-latest:
+  extends:
+    - .rspec-base-pg16
+    - .rspec-ee-base-pg16-opensearch-latest
+    - .rspec-ee-system-parallel
+    - .rails:rules:default-branch-schedule-weekly--code-backstage-ee-only
+
+# EE: default branch weekly scheduled jobs #
+##################################################
+
 ##################################################
 # EE: Canonical MR pipelines
 .rspec-fail-fast:

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

@@ -291,6 +291,11 @@ include:
     - .use-pg16-es8-ee
     - .rails:rules:run-search-tests
 
+.rspec-ee-base-pg16-opensearch-latest:
+  extends:
+    - .rspec-base
+    - .use-pg16-opensearch-latest-ee
+
 .rspec-ee-base-pg16-opensearch1:
   extends:
     - .rspec-base