Add latest changes from gitlab-org/gitlab@master

6 files changed, 2 insertions, 44 deletions

diff --git a/.gitlab/CODEOWNERS b/.gitlab/CODEOWNERS
index 0face29d47d..b6ab141a649 100644
--- a/.gitlab/CODEOWNERS
+++ b/.gitlab/CODEOWNERS
@@ -1300,7 +1300,6 @@ lib/gitlab/checks/**
 /ee/app/views/ci_minutes_usage_mailer/
 /ee/app/views/projects/pipelines/
 /ee/app/views/projects/settings/ci_cd/
-/ee/app/workers/clear_shared_runners_minutes_worker.rb
 /ee/lib/api/merge_trains.rb
 /ee/lib/ee/api/entities/merge_train.rb
 
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 b76f6f85193..bcd63e4f7ec 100644
--- a/.gitlab/ci/package-and-test-nightly/main.gitlab-ci.yml
+++ b/.gitlab/ci/package-and-test-nightly/main.gitlab-ci.yml
@@ -122,10 +122,6 @@ export-test-metrics:
   extends:
     - .export-test-metrics
 
-relate-test-failures:
-  extends:
-    - .relate-test-failures
-
 generate-test-session:
   extends:
     - .generate-test-session
diff --git a/.gitlab/ci/package-and-test/main.gitlab-ci.yml b/.gitlab/ci/package-and-test/main.gitlab-ci.yml
index 0f3884ef5f1..9b127728615 100644
--- a/.gitlab/ci/package-and-test/main.gitlab-ci.yml
+++ b/.gitlab/ci/package-and-test/main.gitlab-ci.yml
@@ -689,11 +689,6 @@ export-test-metrics:
     - .export-test-metrics
     - .rules:report:process-results
 
-relate-test-failures:
-  extends:
-    - .relate-test-failures
-    - .rules:report:process-results
-
 generate-test-session:
   extends:
     - .generate-test-session
diff --git a/.gitlab/ci/qa-common/main.gitlab-ci.yml b/.gitlab/ci/qa-common/main.gitlab-ci.yml
index 51f19a8ee0d..67b341ee760 100644
--- a/.gitlab/ci/qa-common/main.gitlab-ci.yml
+++ b/.gitlab/ci/qa-common/main.gitlab-ci.yml
@@ -205,27 +205,6 @@ stages:
   script:
     - bundle exec rake "ci:export_test_metrics[$QA_METRICS_REPORT_FILE_PATTERN]"
 
-.relate-test-failures:
-  extends:
-    - .qa-install
-    - .ruby-image
-  stage: report
-  when: always
-  variables:
-    QA_RSPEC_JSON_FILE_PATTERN: "${CI_PROJECT_DIR}/gitlab-qa-run-*/**/rspec-*.json"
-  script:
-    - |
-      if [ "$SUITE_FAILED" != "true" ] && [ "$SUITE_RAN" == "true" ]; then
-        echo "Test suite passed. Exiting..."
-        exit 0
-      fi
-    - bundle exec update-screenshot-paths --input-files "${CI_PROJECT_DIR}/gitlab-qa-run-*/**/rspec-*.xml"
-    - |
-      bundle exec relate-failure-issue \
-        --input-files "${QA_RSPEC_JSON_FILE_PATTERN}" \
-        --project "gitlab-org/gitlab" \
-        --token "${QA_RELATE_FAILURE_ISSUE_TOKEN}"
-
 .generate-test-session:
   extends:
     - .qa-install
diff --git a/.gitlab/ci/qa.gitlab-ci.yml b/.gitlab/ci/qa.gitlab-ci.yml
index e8d7115badb..d74adde8860 100644
--- a/.gitlab/ci/qa.gitlab-ci.yml
+++ b/.gitlab/ci/qa.gitlab-ci.yml
@@ -70,15 +70,6 @@ qa:master-auto-quarantine-dequarantine:
     - bundle exec confiner -r .confiner/master.yml
   allow_failure: true
 
-qa:nightly-auto-quarantine-dequarantine:
-  extends:
-    - .qa-job-base
-  rules:
-    - if: '$QA_TRIGGER_AUTO_QUARANTINE =~ /true|yes|1/i'
-  script:
-    - bundle exec confiner -r .confiner/nightly.yml
-  allow_failure: true
-
 qa:update-qa-cache:
   extends:
     - .qa-job-base
diff --git a/.gitlab/ci/test-on-gdk/main.gitlab-ci.yml b/.gitlab/ci/test-on-gdk/main.gitlab-ci.yml
index f55950d56b4..51f88cdfddf 100644
--- a/.gitlab/ci/test-on-gdk/main.gitlab-ci.yml
+++ b/.gitlab/ci/test-on-gdk/main.gitlab-ci.yml
@@ -149,12 +149,10 @@ export-test-metrics:
   variables:
     QA_METRICS_REPORT_FILE_PATTERN: $CI_PROJECT_DIR/qa/tmp/test-metrics-*.json
 
-relate-test-failures:
-  extends:
-    - .relate-test-failures
-    - .rules:report:process-results
+.gitlab-qa-report:
   variables:
     QA_RSPEC_JSON_FILE_PATTERN: $CI_PROJECT_DIR/qa/tmp/rspec-*.json
+    QA_SYSTEM_LOG_FILE_PATTERN: $CI_PROJECT_DIR/test_output/logs
 
 generate-test-session:
   extends: