gitlab-qa 5.13.5 → 5.13.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 176ad29bc36b0c276fd9f0addab99fbc57b3cfc7cc4edec364921e7b2ed9d80a
-  data.tar.gz: 3cd4551211e72968b2403f58e3f0583f588cc3f4496e7da8fc31cd484e6ba013
+  metadata.gz: 742350ecaafcf21ca9ff0fc50547cbb6cd28b2cf7a3fc090f5cb6ab542da3154
+  data.tar.gz: e65a23e2620961c5751eca131cf0dfa4b639f2915488b888975e6a0313c8baee
 SHA512:
-  metadata.gz: 64f2a6f26ade53e538405d3f4f4a7d516205079add946969f2855a27a36e217b93dc6793b5bb2e1365edf0820518ed2e2510a46295903c44099b5fc8d829e652
-  data.tar.gz: f034880d5eee0b1f00b1ab9a60394203cfbd05d0d895f0a26b782f22baec0634880007be944a53a6aa565db908a064a04442041f02f7735fd4f7f83859f9c02d
+  metadata.gz: e42ac20b6a9dd4881c50d5018956241543395dae6c2aac148c1db87e77daa0ac677950a876ffa730e9d8f991c3850640775213ca6a0c8ebefa4a45dd2ab811c2
+  data.tar.gz: b7f993786ae4ac8fdc7b15d4d936cad11066e2f92731b30f696e8615a9454657f40d67e3cccb9074b6464755ab2d37a2e74569e92b66476328ee8215ea4543e3

data/docs/what_tests_can_be_run.md

@@ -69,7 +69,7 @@ For more details on the internals, please read the
 | `QA_SIMULATE_SLOW_CONNECTION` |-  | Set to `true` to configure Chrome's network settings to simulate a slow connection. | No|
 | `QA_SLOW_CONNECTION_LATENCY_MS` | `2000` | The additional latency (in ms) of the simulated slow connection. | No|
 | `QA_SLOW_CONNECTION_THROUGHPUT_KBPS` | `32` | The maximum throughput (in kbps) of the simulated slow connection. | No|
-| `QA_SKIP_PULL` | `false` | Set to `true` to skip pulling docker images (e.g., to use one you built locally). | No|
+| `QA_SKIP_PULL` |-  | Set to `true` to skip pulling docker images (e.g., to use one you built locally). | No|
 | `GITHUB_USERNAME` |-  | Username for authenticating with GitHub. | No|
 | `GITHUB_PASSWORD` |-  | Password for authenticating with GitHub. | No|
 | `GITLAB_QA_LOOP_RUNNER_MINUTES` | `1` | Minutes to run and repeat a spec while using the '--loop' option; default value is 1 minute. | No|

data/lib/gitlab/qa.rb

@@ -6,7 +6,6 @@ module Gitlab
 
     module Runtime
       autoload :Env, 'gitlab/qa/runtime/env'
-      autoload :Scenario, 'gitlab/qa/runtime/scenario'
       autoload :TokenFinder, 'gitlab/qa/runtime/token_finder'
     end
 
@@ -64,7 +63,6 @@ module Gitlab
     end
 
     module Component
-      autoload :Base, 'gitlab/qa/component/base'
       autoload :Gitlab, 'gitlab/qa/component/gitlab'
       autoload :InternetTunnel, 'gitlab/qa/component/internet_tunnel'
       autoload :LDAP, 'gitlab/qa/component/ldap'

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

@@ -1,19 +1,41 @@
 module Gitlab
   module QA
     module Component
-      class Elasticsearch < Base
-        DOCKER_IMAGE = 'docker.elastic.co/elasticsearch/elasticsearch'.freeze
+      class Elasticsearch
+        include Scenario::Actable
+
+        ELASTIC_IMAGE = 'docker.elastic.co/elasticsearch/elasticsearch'.freeze
+
+        attr_reader :docker
+        attr_accessor :environment, :network
+        attr_writer :name
+
+        def initialize
+          @docker = Docker::Engine.new
+          @environment = {}
+        end
 
         def name
           @name ||= "elastic68"
         end
 
-        def tag
-          Runtime::Env.elastic_version
+        def instance
+          prepare
+          start
+          yield self
+        ensure
+          teardown
+        end
+
+        def prepare
+          @docker.pull(ELASTIC_IMAGE, Runtime::Env.elastic_version)
+          return if @docker.network_exists?(network)
+
+          @docker.network_create(network)
         end
 
         def start
-          @docker.run(image, tag) do |command|
+          @docker.run(ELASTIC_IMAGE, Runtime::Env.elastic_version) do |command|
             command << "-d"
             command << "--name #{name}"
             command << "--net #{network}"
@@ -23,6 +45,11 @@ module Gitlab
             command.env("discovery.type", "single-node")
           end
         end
+
+        def teardown
+          @docker.stop(name)
+          @docker.remove(name)
+        end
       end
     end
   end

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

@@ -7,12 +7,13 @@ require 'openssl'
 module Gitlab
   module QA
     module Component
-      class Gitlab < Base
+      class Gitlab
         extend Forwardable
+        include Scenario::Actable
 
-        attr_reader :release
-        attr_accessor :tls, :disable_animations, :skip_availability_check
-        attr_writer :name, :relative_path
+        attr_reader :release, :docker
+        attr_accessor :volumes, :network, :environment, :tls, :disable_animations
+        attr_writer :name, :relative_path, :exec_commands, :skip_check
 
         def_delegators :release, :tag, :image, :edition
 
@@ -20,14 +21,17 @@ module Gitlab
         SSL_PATH = '/etc/gitlab/ssl'.freeze
 
         def initialize
-          super
-
+          @docker = Docker::Engine.new
+          @environment = {}
+          @volumes = {}
+          @network_aliases = []
           @disable_animations = true
-          @skip_availability_check = false
+          @skip_check = false
 
           @volumes[CERTIFICATES_PATH] = SSL_PATH
 
           self.release = 'CE'
+          self.exec_commands = []
         end
 
         def omnibus_config=(config)
@@ -44,6 +48,10 @@ module Gitlab
           @environment['ELASTIC_URL'] = url
         end
 
+        def add_network_alias(name)
+          @network_aliases.push(name)
+        end
+
         def release=(release)
           @release = QA::Release.new(release)
         end
@@ -64,6 +72,10 @@ module Gitlab
           tls ? '443' : '80'
         end
 
+        def hostname
+          "#{name}.#{network}"
+        end
+
         def relative_path
           @relative_path ||= ''
         end
@@ -72,16 +84,24 @@ module Gitlab
           Runtime::Env.accept_insecure_certs = 'true'
         end
 
-        def prepare
-          prepare_gitlab_omnibus_config
+        def instance
+          prepare
+          start
+          reconfigure
+          wait unless @skip_check
+          process_exec_commands
 
-          super
+          yield self if block_given?
+        ensure
+          teardown
         end
 
-        def pull
-          docker.login(**release.login_params) if release.login_params
+        alias_method :launch_and_teardown_instance, :instance
 
-          super
+        def prepare
+          prepare_gitlab_omnibus_config
+          prepare_docker_image
+          prepare_network
         end
 
         def prepare_gitlab_omnibus_config
@@ -89,6 +109,18 @@ module Gitlab
           set_formless_login_token
         end
 
+        def prepare_docker_image
+          return if Runtime::Env.skip_pull?
+
+          @docker.pull(image, tag)
+        end
+
+        def prepare_network
+          return if @docker.network_exists?(network)
+
+          @docker.network_create(network)
+        end
+
         def setup_disable_animations
           @environment['GITLAB_OMNIBUS_CONFIG'] = "gitlab_rails['gitlab_disable_animations'] = true; #{@environment['GITLAB_OMNIBUS_CONFIG'] || ''}"
         end
@@ -96,6 +128,28 @@ module Gitlab
         def start # rubocop:disable Metrics/AbcSize
           ensure_configured!
 
+          if release.dev_gitlab_org?
+            Docker::Command.execute(
+              [
+                'login',
+                '--username gitlab-qa-bot',
+                %(--password "#{Runtime::Env.dev_access_token_variable}"),
+                QA::Release::DEV_REGISTRY
+              ]
+            )
+          elsif release.omnibus_mirror?
+            bot_token = ENV['GITLAB_BOT_MULTI_PROJECT_PIPELINE_POLLING_TOKEN']
+
+            Docker::Command.execute(
+              [
+                'login',
+                '--username gitlab-bot',
+                %(--password "#{bot_token}"),
+                QA::Release::COM_REGISTRY
+              ]
+            )
+          end
+
           docker.run(image, tag) do |command|
             command << "-d -p #{port}"
             command << "--name #{name}"
@@ -127,9 +181,18 @@ module Gitlab
           end
         end
 
-        def wait
-          return if skip_availability_check
+        def restart
+          @docker.restart(name)
+        end
+
+        def teardown
+          raise 'Invalid instance name!' unless name
+
+          @docker.stop(name)
+          @docker.remove(name)
+        end
 
+        def wait
           if Availability.new(name, relative_path: relative_path, scheme: scheme, protocol_port: port.to_i).check(180)
             sleep 12 # TODO, handle that better
             puts ' -> GitLab is available.'
@@ -138,6 +201,10 @@ module Gitlab
           end
         end
 
+        def pull
+          @docker.pull(@release.image, @release.tag)
+        end
+
         def sha_version
           json = @docker.read_file(
             @release.image, @release.tag,
@@ -148,8 +215,14 @@ module Gitlab
           manifest['software']['gitlab-rails']['locked_version']
         end
 
+        def process_exec_commands
+          exec_commands.each { |command| @docker.exec(name, command) }
+        end
+
         private
 
+        attr_reader :exec_commands
+
         def ensure_configured!
           raise 'Please configure an instance first!' unless [name, release, network].all?
         end

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

@@ -3,14 +3,18 @@ require 'tempfile'
 module Gitlab
   module QA
     module Component
-      class InternetTunnel < Base
+      class InternetTunnel
+        include Scenario::Actable
+
         DOCKER_IMAGE = 'gitlab/ssh-tunnel'.freeze
         DOCKER_IMAGE_TAG = '1.0.0'.freeze
 
-        attr_writer :gitlab_hostname
+        attr_writer :gitlab_hostname, :name
+        attr_accessor :network
 
         def initialize
-          super
+          @docker = Docker::Engine.new
+          @volumes = {}
 
           key_dir = ENV['CI_PROJECT_DIR'] || Dir.tmpdir
           @ssh_key = Tempfile.new('tunnel-ssh-private-key', key_dir)
@@ -23,9 +27,14 @@ module Gitlab
         end
 
         def instance
-          raise 'Please provide a block!' unless block_given?
+          raise ArgumentError, 'Please provide a block!' unless block_given?
+
+          prepare
+          start
 
-          super
+          yield self
+        ensure
+          teardown
         end
 
         def url
@@ -38,6 +47,14 @@ module Gitlab
           @name ||= "ssh-tunnel-#{SecureRandom.hex(4)}"
         end
 
+        def prepare
+          @docker.pull(DOCKER_IMAGE, DOCKER_IMAGE_TAG)
+
+          return if @docker.network_exists?(network)
+
+          @docker.network_create(network)
+        end
+
         def tunnel_server_hostname
           ENV.fetch("TUNNEL_SERVER_HOSTNAME")
         end
@@ -60,9 +77,15 @@ module Gitlab
           end
         end
 
+        def restart
+          @docker.restart(name)
+        end
+
         def teardown
-          super
+          raise 'Invalid instance name!' unless name
 
+          @docker.stop(name)
+          @docker.remove(name)
           @ssh_key.unlink
         end
       end

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

@@ -1,22 +1,50 @@
 module Gitlab
   module QA
     module Component
-      class Jira < Base
-        DOCKER_IMAGE = 'registry.gitlab.com/gitlab-org/gitlab-qa/jira-gitlab'.freeze
-        DOCKER_IMAGE_TAG = '8.8-project-and-issue'.freeze
+      class Jira
+        include Scenario::Actable
+
+        JIRA_IMAGE = 'registry.gitlab.com/gitlab-org/gitlab-qa/jira-gitlab'.freeze
+        JIRA_IMAGE_TAG = '8.8-project-and-issue'.freeze
+
+        attr_reader :docker
+        attr_accessor :environment, :network
+        attr_writer :name
+
+        def initialize
+          @docker = Docker::Engine.new
+          @environment = {}
+        end
 
         def name
           @name ||= "jira"
         end
 
+        def hostname
+          "#{name}.#{network}"
+        end
+
         def instance
           raise 'Please provide a block!' unless block_given?
 
-          super
+          prepare
+          start
+
+          yield self
+        ensure
+          teardown
+        end
+
+        def prepare
+          @docker.pull(JIRA_IMAGE, JIRA_IMAGE_TAG)
+
+          return if @docker.network_exists?(network)
+
+          @docker.network_create(network)
         end
 
         def start
-          docker.run(image, tag) do |command|
+          docker.run(JIRA_IMAGE, JIRA_IMAGE_TAG) do |command|
             command << '-d '
             command << "--name #{name}"
             command << "--net #{network}"
@@ -25,6 +53,17 @@ module Gitlab
           end
         end
 
+        def restart
+          @docker.restart(name)
+        end
+
+        def teardown
+          raise 'Invalid instance name!' unless name
+
+          @docker.stop(name)
+          @docker.remove(name)
+        end
+
         def set_jira_hostname
           ::Gitlab::QA::Runtime::Env.jira_hostname = hostname
         end

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

@@ -15,16 +15,25 @@ require 'securerandom'
 module Gitlab
   module QA
     module Component
-      class LDAP < Base
-        DOCKER_IMAGE = 'osixia/openldap'.freeze
-        DOCKER_IMAGE_TAG = 'latest'.freeze
+      class LDAP
+        include Scenario::Actable
+
+        LDAP_IMAGE = 'osixia/openldap'.freeze
+        LDAP_IMAGE_TAG = 'latest'.freeze
         LDAP_USER = 'tanuki'.freeze
         LDAP_PASSWORD = 'password'.freeze
         BOOTSTRAP_LDIF = '/container/service/slapd/assets/config/bootstrap/ldif/custom'.freeze
         FIXTURE_PATH = File.expand_path('../../../../fixtures/ldap'.freeze, __dir__)
 
+        attr_reader :docker
+        attr_accessor :volumes, :network, :environment
+        attr_writer :name
+
         def initialize
-          super
+          @docker = Docker::Engine.new
+          @environment = {}
+          @volumes = {}
+          @network_aliases = []
 
           @volumes[FIXTURE_PATH] = BOOTSTRAP_LDIF
         end
@@ -49,21 +58,41 @@ module Gitlab
           LDAP_PASSWORD
         end
 
+        def add_network_alias(name)
+          @network_aliases.push(name)
+        end
+
         def name
           @name ||= "openldap-#{SecureRandom.hex(4)}"
         end
 
+        def hostname
+          "#{name}.#{network}"
+        end
+
         def instance
           raise 'Please provide a block!' unless block_given?
 
-          super
+          prepare
+          start
+
+          yield self
+        ensure
+          teardown
+        end
+
+        def prepare
+          @docker.pull(LDAP_IMAGE, LDAP_IMAGE_TAG)
+
+          return if @docker.network_exists?(network)
+
+          @docker.network_create(network)
         end
 
-        # rubocop:disable Metrics/AbcSize
         def start
           # copy-service needed for bootstraping LDAP user:
           # https://github.com/osixia/docker-openldap#seed-ldap-database-with-ldif
-          docker.run(image, tag, '--copy-service') do |command|
+          docker.run(LDAP_IMAGE, LDAP_IMAGE_TAG, '--copy-service') do |command|
             command << '-d '
             command << "--name #{name}"
             command << "--net #{network}"
@@ -82,7 +111,21 @@ module Gitlab
             end
           end
         end
-        # rubocop:enable Metrics/AbcSize
+
+        def restart
+          @docker.restart(name)
+        end
+
+        def teardown
+          raise 'Invalid instance name!' unless name
+
+          @docker.stop(name)
+          @docker.remove(name)
+        end
+
+        def pull
+          @docker.pull(LDAP_IMAGE, LDAP_IMAGE_TAG)
+        end
 
         def set_gitlab_credentials
           ::Gitlab::QA::Runtime::Env.ldap_username = username

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

@@ -4,22 +4,50 @@
 module Gitlab
   module QA
     module Component
-      class MailHog < Base
-        DOCKER_IMAGE = 'mailhog/mailhog'.freeze
-        DOCKER_IMAGE_TAG = 'v1.0.0'.freeze
+      class MailHog
+        include Scenario::Actable
+
+        MAILHOG_IMAGE = 'mailhog/mailhog'.freeze
+        MAILHOG_IMAGE_TAG = 'v1.0.0'.freeze
+
+        attr_reader :docker
+        attr_accessor :environment, :network
+        attr_writer :name
+
+        def initialize
+          @docker = Docker::Engine.new
+          @environment = {}
+        end
 
         def name
           @name ||= "mailhog"
         end
 
+        def hostname
+          "#{name}.#{network}"
+        end
+
         def instance
           raise 'Please provide a block!' unless block_given?
 
-          super
+          prepare
+          start
+
+          yield self
+        ensure
+          teardown
+        end
+
+        def prepare
+          @docker.pull(MAILHOG_IMAGE, MAILHOG_IMAGE_TAG)
+
+          return if @docker.network_exists?(network)
+
+          @docker.network_create(network)
         end
 
         def start
-          docker.run(image, tag) do |command|
+          docker.run(MAILHOG_IMAGE, MAILHOG_IMAGE_TAG) do |command|
             command << '-d '
             command << "--name #{name}"
             command << "--net #{network}"
@@ -29,6 +57,17 @@ module Gitlab
           end
         end
 
+        def restart
+          @docker.restart(name)
+        end
+
+        def teardown
+          raise 'Invalid instance name!' unless name
+
+          @docker.stop(name)
+          @docker.remove(name)
+        end
+
         def set_mailhog_hostname
           ::Gitlab::QA::Runtime::Env.mailhog_hostname = hostname
         end

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

@@ -6,18 +6,23 @@ require 'fileutils'
 module Gitlab
   module QA
     module Component
-      class Minio < Base
-        DOCKER_IMAGE = 'minio/minio'.freeze
-        DOCKER_IMAGE_TAG = 'latest'.freeze
+      class Minio
+        include Scenario::Actable
+
+        MINIO_IMAGE = 'minio/minio'.freeze
+        MINIO_IMAGE_TAG = 'latest'.freeze
         # These are secrets used in a local Minio container, they're not used for any online S3 server.
         AWS_ACCESS_KEY = 'AKIAIOSFODNN7EXAMPLE'.freeze
         AWS_SECRET_KEY = 'wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY'.freeze
         DATA_DIR = '/data'.freeze
         DEFAULT_PORT = 9000
 
-        def initialize
-          super
+        attr_reader :docker
+        attr_accessor :volumes, :network, :environment
+        attr_writer :name
 
+        def initialize
+          @docker = Docker::Engine.new
           @environment = { MINIO_ACCESS_KEY: AWS_ACCESS_KEY, MINIO_SECRET_KEY: AWS_SECRET_KEY }
           @volumes = { host_data_dir => DATA_DIR }
           @buckets = []
@@ -26,7 +31,12 @@ module Gitlab
         def instance
           raise 'Please provide a block!' unless block_given?
 
-          super
+          prepare
+          start
+
+          yield self
+        ensure
+          teardown
         end
 
         def add_bucket(name)
@@ -60,12 +70,16 @@ module Gitlab
           @name ||= "minio-#{SecureRandom.hex(4)}"
         end
 
+        def hostname
+          "#{name}.#{network}"
+        end
+
         def port
           DEFAULT_PORT
         end
 
         def prepare
-          super
+          @docker.pull(MINIO_IMAGE, MINIO_IMAGE_TAG)
 
           FileUtils.mkdir_p(host_data_dir)
 
@@ -73,12 +87,16 @@ module Gitlab
             puts "Creating Minio bucket: #{bucket}"
             FileUtils.mkdir_p(File.join(host_data_dir, bucket))
           end
+
+          return if @docker.network_exists?(network)
+
+          @docker.network_create(network)
         end
 
-        def start # rubocop:disable Metrics/AbcSize
+        def start
           # --compat needed until https://gitlab.com/gitlab-org/gitlab-workhorse/issues/210
           # is resolved
-          docker.run(image, tag, "server", "--compat", DATA_DIR) do |command|
+          docker.run(MINIO_IMAGE, MINIO_IMAGE_TAG, "server", "--compat", DATA_DIR) do |command|
             command << '-d '
             command << "--name #{name}"
             command << "--net #{network}"
@@ -97,6 +115,13 @@ module Gitlab
             end
           end
         end
+
+        def teardown
+          raise 'Invalid instance name!' unless name
+
+          @docker.stop(name)
+          @docker.remove(name)
+        end
       end
     end
   end

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

@@ -1,16 +1,43 @@
 module Gitlab
   module QA
     module Component
-      class PostgreSQL < Base
-        DOCKER_IMAGE = 'postgres'.freeze
-        DOCKER_IMAGE_TAG = '11'.freeze
+      class PostgreSQL
+        include Scenario::Actable
+
+        POSTGRES_IMAGE = 'postgres'.freeze
+        POSTGRES_IMAGE_TAG = '11'.freeze
+
+        attr_reader :docker
+        attr_accessor :environment, :network
+        attr_writer :name
+
+        def initialize
+          @docker = Docker::Engine.new
+          @environment = {}
+        end
 
         def name
           @name ||= "postgres"
         end
 
+        def instance
+          prepare
+          start
+          wait_until_ready
+          yield self
+        ensure
+          teardown
+        end
+
+        def prepare
+          @docker.pull(POSTGRES_IMAGE, POSTGRES_IMAGE_TAG)
+          return if @docker.network_exists?(network)
+
+          @docker.network_create(network)
+        end
+
         def start
-          @docker.run(image, tag) do |command|
+          @docker.run(POSTGRES_IMAGE, POSTGRES_IMAGE_TAG) do |command|
             command << "-d"
             command << "--name #{name}"
             command << "--net #{network}"
@@ -19,6 +46,11 @@ module Gitlab
           end
         end
 
+        def teardown
+          @docker.stop(name)
+          @docker.remove(name)
+        end
+
         def run_psql(command)
           @docker.exec(name, %(psql -U postgres #{command}))
         end

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

@@ -6,9 +6,22 @@ require 'securerandom'
 module Gitlab
   module QA
     module Component
-      class SAML < Base
-        DOCKER_IMAGE = 'jamedjo/test-saml-idp'.freeze
-        DOCKER_IMAGE_TAG = 'latest'.freeze
+      class SAML
+        include Scenario::Actable
+
+        SAML_IMAGE = 'jamedjo/test-saml-idp'.freeze
+        SAML_IMAGE_TAG = 'latest'.freeze
+
+        attr_reader :docker
+        attr_accessor :volumes, :network, :environment
+        attr_writer :name
+
+        def initialize
+          @docker = Docker::Engine.new
+          @environment = {}
+          @volumes = {}
+          @network_aliases = []
+        end
 
         def set_entity_id(entity_id)
           @environment['SIMPLESAMLPHP_SP_ENTITY_ID'] = entity_id
@@ -18,10 +31,18 @@ module Gitlab
           @environment['SIMPLESAMLPHP_SP_ASSERTION_CONSUMER_SERVICE'] = assertion_con_service
         end
 
+        def add_network_alias(name)
+          @network_aliases.push(name)
+        end
+
         def name
           @name ||= "saml-qa-idp"
         end
 
+        def hostname
+          "#{name}.#{network}"
+        end
+
         def group_name
           @group_name ||= "saml_sso_group-#{SecureRandom.hex(4)}"
         end
@@ -29,12 +50,25 @@ module Gitlab
         def instance
           raise 'Please provide a block!' unless block_given?
 
-          super
+          prepare
+          start
+
+          yield self
+        ensure
+          teardown
+        end
+
+        def prepare
+          pull
+
+          return if @docker.network_exists?(network)
+
+          @docker.network_create(network)
         end
 
         # rubocop:disable Metrics/AbcSize
         def start
-          docker.run(image, tag) do |command|
+          docker.run(SAML_IMAGE, SAML_IMAGE_TAG) do |command|
             command << '-d '
             command << "--name #{name}"
             command << "--net #{network}"
@@ -57,6 +91,21 @@ module Gitlab
         end
         # rubocop:enable Metrics/AbcSize
 
+        def restart
+          @docker.restart(name)
+        end
+
+        def teardown
+          raise 'Invalid instance name!' unless name
+
+          @docker.stop(name)
+          @docker.remove(name)
+        end
+
+        def pull
+          @docker.pull(SAML_IMAGE, SAML_IMAGE_TAG)
+        end
+
         def set_sandbox_name(sandbox_name)
           ::Gitlab::QA::Runtime::Env.gitlab_sandbox_name = sandbox_name
         end

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

@@ -19,7 +19,16 @@ module Gitlab
         def perform # rubocop:disable Metrics/AbcSize
           raise ArgumentError unless [suite, release].all?
 
-          @docker.login(**release.login_params) if release.login_params
+          if release.dev_gitlab_org?
+            Docker::Command.execute(
+              [
+                'login',
+                '--username gitlab-qa-bot',
+                %(--password "#{Runtime::Env.dev_access_token_variable}"),
+                QA::Release::DEV_REGISTRY
+              ]
+            )
+          end
 
           puts "Running test suite `#{suite}` for #{release.project_name}"
 

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

@@ -8,10 +8,6 @@ module Gitlab
           URI(DOCKER_HOST).host
         end
 
-        def login(username:, password:, registry:)
-          Docker::Command.execute("login --username '#{username}' --password '#{password}' #{registry}")
-        end
-
         def pull(image, tag)
           Docker::Command.execute("pull #{image}:#{tag}")
         end
@@ -67,10 +63,6 @@ module Gitlab
         def port(name, port)
           Docker::Command.execute("port #{name} #{port}/tcp")
         end
-
-        def running?(name)
-          Docker::Command.execute("ps -f name=#{name}").include?(name)
-        end
       end
     end
   end

data/lib/gitlab/qa/release.rb

@@ -135,26 +135,6 @@ module Gitlab
         end
       end
 
-      def login_params
-        if dev_gitlab_org?
-          Runtime::Env.require_qa_dev_access_token!
-
-          {
-            username: Runtime::Env.gitlab_dev_username,
-            password: Runtime::Env.dev_access_token_variable,
-            registry: DEV_REGISTRY
-          }
-        elsif omnibus_mirror?
-          Runtime::Env.require_gitlab_bot_multi_project_pipeline_polling_token!
-
-          {
-            username: Runtime::Env.gitlab_username,
-            password: Runtime::Env.gitlab_bot_multi_project_pipeline_polling_token,
-            registry: COM_REGISTRY
-          }
-        end
-      end
-
       def dev_gitlab_org?
         image.start_with?(DEV_REGISTRY)
       end

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

@@ -84,22 +84,10 @@ module Gitlab
           send(:attr_accessor, accessor) # rubocop:disable GitlabSecurity/PublicSend
         end
 
-        def gitlab_username
-          ENV['GITLAB_USERNAME'] || 'gitlab-qa'
-        end
-
-        def gitlab_dev_username
-          ENV['GITLAB_DEV_USERNAME'] || 'gitlab-qa-bot'
-        end
-
         def gitlab_api_base
           ENV['GITLAB_API_BASE'] || 'https://gitlab.com/api/v4'
         end
 
-        def gitlab_bot_multi_project_pipeline_polling_token
-          ENV['GITLAB_BOT_MULTI_PROJECT_PIPELINE_POLLING_TOKEN']
-        end
-
         def ci_job_name
           ENV['CI_JOB_NAME']
         end
@@ -207,14 +195,8 @@ module Gitlab
           end
         end
 
-        def require_gitlab_bot_multi_project_pipeline_polling_token!
-          return unless ENV['GITLAB_BOT_MULTI_PROJECT_PIPELINE_POLLING_TOKEN'].to_s.strip.empty?
-
-          raise ArgumentError, "Please provide GITLAB_BOT_MULTI_PROJECT_PIPELINE_POLLING_TOKEN"
-        end
-
         def skip_pull?
-          enabled?(ENV['QA_SKIP_PULL'], default: false)
+          (ENV['QA_SKIP_PULL'] =~ /^(false|no|0)$/i) != 0
         end
 
         def gitlab_qa_formless_login_token
@@ -223,12 +205,6 @@ module Gitlab
 
         private
 
-        def enabled?(value, default: true)
-          return default if value.nil?
-
-          (value =~ /^(false|no|0)$/i) != 0
-        end
-
         def env_value_if_defined(variable)
           # Pass through the variables if they are defined in the environment
           return "$#{variable}" if ENV[variable]

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

@@ -31,7 +31,7 @@ module Gitlab
                         praefect.release = QA::Release.new(release)
                         praefect.name = @praefect_node
                         praefect.network = @network
-                        praefect.skip_availability_check = true
+                        praefect.skip_check = true
 
                         praefect.omnibus_config = praefect_omnibus_configuration
 
@@ -149,7 +149,7 @@ module Gitlab
                 gitaly.release = QA::Release.new(release)
                 gitaly.name = name
                 gitaly.network = @network
-                gitaly.skip_availability_check = true
+                gitaly.skip_check = true
 
                 gitaly.omnibus_config = gitaly_omnibus_configuration
 

data/lib/gitlab/qa/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module QA
-    VERSION = '5.13.5'.freeze
+    VERSION = '5.13.6'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 5.13.5
+  version: 5.13.6
 platform: ruby
 authors:
 - Grzegorz Bizon
@@ -237,7 +237,6 @@ files:
 - fixtures/ldap/tanuki.ldif
 - gitlab-qa.gemspec
 - lib/gitlab/qa.rb
-- lib/gitlab/qa/component/base.rb
 - lib/gitlab/qa/component/elasticsearch.rb
 - lib/gitlab/qa/component/gitlab.rb
 - lib/gitlab/qa/component/internet_tunnel.rb
@@ -264,7 +263,6 @@ files:
 - lib/gitlab/qa/reporter.rb
 - lib/gitlab/qa/runner.rb
 - lib/gitlab/qa/runtime/env.rb
-- lib/gitlab/qa/runtime/scenario.rb
 - lib/gitlab/qa/runtime/token_finder.rb
 - lib/gitlab/qa/scenario/actable.rb
 - lib/gitlab/qa/scenario/cli_commands.rb

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

@@ -1,131 +0,0 @@
-module Gitlab
-  module QA
-    module Component
-      class Base
-        include Scenario::Actable
-
-        attr_reader :docker
-        attr_accessor :volumes, :network, :environment
-        attr_writer :name, :exec_commands
-
-        def initialize
-          @docker = Docker::Engine.new
-          @environment = {}
-          @volumes = {}
-          @network_aliases = []
-
-          self.exec_commands = []
-        end
-
-        def add_network_alias(name)
-          @network_aliases.push(name)
-        end
-
-        def name
-          raise NotImplementedError, "#{self.class.name} must specify a default name"
-        end
-
-        def hostname
-          "#{name}.#{network}"
-        end
-
-        def image
-          return self.class.const_get('DOCKER_IMAGE') if self.class.const_defined?('DOCKER_IMAGE')
-
-          raise NotImplementedError, "#{self.class.name} must specify a docker image as DOCKER_IMAGE"
-        end
-
-        def tag
-          return self.class.const_get('DOCKER_IMAGE_TAG') if self.class.const_defined?('DOCKER_IMAGE_TAG')
-
-          raise NotImplementedError, "#{self.class.name} must specify a docker image tag as DOCKER_IMAGE_TAG"
-        end
-
-        def instance
-          prepare
-          start
-          reconfigure
-          wait_until_ready
-          process_exec_commands
-
-          yield self if block_given?
-        ensure
-          teardown
-        end
-
-        alias_method :launch_and_teardown_instance, :instance
-
-        def prepare
-          prepare_docker_image
-          prepare_network
-        end
-
-        def prepare_docker_image
-          return if Runtime::Env.skip_pull?
-
-          pull
-        end
-
-        def prepare_network
-          return if docker.network_exists?(network)
-
-          docker.network_create(network)
-        end
-
-        def start # rubocop:disable Metrics/AbcSize
-          docker.run(image, tag) do |command|
-            command << "-d"
-            command << "--name #{name}"
-            command << "--net #{network}"
-            command << "--hostname #{hostname}"
-
-            @volumes.to_h.each do |to, from|
-              command.volume(to, from, 'Z')
-            end
-
-            command.volume(File.join(Runtime::Env.host_artifacts_dir, name, 'logs'), '/var/log/gitlab', 'Z')
-
-            @environment.to_h.each do |key, value|
-              command.env(key, value)
-            end
-
-            @network_aliases.to_a.each do |network_alias|
-              command << "--network-alias #{network_alias}"
-            end
-          end
-        end
-
-        def restart
-          assert_name!
-
-          docker.restart(name)
-        end
-
-        def teardown
-          assert_name!
-
-          return unless docker.running?(name)
-
-          docker.stop(name)
-          docker.remove(name)
-        end
-
-        def pull
-          docker.pull(image, tag)
-        end
-
-        def process_exec_commands
-          exec_commands.each { |command| docker.exec(name, command) }
-        end
-
-        private
-
-        attr_reader :exec_commands, :wait_until_ready, :reconfigure
-
-        def assert_name!
-          raise 'Invalid instance name!' unless name
-        end
-      end
-    end
-  end
-end

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

@@ -1,36 +0,0 @@
-# frozen_string_literal: true
-
-module Gitlab
-  module QA
-    module Runtime
-      ##
-      # Singleton approach to global test scenario arguments.
-      #
-      module Scenario
-        extend self
-
-        def attributes
-          @attributes ||= {}
-        end
-
-        def define(attribute, value)
-          attributes.store(attribute.to_sym, value)
-
-          define_singleton_method(attribute) do
-            attributes[attribute.to_sym].tap do |value|
-              if value.to_s.empty?
-                raise ArgumentError, "Empty `#{attribute}` attribute!"
-              end
-            end
-          end
-        end
-
-        # rubocop:disable Style/MethodMissing
-        def method_missing(name, *)
-          raise ArgumentError, "Scenario attribute `#{name}` not defined!"
-        end
-        # rubocop:enable Style/MethodMissing
-      end
-    end
-  end
-end