gitlab-qa 3.3.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c1bc1540f6d6a9cb4fcd192bc71ac4e210801669e542f2961ee43fcd9b8f3a7
-  data.tar.gz: 1251851bf8c854295292845d08bb099c0a9e5bc6122af0b024b43a6d2211ac5d
+  metadata.gz: 10ff9ce3afe8746024b84ea1bd1fe0f30ccc73f1368a27951e5d2034070cd128
+  data.tar.gz: f96e2c77228886b267c9166068f4df25536c6848a81fd9934e87ae83dbd88d47
 SHA512:
-  metadata.gz: 65d6f5f1d170769d90454c3428ae4212acc98303e9d5c0c8aedf12f434d2abf9beb7d95db2cad9028c62607978d4643e25a7934ae9545d71c67013e3930f72c6
-  data.tar.gz: bcc1d3661032661c3b0088478848825327526aea38ecf0dd451992ec52c2c528140bf7753d6d4303657c4bbc4334107d22bd7900065c0d14867c5186afc208cc
+  metadata.gz: 53ee15a5af7bd0f0f2f9940d9346cc1efab4175cde77c8c57cc70296294a2b687946dbb8c734841c5db5a44451c57e4ac78a380bf4265323f7cba04bcb9b3b64
+  data.tar.gz: 761875c4b3cbc395d60a7a576ed4d3bd92db37ad0791a4ebacb280793ed7790041494933d961b299e15cc74c9dad37764b7358c623b7ea07174118ff32658634

data/lib/gitlab/qa.rb

@@ -1,72 +1,73 @@
-$LOAD_PATH << File.expand_path(__dir__)
-
 module Gitlab
   module QA
-    autoload :Release, 'qa/release'
-    autoload :Runner, 'qa/runner'
+    autoload :Release, 'gitlab/qa/release'
+    autoload :Runner, 'gitlab/qa/runner'
 
     module Runtime
-      autoload :Env, 'qa/runtime/env'
+      autoload :Env, 'gitlab/qa/runtime/env'
     end
 
     module Scenario
-      autoload :Actable, 'qa/scenario/actable'
-      autoload :Template, 'qa/scenario/template'
+      autoload :Actable, 'gitlab/qa/scenario/actable'
+      autoload :Template, 'gitlab/qa/scenario/template'
 
       module Test
         module Instance
-          autoload :Any, 'qa/scenario/test/instance/any'
-          autoload :Image, 'qa/scenario/test/instance/image'
-          autoload :RelativeUrl, 'qa/scenario/test/instance/relative_url'
-          autoload :Staging, 'qa/scenario/test/instance/staging'
-          autoload :Production, 'qa/scenario/test/instance/production'
-          autoload :Smoke, 'qa/scenario/test/instance/smoke'
-          autoload :Preprod, 'qa/scenario/test/instance/preprod'
+          autoload :Any, 'gitlab/qa/scenario/test/instance/any'
+          autoload :DeploymentBase, 'gitlab/qa/scenario/test/instance/deployment_base'
+          autoload :Image, 'gitlab/qa/scenario/test/instance/image'
+          autoload :RelativeUrl, 'gitlab/qa/scenario/test/instance/relative_url'
+          autoload :Staging, 'gitlab/qa/scenario/test/instance/staging'
+          autoload :Production, 'gitlab/qa/scenario/test/instance/production'
+          autoload :Smoke, 'gitlab/qa/scenario/test/instance/smoke'
+          autoload :Preprod, 'gitlab/qa/scenario/test/instance/preprod'
         end
 
         module Omnibus
-          autoload :Image, 'qa/scenario/test/omnibus/image'
-          autoload :Update, 'qa/scenario/test/omnibus/update'
-          autoload :Upgrade, 'qa/scenario/test/omnibus/upgrade'
+          autoload :Image, 'gitlab/qa/scenario/test/omnibus/image'
+          autoload :Update, 'gitlab/qa/scenario/test/omnibus/update'
+          autoload :Upgrade, 'gitlab/qa/scenario/test/omnibus/upgrade'
         end
 
         module Integration
-          autoload :Geo, 'qa/scenario/test/integration/geo'
-          autoload :LDAP, 'qa/scenario/test/integration/ldap'
-          autoload :LDAPNoTLS, 'qa/scenario/test/integration/ldap_no_tls'
-          autoload :LDAPTLS, 'qa/scenario/test/integration/ldap_tls'
-          autoload :SAML, 'qa/scenario/test/integration/saml'
-          autoload :GroupSAML, 'qa/scenario/test/integration/group_saml'
-          autoload :InstanceSAML, 'qa/scenario/test/integration/instance_saml'
-          autoload :Mattermost, 'qa/scenario/test/integration/mattermost'
-          autoload :Kubernetes, 'qa/scenario/test/integration/kubernetes'
-          autoload :ObjectStorage, 'qa/scenario/test/integration/object_storage'
-          autoload :OAuth, 'qa/scenario/test/integration/oauth'
+          autoload :Geo, 'gitlab/qa/scenario/test/integration/geo'
+          autoload :LDAP, 'gitlab/qa/scenario/test/integration/ldap'
+          autoload :LDAPNoTLS, 'gitlab/qa/scenario/test/integration/ldap_no_tls'
+          autoload :LDAPTLS, 'gitlab/qa/scenario/test/integration/ldap_tls'
+          autoload :SAML, 'gitlab/qa/scenario/test/integration/saml'
+          autoload :GroupSAML, 'gitlab/qa/scenario/test/integration/group_saml'
+          autoload :InstanceSAML, 'gitlab/qa/scenario/test/integration/instance_saml'
+          autoload :Mattermost, 'gitlab/qa/scenario/test/integration/mattermost'
+          autoload :Kubernetes, 'gitlab/qa/scenario/test/integration/kubernetes'
+          autoload :ObjectStorage, 'gitlab/qa/scenario/test/integration/object_storage'
+          autoload :OAuth, 'gitlab/qa/scenario/test/integration/oauth'
+          autoload :Elasticsearch, 'gitlab/qa/scenario/test/integration/elasticsearch'
         end
 
         module Sanity
-          autoload :Version, 'qa/scenario/test/sanity/version'
+          autoload :Version, 'gitlab/qa/scenario/test/sanity/version'
         end
       end
     end
 
     module Component
-      autoload :Gitlab, 'qa/component/gitlab'
-      autoload :InternetTunnel, 'qa/component/internet_tunnel'
-      autoload :LDAP, 'qa/component/ldap'
-      autoload :SAML, 'qa/component/saml'
-      autoload :Specs, 'qa/component/specs'
-      autoload :Staging, 'qa/component/staging'
-      autoload :Production, 'qa/component/production'
-      autoload :Minio, 'qa/component/minio'
-      autoload :Preprod, 'qa/component/preprod'
+      autoload :Gitlab, 'gitlab/qa/component/gitlab'
+      autoload :InternetTunnel, 'gitlab/qa/component/internet_tunnel'
+      autoload :LDAP, 'gitlab/qa/component/ldap'
+      autoload :SAML, 'gitlab/qa/component/saml'
+      autoload :Specs, 'gitlab/qa/component/specs'
+      autoload :Staging, 'gitlab/qa/component/staging'
+      autoload :Production, 'gitlab/qa/component/production'
+      autoload :Minio, 'gitlab/qa/component/minio'
+      autoload :Preprod, 'gitlab/qa/component/preprod'
+      autoload :Elasticsearch, 'gitlab/qa/component/elasticsearch'
     end
 
     module Docker
-      autoload :Command, 'qa/docker/command'
-      autoload :Engine, 'qa/docker/engine'
-      autoload :Shellout, 'qa/docker/shellout'
-      autoload :Volumes, 'qa/docker/volumes'
+      autoload :Command, 'gitlab/qa/docker/command'
+      autoload :Engine, 'gitlab/qa/docker/engine'
+      autoload :Shellout, 'gitlab/qa/docker/shellout'
+      autoload :Volumes, 'gitlab/qa/docker/volumes'
     end
   end
 end

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

@@ -0,0 +1,57 @@
+module Gitlab
+  module QA
+    module Component
+      class Elasticsearch
+        include Scenario::Actable
+
+        ELASTIC_IMAGE = 'docker.elastic.co/elasticsearch/elasticsearch'.freeze
+        ELASTIC_IMAGE_TAG = '5.6.12'.freeze
+
+        attr_reader :docker
+        attr_accessor :environment, :network
+        attr_writer :name
+
+        def initialize
+          @docker = Docker::Engine.new
+          @environment = {}
+        end
+
+        def name
+          @name ||= "elastic56"
+        end
+
+        def instance
+          prepare
+          start
+          yield self
+        ensure
+          teardown
+        end
+
+        def prepare
+          @docker.pull(ELASTIC_IMAGE, ELASTIC_IMAGE_TAG)
+          return if @docker.network_exists?(network)
+
+          @docker.network_create(network)
+        end
+
+        def start
+          @docker.run(ELASTIC_IMAGE, ELASTIC_IMAGE_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")
+          end
+        end
+
+        def teardown
+          @docker.stop(name)
+          @docker.remove(name)
+        end
+      end
+    end
+  end
+end

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

@@ -8,10 +8,13 @@ module Gitlab
       class Staging
         ADDRESS = 'https://staging.gitlab.com'.freeze
         def self.release
-          # Temporary fix so that the tests can run
+          # Auto-deploy builds have a tag formatted like 12.0.12345+5159f2949cb.59c9fa631
+          # but the version api returns a semver version like 12.0.1
+          # so images are tagged using minor and major semver components plus
+          # the EE commit ref, which is the 'revision' returned by the API
+          # and so the version used for the docker image tag is like 12.0-5159f2949cb
           # See: https://gitlab.com/gitlab-org/quality/staging/issues/56
-          # version = Version.new(address).fetch!
-          version = 'nightly'
+          version = Version.new(address).major_minor_revision
           image =
             if Runtime::Env.dev_access_token_variable
               "dev.gitlab.org:5005/gitlab/omnibus-gitlab/gitlab-ee:#{version}"
@@ -53,12 +56,20 @@ module Gitlab
 
             case response
             when Net::HTTPSuccess
-              JSON.parse(response.body).fetch('version')
+              JSON.parse(response.body)
             else
               raise InvalidResponseError.new(@uri.to_s, response)
             end
           end
 
+          def major_minor_revision
+            api_response = fetch!
+            version_regexp = /^v?(?<major>\d+)\.(?<minor>\d+)\.\d+/
+            match = version_regexp.match(api_response.fetch('version'))
+
+            "#{match[:major]}.#{match[:minor]}-#{api_response.fetch('revision')}"
+          end
+
           private
 
           def request

data/lib/gitlab/qa/runner.rb

@@ -7,8 +7,9 @@ module Gitlab
       # They're included here so that gitlab-qa treats them as valid options
       PASS_THROUGH_OPTS = [
         ['--address URL', 'Address of the instance to test'],
+        ['--enable-feature FEATURE_FLAG', 'Enable a feature before running tests'],
         ['--mattermost-address URL', 'Address of the Mattermost server'],
-        ['--enable-feature FEATURE_FLAG', 'Enable a feature before running tests']
+        ['--parallel', 'Execute tests in parallel']
       ].freeze
 
       # rubocop:disable Metrics/AbcSize

data/lib/gitlab/qa/scenario/test/instance/deployment_base.rb

@@ -0,0 +1,49 @@
+module Gitlab
+  module QA
+    module Scenario
+      module Test
+        module Instance
+          ##
+          # Base class to be used to define deployment environment scenarios
+          #
+          class DeploymentBase < Scenario::Template
+            def perform(release_name = nil, *rspec_args)
+              Runtime::Env.require_no_license!
+
+              release_name ||= '--'
+
+              case release_name
+              when '--'
+                rspec_args.unshift('--')
+                release = deployment_component.release
+              else
+                release = Release.new(release_name)
+              end
+
+              if release.dev_gitlab_org?
+                Docker::Command.execute(
+                  [
+                    'login',
+                    '--username gitlab-qa-bot',
+                    %(--password "#{Runtime::Env.dev_access_token_variable}"),
+                    Release::DEV_REGISTRY
+                  ]
+                )
+              end
+
+              Component::Specs.perform do |specs|
+                specs.suite = 'Test::Instance::All'
+                specs.release = release
+                specs.args = [deployment_component::ADDRESS, *rspec_args]
+              end
+            end
+
+            def deployment_component
+              raise NotImplementedError, 'Please define the Component for the deployment environment associated with this scenario.'
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/gitlab/qa/scenario/test/instance/preprod.rb

@@ -6,28 +6,9 @@ module Gitlab
           ##
           # Run test suite against pre.gitlab.com
           #
-          class Preprod < Scenario::Template
-            def perform(*rspec_args)
-              Runtime::Env.require_no_license!
-
-              release = Component::Preprod.release
-
-              if release.dev_gitlab_org?
-                Docker::Command.execute(
-                  [
-                    'login',
-                    '--username gitlab-qa-bot',
-                    %(--password "#{Runtime::Env.dev_access_token_variable}"),
-                    Release::DEV_REGISTRY
-                  ]
-                )
-              end
-
-              Component::Specs.perform do |specs|
-                specs.suite = 'Test::Instance::All'
-                specs.release = release
-                specs.args = [Component::Preprod::ADDRESS, *rspec_args]
-              end
+          class Preprod < DeploymentBase
+            def deployment_component
+              Component::Preprod
             end
           end
         end

data/lib/gitlab/qa/scenario/test/instance/production.rb

@@ -6,28 +6,9 @@ module Gitlab
           ##
           # Run test suite against gitlab.com
           #
-          class Production < Scenario::Template
-            def perform(*rspec_args)
-              Runtime::Env.require_no_license!
-
-              release = Component::Production.release
-
-              if release.dev_gitlab_org?
-                Docker::Command.execute(
-                  [
-                    'login',
-                    '--username gitlab-qa-bot',
-                    %(--password "#{Runtime::Env.dev_access_token_variable}"),
-                    Release::DEV_REGISTRY
-                  ]
-                )
-              end
-
-              Component::Specs.perform do |specs|
-                specs.suite = 'Test::Instance::All'
-                specs.release = release
-                specs.args = [Component::Production::ADDRESS, *rspec_args]
-              end
+          class Production < DeploymentBase
+            def deployment_component
+              Component::Production
             end
           end
         end

data/lib/gitlab/qa/scenario/test/instance/staging.rb

@@ -6,28 +6,9 @@ module Gitlab
           ##
           # Run test suite against staging.gitlab.com
           #
-          class Staging < Scenario::Template
-            def perform(*rspec_args)
-              Runtime::Env.require_no_license!
-
-              release = Component::Staging.release
-
-              if release.dev_gitlab_org?
-                Docker::Command.execute(
-                  [
-                    'login',
-                    '--username gitlab-qa-bot',
-                    %(--password "#{Runtime::Env.dev_access_token_variable}"),
-                    Release::DEV_REGISTRY
-                  ]
-                )
-              end
-
-              Component::Specs.perform do |specs|
-                specs.suite = 'Test::Instance::All'
-                specs.release = release
-                specs.args = [Component::Staging::ADDRESS, *rspec_args]
-              end
+          class Staging < DeploymentBase
+            def deployment_component
+              Component::Staging
             end
           end
         end

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

@@ -0,0 +1,48 @@
+module Gitlab
+  module QA
+    module Scenario
+      module Test
+        module Integration
+          class Elasticsearch < Scenario::Template
+            attr_reader :gitlab_name, :spec_suite
+
+            def initialize
+              @gitlab_name = 'gitlab-elastic'
+              @spec_suite = 'Test::Integration::Elasticsearch'
+            end
+
+            def before_perform(release)
+              raise ArgumentError, 'Elasticsearch is an EE only feature!' unless release.ee?
+            end
+
+            def perform(release, *rspec_args)
+              release = Release.new(release)
+              before_perform(release)
+
+              Component::Gitlab.perform do |gitlab|
+                gitlab.release = release
+                gitlab.name = gitlab_name
+                gitlab.network = 'test'
+
+                Component::Elasticsearch.perform do |elastic|
+                  elastic.instance do
+                    gitlab.instance do
+                      puts "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
+          end
+        end
+      end
+    end
+  end
+end

data/lib/gitlab/qa/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module QA
-    VERSION = '3.3.0'.freeze
+    VERSION = '4.0.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Grzegorz Bizon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-17 00:00:00.000000000 Z
+date: 2019-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control
@@ -148,6 +148,7 @@ files:
 - fixtures/ldap/tanuki.ldif
 - gitlab-qa.gemspec
 - lib/gitlab/qa.rb
+- lib/gitlab/qa/component/elasticsearch.rb
 - lib/gitlab/qa/component/gitlab.rb
 - lib/gitlab/qa/component/internet_tunnel.rb
 - lib/gitlab/qa/component/ldap.rb
@@ -167,12 +168,14 @@ files:
 - lib/gitlab/qa/scenario/actable.rb
 - lib/gitlab/qa/scenario/template.rb
 - lib/gitlab/qa/scenario/test/instance/any.rb
+- lib/gitlab/qa/scenario/test/instance/deployment_base.rb
 - lib/gitlab/qa/scenario/test/instance/image.rb
 - lib/gitlab/qa/scenario/test/instance/preprod.rb
 - lib/gitlab/qa/scenario/test/instance/production.rb
 - lib/gitlab/qa/scenario/test/instance/relative_url.rb
 - lib/gitlab/qa/scenario/test/instance/smoke.rb
 - lib/gitlab/qa/scenario/test/instance/staging.rb
+- lib/gitlab/qa/scenario/test/integration/elasticsearch.rb
 - lib/gitlab/qa/scenario/test/integration/geo.rb
 - lib/gitlab/qa/scenario/test/integration/group_saml.rb
 - lib/gitlab/qa/scenario/test/integration/instance_saml.rb