gitlab-qa 7.13.3 → 7.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d3ffb02978235a44a7335c81ba6c2e4929e103194f25d496e71b3c2e97d43d2
-  data.tar.gz: 66d345d1c84916c55cedaed33b25074d5cfd6f06eb40f31fa6570cc2425c56dc
+  metadata.gz: e034576001af3b45e773e20fcbef82cc68776e5cf5cfc05d5b3364222daaca1a
+  data.tar.gz: 32b55a91955bda342e75a02500a32bee30afba00f88f1fc9beaf7047c8168743
 SHA512:
-  metadata.gz: 0f2b8e1bec8128104d81d79d2ec5dc86d08d13bd7fa988f44ffe312569875f9d0ab6f864356dfc804c5ba2207ffc05e6260669cbbf19c0ba9e0a9fbb8e8c5fa5
-  data.tar.gz: 8ca3dde5565b4ae744791ff1faec00088a0573102de1545f20c8192f00f08b7dad25f64e34a5c06b1cfbf066d248895926a99adb3260577d1febf16feb417df2
+  metadata.gz: d70b63b685d3f8d664dcd5b9b11f249bab07869045ce6c9012a94e17f2f0f789011ca398f566019d81da255043a47813751461f5f4aba25678cc1856841e0f63
+  data.tar.gz: 2c7e1a97dce74b729720acac3b88c85b1986cd8991eaf1af736a8c0d469e2565f354155ddea493865a8949a0948a9abac770000e71a99543c5065f0c5a4470e2

data/.gitlab/ci/rules.gitlab-ci.yml

@@ -37,6 +37,12 @@
 .if-set-feature-flag: &if-set-feature-flag
   if: '$GITLAB_QA_OPTIONS =~ /--set-feature-flags/'
 
+.if-qa-tests-specified: &if-qa-tests-specified
+  if: '$QA_TESTS != null && $QA_TESTS != ""'
+
+.if-qa-tests-not-specified: &if-qa-tests-not-specified
+  if: '$QA_TESTS == null || $QA_TESTS == ""'
+
 #########
 # Rules #
 #########
@@ -98,3 +104,67 @@
     - <<: *if-set-feature-flag
       when: never
     - !reference [".rules:only-qa", rules]
+
+# === When QA_TESTS variable has a value ===
+
+.rules:ce-never-when-qa-tests-specified:
+  rules:
+    - <<: *if-qa-tests-specified
+      when: never
+    - !reference [".rules:ce-qa", rules]
+
+.rules:ee-never-when-qa-tests-specified:
+  rules:
+    - <<: *if-qa-tests-specified
+      when: never
+    - !reference [".rules:ee-qa", rules]
+
+.rules:ce-never-when-triggered-by-feature-flag-definition-change-and-never-when-qa-tests-specified:
+  rules:
+    - <<: *if-qa-tests-specified
+      when: never
+    - !reference [".rules:ce-never-when-triggered-by-feature-flag-definition-change", rules]
+
+.rules:ee-never-when-triggered-by-feature-flag-definition-change-and-never-when-qa-tests-specified:
+  rules:
+    - <<: *if-qa-tests-specified
+      when: never
+    - !reference [".rules:ee-never-when-triggered-by-feature-flag-definition-change", rules]
+
+.rules:only-qa-never-when-triggered-by-feature-flag-definition-change-and-never-when-qa-tests-specified:
+  rules:
+    - <<: *if-qa-tests-specified
+      when: never
+    - !reference [".rules:only-qa-never-when-triggered-by-feature-flag-definition-change", rules]
+
+# === When QA_TESTS variable does not have a value ===
+
+.rules:ce-never-when-qa-tests-not-specified:
+  rules:
+    - <<: *if-qa-tests-not-specified
+      when: never
+    - !reference [".rules:ce-qa", rules]
+
+.rules:ee-never-when-qa-tests-not-specified:
+  rules:
+    - <<: *if-qa-tests-not-specified
+      when: never
+    - !reference [".rules:ee-qa", rules]
+
+.rules:ce-never-when-triggered-by-feature-flag-definition-change-and-never-when-qa-tests-not-specified:
+  rules:
+    - <<: *if-qa-tests-not-specified
+      when: never
+    - !reference [".rules:ce-never-when-triggered-by-feature-flag-definition-change", rules]
+
+.rules:ee-never-when-triggered-by-feature-flag-definition-change-and-never-when-qa-tests-not-specified:
+  rules:
+    - <<: *if-qa-tests-not-specified
+      when: never
+    - !reference [".rules:ee-never-when-triggered-by-feature-flag-definition-change", rules]
+
+.rules:only-qa-never-when-triggered-by-feature-flag-definition-change-and-never-when-qa-tests-not-specified:
+  rules:
+    - <<: *if-qa-tests-not-specified
+      when: never
+    - !reference [".rules:only-qa-never-when-triggered-by-feature-flag-definition-change", rules]

data/.gitlab-ci.yml

@@ -187,9 +187,9 @@ ee:custom-parallel:
   allow_failure: true
   parallel: 10
 
-ce:instance:
+ce:instance-parallel:
   extends:
-    - .rules:ce-qa
+    - .rules:ce-never-when-qa-tests-specified
     - .test
     - .high-capacity
     - .ce-variables
@@ -197,6 +197,14 @@ ce:instance:
     - .rspec-report-opts
   parallel: 5
 
+ce:instance:
+  extends:
+    - .rules:ce-never-when-qa-tests-not-specified
+    - .test
+    - .high-capacity
+    - .ce-variables
+    - .rspec-report-opts
+
 ce:instance-quarantine:
   extends:
     - .rules:ce-qa
@@ -208,9 +216,9 @@ ce:instance-quarantine:
   variables:
     QA_RSPEC_TAGS: "--tag quarantine --tag ~orchestrated"
 
-ee:instance:
+ee:instance-parallel:
   extends:
-    - .rules:ee-qa
+    - .rules:ee-never-when-qa-tests-specified
     - .test
     - .high-capacity
     - .ee-variables
@@ -218,6 +226,14 @@ ee:instance:
     - .rspec-report-opts
   parallel: 5
 
+ee:instance:
+  extends:
+    - .rules:ee-never-when-qa-tests-not-specified
+    - .test
+    - .high-capacity
+    - .ee-variables
+    - .rspec-report-opts
+
 ee:instance-quarantine:
   extends:
     - .rules:ee-qa
@@ -229,9 +245,9 @@ ee:instance-quarantine:
   variables:
     QA_RSPEC_TAGS: "--tag quarantine --tag ~orchestrated"
 
-ce:relative_url:
+ce:relative_url-parallel:
   extends:
-    - .rules:ce-never-when-triggered-by-feature-flag-definition-change
+    - .rules:ce-never-when-triggered-by-feature-flag-definition-change-and-never-when-qa-tests-specified
     - .test
     - .high-capacity
     - .ce-variables
@@ -241,6 +257,16 @@ ce:relative_url:
   variables:
     QA_SCENARIO: "Test::Instance::RelativeUrl"
 
+ce:relative_url:
+  extends:
+    - .rules:ce-never-when-triggered-by-feature-flag-definition-change-and-never-when-qa-tests-not-specified
+    - .test
+    - .high-capacity
+    - .ce-variables
+    - .rspec-report-opts
+  variables:
+    QA_SCENARIO: "Test::Instance::RelativeUrl"
+
 ce:relative_url-quarantine:
   extends:
     - .rules:ce-never-when-triggered-by-feature-flag-definition-change
@@ -253,9 +279,9 @@ ce:relative_url-quarantine:
     QA_SCENARIO: "Test::Instance::RelativeUrl"
     QA_RSPEC_TAGS: "--tag quarantine --tag ~orchestrated"
 
-ee:relative_url:
+ee:relative_url-parallel:
   extends:
-    - .rules:ee-never-when-triggered-by-feature-flag-definition-change
+    - .rules:ee-never-when-triggered-by-feature-flag-definition-change-and-never-when-qa-tests-specified
     - .test
     - .high-capacity
     - .ee-variables
@@ -265,6 +291,16 @@ ee:relative_url:
   variables:
     QA_SCENARIO: "Test::Instance::RelativeUrl"
 
+ee:relative_url:
+  extends:
+    - .rules:ee-never-when-triggered-by-feature-flag-definition-change-and-never-when-qa-tests-not-specified
+    - .test
+    - .high-capacity
+    - .ee-variables
+    - .rspec-report-opts
+  variables:
+    QA_SCENARIO: "Test::Instance::RelativeUrl"
+
 ee:relative_url-quarantine:
   extends:
     - .rules:ee-never-when-triggered-by-feature-flag-definition-change
@@ -336,9 +372,9 @@ ee:image:
     - .test
     - .ee-variables
 
-ce:update:
+ce:update-parallel:
   extends:
-    - .rules:ce-never-when-triggered-by-feature-flag-definition-change
+    - .rules:ce-never-when-triggered-by-feature-flag-definition-change-and-never-when-qa-tests-specified
     - .test
     - .high-capacity
     - .ce-variables
@@ -347,6 +383,15 @@ ce:update:
     - .update-scenario-script
   parallel: 5
 
+ce:update:
+  extends:
+    - .rules:ce-never-when-triggered-by-feature-flag-definition-change-and-never-when-qa-tests-not-specified
+    - .test
+    - .high-capacity
+    - .ce-variables
+    - .rspec-report-opts
+    - .update-scenario-script
+
 ce:update-quarantine:
   extends:
     - .rules:ce-never-when-triggered-by-feature-flag-definition-change
@@ -359,9 +404,9 @@ ce:update-quarantine:
   variables:
     QA_RSPEC_TAGS: "--tag quarantine --tag ~orchestrated"
 
-ee:update:
+ee:update-parallel:
   extends:
-    - .rules:ee-never-when-triggered-by-feature-flag-definition-change
+    - .rules:ee-never-when-triggered-by-feature-flag-definition-change-and-never-when-qa-tests-specified
     - .test
     - .high-capacity
     - .ee-variables
@@ -370,6 +415,15 @@ ee:update:
     - .update-scenario-script
   parallel: 10
 
+ee:update:
+  extends:
+    - .rules:ee-never-when-triggered-by-feature-flag-definition-change-and-never-when-qa-tests-not-specified
+    - .test
+    - .high-capacity
+    - .ee-variables
+    - .rspec-report-opts
+    - .update-scenario-script
+
 ee:update-quarantine:
   extends:
     - .rules:ee-never-when-triggered-by-feature-flag-definition-change
@@ -382,17 +436,26 @@ ee:update-quarantine:
     QA_RSPEC_TAGS: "--tag quarantine --tag ~orchestrated"
 
 # The Test::Omnibus::Upgrade scenario isn't run on master (because it always uses the latest CE/EE image) so we don't report the test results in issues
-ce:upgrade:
+ce:upgrade-parallel:
   script:
     - bundle exec exe/gitlab-qa Test::Omnibus::Upgrade CE -- $RSPEC_REPORT_OPTS
   extends:
-    - .rules:only-qa-never-when-triggered-by-feature-flag-definition-change
+    - .rules:only-qa-never-when-triggered-by-feature-flag-definition-change-and-never-when-qa-tests-specified
     - .test
     - .high-capacity
     - .rspec-report-opts
     - .knapsack-variables
   parallel: 5
 
+ce:upgrade:
+  script:
+    - bundle exec exe/gitlab-qa Test::Omnibus::Upgrade CE -- $RSPEC_REPORT_OPTS
+  extends:
+    - .rules:only-qa-never-when-triggered-by-feature-flag-definition-change-and-never-when-qa-tests-not-specified
+    - .test
+    - .high-capacity
+    - .rspec-report-opts
+
 ce:upgrade-quarantine:
   script:
     - bundle exec exe/gitlab-qa Test::Omnibus::Upgrade CE -- --tag quarantine --tag ~orchestrated $RSPEC_REPORT_OPTS
@@ -920,9 +983,9 @@ ee:elasticsearch-quarantine:
   variables:
     QA_SCENARIO: "Test::Integration::Elasticsearch"
 
-ce:praefect:
+ce:praefect-parallel:
   extends:
-    - .rules:ce-never-when-triggered-by-feature-flag-definition-change
+    - .rules:ce-never-when-triggered-by-feature-flag-definition-change-and-never-when-qa-tests-specified
     - .test
     - .high-capacity
     - .ce-variables
@@ -933,6 +996,17 @@ ce:praefect:
     QA_SCENARIO: "Test::Integration::Praefect"
     QA_CAN_TEST_PRAEFECT: "true"
 
+ce:praefect:
+  extends:
+    - .rules:ce-never-when-triggered-by-feature-flag-definition-change-and-never-when-qa-tests-not-specified
+    - .test
+    - .high-capacity
+    - .ce-variables
+    - .rspec-report-opts
+  variables:
+    QA_SCENARIO: "Test::Integration::Praefect"
+    QA_CAN_TEST_PRAEFECT: "true"
+
 ce:praefect-quarantine:
   extends:
     - .rules:ce-never-when-triggered-by-feature-flag-definition-change
@@ -946,9 +1020,9 @@ ce:praefect-quarantine:
     QA_CAN_TEST_PRAEFECT: "true"
     QA_RSPEC_TAGS: "--tag quarantine --tag ~orchestrated"
 
-ee:praefect:
+ee:praefect-parallel:
   extends:
-    - .rules:ee-never-when-triggered-by-feature-flag-definition-change
+    - .rules:ee-never-when-triggered-by-feature-flag-definition-change-and-never-when-qa-tests-specified
     - .test
     - .high-capacity
     - .ee-variables
@@ -959,6 +1033,17 @@ ee:praefect:
     QA_SCENARIO: "Test::Integration::Praefect"
     QA_CAN_TEST_PRAEFECT: "true"
 
+ee:praefect:
+  extends:
+    - .rules:ee-never-when-triggered-by-feature-flag-definition-change-and-never-when-qa-tests-not-specified
+    - .test
+    - .high-capacity
+    - .ee-variables
+    - .rspec-report-opts
+  variables:
+    QA_SCENARIO: "Test::Integration::Praefect"
+    QA_CAN_TEST_PRAEFECT: "true"
+
 ee:praefect-quarantine:
   extends:
     - .rules:ee-never-when-triggered-by-feature-flag-definition-change

data/lib/gitlab/qa/report/gitlab_issue_client.rb

@@ -107,7 +107,14 @@ module Gitlab
           retry
         rescue StandardError => e
           pipeline = QA::Runtime::Env.pipeline_from_project_name
-          channel = pipeline == "canary" ? "qa-production" : "qa-#{pipeline}"
+          channel = case pipeline
+                    when "canary"
+                      "qa-production"
+                    when "staging-canary"
+                      "qa-staging"
+                    else
+                      "qa-#{pipeline}"
+                    end
           error_msg = warn_exception(e)
 
           return unless QA::Runtime::Env.ci_commit_ref_name == QA::Runtime::Env.default_branch

data/lib/gitlab/qa/report/report_as_issue.rb

@@ -111,6 +111,8 @@ module Gitlab
             'found:gitlab.com'
           when 'canary', 'staging'
             "found:#{pipeline}.gitlab.com"
+          when 'staging-canary'
+            "found:canary.staging.gitlab.com"
           when 'preprod'
             'found:pre.gitlab.com'
           when 'staging-orchestrated', 'nightly', QA::Runtime::Env.default_branch, 'staging-ref', 'release'

data/lib/gitlab/qa/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module QA
-    VERSION = '7.13.3'.freeze
+    VERSION = '7.14.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 7.13.3
+  version: 7.14.0
 platform: ruby
 authors:
 - GitLab Quality
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-11-04 00:00:00.000000000 Z
+date: 2021-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control