Add latest changes from gitlab-org/gitlab@master

5 files changed, 25 insertions, 35 deletions

diff --git a/.gitlab/ci/gitlab-gems.gitlab-ci.yml b/.gitlab/ci/gitlab-gems.gitlab-ci.yml
index adab179d2a2..aff272935c5 100644
--- a/.gitlab/ci/gitlab-gems.gitlab-ci.yml
+++ b/.gitlab/ci/gitlab-gems.gitlab-ci.yml
@@ -5,3 +5,11 @@ gems gitlab-rspec:
   trigger:
     include: gems/gitlab-rspec/.gitlab-ci.yml
     strategy: depend
+
+gems gitlab-utils:
+  extends:
+    - .gems:rules:gitlab-utils
+  needs: []
+  trigger:
+    include: gems/gitlab-utils/.gitlab-ci.yml
+    strategy: depend
diff --git a/.gitlab/ci/package-and-test-nightly/main.gitlab-ci.yml b/.gitlab/ci/package-and-test-nightly/main.gitlab-ci.yml
index 34b4e853415..d1062250040 100644
--- a/.gitlab/ci/package-and-test-nightly/main.gitlab-ci.yml
+++ b/.gitlab/ci/package-and-test-nightly/main.gitlab-ci.yml
@@ -97,6 +97,17 @@ integration-opensearch-compatibility-version-2:
     OPENSEARCH_VERSION: "2.0.1"
     QA_SCENARIO: "Test::Integration::Opensearch"
 
+# ------------------------------------------
+# Relative url
+# ------------------------------------------
+relative-url:
+  extends:
+    - .qa
+    - .ee
+    - .parallel
+  variables:
+    QA_SCENARIO: Test::Instance::RelativeUrl
+
 # ==========================================
 # Post test stage
 # ==========================================
diff --git a/.gitlab/ci/package-and-test/main.gitlab-ci.yml b/.gitlab/ci/package-and-test/main.gitlab-ci.yml
index fcea49e3103..8ed1bb5d067 100644
--- a/.gitlab/ci/package-and-test/main.gitlab-ci.yml
+++ b/.gitlab/ci/package-and-test/main.gitlab-ci.yml
@@ -81,6 +81,7 @@ instance-ff-inverse:
 # ------------------------------------------
 
 # ========== instance ===========
+
 instance:
   extends:
     - .parallel
@@ -151,38 +152,6 @@ praefect-selective-parallel:
       variables:
         QA_TESTS: ""
 
-# ========== relative-url ===========
-
-relative-url:
-  extends:
-    - .qa
-    - .parallel
-  variables:
-    QA_SCENARIO: Test::Instance::RelativeUrl
-  rules:
-    - !reference [.rules:test:qa-parallel, rules]
-    - if: $QA_SUITES =~ /Test::Instance::All/
-
-relative-url-selective:
-  extends: .qa
-  variables:
-    QA_SCENARIO: Test::Instance::RelativeUrl
-  rules:
-    - !reference [.rules:test:qa-selective, rules]
-    - if: $QA_SUITES =~ /Test::Instance::All/
-
-relative-url-selective-parallel:
-  extends:
-    - .qa
-    - .parallel
-  variables:
-    QA_SCENARIO: Test::Instance::RelativeUrl
-  rules:
-    - !reference [.rules:test:qa-selective-parallel, rules]
-    - if: $QA_SUITES =~ /Test::Instance::All/
-      variables:
-        QA_TESTS: ""
-
 # ========== decomposition-single-db ===========
 
 decomposition-single-db:
diff --git a/.gitlab/ci/preflight.gitlab-ci.yml b/.gitlab/ci/preflight.gitlab-ci.yml
index 968402b2ea5..6a2ea85f393 100644
--- a/.gitlab/ci/preflight.gitlab-ci.yml
+++ b/.gitlab/ci/preflight.gitlab-ci.yml
@@ -24,9 +24,6 @@
     - .ruby-cache
     - .preflight:rules:rails-production-server-boot
     - .use-pg13
-  variables:
-    BUNDLE_WITHOUT: "development:test"
-    BUNDLE_WITH: "production"
 
 # Test the puma configuration present in `config/puma.rb.example`
 rails-production-server-boot-puma-example:
diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml
index 6acc2dea2e2..007e5cefb89 100644
--- a/.gitlab/ci/rules.gitlab-ci.yml
+++ b/.gitlab/ci/rules.gitlab-ci.yml
@@ -2135,6 +2135,11 @@
     - <<: *if-merge-request
       changes: ["gems/gitlab-rspec/**/*"]
 
+.gems:rules:gitlab-utils:
+  rules:
+    - <<: *if-merge-request
+      changes: ["gems/gitlab-utils/**/*"]
+
 #######################
 # Vendored gems rules #
 #######################