gitlab-qa 7.19.0 → 7.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7314a9036c9aeacae478aaf82d13baee97c53c94bf5aabe800ec0e9f98b5234d
-  data.tar.gz: 83fe883428323a6edc87c1993564de31dcd5afc79aada90798ea07d93a1b09fb
+  metadata.gz: 844c99c0251d384017a5276158c67476caba4da667ac93fd5c753641173a3c22
+  data.tar.gz: b67e5382bb0493a147dcaef6b6afa6e63591673b302c04dafb00a07da6e428c3
 SHA512:
-  metadata.gz: 7e3d05561762175dae31c8298ef4411595287f516f3fc809457e842c368a7ea712c6c2f697a1c1849c1ff26b060b68220327e5d3cb5e5792426bb886881a233a
-  data.tar.gz: 062b24dfdf48a7da1d309b0282f4972d1f6e72dbb2ad4a44f2ad8c2c352f3684ff0b423390070dcc83c9228b19597bc0ddfee94aef017810f5283c673511e472
+  metadata.gz: 7a0342f9b71831a3f5d0924506e6f00d0f0621e0bc44096b285d2346afb23284bb56ade7778fc1613df5a3c3bc3f13e10ef58634f38e57eb95fbd45f99d1f776
+  data.tar.gz: 91a8a798f1b3f642954022124e8cb3ca07ec52b2579503979c973e880a5cea202447a15dc5b869aa6ac291745f6ed6f5075e527d10af6d84adc615321f7de5fb

data/.gitlab-ci.yml

@@ -21,9 +21,6 @@ default:
     - bundle version
     - bundle config path vendor
     - bundle install --jobs=$(nproc) --retry=3 --quiet && bundle check
-    - if [ -n "$TRIGGERED_USER" ] && [ -n "$TRIGGER_SOURCE" ]; then
-        echo "Pipeline triggered by $TRIGGERED_USER at $TRIGGER_SOURCE";
-      fi
     - export LANG=C.UTF-8
 
 workflow:
@@ -98,7 +95,11 @@ rspec:
 .combined-gitlab-qa-options-script:
   script:
     - 'echo "Running: bundle exec exe/gitlab-qa ${QA_SCENARIO:=Test::Instance::Image} ${RELEASE:=$DEFAULT_RELEASE} $GITLAB_QA_OPTIONS_COMBINED -- $QA_TESTS $QA_RSPEC_TAGS $RSPEC_REPORT_OPTS"'
-    - bundle exec exe/gitlab-qa ${QA_SCENARIO:=Test::Instance::Image} ${RELEASE:=$DEFAULT_RELEASE} $GITLAB_QA_OPTIONS_COMBINED -- $QA_TESTS $QA_RSPEC_TAGS $RSPEC_REPORT_OPTS
+    - bundle exec exe/gitlab-qa ${QA_SCENARIO:=Test::Instance::Image} ${RELEASE:=$DEFAULT_RELEASE} $GITLAB_QA_OPTIONS_COMBINED -- $QA_TESTS $QA_RSPEC_TAGS $RSPEC_REPORT_OPTS || test_run_exit_code=$?
+    - bundle exec exe/gitlab-qa-report --update-screenshot-path "gitlab-qa-run-*/**/rspec-*.xml"
+    - export GITLAB_QA_ACCESS_TOKEN="$GITLAB_QA_PRODUCTION_ACCESS_TOKEN"
+    - if [ "$TOP_UPSTREAM_SOURCE_REF" == $TOP_UPSTREAM_DEFAULT_BRANCH ] || [[ "$TOP_UPSTREAM_SOURCE_JOB" == https://ops.gitlab.net* ]]; then exe/gitlab-qa-report --report-results "gitlab-qa-run-*/**/rspec-*.json" --test-case-project "$QA_TESTCASES_REPORTING_PROJECT" --results-issue-project "$QA_TEST_RESULTS_ISSUES_PROJECT" || true; fi
+    - exit $test_run_exit_code
 
 # The Test::Omnibus::Update scenarios require the release to be specified twice, which can't be done dynamically using the `variables` parameter
 # So instead we can use this script with two release variables
@@ -1189,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/component/telegraf.rb

@@ -0,0 +1,174 @@
+# frozen_string_literal: true
+
+require 'tempfile'
+
+module Gitlab
+  module QA
+    module Component
+      # Component to collect docker metrics
+      #
+      class Telegraf < Base
+        DOCKER_IMAGE = 'telegraf'
+        DOCKER_IMAGE_TAG = '1.21-alpine'
+        LOG_DIR = '/etc/telegraf/log'
+
+        def initialize
+          super
+
+          @name = DOCKER_IMAGE
+          @host_log_dir = "#{Runtime::Env.host_artifacts_dir}/#{@name}"
+          @environment = Runtime::Env.variables.slice(
+            'QA_INFLUXDB_TOKEN',
+            'QA_INFLUXDB_URL',
+            'QA_RUN_TYPE',
+            'CI_JOB_NAME',
+            'CI_PIPELINE_ID'
+          )
+        end
+
+        attr_reader :name, :host_log_dir, :telegraf_config
+
+        # Start container
+        #
+        # @return [void]
+        def start
+          docker.run(image: image, tag: tag) do |command|
+            set_command_args(command)
+            set_volumes(command)
+            set_environment(command)
+          end
+        end
+
+        # Run prepare commands
+        #
+        # @return [void]
+        def prepare
+          @telegraf_config = File.open("#{Dir.mktmpdir(nil, ENV['CI_BUILDS_DIR'])}/telegraf.conf", 'w') do |file|
+            file.write(config)
+            file.path
+          end
+          FileUtils.mkdir_p(host_log_dir)
+
+          prepare_docker_image
+          prepare_docker_container
+        end
+
+        # Run teardown
+        #
+        # @return [void]
+        def teardown
+          return unless run_telegraf?
+
+          super
+        end
+
+        private
+
+        # Set custom run command arguments
+        #
+        # @param [Docker::Command] command
+        # @return [void]
+        def set_command_args(command)
+          command << '-d'
+          command << "--name #{name}"
+          command << "--user root"
+          command << "--entrypoint telegraf"
+        end
+
+        # Set volumes
+        #
+        # @param [Docker::Command] command
+        # @return [void]
+        def set_volumes(command)
+          command.volume(host_log_dir, LOG_DIR)
+          command.volume('/var/run/docker.sock', '/var/run/docker.sock')
+          command.volume(telegraf_config, '/etc/telegraf/telegraf.conf', :ro)
+        end
+
+        # Set environment variables
+        #
+        # @param [Docker::Command] command
+        # @return [void]
+        def set_environment(command)
+          environment.each { |k, v| command.env(k, v) }
+        end
+
+        # Run main entrypoint
+        #
+        # @return [void]
+        def instance_no_teardown
+          if run_telegraf?
+            super
+          else
+            Runtime::Logger.debug("Skipping starting telegraf container!")
+            yield self if block_given?
+          end
+        end
+
+        # Should telegraf be started
+        #
+        # Run only on CI and skip if metrics explicitly disabled, run_type not set or influx params missing
+        #
+        # @return [Boolean]
+        def run_telegraf?
+          Runtime::Env.ci && Runtime::Env.qa_export_test_metrics? && Runtime::Env.qa_run_type && !missing_influx_config?
+        end
+
+        # Influxdb config params missing
+        #
+        # @return [Boolean]
+        def missing_influx_config?
+          environment.slice('QA_INFLUXDB_TOKEN', 'QA_INFLUXDB_URL').any? { |_k, v| v.blank? }
+        end
+
+        # Telegraf configuration
+        #
+        # @return [String]
+        def config
+          <<~CONFIG
+            [global_tags]
+              run_type = "${QA_RUN_TYPE}"
+              pipeline_id = "${CI_PIPELINE_ID}"
+              job_name = "${CI_JOB_NAME}"
+
+            [agent]
+              interval = "1s"
+              round_interval = true
+              metric_batch_size = 1000
+              metric_buffer_limit = 10000
+              collection_jitter = "0s"
+              flush_interval = "10s"
+              flush_jitter = "0s"
+              precision = ""
+              debug = true
+              logtarget = "file"
+              logfile = "#{LOG_DIR}/telegraf.log"
+              hostname = ""
+              omit_hostname = false
+
+            [[outputs.influxdb_v2]]
+              urls = ["${QA_INFLUXDB_URL}"]
+              token = "${QA_INFLUXDB_TOKEN}"
+              organization = "gitlab-qa"
+              bucket = "test-env-stats"
+
+            [[inputs.docker]]
+              endpoint = "unix:///var/run/docker.sock"
+              gather_services = false
+              container_names = []
+              source_tag = false
+              container_name_include = []
+              container_name_exclude = ["#{name}"]
+              timeout = "5s"
+              perdevice = false
+              perdevice_include = []
+              total = true
+              total_include = ["cpu", "blkio", "network"]
+              docker_label_include = []
+              docker_label_exclude = []
+          CONFIG
+        end
+      end
+    end
+  end
+end

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'erb'
+require 'date'
 
 module Gitlab
   module QA
@@ -24,7 +25,7 @@ module Gitlab
           end
 
           issue = gitlab.create_issue(
-            title: "Test session report | #{pipeline}",
+            title: "#{Time.now.strftime('%Y-%m-%d')} Test session report | #{pipeline}",
             description: generate_description(tests),
             labels: ['Quality', 'QA', 'triage report', pipeline_name_label]
           )

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

@@ -122,7 +122,7 @@ module Gitlab
             "found:canary.staging.gitlab.com"
           when 'preprod'
             'found:pre.gitlab.com'
-          when 'staging-orchestrated', 'nightly', QA::Runtime::Env.default_branch, 'staging-ref', 'release'
+          when 'nightly', QA::Runtime::Env.default_branch, 'staging-ref', 'release'
             "found:#{pipeline}"
           else
             raise "No `found:*` label for the `#{pipeline}` pipeline!"

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

@@ -117,6 +117,10 @@ module Gitlab
         def error_and_stack_trace(text)
           text.strip[/Error:(.*)/m, 1].to_s
         end
+
+        def updated_description(issue, test)
+          new_issue_description(test)
+        end
       end
     end
   end

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

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'erb'
+
 module Gitlab
   module QA
     module Report
@@ -59,7 +61,28 @@ module Gitlab
         end
 
         def new_issue_description(test)
-          "#{super}#{TEST_CASE_RESULTS_SECTION_TEMPLATE}"
+          "#{super}\n\n#{execution_graph_section(test)}"
+        end
+
+        def execution_graph_section(test)
+          formatted_title = ERB::Util.url_encode(test.name)
+
+          <<~MKDOWN.strip
+            ### Executions
+
+            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
+
+        def updated_description(testcase, test)
+          historical_results_section = testcase.description.match(/### DO NOT EDIT BELOW THIS LINE[\s\S]+/)
+
+          "#{new_issue_description(test)}\n\n#{historical_results_section}"
+        end
+
+        def issue_title_needs_updating?(testcase, test)
+          super || !testcase.description.include?(execution_graph_section(test)) && !%w[canary production preprod release].include?(pipeline)
         end
       end
     end

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

@@ -47,9 +47,14 @@ module Gitlab
         end
 
         def update_issue_title(issue, test)
-          warn(%(#{issue_type} title needs to be updated from '#{issue.title.strip}' to '#{title_from_test(test)}'))
+          old_title = issue.title.strip
+          new_title = title_from_test(test)
 
-          gitlab.edit_issue(iid: issue.iid, options: { title: title_from_test(test) })
+          warn(%(#{issue_type} title needs to be updated from '#{old_title}' to '#{new_title}'))
+
+          new_description = updated_description(issue, test)
+
+          gitlab.edit_issue(iid: issue.iid, options: { title: new_title, description: new_description })
         end
 
         private

data/lib/gitlab/qa/runner.rb

@@ -62,16 +62,17 @@ module Gitlab
         args = remove_gitlab_qa_args(args)
 
         if args.size >= 1
+          scenario = Scenario.const_get(args.shift)
+
           load_omnibus_configurations
+          load_telegraf(scenario)
 
           begin
             @active_configurators.compact.each do |configurator|
               configurator.instance(skip_teardown: true)
             end
 
-            Scenario
-              .const_get(args.shift)
-              .perform(*args)
+            scenario.perform(*args)
           ensure
             @active_configurators.compact.each(&:teardown)
           end
@@ -100,6 +101,18 @@ module Gitlab
         end.compact
       end
 
+      # Start telegraf agent for metrics collection
+      #
+      # Do not load when running against external instance
+      #
+      # @param [Class] scenario
+      # @return [void]
+      def self.load_telegraf(scenario)
+        return if scenario <= Scenario::Test::Instance::DeploymentBase || scenario == Scenario::Test::Instance::Any
+
+        @active_configurators << Component::Telegraf.new
+      end
+
       def self.load_omnibus_configurations
         # OmnibusConfiguration::Test       => --test
         # OmnibusConfiguration::HelloThere => --hello_there

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

@@ -142,16 +142,12 @@ module Gitlab
         end
 
         def variables
-          vars = {}
-
-          ENV_VARIABLES.each do |name, attribute|
+          ENV_VARIABLES.each_with_object({}) do |(name, attribute), vars|
             # Variables that are overridden in the environment take precedence
             # over the defaults specified by the QA runtime.
             value = env_var_name_if_defined(name) || send(attribute) # rubocop:disable GitlabSecurity/PublicSend
             vars[name] = value if value
           end
-
-          vars
         end
 
         def debug?
@@ -179,15 +175,7 @@ module Gitlab
         end
 
         def pipeline_from_project_name
-          if ci_project_name.to_s.start_with?('gitlab-qa')
-            if env_var_value_if_defined('TOP_UPSTREAM_SOURCE_JOB').to_s.start_with?('https://ops.gitlab.net')
-              'staging-orchestrated'
-            else
-              QA::Runtime::Env.default_branch
-            end
-          else
-            ci_project_name
-          end
+          ci_project_name.to_s.start_with?('gitlab-qa') ? QA::Runtime::Env.default_branch : ci_project_name
         end
 
         def run_id
@@ -314,6 +302,10 @@ module Gitlab
           enabled?(env_var_value_if_defined('TEST_LICENSE_MODE'), default: false)
         end
 
+        def qa_export_test_metrics?
+          enabled?(env_var_value_if_defined('QA_EXPORT_TEST_METRICS'), default: true)
+        end
+
         private
 
         def enabled?(value, default: true)

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.19.0'
+    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
@@ -99,6 +100,7 @@ module Gitlab
       autoload :MailHog, 'gitlab/qa/component/mail_hog'
       autoload :Jira, 'gitlab/qa/component/jira'
       autoload :PostgreSQL, 'gitlab/qa/component/postgresql'
+      autoload :Telegraf, 'gitlab/qa/component/telegraf'
     end
 
     module Support

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 7.19.0
+  version: 7.22.0
 platform: ruby
 authors:
 - GitLab Quality
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-01-25 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
@@ -256,6 +255,7 @@ files:
 - lib/gitlab/qa/component/specs.rb
 - lib/gitlab/qa/component/staging.rb
 - lib/gitlab/qa/component/staging_ref.rb
+- lib/gitlab/qa/component/telegraf.rb
 - lib/gitlab/qa/docker/command.rb
 - lib/gitlab/qa/docker/engine.rb
 - lib/gitlab/qa/docker/shellout.rb
@@ -315,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`.