Add latest changes from gitlab-org/gitlab@master

2 files changed, 21 insertions, 48 deletions

diff --git a/.gitlab/ci/package-and-test/main.gitlab-ci.yml b/.gitlab/ci/package-and-test/main.gitlab-ci.yml
index 8586d0af0fc..879b8579e2d 100644
--- a/.gitlab/ci/package-and-test/main.gitlab-ci.yml
+++ b/.gitlab/ci/package-and-test/main.gitlab-ci.yml
@@ -63,6 +63,7 @@ stages:
     QA_INTERCEPT_REQUESTS: "true"
     GITLAB_LICENSE_MODE: test
     GITLAB_QA_ADMIN_ACCESS_TOKEN: $QA_ADMIN_ACCESS_TOKEN
+    GITLAB_QA_OPTS: $EXTRA_GITLAB_QA_OPTS
     # todo: remove in 16.1 milestone when not needed for backwards compatibility anymore
     EE_LICENSE: $QA_EE_LICENSE
     GITHUB_ACCESS_TOKEN: $QA_GITHUB_ACCESS_TOKEN
@@ -233,28 +234,6 @@ _quarantine:
   variables:
     QA_RSPEC_TAGS: --tag quarantine
 
-# Temporary test job to support the effort of migrating to Super Sidebar
-# https://gitlab.com/groups/gitlab-org/-/epics/9044
-_super-sidebar-nav:
-  extends:
-    - .qa
-    - .parallel
-  variables:
-    QA_SCENARIO: Test::Instance::Image
-    QA_KNAPSACK_REPORT_NAME: ee-instance
-    QA_TESTS: ""
-    QA_SUPER_SIDEBAR_ENABLED: "true"
-    QA_ALLURE_RESULTS_DIRECTORY: tmp/allure-results-super-sidebar
-    QA_EXPORT_TEST_METRICS: "false"
-    QA_DISABLE_RSPEC_RETRY: "true"
-    GITLAB_QA_OPTS: --set-feature-flags super_sidebar_nav=enabled
-    RSPEC_REPORT_OPTS: "--format documentation"
-    SKIP_REPORT_IN_ISSUES: "true"
-  allow_failure: true
-  rules:
-    - if: $CI_SERVER_HOST == "gitlab.com" && $CI_PROJECT_PATH == "gitlab-org/gitlab" && $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH
-    - !reference [.rules:test:manual, rules]
-
 # ------------------------------------------
 # FF changes
 # ------------------------------------------
@@ -325,7 +304,7 @@ decomposition-single-db-selective:
   extends: .qa
   variables:
     QA_SCENARIO: Test::Instance::Image
-    GITLAB_QA_OPTS: --omnibus-config decomposition_single_db
+    GITLAB_QA_OPTS: --omnibus-config decomposition_single_db $EXTRA_GITLAB_QA_OPTS
   rules:
     - !reference [.rules:test:qa-selective, rules]
     - if: $QA_SUITES =~ /Test::Instance::All/
@@ -342,7 +321,7 @@ decomposition-multiple-db-selective:
   variables:
     QA_SCENARIO: Test::Instance::Image
     GITLAB_ALLOW_SEPARATE_CI_DATABASE: "true"
-    GITLAB_QA_OPTS: --omnibus-config decomposition_multiple_db
+    GITLAB_QA_OPTS: --omnibus-config decomposition_multiple_db $EXTRA_GITLAB_QA_OPTS
   rules:
     - !reference [.rules:test:qa-selective, rules]
     - if: $QA_SUITES =~ /Test::Instance::All/
@@ -359,7 +338,7 @@ object-storage-selective:
   variables:
     QA_SCENARIO: Test::Instance::Image
     QA_RSPEC_TAGS: --tag object_storage
-    GITLAB_QA_OPTS: --omnibus-config object_storage
+    GITLAB_QA_OPTS: --omnibus-config object_storage $EXTRA_GITLAB_QA_OPTS
   rules:
     - !reference [.rules:test:qa-selective, rules]
     - if: $QA_SUITES =~ /Test::Instance::ObjectStorage/
@@ -377,7 +356,7 @@ object-storage-aws-selective:
     AWS_S3_BUCKET_NAME: $QA_AWS_S3_BUCKET_NAME
     AWS_S3_KEY_ID: $QA_AWS_S3_KEY_ID
     AWS_S3_REGION: $QA_AWS_S3_REGION
-    GITLAB_QA_OPTS: --omnibus-config object_storage_aws
+    GITLAB_QA_OPTS: --omnibus-config object_storage_aws $EXTRA_GITLAB_QA_OPTS
 object-storage-aws:
   extends: object-storage-aws-selective
   parallel: 2
@@ -391,7 +370,7 @@ object-storage-gcs-selective:
     GOOGLE_PROJECT: $QA_GOOGLE_PROJECT
     GOOGLE_JSON_KEY: $QA_GOOGLE_JSON_KEY
     GOOGLE_CLIENT_EMAIL: $QA_GOOGLE_CLIENT_EMAIL
-    GITLAB_QA_OPTS: --omnibus-config object_storage_gcs
+    GITLAB_QA_OPTS: --omnibus-config object_storage_gcs $EXTRA_GITLAB_QA_OPTS
 object-storage-gcs:
   extends: object-storage-gcs-selective
   parallel: 2
@@ -403,7 +382,7 @@ packages-selective:
   variables:
     QA_SCENARIO: Test::Instance::Image
     QA_RSPEC_TAGS: --tag packages
-    GITLAB_QA_OPTS: --omnibus-config packages
+    GITLAB_QA_OPTS: --omnibus-config packages $EXTRA_GITLAB_QA_OPTS
   rules:
     - !reference [.rules:test:qa-selective, rules]
     - if: $QA_SUITES =~ /Test::Instance::Packages/
@@ -650,7 +629,7 @@ registry-object-storage-tls:
     QA_SCENARIO: Test::Integration::RegistryTLS
     QA_RSPEC_TAGS: ""
     GITLAB_TLS_CERTIFICATE: $QA_GITLAB_TLS_CERTIFICATE
-    GITLAB_QA_OPTS: --omnibus-config registry_object_storage
+    GITLAB_QA_OPTS: --omnibus-config registry_object_storage $EXTRA_GITLAB_QA_OPTS
 
 importers:
   extends: .qa
@@ -671,27 +650,10 @@ e2e-test-report:
     - .rules:report:allure-report
   stage: report
   variables:
-    ALLURE_JOB_NAME: e2e-package-and-test
     GITLAB_AUTH_TOKEN: $PROJECT_TOKEN_FOR_CI_SCRIPTS_API_USAGE
     ALLURE_PROJECT_PATH: $CI_PROJECT_PATH
     ALLURE_MERGE_REQUEST_IID: $CI_MERGE_REQUEST_IID
 
-# Temporary separate test report for super-sidebar test job
-# TODO: remove once super-sidebar is on by default and enabled in tests
-# https://gitlab.com/groups/gitlab-org/-/epics/9044
-e2e-test-report-super-sidebar:
-  extends:
-    - .generate-allure-report-base
-  stage: report
-  needs:
-    - _super-sidebar-nav
-  variables:
-    ALLURE_JOB_NAME: e2e-super-sidebar
-    ALLURE_RESULTS_GLOB: gitlab-qa-run-*/**/allure-results-super-sidebar
-  rules:
-    - if: $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH
-    - !reference [.rules:test:manual, rules]
-
 upload-knapsack-report:
   extends:
     - .generate-knapsack-report-base
diff --git a/.gitlab/ci/qa.gitlab-ci.yml b/.gitlab/ci/qa.gitlab-ci.yml
index 2956eef6a9e..b786b2427ee 100644
--- a/.gitlab/ci/qa.gitlab-ci.yml
+++ b/.gitlab/ci/qa.gitlab-ci.yml
@@ -70,6 +70,7 @@ e2e:package-and-test-ee:
     RUN_WITH_BUNDLE: "true"  # instructs pipeline to install and run gitlab-qa gem via bundler
     QA_PATH: qa  # sets the optional path for bundler to run from
     QA_RUN_TYPE: e2e-package-and-test
+    ALLURE_JOB_NAME: e2e-package-and-test
     PIPELINE_NAME: E2E Omnibus GitLab EE
   inherit:
     variables:
@@ -100,12 +101,22 @@ e2e:package-and-test-ce:
     - e2e-test-pipeline-generate
   variables:
     FOSS_ONLY: "1"
-    QA_RUN_TYPE: e2e-package-and-test-ce
-    ALLURE_JOB_NAME: e2e-package-and-test-ce
     RELEASE: ${REGISTRY_HOST}/${REGISTRY_GROUP}/build/omnibus-gitlab-mirror/gitlab-ce:${CI_COMMIT_SHA}
     GITLAB_QA_IMAGE: ${CI_REGISTRY_IMAGE}/gitlab-ce-qa:${CI_COMMIT_SHA}
+    QA_RUN_TYPE: e2e-package-and-test-ce
+    ALLURE_JOB_NAME: e2e-package-and-test-ce
     PIPELINE_NAME: E2E Omnibus GitLab CE
 
+e2e:package-and-test-super-sidebar:
+  extends: e2e:package-and-test-ee
+  when: manual
+  variables:
+    QA_SUPER_SIDEBAR_ENABLED: "true"
+    EXTRA_GITLAB_QA_OPTS: --set-feature-flags super_sidebar_nav=enabled
+    QA_RUN_TYPE: e2e-package-and-test-super-sidebar
+    ALLURE_JOB_NAME: e2e-package-and-test-super-sidebar
+    PIPELINE_NAME: E2E Omnibus Super Sidebar
+
 e2e:test-on-gdk:
   extends:
     - .qa:rules:e2e:test-on-gdk