Add latest changes from gitlab-org/gitlab@master

3 files changed, 28 insertions, 5 deletions

diff --git a/.gitlab/ci/rails.gitlab-ci.yml b/.gitlab/ci/rails.gitlab-ci.yml
index c96628f72a2..937bfc7e93d 100644
--- a/.gitlab/ci/rails.gitlab-ci.yml
+++ b/.gitlab/ci/rails.gitlab-ci.yml
@@ -774,11 +774,19 @@ rspec-ee unit gitlab-duo-chat-zeroshot pg14:
 rspec-ee unit gitlab-duo-chat-qa-fast pg14:
   extends:
     - .rspec-ee-base-gitlab-duo
-    - .rails:rules:ee-gitlab-duo-chat-qa-fast
+    - .rails:rules:ee-gitlab-duo-chat-always
   script:
     - !reference [.base-script, script]
     - rspec_paralellized_job "--tag fast_chat_qa_evaluation"
 
+rspec-ee unit gitlab-duo pg14:
+  extends:
+    - .rspec-ee-base-gitlab-duo
+    - .rails:rules:ee-gitlab-duo-chat-always
+  script:
+    - !reference [.base-script, script]
+    - rspec_paralellized_job "--tag gitlab_duo"
+
 rspec-ee unit gitlab-duo-chat-qa pg14:
   variables:
     QA_EVAL_REPORT_FILENAME: "qa_evaluation_report.md"
diff --git a/.gitlab/ci/rails/shared.gitlab-ci.yml b/.gitlab/ci/rails/shared.gitlab-ci.yml
index 90289faef0d..77b0e336c9a 100644
--- a/.gitlab/ci/rails/shared.gitlab-ci.yml
+++ b/.gitlab/ci/rails/shared.gitlab-ci.yml
@@ -85,13 +85,27 @@ include:
     - bundle exec gem list gitlab_quality-test_tooling
     - |
       if [ "$CREATE_RAILS_TEST_FAILURE_ISSUES" == "true" ]; then
-        bundle exec relate-failure-issue --input-files "rspec/rspec-*.json" --system-log-files "log" --project "gitlab-org/gitlab" --token "${TEST_FAILURES_PROJECT_TOKEN}" --related-issues-file "rspec/${CI_JOB_ID}-failed-test-issues.json";
+        bundle exec relate-failure-issue \
+          --token "${TEST_FAILURES_PROJECT_TOKEN}" \
+          --project "gitlab-org/gitlab" \
+          --input-files "rspec/rspec-*.json" \
+          --exclude-labels-for-search "QA,rspec:slow test" \
+          --system-log-files "log" \
+          --related-issues-file "rspec/${CI_JOB_ID}-failed-test-issues.json";
       fi
       if [ "$CREATE_RAILS_SLOW_TEST_ISSUES" == "true" ]; then
-        bundle exec slow-test-issues --input-files "rspec/rspec-*.json" --project "gitlab-org/gitlab" --token "${TEST_FAILURES_PROJECT_TOKEN}" --related-issues-file "rspec/${CI_JOB_ID}-slow-test-issues.json";
+        bundle exec slow-test-issues \
+          --token "${TEST_FAILURES_PROJECT_TOKEN}" \
+          --project "gitlab-org/gitlab" \
+          --input-files "rspec/rspec-*.json" \
+          --related-issues-file "rspec/${CI_JOB_ID}-slow-test-issues.json";
       fi
       if [ "$ADD_SLOW_TEST_NOTE_TO_MERGE_REQUEST" == "true" ]; then
-        bundle exec slow-test-merge-request-report-note --input-files "rspec/rspec-*.json" --project "gitlab-org/gitlab" --merge_request_iid "$CI_MERGE_REQUEST_IID" --token "${TEST_SLOW_NOTE_PROJECT_TOKEN}";
+        bundle exec slow-test-merge-request-report-note \
+          --token "${TEST_SLOW_NOTE_PROJECT_TOKEN}" \
+          --project "gitlab-org/gitlab" \
+          --input-files "rspec/rspec-*.json" \
+          --merge_request_iid "$CI_MERGE_REQUEST_IID";
       fi
     - echo -e "\e[0Ksection_end:`date +%s`:report_results_section\r\e[0K"
     - tooling/bin/push_job_metrics || true
diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml
index 22e0531dd27..9e9f24d37bc 100644
--- a/.gitlab/ci/rules.gitlab-ci.yml
+++ b/.gitlab/ci/rules.gitlab-ci.yml
@@ -372,6 +372,7 @@
 .ai-patterns: &ai-patterns
   - "{,ee/,jh/}lib/gitlab/llm/**/*"
   - "{,ee/,jh/}{,spec/}lib/gitlab/llm/**/*"
+  - "{,ee/,jh/}lib/gitlab/duo/**/*"
 
 # DB patterns + .ci-patterns
 .db-patterns: &db-patterns
@@ -2166,7 +2167,7 @@
       when: manual
       allow_failure: true
 
-.rails:rules:ee-gitlab-duo-chat-qa-fast:
+.rails:rules:ee-gitlab-duo-chat-always:
   rules:
     - !reference [".rails:rules:ee-gitlab-duo-chat-base", rules]
     - <<: *if-merge-request