Add latest changes from gitlab-org/gitlab@15-0-stable-ee

1 files changed, 13 insertions, 3 deletions

diff --git a/qa/qa/specs/features/browser_ui/2_plan/issue/create_issue_spec.rb b/qa/qa/specs/features/browser_ui/2_plan/issue/create_issue_spec.rb
index 5fc9f8c2f41..82266b03c9a 100644
--- a/qa/qa/specs/features/browser_ui/2_plan/issue/create_issue_spec.rb
+++ b/qa/qa/specs/features/browser_ui/2_plan/issue/create_issue_spec.rb
@@ -12,7 +12,12 @@ module QA
         Flow::Login.sign_in
       end
 
-      it 'creates an issue', :mobile, testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347989' do
+      it(
+        'creates an issue',
+        :mobile,
+        testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347989',
+        except: { subdomain: 'pre' }
+      ) do
         issue = Resource::Issue.fabricate_via_browser_ui! { |issue| issue.project = project }
 
         Page::Project::Menu.perform(&:click_issues)
@@ -25,7 +30,12 @@ module QA
         end
       end
 
-      it 'closes an issue', :mobile, testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347967' do
+      it(
+        'closes an issue',
+        :mobile,
+        testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347967',
+        except: { subdomain: 'pre' }
+      ) do
         closed_issue.visit!
 
         Page::Project::Issue::Show.perform do |issue_page|
@@ -61,7 +71,7 @@ module QA
         # The following example is excluded from running in `review-qa-smoke` job
         # as it proved to be flaky when running against Review App
         # See https://gitlab.com/gitlab-com/www-gitlab-com/-/issues/11568#note_621999351
-        it 'comments on an issue with an attachment', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347946', except: { job: 'review-qa-smoke' } do
+        it 'comments on an issue with an attachment', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347946', except: { subdomain: 'pre', job: 'review-qa-smoke' } do
           Page::Project::Issue::Show.perform do |show|
             show.comment('See attached image for scale', attachment: file_to_attach)