gitlab-qa 7.21.1 → 7.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d0474bbb165c8eb249d43ecaf01951a84cb6afe3e2acaae1277f8a5ef69cec1
-  data.tar.gz: 5fc154945416823b3ae095c88f41166eddf41896ec2c4be7d7a1c734d179b1a8
+  metadata.gz: 844c99c0251d384017a5276158c67476caba4da667ac93fd5c753641173a3c22
+  data.tar.gz: b67e5382bb0493a147dcaef6b6afa6e63591673b302c04dafb00a07da6e428c3
 SHA512:
-  metadata.gz: 86d3bd714931d4868e053629ba7fe65307e77e5199356fe3e85d23647023eccbcf76be49398c2f0a74c47348b6f3e7df57c10b12f3636c6587fd7f2175c203a0
-  data.tar.gz: d62d1eec5495a1fa420bdcdf0c95ba3222800519962871669ff2b4dad1f6046fe9d91f7413a397a75c66e405b7c10b19c200f378448b3ab37d5aee7c0c3110fb
+  metadata.gz: 7a0342f9b71831a3f5d0924506e6f00d0f0621e0bc44096b285d2346afb23284bb56ade7778fc1613df5a3c3bc3f13e10ef58634f38e57eb95fbd45f99d1f776
+  data.tar.gz: 91a8a798f1b3f642954022124e8cb3ca07ec52b2579503979c973e880a5cea202447a15dc5b869aa6ac291745f6ed6f5075e527d10af6d84adc615321f7de5fb

data/.gitlab-ci.yml

@@ -1190,6 +1190,21 @@ ee:jira-quarantine:
   variables:
     QA_SCENARIO: "Test::Integration::Jira"
 
+ce:integrations:
+  extends:
+    - .rules:ce-never-when-triggered-by-feature-flag-definition-change
+    - .test
+    - .high-capacity
+    - .ce-variables
+    - .rspec-report-opts
+  variables:
+    QA_SCENARIO: "Test::Integration::Integrations"
+
+ce:integrations-quarantine:
+  extends:
+    - ce:integrations
+    - .quarantine
+
 ce:large-setup:
   extends:
     - .rules:ce-never-when-triggered-by-feature-flag-definition-change

data/README.md

@@ -88,7 +88,6 @@ of tests.
 - [How it works](docs/how_it_works.md)
 - [Release process](docs/release_process.md)
 - [Run QA tests against your GDK setup](docs/run_qa_against_gdk.md)
-- [Running specific orchestrated tests](docs/running_specific_orchestrated_tests.md)
 - [Trainings](docs/trainings.md)
 - [Waits](docs/waits.md)
 - [What tests can be run?](docs/what_tests_can_be_run.md)

data/docs/what_tests_can_be_run.md

@@ -95,6 +95,7 @@ All environment variables used by GitLab QA should be defined in [`lib/gitlab/qa
 | `GITLAB_QA_USER_AGENT` |- | The browser user-agent to use instead of the default Chrome user-agent. | No|
 | `GEO_FAILOVER` | `false` | Set to `true` when a Geo secondary site has been promoted to a Geo primary site. | No|
 | `GITLAB_INITIAL_ROOT_PASSWORD` | `5iveL!fe` | Initial root password for Omnibus installations | No|
+| `COLORIZED_LOGS` | `false` | Colors GitLab QA and test logs to improve readability | No|
 
 ## [Supported Remote Grid environment variables](./running_against_remote_grid.md)
 
@@ -664,6 +665,20 @@ Example:
 $ gitlab-qa Test::Integration::Actioncable CE
 ```
 
+### `Test::Integration::Integrations CE|<full image address>`
+
+This scenario is intended to test the different integrations that a GitLab instance can offer, such as WebHooks to an external service, Jenkins, etc.
+
+To run tests against the GitLab container, a GitLab QA (`gitlab/gitlab-qa`)
+container is spun up and tests are run from it by running the
+`Test::Integration::Integrations` scenario.
+
+Example:
+
+```
+$ gitlab-qa Test::Integration::Integrations CE
+```
+
 ### `Test::Instance::Any CE|EE|<full image address>:nightly|latest|any_tag http://your.instance.gitlab`
 
 This tests that a live GitLab instance works as expected by running tests
@@ -877,12 +892,39 @@ $ gitlab-qa Test::Instance::Airgapped EE -- --tag smoke
 
 ### `Test::Instance::Image CE|EE|<full image address> --omnibus-config object_storage`
 
-This orchestrated scenario runs tests from the test suite against a GitLab instance which has object storage configured instead of using local storage. The omnibus configuration `object_storage` ([configurator](configuring_omnibus.md)), uses Minio and `object_storage_aws` uses an AWS S3 account with credentials configured in the pipeline as CI Variables (available on 1Password). Requires:
+This orchestrated scenario runs tests from the test suite against a GitLab instance which has object storage configured instead of using local storage. The omnibus configuration `object_storage` ([configurator](configuring_omnibus.md)), uses Minio and `object_storage_aws` uses an AWS S3 account with credentials configured in the pipeline as CI Variables. To use Google Cloud Storage pass `--omnibus-config object_storage_gcp`. According to the storage selected it requires:
+
+| Scenario              | Variable            | Description                          |
+|-----------------------|---------------------|--------------------------------------|
+| AWS S3 Object Storage | AWS_S3_REGION       | AWS region where bucket is created   |
+| AWS S3 Object Storage | AWS_S3_KEY_ID       | AWS credentials                      |
+| AWS S3 Object Storage | AWS_S3_ACCESS_KEY   | AWS credentials                      |
+| AWS S3 Object Storage | AWS_S3_BUCKET_NAME  | Name of the bucket set in AWS        |
+| GCP Object Storage    | GCS_BUCKET_NAME     | Name of the bucket set in AWS        |
+| GCP Object Storage    | GOOGLE_JSON_KEY     | JSON key credential                  |
+| GCP Object Storage    | GOOGLE_CLIENT_EMAIL | Email address of the service account |
+| GCP Object Storage    | GOOGLE_PROJECT      | GCP project name                     |
+
+These variables are available at 1Password QA Vault.
+
+### `Test::Integration::RegistryTLS EE`
+
+It requires GitLab's TLS certificate found on the [`tls_certificates`](https://gitlab.com/gitlab-org/gitlab-qa/-/blob/master/tls_certificates/gitlab/gitlab.test.crt) folder
+```
+$ export GITLAB_TLS_CERTIFICATE=$(cat /path/to/certificate.crt)
+```
+
+To run a scenario with an insecure registry enabled use `Test::Integration::Registry EE` instead (it does not require the above certificate).
+
+### Test::Integration::RegistryTLS EE --omnibus-config object_storage
+
+This scenario is a composition of two orchestrated scenarios. It tests the container registry (TLS-enabled) integrated with an object storage backend.
+
+ An example would be to pass the option `--omnibus-config object_storage_aws` and the registry will be pulling and pushing images using AWS Cloud Storage as a storage backend.
 
-* `AWS_S3_REGION` - Region where the bucket is created. To optimize latency, minimize costs, or address regulatory requirements, choose any AWS Region that is geographically close to you.
-* `AWS_S3_KEY_ID` - Key ID for the user accessing the bucket.
-* `AWS_S3_ACCESS_KEY` - Access Key for the user accessing the bucket.
-* `AWS_S3_BUCKET_NAME` - The name of the bucket where objects are stored. After a bucket is created, the name of that bucket cannot be used by another AWS account in any AWS Region until the bucket is deleted.
+ ```
+ GITLAB_TLS_CERTIFICATE=$(cat /path/to/certificate.crt) gitlab-qa Test::Integration::RegistryTLS EE --omnibus-config object_storage_aws
+ ```
 
 ### `Test::Instance::Geo EE|<full image address>:nightly|latest|any_tag http://geo-primary.gitlab http://geo-secondary.gitlab`
 

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

@@ -70,8 +70,8 @@ module Gitlab
           <<~MKDOWN.strip
             ### Executions
 
-            package-and-qa:
-            <img src="https://dashboards.quality.gitlab.net/render/d-solo/cW0UMgv7k/spec-health?orgId=1&var-run_type=package-and-qa&var-name=#{formatted_title}&panelId=4&width=1000&height=500" />
+            All Environments:
+            <img src="https://dashboards.quality.gitlab.net/render/d-solo/cW0UMgv7k/spec-health?orgId=1&var-run_type=All&var-name=#{formatted_title}&panelId=4&width=1000&height=500" />
           MKDOWN
         end
 

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

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module QA
+    module Scenario
+      module Test
+        module Integration
+          class Integrations < Scenario::Template
+            def perform(release, *rspec_args)
+              Component::Gitlab.perform do |gitlab|
+                gitlab.release = QA::Release.new(release)
+                gitlab.network = 'test'
+                gitlab.name = 'gitlab-integrations'
+                gitlab.instance do
+                  Component::Specs.perform do |specs|
+                    rspec_args << '--' unless rspec_args.include?('--')
+                    rspec_args << %w[--tag integrations]
+                    specs.suite = 'Test::Instance::All'
+                    specs.hostname = "qa-e2e-specs.#{gitlab.network}"
+                    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

@@ -2,6 +2,6 @@
 
 module Gitlab
   module QA
-    VERSION = '7.21.1'
+    VERSION = '7.22.0'
   end
 end

data/lib/gitlab/qa.rb

@@ -74,6 +74,7 @@ module Gitlab
           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'
+          autoload :Integrations, 'gitlab/qa/scenario/test/integration/integrations'
         end
 
         module Sanity

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 7.21.1
+  version: 7.22.0
 platform: ruby
 authors:
 - GitLab Quality
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-01-31 00:00:00.000000000 Z
+date: 2022-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control
@@ -228,7 +228,6 @@ files:
 - docs/release_process.md
 - docs/run_qa_against_gdk.md
 - docs/running_against_remote_grid.md
-- docs/running_specific_orchestrated_tests.md
 - docs/trainings.md
 - docs/waits.md
 - docs/what_tests_can_be_run.md
@@ -316,6 +315,7 @@ files:
 - lib/gitlab/qa/scenario/test/integration/gitaly_cluster.rb
 - lib/gitlab/qa/scenario/test/integration/group_saml.rb
 - lib/gitlab/qa/scenario/test/integration/instance_saml.rb
+- lib/gitlab/qa/scenario/test/integration/integrations.rb
 - lib/gitlab/qa/scenario/test/integration/jira.rb
 - lib/gitlab/qa/scenario/test/integration/kubernetes.rb
 - lib/gitlab/qa/scenario/test/integration/ldap.rb

data/docs/running_specific_orchestrated_tests.md

@@ -1,11 +0,0 @@
-# Running specific orchestrated tests
-
-## Maven artifact spec
-
-The [maven repository spec](https://gitlab.com/gitlab-org/gitlab/-/blob/master/qa/qa/specs/features/ee/browser_ui/5_package/maven_repository_spec.rb) creates a Maven artifact and links it to a GitLab project. The artifact is created within a [Maven docker image](https://gitlab.com/gitlab-org/gitlab/-/blob/master/qa/qa/service/docker_run/maven.rb#L8).
-
-Using `gitlab-qa` to run these tests reduces the likelihood of network errors between the maven container and GitLab instance.
-
-To run this with `gitlab-qa` you can use the `Test::Instance::Image` that is needed for your test. For example:
-
-`gitlab-qa Test::Instance::Image registry.gitlab.com/gitlab-org/build/omnibus-gitlab-mirror/gitlab-ee:2cb9a85d2beadd51b926eaddb05005403bee0013 -- --tag orchestrated qa/specs/features/ee/browser_ui/5_package/maven_repository_spec.rb` - runs the test against a specific Omnibus GitLab image that was built through `package-and-qa`.