gitlab-qa 8.0.0 → 8.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0982270bb1256eb950e30c84028a70fca0663c744fff1bf00cb1937f89936f43'
-  data.tar.gz: c2051a27b8027df5d47359a6b27a54338e25bfc37471dae2fe600087e118b392
+  metadata.gz: d9b328348db20338194b52a69ad58985c4f48bfec8b9a7989b44a1840c6d27d2
+  data.tar.gz: 11aaf09daf2aac04f0f06e626087230b959ee68eba236c516ae4ce28df808817
 SHA512:
-  metadata.gz: c11dd80b24b285fcd8b93c94c0fabac93be215576eb307804c485ad9a5dbba4a7b6cd9f6b016f13082ba4c146f8189a2e7f6bf9b41ef85172a735696e2e558af
-  data.tar.gz: 0cf57dcfa1f30e37f2acc66015ed03c0d2e3d2bd65284f7be92d71b1028fadbceb9f72feaa7a4dad29905d7554a9f985885b6d95ca096944c1a955ffa0ac244d
+  metadata.gz: bd385edcc561ad24faf5cba3b3e8ed28ff444b3b801224657c3bfd425a759c4eb39a0090e9425dedba48b0c20be6ed6a9624e41e06e304bb929c1a1b2905f30c
+  data.tar.gz: d5b8fd24b8f23e8f9bc291c626261f200f54795df0ea613bca59a59e63c34779842657954f6a52b53c92fe466e203ff2aefa0c0501cef8e120ed4c3cd33acd6a

data/.gitlab/ci/jobs/cloud_activation.gitlab-ci.yml

@@ -1,7 +1,4 @@
 ee:cloud-activation:
-  before_script:
-    - unset EE_LICENSE
-    - !reference [default, before_script]
   extends:
     - .rules:ee-never-when-triggered-by-feature-flag-definition-change
     - .test
@@ -14,9 +11,6 @@ ee:cloud-activation:
     GITLAB_QA_OPTIONS_COMBINED: "$GITLAB_QA_OPTIONS --seed-db license*.rb"
 
 ee:cloud-activation-quarantine:
-  before_script:
-    - unset EE_LICENSE
-    - !reference [default, before_script]
   extends:
     - .rules:ee-never-when-triggered-by-feature-flag-definition-change
     - .test

data/.gitlab/ci/jobs/opensearch.gitlab-ci.yml

@@ -0,0 +1,20 @@
+ee:opensearch:
+  extends:
+    - .rules:ee-never-when-triggered-by-feature-flag-definition-change
+    - .test
+    - .high-capacity
+    - .ee-variables
+    - .rspec-report-opts
+  variables:
+    QA_SCENARIO: "Test::Integration::Opensearch"
+
+ee:opensearch-quarantine:
+  extends:
+    - .rules:ee-never-when-triggered-by-feature-flag-definition-change
+    - .test
+    - .high-capacity
+    - .ee-variables
+    - .quarantine
+    - .rspec-report-opts
+  variables:
+    QA_SCENARIO: "Test::Integration::Opensearch"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gitlab-qa (8.0.0)
+    gitlab-qa (8.1.0)
       activesupport (~> 6.1)
       gitlab (~> 4.18.0)
       http (~> 5.0)
@@ -13,7 +13,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.6)
+    activesupport (6.1.6.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -72,11 +72,11 @@ GEM
     faraday-em_http (1.0.0)
     faraday-em_synchrony (1.0.0)
     faraday-excon (1.1.0)
-    faraday-http-cache (2.2.0)
+    faraday-http-cache (2.4.0)
       faraday (>= 0.8)
     faraday-httpclient (1.0.1)
-    faraday-multipart (1.0.3)
-      multipart-post (>= 1.2, < 3)
+    faraday-multipart (1.0.4)
+      multipart-post (~> 2)
     faraday-net_http (1.0.1)
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
@@ -101,7 +101,7 @@ GEM
       rubocop-rails (~> 2.9)
       rubocop-rspec (~> 1.44)
     hashdiff (1.0.1)
-    http (5.0.4)
+    http (5.1.0)
       addressable (~> 2.8)
       http-cookie (~> 1.0)
       http-form_data (~> 2.2)
@@ -112,7 +112,7 @@ GEM
     httparty (0.20.0)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
-    i18n (1.10.0)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.4)
     kramdown (2.4.0)
@@ -127,17 +127,17 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2022.0105)
     mini_portile2 (2.8.0)
-    minitest (5.15.0)
+    minitest (5.16.2)
     multi_xml (0.6.0)
-    multipart-post (2.1.1)
+    multipart-post (2.2.3)
     nap (1.1.0)
     no_proxy_fix (0.1.2)
-    nokogiri (1.13.6)
+    nokogiri (1.13.8)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    octokit (4.22.0)
-      faraday (>= 0.9)
-      sawyer (~> 0.8.0, >= 0.5.3)
+    octokit (4.25.1)
+      faraday (>= 1, < 3)
+      sawyer (~> 0.9)
     open4 (1.3.4)
     parallel (1.22.1)
     parser (3.1.2.0)
@@ -147,11 +147,11 @@ GEM
       method_source (~> 1.0)
     public_suffix (4.0.7)
     racc (1.6.0)
-    rack (2.2.3)
+    rack (2.2.4)
     rainbow (3.0.0)
     rake (13.0.6)
     rchardet (1.8.0)
-    regexp_parser (2.4.0)
+    regexp_parser (2.5.0)
     reverse_markdown (2.1.1)
       nokogiri
     rexml (3.2.5)
@@ -177,7 +177,7 @@ GEM
       rubocop-ast (>= 0.6.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (1.18.0)
+    rubocop-ast (1.19.1)
       parser (>= 3.1.1.0)
     rubocop-gitlab-security (0.1.1)
       rubocop (>= 0.51)
@@ -193,9 +193,9 @@ GEM
       rubocop-ast (>= 0.7.1)
     ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.5)
-    sawyer (0.8.2)
+    sawyer (0.9.2)
       addressable (>= 2.3.5)
-      faraday (> 0.8, < 2.0)
+      faraday (>= 0.17.3, < 3)
     solargraph (0.45.0)
       backport (~> 1.2)
       benchmark
@@ -215,8 +215,8 @@ GEM
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
     thor (1.2.1)
-    tilt (2.0.10)
-    tzinfo (2.0.4)
+    tilt (2.0.11)
+    tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
     unf (0.1.4)
       unf_ext
@@ -227,9 +227,9 @@ GEM
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
     webrick (1.7.0)
-    yard (0.9.27)
+    yard (0.9.28)
       webrick (~> 1.7.0)
-    zeitwerk (2.5.4)
+    zeitwerk (2.6.0)
 
 PLATFORMS
   ruby

data/docs/release_process.md

@@ -23,6 +23,7 @@ when we make a change - no matter the size of the change.
   - If there is one, update it if necessary.
   - If not, update [`lib/gitlab/qa/version.rb`] to an appropriate [semantic version](https://semver.org) in a new merge request using the [release template](https://gitlab.com/gitlab-org/gitlab-qa/blob/master/.gitlab/merge_request_templates/Release.md)
     and title the MR like `"Bump version to <version>"`.
+    - Run `bundle update` to update the `Gemfile.lock` with the new version number of `gitlab-qa`.
 - Merge the merge request.
 - The new version should automatically be tagged and pushed to Rubygems by the `gem-release` job in the merge commit pipeline.
 - Update the release notes for the newly created tag (https://gitlab.com/gitlab-org/gitlab-qa/-/tags):

data/docs/trainings.md

@@ -1,5 +1,7 @@
 # GitLab QA trainings
 
+The handbook has [information about the entire test automation framework](https://about.gitlab.com/handbook/engineering/quality/#test-automation-framework), including GitLab QA. There you can find links to additional documentation and videos.
+
 ## Build team training on GitLab QA
 
 A great introduction to the GitLab QA project, its internal structure, how it's

data/docs/what_tests_can_be_run.md

@@ -98,6 +98,7 @@ All environment variables used by GitLab QA should be defined in [`lib/gitlab/qa
 | `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|
+| `QA_DOCKER_ADD_HOSTS` |- | Comma separated list of hosts to add to /etc/hosts in docker container | No|
 
 ## [Supported Remote Grid environment variables](./running_against_remote_grid.md)
 

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

@@ -7,6 +7,7 @@ require 'uri'
 require 'forwardable'
 require 'openssl'
 require 'tempfile'
+require 'json'
 
 module Gitlab
   module QA
@@ -119,6 +120,10 @@ module Gitlab
           super
         end
 
+        def exist?(image, tag)
+          docker.manifest_exists?("#{image}:#{tag}")
+        end
+
         def prepare_gitlab_omnibus_config
           set_formless_login_token
           set_license_mode
@@ -202,18 +207,18 @@ module Gitlab
         end
 
         def rails_version
-          json = @docker.read_file(
-            @release.image, @release.tag,
-            '/opt/gitlab/version-manifest.json'
-          )
-
-          manifest = JSON.parse(json)
+          manifest = JSON.parse(read_package_manifest)
           {
             sha: manifest['software']['gitlab-rails']['locked_version'],
             source: manifest['software']['gitlab-rails']['locked_source']['git']
           }
         end
 
+        def package_version
+          manifest = JSON.parse(read_package_manifest)
+          manifest['software']['package-scripts']['locked_version']
+        end
+
         def copy_key_file(env_key)
           key_dir = ENV['CI_PROJECT_DIR'] || Dir.tmpdir
           key_file = Tempfile.new(env_key.downcase, key_dir)
@@ -229,6 +234,13 @@ module Gitlab
 
         private
 
+        def read_package_manifest
+          @docker.read_file(
+            @release.image, @release.tag,
+            '/opt/gitlab/version-manifest.json'
+          )
+        end
+
         # Copy certs to a temporary directory in current working directory.
         # This is needed for docker-in-docker ci environments where mount points outside of build dir are not accessible
         #

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

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module QA
+    module Component
+      class Opensearch < Base
+        DOCKER_IMAGE = 'opensearchproject/opensearch'
+
+        def name
+          @name ||= "elastic68"
+        end
+
+        def tag
+          Runtime::Env.opensearch_version
+        end
+
+        def start
+          @docker.run(image: image, tag: tag) do |command|
+            command << "-d"
+            command << "--name #{name}"
+            command << "--net #{network}"
+            command << "--publish 9200:9200"
+            command << "--publish 9300:9300"
+
+            command.env("discovery.type", "single-node")
+            command.env("ES_JAVA_OPTS", "-Xms512m -Xmx512m")
+            command.env("plugins.security.disabled", "true")
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -23,9 +23,7 @@ module Gitlab
 
           raise ArgumentError unless [suite, release].all?
 
-          @docker.login(**release.login_params) if release.login_params
-
-          @docker.pull(image: qa_image) unless Runtime::Env.skip_pull?
+          docker_pull_qa_image_if_needed
 
           Runtime::Logger.info("Running test suite `#{suite}` for #{release.project_name}")
 
@@ -52,6 +50,11 @@ module Gitlab
                 command.env('QA_HOSTNAME', hostname)
               end
 
+              unless Runtime::Env.docker_add_hosts.empty?
+                hosts = Runtime::Env.docker_add_hosts.map { |host| "--add-host=#{host} " }.join
+                command << hosts # override /etc/hosts in docker container when test runs
+              end
+
               env.merge(Runtime::Env.variables).each do |key, value|
                 command.env(key, value)
               end
@@ -70,6 +73,12 @@ module Gitlab
 
         private
 
+        def docker_pull_qa_image_if_needed
+          @docker.login(**release.login_params) if release.login_params
+
+          @docker.pull(image: qa_image) unless Runtime::Env.skip_pull?
+        end
+
         def args_with_flags(args, feature_flag_set)
           return args if feature_flag_set.empty?
 

data/lib/gitlab/qa/docker/engine.rb

@@ -110,6 +110,14 @@ module Gitlab
           Docker::Command.execute("rm -f #{name}")
         end
 
+        def manifest_exists?(name)
+          Docker::Command.execute("manifest inspect #{name}")
+        rescue Docker::Shellout::StatusError
+          false
+        else
+          true
+        end
+
         def container_exists?(name)
           Docker::Command.execute("container inspect #{name}")
         rescue Docker::Shellout::StatusError

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

@@ -232,6 +232,10 @@ module Gitlab
           env_var_value_if_defined('ELASTIC_VERSION') || '8.2.0'
         end
 
+        def opensearch_version
+          env_var_value_if_defined('OPENSEARCH_VERSION') || '2.0.1'
+        end
+
         def require_license!
           return if ENV.include?('EE_LICENSE')
 
@@ -357,6 +361,10 @@ module Gitlab
           "#{ci_project_name}-#{test_subset}"
         end
 
+        def docker_add_hosts
+          (env_var_value_if_defined('QA_DOCKER_ADD_HOSTS') || '').split(',')
+        end
+
         private
 
         def enabled?(value, default: true)

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

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module QA
+    module Scenario
+      module Test
+        module Integration
+          class Opensearch < Scenario::Template
+            attr_reader :gitlab_name, :spec_suite
+
+            def initialize
+              @gitlab_name = 'gitlab-opensearch'
+              # Currently the test suite that tests Advanced Search features is called 'Elasticsearch' which we hope to abstract to 'Advancedsearch' in the future
+              @spec_suite = 'QA::EE::Scenario::Test::Integration::Elasticsearch'
+            end
+
+            def before_perform(release)
+              raise ArgumentError, 'OpenSearch is an EE only feature!' unless release.ee?
+            end
+
+            def perform(release, *rspec_args)
+              release = QA::Release.new(release)
+              before_perform(release)
+
+              Component::Gitlab.perform do |gitlab|
+                gitlab.release = release
+                setup_opensearch_on gitlab
+
+                Component::Opensearch.perform do |opensearch|
+                  opensearch.network = 'test'
+                  opensearch.instance do
+                    gitlab.instance do
+                      Runtime::Logger.info("Running #{spec_suite} specs!")
+
+                      Component::Specs.perform do |specs|
+                        specs.suite = spec_suite
+                        specs.release = gitlab.release
+                        specs.network = gitlab.network
+                        specs.args = [gitlab.address, *rspec_args]
+                      end
+                    end
+                  end
+                end
+              end
+            end
+
+            def empty_index
+              @empty_index ||= ["gitlab-rake gitlab:elastic:create_empty_index"]
+            end
+
+            def setup_opensearch_on(instance)
+              instance.name = gitlab_name
+              instance.network = 'test'
+              instance.elastic_url = "http://elastic68:9200"
+              instance.exec_commands = empty_index
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/gitlab/qa/scenario/test/omnibus/update.rb

@@ -10,8 +10,44 @@ module Gitlab
         module Omnibus
           class Update < Scenario::Template
             def perform(from_release, to_release = nil, *rspec_args)
-              previous_release = QA::Release.new(from_release).previous_stable
-              current_release = QA::Release.new(to_release || from_release)
+              version = Component::Gitlab.perform do |gitlab|
+                gitlab.release = from_release
+                gitlab.act do
+                  pull
+                  package_version
+                end
+              end
+
+              if version
+                # Sub any plus symbols in version eg. "15.1.2+ce.0"
+                version.tr!('+', '-')
+                Runtime::Logger.info("Found previous version '#{version}'")
+
+                current_release = QA::Release.new(to_release || from_release)
+
+                type = current_release.ee? ? 'ee' : 'ce'
+
+                existing_previous = Component::Gitlab.perform do |gitlab|
+                  gitlab.act do
+                    next "gitlab/gitlab-#{type}:#{version}" if exist?("gitlab/gitlab-#{type}", version)
+
+                    next "gitlab/gitlab-#{type}:#{version}-#{type}.0" if exist?("gitlab/gitlab-#{type}", "#{version}-#{type}.0")
+
+                    nil
+                  end
+                end
+              else
+                Runtime::Logger.info("Could not find previous image version")
+                existing_previous = nil
+              end
+
+              previous_release = if existing_previous
+                                   Runtime::Logger.info("Using previous image '#{existing_previous}'")
+                                   QA::Release.new(existing_previous)
+                                 else
+                                   Runtime::Logger.info("Using stable as previous image")
+                                   QA::Release.new(from_release).previous_stable
+                                 end
 
               Docker::Volumes.new.with_temporary_volumes do |volumes|
                 Component::Gitlab.perform do |gitlab|

data/lib/gitlab/qa/version.rb

@@ -2,6 +2,6 @@
 
 module Gitlab
   module QA
-    VERSION = '8.0.0'
+    VERSION = '8.1.0'
   end
 end

data/scripts/generate-qa-jobs.rb

@@ -37,6 +37,7 @@ class GenerateQAJobs
     jobs.merge!(load_yml_contents('registry', should_automatically_run?('test_integration_registry')))
     jobs.merge!(load_yml_contents('packages', should_automatically_run?('test_instance_all_packages')))
     jobs.merge!(load_yml_contents('elasticsearch', should_automatically_run?('test_integration_elasticsearch')))
+    jobs.merge!(load_yml_contents('opensearch', should_automatically_run?('test_integration_opensearch')))
     jobs.merge!(load_yml_contents('praefect', should_automatically_run?('test_instance_all')))
     jobs.merge!(load_yml_contents('gitaly_cluster', should_automatically_run?('test_instance_all')))
     jobs.merge!(load_yml_contents('mtls', should_automatically_run?('test_instance_all_mtls')))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 8.0.0
+  version: 8.1.0
 platform: ruby
 authors:
 - GitLab Quality
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-06-27 00:00:00.000000000 Z
+date: 2022-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control
@@ -258,6 +258,7 @@ files:
 - ".gitlab/ci/jobs/object_storage_registry_tls.gitlab-ci.yml"
 - ".gitlab/ci/jobs/omnibus_image.gitlab-ci.yml"
 - ".gitlab/ci/jobs/omnibus_upgrade.gitlab-ci.yml"
+- ".gitlab/ci/jobs/opensearch.gitlab-ci.yml"
 - ".gitlab/ci/jobs/packages.gitlab-ci.yml"
 - ".gitlab/ci/jobs/praefect.gitlab-ci.yml"
 - ".gitlab/ci/jobs/registry.gitlab-ci.yml"
@@ -316,6 +317,7 @@ files:
 - lib/gitlab/qa/component/ldap.rb
 - lib/gitlab/qa/component/mail_hog.rb
 - lib/gitlab/qa/component/minio.rb
+- lib/gitlab/qa/component/opensearch.rb
 - lib/gitlab/qa/component/postgresql.rb
 - lib/gitlab/qa/component/preprod.rb
 - lib/gitlab/qa/component/production.rb
@@ -395,6 +397,7 @@ files:
 - lib/gitlab/qa/scenario/test/integration/ldap_tls.rb
 - lib/gitlab/qa/scenario/test/integration/mattermost.rb
 - lib/gitlab/qa/scenario/test/integration/mtls.rb
+- lib/gitlab/qa/scenario/test/integration/opensearch.rb
 - lib/gitlab/qa/scenario/test/integration/praefect.rb
 - lib/gitlab/qa/scenario/test/integration/registry.rb
 - lib/gitlab/qa/scenario/test/integration/registry_tls.rb