gitlab-qa 7.13.2 → 7.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b871a70af32053e7d32aee98e213a86bcf4e8d05d69fad97bf8180a0bd618656
-  data.tar.gz: 73d91628111ea86a9e7c13cf1ff11b21e60ed14ba028d722becba4c1df65e606
+  metadata.gz: eff5b2a5b6b59f95a7ce622eb57a6157dc7492af83be416d3b8950ba527c3495
+  data.tar.gz: 6da73f8680896f2875e4899ea21b3272c418ee0140ae9d1a54b5117e870f5e5a
 SHA512:
-  metadata.gz: 3cf779ac1691072e13d3e616906200b291ef88f755985ae75ec24cc87e8a176acd9d120a9034011546253d7ea065b07d4b1d6fc45cb4f3d7a12324fbfc81115f
-  data.tar.gz: 56c646ad59e829fe29f3227d5d0bd169d2088d049b02866e9aca2b5ba0471cf335674c2611f97deb8415ff424edbe78159e77e38a245d080e0dd739beae8acd4
+  metadata.gz: 6110c4e993d4ff262476a637e7fad86a32561c29609bd6a5341cf8d14a53de73a0c7301763a71a3674551cd36385d67ed42db86de2c434cd938c13cbb98a0afa
+  data.tar.gz: 43db85b7549e3b3296df9f1d2c8534724d7c908ecaa11b300fe64f8a7b0f4297fbf88e704c8431fa2da4ce5a5247788136a6b66972cbbf7fd6dd1a6de3956dff

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

@@ -66,6 +66,7 @@ rspec:
 
 .test:
   stage: test
+  timeout: 1 hour 30 minutes
   services:
     - docker:20.10.5-dind
   tags:
@@ -187,9 +188,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 +198,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 +217,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 +227,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 +246,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 +258,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 +280,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 +292,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 +373,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 +384,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 +405,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 +416,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 +437,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
@@ -464,6 +528,26 @@ ee:mattermost-quarantine:
   variables:
     QA_SCENARIO: "Test::Integration::Mattermost"
 
+ce:service_ping_disabled:
+  extends:
+    - .rules:ce-never-when-triggered-by-feature-flag-definition-change
+    - .test
+    - .high-capacity
+    - .ce-variables
+    - .rspec-report-opts
+  variables:
+    QA_SCENARIO: "Test::Integration::ServicePingDisabled"
+
+ee:service_ping_disabled:
+  extends:
+    - .rules:ee-never-when-triggered-by-feature-flag-definition-change
+    - .test
+    - .high-capacity
+    - .ee-variables
+    - .rspec-report-opts
+  variables:
+    QA_SCENARIO: "Test::Integration::ServicePingDisabled"
+
 # Disabling geo jobs temporarily due to https://gitlab.com/gitlab-org/gitlab/-/issues/273063
 # ee:geo:
 #   extends:
@@ -920,9 +1004,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 +1017,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 +1041,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 +1054,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
@@ -981,6 +1087,7 @@ ce:gitaly-cluster:
     - .rspec-report-opts
   variables:
     QA_SCENARIO: "Test::Integration::GitalyCluster"
+    QA_LOG_PATH: "tmp/gitaly_cluster.log"
 
 ce:gitaly-cluster-quarantine:
   extends:
@@ -992,6 +1099,7 @@ ce:gitaly-cluster-quarantine:
     - .rspec-report-opts
   variables:
     QA_SCENARIO: "Test::Integration::GitalyCluster"
+    QA_LOG_PATH: "tmp/gitaly_cluster.log"
 
 ee:gitaly-cluster:
   extends:
@@ -1002,6 +1110,7 @@ ee:gitaly-cluster:
     - .rspec-report-opts
   variables:
     QA_SCENARIO: "Test::Integration::GitalyCluster"
+    QA_LOG_PATH: "tmp/gitaly_cluster.log"
 
 ee:gitaly-cluster-quarantine:
   extends:
@@ -1013,6 +1122,7 @@ ee:gitaly-cluster-quarantine:
     - .rspec-report-opts
   variables:
     QA_SCENARIO: "Test::Integration::GitalyCluster"
+    QA_LOG_PATH: "tmp/gitaly_cluster.log"
 
 ce:mtls:
   extends:

data/docs/run_qa_against_gdk.md

@@ -49,6 +49,16 @@ make a few changes to your `gdk/gitlab/config/gitlab.yml` file.
 **Note:** The hostname of the URL provided to `gitlab-qa` must match the hostname configured for GDK.
 If they do not match, a test will be signed out when it visits a page directly because the hostname of the URL visited will be different from the hostname that was used when signing in.
 
+**Note:** When you log into your GDK instance of GitLab for the first time, the root password requires a change.
+GitLab QA expects the default initial password to be used in tests; see all default values listed in
+[Supported GitLab environment variables](what_tests_can_be_run.md#supported-gitlab-environment-variables).
+If you have changed your root password, you must set the `GITLAB_INITIAL_ROOT_PASSWORD` environment
+variable.
+
+```
+export GITLAB_INITIAL_ROOT_PASSWORD="<GDK root password>"
+```
+
 ### Running EE tests
 
 When running EE tests you'll need to have a license available. GitLab engineers can [request a license](https://about.gitlab.com/handbook/developer-onboarding/#working-on-gitlab-ee).
@@ -101,7 +111,7 @@ your DNS and point to the IP/port of `dnsdock` application.
 
 ### Docker on macOS caveats
 
-When using OS X Docker, you need to go to Preferences > Advanced and allocate at least **5.0 GB**,
+When using OS X Docker, you need to go to Preferences > Resources > Advanced and allocate at least **5.0 GB**,
 otherwise some steps may fail to execute the `chrome-webdriver`.
 
 When using docker-machine, see [this StackOverflow link for increasing memory](https://stackoverflow.com/questions/32834082/how-to-increase-docker-machine-memory-mac/36982696#36982696).

data/docs/running_against_remote_grid.md

@@ -8,20 +8,49 @@ I.e, if you have a Selenium server set up at http://localhost:4444 or if you hav
 
 | Variable                  | Description                                                    | Default  | Example(s)                     |
 |---------------------------|----------------------------------------------------------------|----------|--------------------------------|
-| QA_BROWSER                | Browser to run against                                         | "chrome" | "chrome" "firefox"             |
+| QA_BROWSER                | Browser to run against                                         | "chrome" | "chrome" "firefox" "safari"    |
 | QA_REMOTE_GRID_PROTOCOL   | Protocol to use                                                | "http"   | "http" "https"                 |
 | QA_REMOTE_GRID            | Remote grid to run tests against                               |          | "localhost:3000" "provider:80" |
-| QA_REMOTE_GRID_USERNAME   | Username to specify in the remote grid. "USERNAME@provider:80" |          |                                |
+| QA_REMOTE_GRID_USERNAME   | Username to specify in the remote grid. "USERNAME@provider:80" |          | "gitlab-sl"                    |
 | QA_REMOTE_GRID_ACCESS_KEY | Key/Token paired with `QA_REMOTE_GRID_USERNAME`                |          |                                |
+| QA_REMOTE_TUNNEL_ID       | Name of the remote tunnel to use                               | "gitlab-sl_tunnel_id" |                                |
+| QA_REMOTE_MOBILE_DEVICE_NAME | Name of mobile device to test against. `QA_BROWSER` must be set to `safari` for iOS devices and `chrome` for Android devices.                                                |          | "iPhone 12 Simulator"          |
 
-## Examples
+## Testing with Sauce Labs
 
-*Run QA Smoke Tests against firefox on SauceLabs*
+Running directly against an environment like staging is not recommended because test logs expose credentials. Therefore, it is best practice and the default to use a tunnel.
 
-```bash
-$ QA_BROWSER=firefox \
-  QA_REMOTE_GRID=ondemand.saucelabs.com:80 \
-  QA_REMOTE_GRID_USERNAME=user \
-  QA_REMOTE_GRID_ACCESS_KEY=privatetoken \
-  gitlab-qa Test::Instance::All --tags smoke
+To install a tunnel, follow these [instructions](https://docs.saucelabs.com/secure-connections/sauce-connect/installation). 
+
+To start the tunnel, copy the run command in **Sauce Labs > Tunnels** and run it in the terminal. You must be logged in to Sauce Labs. Use the credentials in 1Password to log in.
+
+It is highly recommended to use `GITLAB_QA_ACCESS_TOKEN` to speed up tests and reduce flakiness.
+
+
+### Run a test in a desktop browser
+
+While tunnel is running, to test against a local instance in a desktop browser, run:
+```shell
+$ QA_BROWSER="safari" \
+  QA_REMOTE_GRID="ondemand.saucelabs.com:80" \
+  QA_REMOTE_GRID_USERNAME="gitlab-sl" \
+  QA_REMOTE_GRID_ACCESS_KEY="<access key found in Sauce Lab account>" \
+  GITLAB_QA_ACCESS_TOKEN="<token>" \
+  gitlab-qa Test::Instance::Any <CE|EE> http://<local_ip>:3000 -- -- <relative_spec_path>
 ```
+
+### Run a test in a mobile device browser
+
+`QA_REMOTE_MOBILE_DEVICE_NAME` can be any device name in the [supported browser devices](https://saucelabs.com/platform/supported-browsers-devices) in the Emulators/simulators list, and the latest versions of Android or iOS. You must set `QA_BROWSER` to `safari` for iOS devices and `chrome` for Android devices.```
+
+```shell
+$ QA_BROWSER="safari" \
+  QA_REMOTE_MOBILE_DEVICE_NAME="iPhone 12 Simulator" \
+  QA_REMOTE_GRID="ondemand.saucelabs.com:80" \
+  QA_REMOTE_GRID_USERNAME="gitlab-sl" \
+  QA_REMOTE_GRID_ACCESS_KEY="<found in Sauce Lab account>" \
+  GITLAB_QA_ACCESS_TOKEN="<token>" \
+  gitlab-qa Test::Instance::Any <CE|EE> http://<local_ip>:3000 -- -- <relative_spec_path>
+```
+
+Results can be watched in real time in Sauce Labs under AUTOMATED > Test Results

data/docs/what_tests_can_be_run.md

@@ -62,6 +62,7 @@ All environment variables used by GitLab QA should be defined in [`lib/gitlab/qa
 | `QA_ARTIFACTS_DIR` |`/tmp/gitlab-qa`| Path to a directory where artifacts (logs and screenshots) for failing tests will be saved. | No|
 | `DOCKER_HOST` |`http://localhost`| Docker host to run tests against. | No|
 | `WEBDRIVER_HEADLESS` |-  | When running locally, set to `false` to allow Chrome tests to be visible - watch your tests being run. | No|
+| `CHROME_DISABLE_DEV_SHM` | `false` | Set to `true` to disable `/dev/shm` usage in Chrome on Linux. | No|
 | `QA_ADDITIONAL_REPOSITORY_STORAGE` |-  | The name of additional, non-default storage to be used with tests tagged `repository_storage`, run via the `Test::Instance::RepositoryStorage` scenario.  Note: Admin access is required to change repository storage. | No|
 | `QA_PRAEFECT_REPOSITORY_STORAGE` |-  | The name of repository storage using Praefect. Note: Admin access is required to change repository storage. | No|
 | `QA_COOKIES` |-  | Optionally set to "cookie1=value;cookie2=value" in order to add a cookie to every request. This can be used to set the canary cookie by setting it to "gitlab_canary=true". | No|

data/lib/gitlab/qa/component/elasticsearch.rb

@@ -21,6 +21,7 @@ module Gitlab
             command << "--publish 9300:9300"
 
             command.env("discovery.type", "single-node")
+            command.env("ES_JAVA_OPTS", "-Xms512m -Xmx512m")
           end
         end
       end

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/report/results_in_issues.rb

@@ -35,7 +35,7 @@ module Gitlab
           issue = find_linked_results_issue_by_iid(testcase, test)
 
           if issue
-            issue = update_issue_title(issue, test, 'issue') if issue.title.strip != title_from_test(test)
+            issue = update_issue_title(issue, test, 'issue') if issue_title_needs_updating?(issue, test)
           else
             puts "No valid issue link found"
             issue = find_or_create_results_issue(test)
@@ -51,7 +51,7 @@ module Gitlab
           testcase = find_testcase_by_iid(test)
 
           if testcase
-            testcase = update_issue_title(testcase, test, 'test_case') if testcase.title.strip != title_from_test(test)
+            testcase = update_issue_title(testcase, test, 'test_case') if issue_title_needs_updating?(testcase, test)
           else
             testcase = find_issue(test, 'test_case')
           end
@@ -67,6 +67,10 @@ module Gitlab
           find_issue_by_iid(iid, 'test_case')
         end
 
+        def issue_title_needs_updating?(issue, test)
+          issue.title.strip != title_from_test(test) && !%w[canary production preprod release].include?(pipeline)
+        end
+
         def find_linked_results_issue_by_iid(testcase, test)
           iid = issue_iid_from_testcase(testcase)
 

data/lib/gitlab/qa/runtime/env.rb

@@ -15,6 +15,8 @@ module Gitlab
           'QA_REMOTE_GRID_USERNAME' => :remote_grid_username,
           'QA_REMOTE_GRID_ACCESS_KEY' => :remote_grid_access_key,
           'QA_REMOTE_GRID_PROTOCOL' => :remote_grid_protocol,
+          'QA_REMOTE_MOBILE_DEVICE_NAME' => :remote_mobile_device_name,
+          'QA_REMOTE_TUNNEL_ID' => :remote_tunnel_id,
           'QA_BROWSER' => :browser,
           'QA_ADDITIONAL_REPOSITORY_STORAGE' => :qa_additional_repository_storage,
           'QA_PRAEFECT_REPOSITORY_STORAGE' => :qa_praefect_repository_storage,
@@ -121,7 +123,8 @@ module Gitlab
           'GOOGLE_JSON_KEY' => :google_json_key,
           'GCS_BUCKET_NAME' => :gcs_bucket_name,
           'SMOKE_ONLY' => :smoke_only,
-          'NO_ADMIN' => :no_admin
+          'NO_ADMIN' => :no_admin,
+          'CHROME_DISABLE_DEV_SHM' => :chrome_disable_dev_shm
         }.freeze
 
         ENV_VARIABLES.each do |env_name, method_name|

data/lib/gitlab/qa/runtime/omnibus_configurations/license_mode.rb

@@ -7,7 +7,7 @@ module Gitlab
         class LicenseMode < Default
           def configuration
             <<~OMNIBUS
-              gitlab_rails['env'] = { 'GITLAB_LICENSE_MODE' => 'test', 'CUSTOMER_PORTAL_URL' => 'https://customers.stg.gitlab.com' }
+              gitlab_rails['env'] = { 'GITLAB_LICENSE_MODE' => 'test', 'CUSTOMER_PORTAL_URL' => 'https://customers.staging.gitlab.com' }
             OMNIBUS
           end
         end

data/lib/gitlab/qa/scenario/test/integration/service_ping_disabled.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module QA
+    module Scenario
+      module Test
+        module Integration
+          class ServicePingDisabled < Scenario::Template
+            def perform(release, *rspec_args)
+              Component::Gitlab.perform do |gitlab|
+                gitlab.release = release
+                gitlab.network = 'test'
+
+                gitlab.omnibus_configuration << <<~OMNIBUS
+                  gitlab_rails['usage_ping_enabled'] = false;
+                OMNIBUS
+
+                gitlab.instance do
+                  Component::Specs.perform do |specs|
+                    specs.suite = 'Test::Integration::ServicePingDisabled'
+                    specs.release = gitlab.release
+                    specs.network = gitlab.network
+                    specs.args = [gitlab.address, *rspec_args]
+                  end
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/gitlab/qa/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module QA
-    VERSION = '7.13.2'.freeze
+    VERSION = '7.15.1'.freeze
   end
 end

data/lib/gitlab/qa.rb

@@ -72,6 +72,7 @@ module Gitlab
           autoload :ClientSSL, 'gitlab/qa/scenario/test/integration/client_ssl'
           autoload :Registry, 'gitlab/qa/scenario/test/integration/registry'
           autoload :RegistryTLS, 'gitlab/qa/scenario/test/integration/registry_tls'
+          autoload :ServicePingDisabled, 'gitlab/qa/scenario/test/integration/service_ping_disabled'
         end
 
         module Sanity

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 7.13.2
+  version: 7.15.1
 platform: ruby
 authors:
 - GitLab Quality
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-10-29 00:00:00.000000000 Z
+date: 2021-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control
@@ -309,6 +309,7 @@ files:
 - lib/gitlab/qa/scenario/test/integration/registry.rb
 - lib/gitlab/qa/scenario/test/integration/registry_tls.rb
 - lib/gitlab/qa/scenario/test/integration/saml.rb
+- lib/gitlab/qa/scenario/test/integration/service_ping_disabled.rb
 - lib/gitlab/qa/scenario/test/integration/smtp.rb
 - lib/gitlab/qa/scenario/test/integration/ssh_tunnel.rb
 - lib/gitlab/qa/scenario/test/omnibus/image.rb