gitlab-qa 2.4.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1dc61ff76fb45f254e883b53575de7e09482348b52f7b72a0e840f8b8024302e
-  data.tar.gz: 656af151c59ce81cfed572c9d3c73a4425234155b2f48da6dda7f633b3b2be20
+  metadata.gz: 8ecae34a82e75238783d46d9099fdf98e0215ac93b0dde2dd043cf37779565a0
+  data.tar.gz: 118aa1a47570a26ab84f4cb138f9a65ff29f30412dbb54f6d599a2f31528dadf
 SHA512:
-  metadata.gz: cb409def7c5f6db99941f2632ffa51c58ccd42b862bbc65e61ab56d80988184e29950da6a62023225982472318bf367eafae57c3dbec733d202d87eed86ad86d
-  data.tar.gz: '0089c9e722eadfdb095b1fbbf60333d6e0ff7f19a8b18cba4bcc772c9b3765823e297eea19b8fce8b63577089ed53ab96a27ff0d9e6b58c4442ee6d5997138f2'
+  metadata.gz: 990bf38a0d1a5eb1c805f010f94aa045dab39ffe72aa884318f24e9953bc1f8bb1b4a2cbe7d14580348091b717e0cfe4d01e1443a59c7414872531390daa5ae5
+  data.tar.gz: 3f4272fdf695dbf93565a4cde155d382fbcdcc556d0e36bd7c4b79969af04b0689a672710b49d4c53205475180f6a2c15a6c01596e6836461de84c64e3e76624

data/.gitlab-ci.yml

@@ -70,6 +70,20 @@ check:rspec:
     - 7gb
     - triggered-packages
 
+ce:sanity-framework:
+  script:
+    - ./bin/expect_exit_code_and_text "bin/qa Test::Instance::Image ${RELEASE:=CE} --tag framework" 1 "2 examples, 1 failure"
+  <<: *test
+  <<: *high-capacity
+  <<: *ce-qa
+
+ee:sanity-framework:
+  script:
+    - ./bin/expect_exit_code_and_text "bin/qa Test::Instance::Image ${RELEASE:=EE} --tag framework" 1 "2 examples, 1 failure"
+  <<: *test
+  <<: *high-capacity
+  <<: *ee-qa
+
 ce:instance:
   script:
     - bin/qa Test::Instance::Image ${RELEASE:=CE}
@@ -84,6 +98,20 @@ ee:instance:
   <<: *high-capacity
   <<: *ee-qa
 
+ce:relative_url:
+  script:
+    - bin/qa Test::Instance::RelativeUrl ${RELEASE:=CE}
+  <<: *test
+  <<: *high-capacity
+  <<: *ce-qa
+
+ee:relative_url:
+  script:
+    - bin/qa Test::Instance::RelativeUrl ${RELEASE:=EE}
+  <<: *test
+  <<: *high-capacity
+  <<: *ee-qa
+
 ce:image:
   script:
     - bin/qa Test::Omnibus::Image ${RELEASE:=CE}
@@ -159,6 +187,13 @@ ee:ldap:
   <<: *high-capacity
   <<: *ee-qa
 
+ee:saml:
+  script:
+  - bin/qa Test::Integration::GroupSAML ${RELEASE:=EE}
+  <<: *test
+  <<: *high-capacity
+  <<: *ee-qa
+
 ce:kubernetes:
   script:
     - bin/qa Test::Integration::Kubernetes ${RELEASE:=CE}
@@ -172,3 +207,17 @@ ee:kubernetes:
   <<: *test
   <<: *high-capacity
   <<: *ee-qa
+
+ce:object_storage:
+  script:
+    - bin/qa Test::Integration::ObjectStorage ${RELEASE:=CE}
+  <<: *test
+  <<: *high-capacity
+  <<: *ce-qa
+
+ee:object_storage:
+  script:
+    - bin/qa Test::Integration::ObjectStorage ${RELEASE:=EE}
+  <<: *test
+  <<: *high-capacity
+  <<: *ee-qa

data/bin/expect_exit_code_and_text

@@ -0,0 +1,36 @@
+#!/usr/bin/env bash
+# Run the given SCRIPT and expect its exit code to be EXPECTED_EXIT_CODE and its
+# output to include the given EXPECTED_TEXT.
+# If the expectation succeeds, exit with 0, otherwise exit with 1.
+# This is useful when you want don't care about a script's exit code but only
+# care about its output.
+
+SCRIPT=$1
+EXPECTED_EXIT_CODE=$2
+EXPECTED_TEXT=$3
+
+mkdir -p gitlab-qa-run-expect_text
+log_file="gitlab-qa-run-expect_text/log.txt"
+
+if [ -z "$SCRIPT" ] || [ -z "$EXPECTED_EXIT_CODE" ] || [ -z "$EXPECTED_TEXT" ]; then
+  echo "Missing argument(s) - Use: $0 script expected_exit_code expected_text"
+else
+  $SCRIPT > $log_file
+  SCRIPT_EXIT_CODE=$?
+
+  if [ "$SCRIPT_EXIT_CODE" -eq "$EXPECTED_EXIT_CODE" ]
+  then
+    echo "'$SCRIPT' exited with '$SCRIPT_EXIT_CODE', as expected!"
+    grep "$EXPECTED_TEXT" $log_file > /dev/null
+
+    if [ "$?" -eq "0" ]; then
+      echo "'$SCRIPT' outputted '$EXPECTED_TEXT', as expected!"
+    else
+      echo "'$SCRIPT' was expected to output '$EXPECTED_TEXT', but did not!"
+      exit 1
+    fi
+  else
+    echo "'$SCRIPT' was expected to exit with '$EXPECTED_EXIT_CODE', but exited with '$SCRIPT_EXIT_CODE' instead!"
+    exit 1
+  fi
+fi

data/docs/run_qa_against_gdk.md

@@ -4,8 +4,13 @@ To run the `Test::Instance::Any` scenario against your local GDK, you'll need to
 make a few changes to your `gdk/gitlab/config/gitlab.yml` file.
 
 1. Retrieve your current local IP with `ifconfig`, e.g. `192.168.0.12`.
-1. Edit `gdk/gitlab/config/gitlab.yml` and replace `host: localhost` with
-  `host: 192.168.0.12`.
+1. Edit `gdk/gitlab/config/gitlab.yml` and replace `host: localhost` with 
+   `host: 192.168.0.12`.
+1. Also replace `ssh_host: localhost` (found under `gitlab_shell`) with 
+   `ssh_host: 192.168.0.12`.
+1. Enable the `sshd` service by uncommenting the relevant line in your 
+   `Procfile`.
+1. Edit `openssh/sshd_config` and set `ListenAddress` to `192.168.0.12`.
 1. Restart your GDK
 1. Run the QA scenario as follows:
 

data/docs/what_tests_can_be_run.md

@@ -32,9 +32,10 @@ For more details on the internals, please read the
 * `GITLAB_PASSWORD` - password to use when signing into GitLab
 * `GITLAB_FORKER_USERNAME` - username to use for forking a project
 * `GITLAB_FORKER_PASSWORD` - password to use for forking a project
-* `GITLAB_USER_TYPE` - type of user to use when signing into GitLab: standard (default), ldap
 * `GITLAB_LDAP_USERNAME` - LDAP username to use when signing into GitLab
 * `GITLAB_LDAP_PASSWORD` - LDAP password to use when signing into GitLab
+* `GITLAB_ADMIN_USERNAME` - Admin username to use when adding a license
+* `GITLAB_ADMIN_PASSWORD` - Admin password to use when adding a license
 * `GITLAB_SANDBOX_NAME` - The sandbox group name the test suite is going to use (default: `gitlab-qa-sandbox`)
 * `EE_LICENSE` - Enterprise Edition license
 * `QA_ARTIFACTS_DIR` - Path to a directory where artifacts (logs and screenshots)
@@ -272,8 +273,26 @@ $ export GITLAB_PASSWORD="$GITLAB_QA_PASSWORD"
 $ gitlab-qa Test::Instance::Staging
 ```
 
-[test-instance]: https://gitlab.com/gitlab-org/gitlab-ce/blob/master/qa/qa/scenario/test/instance.rb
+### `Test::Instance::Smoke`
+
+This scenario will run a limited amount of tests selected from the test suite tagged by `:smoke`.
+Smoke tests are quick tests that ensure that some basic functionality of GitLab works.
+
+To run tests against the GitLab instance, a GitLab QA (`gitlab/gitlab-qa`)
+container is spun up and tests are run from it by running the
+`Test::Instance::Smoke` scenario (located under
+[`gitlab-org/gitlab-ce@qa/qa/scenario/test/smoke.rb`][smoke-instance] in the
+in the GitLab CE project).
+
+Example:
+
+```
+$ gitlab-qa Test::Instance::Smoke ee:<tag> https://staging.gitlab.com
+```
 
 ----
 
 [Back to README.md](../README.md)
+
+[test-instance]: https://gitlab.com/gitlab-org/gitlab-ce/blob/master/qa/qa/scenario/test/instance/all.rb
+[smoke-instance]: https://gitlab.com/gitlab-org/gitlab-ce/blob/master/qa/qa/scenario/test/instance/smoke.rb

data/exe/gitlab-qa

@@ -1,7 +1,30 @@
 #!/usr/bin/env ruby
 
 require 'gitlab/qa'
+require 'optparse'
 
-Gitlab::QA::Scenario
-  .const_get(ARGV.shift)
-  .perform(*ARGV)
+options = OptionParser.new do |opts|
+  opts.banner = 'Usage: gitlab-qa [options] Scenario URL [[--] path] [rspec_options]'
+
+  opts.on('-v', '--version', 'Show the version') do
+    require 'gitlab/qa/version'
+    puts "#{$PROGRAM_NAME} : #{Gitlab::QA::VERSION}"
+    exit
+  end
+
+  opts.on('-h', '--help', 'Show the usage') do
+    puts opts
+    exit
+  end
+
+  opts.parse!
+end
+
+if ARGV.size >= 1
+  Gitlab::QA::Scenario
+    .const_get(ARGV.shift)
+    .perform(*ARGV)
+else
+  puts options
+  exit 1
+end

data/lib/gitlab/qa.rb

@@ -16,6 +16,7 @@ module Gitlab
         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 :Smoke, 'qa/scenario/test/instance/smoke'
         end
@@ -29,8 +30,10 @@ module Gitlab
         module Integration
           autoload :Geo, 'qa/scenario/test/integration/geo'
           autoload :LDAP, 'qa/scenario/test/integration/ldap'
+          autoload :GroupSAML, 'qa/scenario/test/integration/group_saml'
           autoload :Mattermost, 'qa/scenario/test/integration/mattermost'
           autoload :Kubernetes, 'qa/scenario/test/integration/kubernetes'
+          autoload :ObjectStorage, 'qa/scenario/test/integration/object_storage'
         end
 
         module Sanity
@@ -43,8 +46,10 @@ module Gitlab
       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 :Minio, 'qa/component/minio'
     end
 
     module Docker

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

@@ -12,7 +12,7 @@ module Gitlab
 
         attr_reader :release, :docker
         attr_accessor :volumes, :network, :environment
-        attr_writer :name
+        attr_writer :name, :relative_path
 
         def_delegators :release, :tag, :image, :edition
 
@@ -42,13 +42,17 @@ module Gitlab
         end
 
         def address
-          "http://#{hostname}"
+          "http://#{hostname}#{relative_path}"
         end
 
         def hostname
           "#{name}.#{network}"
         end
 
+        def relative_path
+          @relative_path ||= ''
+        end
+
         def instance
           raise 'Please provide a block!' unless block_given?
 
@@ -116,7 +120,7 @@ module Gitlab
         end
 
         def wait
-          if Availability.new(name).check(180)
+          if Availability.new(name, relative_path: relative_path).check(180)
             sleep 12 # TODO, handle that better
             puts ' -> GitLab is available.'
           else
@@ -145,13 +149,13 @@ module Gitlab
         end
 
         class Availability
-          def initialize(name)
+          def initialize(name, relative_path: '')
             @docker = Docker::Engine.new
 
             host = @docker.hostname
             port = @docker.port(name, 80).split(':').last
 
-            @uri = URI.join("http://#{host}:#{port}", '/help')
+            @uri = URI.join("http://#{host}:#{port}", "#{relative_path}/", 'help')
           end
 
           def check(retries)

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

@@ -0,0 +1,125 @@
+require 'securerandom'
+require 'fileutils'
+
+# This component sets up the Minio (https://hub.docker.com/r/minio/minio)
+# image with the proper configuration for GitLab users to use object storage.
+module Gitlab
+  module QA
+    module Component
+      class Minio
+        include Scenario::Actable
+
+        MINIO_IMAGE = 'minio/minio'.freeze
+        MINIO_IMAGE_TAG = 'latest'.freeze
+        AWS_ACCESS_KEY = 'AKIAIOSFODNN7EXAMPLE'.freeze
+        AWS_SECRET_KEY = 'wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY'.freeze
+        DATA_DIR = '/data'.freeze
+        DEFAULT_PORT = 9000
+
+        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 = []
+        end
+
+        def instance
+          raise 'Please provide a block!' unless block_given?
+
+          prepare
+          start
+
+          yield self
+
+          teardown
+        end
+
+        def add_bucket(name)
+          @buckets << name
+        end
+
+        def to_config
+          config = YAML.safe_load <<~CFG
+            provider: AWS
+            aws_access_key_id: #{AWS_ACCESS_KEY}
+            aws_secret_access_key: #{AWS_SECRET_KEY}
+            aws_signature_version: 4
+            host: #{hostname}
+            endpoint: http://#{hostname}:#{port}
+            path_style: true
+          CFG
+
+          # Quotes get eaten up when the string is set in the environment
+          config.to_s.gsub('"', '\\"')
+        end
+
+        private
+
+        def host_data_dir
+          base_dir = ENV['CI_PROJECT_DIR'] || '/tmp'
+
+          File.join(base_dir, 'minio')
+        end
+
+        def name
+          @name ||= "minio-#{SecureRandom.hex(4)}"
+        end
+
+        def hostname
+          "#{name}.#{network}"
+        end
+
+        def port
+          DEFAULT_PORT
+        end
+
+        def prepare
+          @docker.pull(MINIO_IMAGE, MINIO_IMAGE_TAG)
+
+          FileUtils.mkdir_p(host_data_dir)
+
+          @buckets.each do |bucket|
+            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
+          docker.run(MINIO_IMAGE, MINIO_IMAGE_TAG, "server", DATA_DIR) 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
+
+            @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 teardown
+          raise 'Invalid instance name!' unless name
+
+          @docker.stop(name)
+          @docker.remove(name)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,123 @@
+require 'securerandom'
+
+# This component sets up the docker-test-saml-idp (https://github.com/kristophjunge/docker-test-saml-idp)
+# image with the proper configuration for SAML integration.
+
+module Gitlab
+  module QA
+    module Component
+      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
+        end
+
+        def set_assertion_consumer_service(assertion_con_service)
+          @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
+
+        def instance
+          raise 'Please provide a block!' unless block_given?
+
+          prepare
+          start
+
+          yield self
+
+          teardown
+        end
+
+        def prepare
+          pull
+
+          return if @docker.network_exists?(network)
+
+          @docker.network_create(network)
+        end
+
+        # rubocop:disable Metrics/AbcSize
+        def start
+          docker.run(SAML_IMAGE, SAML_IMAGE_TAG) do |command|
+            command << '-d '
+            command << "--name #{name}"
+            command << "--net #{network}"
+            command << "--hostname #{hostname}"
+            command << "--publish 8080:8080"
+            command << "--publish 8443:8443"
+
+            @volumes.to_h.each do |to, from|
+              command.volume(to, from, 'Z')
+            end
+
+            @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
+        # 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
+
+        def set_simple_saml_hostname
+          ::Gitlab::QA::Runtime::Env.simple_saml_hostname = hostname
+        end
+
+        def set_accept_insecure_certs
+          ::Gitlab::QA::Runtime::Env.accept_insecure_certs = 'true'
+        end
+      end
+    end
+  end
+end

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

@@ -7,6 +7,8 @@ module Gitlab
         extend self
 
         ENV_VARIABLES = {
+          'GITLAB_ADMIN_USERNAME' => :admin_username,
+          'GITLAB_ADMIN_PASSWORD' => :admin_password,
           'GITLAB_USERNAME' => :user_username,
           'GITLAB_PASSWORD' => :user_password,
           'GITLAB_LDAP_USERNAME' => :ldap_username,
@@ -18,6 +20,8 @@ module Gitlab
           'GITLAB_QA_ACCESS_TOKEN' => :qa_access_token,
           'GITHUB_ACCESS_TOKEN' => :github_access_token,
           'GITLAB_URL' => :gitlab_url,
+          'SIMPLE_SAML_HOSTNAME' => :simple_saml_hostname,
+          'ACCEPT_INSECURE_CERTS' => :accept_insecure_certs,
           'EE_LICENSE' => :ee_license,
           'GCLOUD_ACCOUNT_EMAIL' => :gcloud_account_email,
           'GCLOUD_ACCOUNT_KEY' => :gcloud_account_key,

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

@@ -10,7 +10,7 @@ module Gitlab
               @volumes = {}
             end
 
-            def perform(release)
+            def perform(release, *rspec_args)
               Component::Gitlab.perform do |gitlab|
                 gitlab.release = release
                 gitlab.volumes = @volumes
@@ -21,7 +21,7 @@ module Gitlab
                     specs.suite = 'Test::Instance'
                     specs.release = gitlab.release
                     specs.network = gitlab.network
-                    specs.args = [gitlab.address]
+                    specs.args = [gitlab.address, *rspec_args]
                   end
                 end
               end

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

@@ -0,0 +1,32 @@
+module Gitlab
+  module QA
+    module Scenario
+      module Test
+        module Instance
+          class RelativeUrl < Image
+            def perform(release)
+              Component::Gitlab.perform do |gitlab|
+                gitlab.release = release
+                gitlab.network = 'test'
+                gitlab.relative_path = '/relative'
+
+                gitlab.omnibus_config = <<~OMNIBUS
+                  external_url '#{gitlab.address}'
+                OMNIBUS
+
+                gitlab.instance do
+                  Component::Specs.perform do |specs|
+                    specs.suite = 'Test::Instance'
+                    specs.release = gitlab.release
+                    specs.network = gitlab.network
+                    specs.args = [gitlab.address]
+                  end
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,54 @@
+require 'yaml'
+
+module Gitlab
+  module QA
+    module Scenario
+      module Test
+        module Integration
+          class GroupSAML < Scenario::Template
+            # rubocop:disable Metrics/AbcSize
+            def perform(release)
+              release = Release.new(release)
+
+              raise ArgumentError, 'Group SAML is EE only feature!' unless release.ee?
+
+              Component::Gitlab.perform do |gitlab|
+                gitlab.release = release.edition
+                gitlab.name = 'gitlab-saml'
+                gitlab.network = 'test'
+
+                Component::SAML.perform do |saml|
+                  saml.network = 'test'
+                  saml.set_entity_id("#{gitlab.address}/groups/#{saml.group_name}")
+                  saml.set_assertion_consumer_service("#{gitlab.address}/groups/#{saml.group_name}/-/saml/callback")
+                  saml.set_sandbox_name(saml.group_name)
+                  saml.set_simple_saml_hostname
+                  saml.set_accept_insecure_certs
+
+                  gitlab.omnibus_config = <<~OMNIBUS
+                    gitlab_rails['omniauth_enabled'] = true;
+                    gitlab_rails['omniauth_providers'] = [{ name: 'group_saml' }];
+                  OMNIBUS
+
+                  saml.instance do
+                    gitlab.instance do
+                      puts 'Running SAML specs!'
+
+                      Component::Specs.perform do |specs|
+                        specs.suite = 'QA::EE::Scenario::Test::Integration::GroupSAML'
+                        specs.release = release
+                        specs.network = gitlab.network
+                        specs.args = [gitlab.address]
+                      end
+                    end
+                  end
+                end
+              end
+            end
+            # rubocop:enable Metrics/AbcSize
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,50 @@
+require 'yaml'
+
+module Gitlab
+  module QA
+    module Scenario
+      module Test
+        module Integration
+          class ObjectStorage < Scenario::Template
+            # rubocop:disable Metrics/AbcSize
+            def perform(release)
+              Component::Gitlab.perform do |gitlab|
+                gitlab.release = release
+                gitlab.name = 'gitlab-object-storage'
+                gitlab.network = 'test'
+
+                Component::Minio.perform do |minio|
+                  minio.network = 'test'
+                  minio.add_bucket('upload-bucket')
+
+                  gitlab.omnibus_config = <<~OMNIBUS
+                    gitlab_rails['uploads_object_store_enabled'] = true;
+                    gitlab_rails['uploads_object_store_remote_directory'] = 'upload-bucket';
+                    gitlab_rails['uploads_object_store_background_upload'] = false;
+                    gitlab_rails['uploads_object_store_direct_upload'] = true;
+                    gitlab_rails['uploads_object_store_proxy_download'] = true;
+                    gitlab_rails['uploads_object_store_connection'] = #{minio.to_config};
+                  OMNIBUS
+
+                  minio.instance do
+                    gitlab.instance do
+                      puts 'Running object store specs!'
+
+                      Component::Specs.perform do |specs|
+                        specs.suite = 'Test::Integration::ObjectStorage'
+                        specs.release = gitlab.release
+                        specs.network = gitlab.network
+                        specs.args = [gitlab.address]
+                      end
+                    end
+                  end
+                end
+              end
+            end
+            # rubocop:enable Metrics/AbcSize
+          end
+        end
+      end
+    end
+  end
+end

data/lib/gitlab/qa/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module QA
-    VERSION = '2.4.0'.freeze
+    VERSION = '2.5.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - Grzegorz Bizon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-29 00:00:00.000000000 Z
+date: 2018-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control
@@ -128,6 +128,7 @@ files:
 - README.md
 - Rakefile
 - bin/console
+- bin/expect_exit_code_and_text
 - bin/qa
 - bin/setup
 - docs/README.md
@@ -144,6 +145,8 @@ files:
 - lib/gitlab/qa/component/gitlab.rb
 - lib/gitlab/qa/component/internet_tunnel.rb
 - lib/gitlab/qa/component/ldap.rb
+- lib/gitlab/qa/component/minio.rb
+- lib/gitlab/qa/component/saml.rb
 - lib/gitlab/qa/component/specs.rb
 - lib/gitlab/qa/component/staging.rb
 - lib/gitlab/qa/docker/command.rb
@@ -156,12 +159,15 @@ files:
 - lib/gitlab/qa/scenario/template.rb
 - lib/gitlab/qa/scenario/test/instance/any.rb
 - lib/gitlab/qa/scenario/test/instance/image.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/geo.rb
+- lib/gitlab/qa/scenario/test/integration/group_saml.rb
 - lib/gitlab/qa/scenario/test/integration/kubernetes.rb
 - lib/gitlab/qa/scenario/test/integration/ldap.rb
 - lib/gitlab/qa/scenario/test/integration/mattermost.rb
+- lib/gitlab/qa/scenario/test/integration/object_storage.rb
 - lib/gitlab/qa/scenario/test/omnibus/image.rb
 - lib/gitlab/qa/scenario/test/omnibus/update.rb
 - lib/gitlab/qa/scenario/test/omnibus/upgrade.rb