gitlab-qa 1.0.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f352f47419c62cba301b61f8dae9e8eaabeb5e9ec40def22f5770f158d027f6
-  data.tar.gz: af84f87fe4e1cdfd58ed15f116e924d7cac299428d3b578be5c57e89ff9776f6
+  metadata.gz: c17e7bee760ef32484d6f507fd02608e47770000ec56f04b8ea24974e97c6c7d
+  data.tar.gz: cbacf02dfcda7387f1d0e9fcaad84d13ce95f123e25b36b8beb3ddcda6ac68ce
 SHA512:
-  metadata.gz: 285d3c5aa401f083311d9aecb09e34758278cdadcaaca49ee53242a5883b2c08307e5010f64a155bc1113722671fee8d239a1e641e899e47d4d89813ae8c21a1
-  data.tar.gz: 8848ec793a59d57c56d6e829eb5defb58591eb90675274d8528ee10d295515726baca2452138ebbd82c625cb71c774857ab614bc697f7816b325fa2d52320b4b
+  metadata.gz: c6dabae50aa76d1495294821144ba623244daaf523d17fe3ff9d4503df5734880e8c4b54017d303d898d192bc638636b0352254d24cf7f62e52bac6973a3e4a1
+  data.tar.gz: 83f9fa4f377e1503551acb8a3eba379e301553f95e4de95c811c86a5d63dd96e54dfed864a16800629d9c0fa3434851b14ee034f939f98904dba1c975dcfb105

data/.gitlab-ci.yml

@@ -5,14 +5,12 @@ stages:
   - check
   - sanity
   - test
-  - qa
 
 variables:
   TEST_IMAGE: registry.gitlab.com/gitlab-org/gitlab-build-images:gitlab-qa
   DOCKER_DRIVER: overlay
   DOCKER_HOST: tcp://docker:2375
-  QA_SCREENSHOTS_DIR: $CI_PROJECT_DIR/screenshots
-  QA_LOGS_DIR: $CI_PROJECT_DIR/logs
+  QA_ARTIFACTS_DIR: $CI_PROJECT_DIR
 
 before_script:
   - bundle install
@@ -66,8 +64,24 @@ ee:version:
     when: on_failure
     expire_in: 30d
     paths:
-      - screenshots/
-      - logs/
+      - ./gitlab-qa-run-*
+
+.ce-qa: &ce-qa
+  only:
+    variables:
+      - $RELEASE == null
+      - $RELEASE =~ /gitlab-ce/
+
+.ee-qa: &ee-qa
+  only:
+    variables:
+      - $RELEASE == null
+      - $RELEASE =~ /gitlab-ee/
+
+.only-qa: &only-qa
+  except:
+    variables:
+      - $RELEASE
 
 .high-capacity: &high-capacity
   tags:
@@ -76,104 +90,116 @@ ee:version:
     - triggered-packages
 
 ce:instance:
-    # Checking if the build is triggered for a EE image. In that case, we need
-    # not run CE specific tests. This doesn't apply to nightly/regular branch
-    # builds as RELEASE will not match gitlab-ce in those cases.
   script:
-    - if $(echo ${RELEASE} | grep -q gitlab-ee); then exit 0; fi
     - bin/qa Test::Instance::Image ${RELEASE:=CE}
   <<: *test
   <<: *high-capacity
+  <<: *ce-qa
 
 ee:instance:
   script:
-    - if $(echo ${RELEASE} | grep -q gitlab-ce); then exit 0; fi
     - bin/qa Test::Instance::Image ${RELEASE:=EE}
   <<: *test
   <<: *high-capacity
+  <<: *ee-qa
 
 ce:image:
   script:
-    - if $(echo ${RELEASE} | grep -q gitlab-ee); then exit 0; fi
     - bin/qa Test::Omnibus::Image ${RELEASE:=CE}
   <<: *test
+  <<: *ce-qa
 
 ee:image:
   script:
-    - if $(echo ${RELEASE} | grep -q gitlab-ce); then exit 0; fi
     - bin/qa Test::Omnibus::Image ${RELEASE:=EE}
   <<: *test
+  <<: *ee-qa
 
 ce:update:
   script:
-    - if $(echo ${RELEASE} | grep -q gitlab-ee); then exit 0; fi
     - bin/qa Test::Omnibus::Update ${RELEASE:=CE}
   <<: *test
   <<: *high-capacity
+  <<: *ce-qa
 
 ee:update:
   script:
-    - if $(echo ${RELEASE} | grep -q gitlab-ce); then exit 0; fi
     - bin/qa Test::Omnibus::Update ${RELEASE:=EE}
   <<: *test
   <<: *high-capacity
+  <<: *ee-qa
 
-ee-previous-to-ce-next:update:
+ce:upgrade:
   script:
-     - bin/qa Test::Omnibus::Update EE CE
+    - bin/qa Test::Omnibus::Upgrade
   <<: *test
   <<: *high-capacity
+  <<: *only-qa
 
-ce:upgrade:
+ee-previous-to-ce:update:
   script:
-    - if [[ $RELEASE ]]; then exit 0; fi
-    - bin/qa Test::Omnibus::Upgrade
+     - bin/qa Test::Omnibus::Update EE CE
   <<: *test
   <<: *high-capacity
+  <<: *only-qa
 
 ce:mattermost:
   script:
-    - if $(echo ${RELEASE} | grep -q gitlab-ee); then exit 0; fi
     - bin/qa Test::Integration::Mattermost ${RELEASE:=CE}
   <<: *test
   <<: *high-capacity
+  <<: *ce-qa
 
 ee:mattermost:
   script:
-    - if $(echo ${RELEASE} | grep -q gitlab-ce); then exit 0; fi
     - bin/qa Test::Integration::Mattermost ${RELEASE:=EE}
   <<: *test
   <<: *high-capacity
+  <<: *ee-qa
 
 ee:geo:
   script:
-    - if $(echo ${RELEASE} | grep -q gitlab-ce); then exit 0; fi
     - bin/qa Test::Integration::Geo ${RELEASE:=EE}
   <<: *test
   <<: *high-capacity
+  <<: *ee-qa
 
 ce:ldap:
   script:
     - bin/qa Test::Integration::LDAP ${RELEASE:=CE}
   <<: *test
   <<: *high-capacity
+  <<: *ce-qa
 
 ee:ldap:
   script:
     - bin/qa Test::Integration::LDAP ${RELEASE:=EE}
   <<: *test
   <<: *high-capacity
+  <<: *ee-qa
+
+ce:kubernetes:
+  script:
+    - bin/qa Test::Integration::Kubernetes ${RELEASE:=CE}
+  <<: *test
+  <<: *high-capacity
+  <<: *ce-qa
+
+ee:kubernetes:
+  script:
+    - bin/qa Test::Integration::Kubernetes ${RELEASE:=EE}
+  <<: *test
+  <<: *high-capacity
+  <<: *ee-qa
 
 qa:staging:
   script:
-    - if $(echo ${RELEASE} | grep -q gitlab-ce); then exit 0; fi
     - export GITLAB_USERNAME="gitlab-qa"
     - export GITLAB_PASSWORD="$GITLAB_QA_PASSWORD"
     - unset EE_LICENSE
     - bin/qa Test::Instance::Staging
   <<: *test
   retry: 0
-  stage: qa
   when: manual
   except:
     - triggers

data/.rubocop.yml

@@ -28,3 +28,6 @@ Style/ModuleFunction:
 
 Style/SignalException:
   Enabled: false
+
+Layout/SpaceBeforeFirstArg:
+  Enabled: false

data/README.md

@@ -98,9 +98,9 @@ GitLab QA tool is published as a [Ruby Gem](https://rubygems.org/gems/gitlab-qa)
 You can install it with `gem install gitlab-qa`. It will expose a `gitlab-qa`
 command in your system.
 
-If you want to run the scenarios or develop them on Mac OS, please read
-[Mac OS specific documentation](/docs/run_geo_qa_against_gdk.md) as there are caveats and things
-that may work differently.
+If you want to run the scenarios against your GDK and/or develop them on Mac OS,
+please read [Run QA tests against your GDK setup](/docs/run_qa_against_gdk.md)
+as there are caveats and things that may work differently.
 
 All the scenarios you can run are described in the
 [What tests can be run?](/docs/what_tests_can_be_run.md) documentation.

data/docs/README.md

@@ -3,6 +3,6 @@
 - [Architecture](architecture.md)
 - [How it works](how_it_works.md)
 - [What tests can be run?](what_tests_can_be_run.md)
-- [Run Geo QA tests against your Geo GDK setup](run_geo_qa_against_gdk.md)
+- [Run QA tests against your GDK setup](run_qa_against_gdk.md)
 - [Trainings](trainings.md)
 - [Waits](waits.md)

data/docs/{run_geo_qa_against_gdk.md → run_qa_against_gdk.md}

@@ -1,4 +1,30 @@
-# Run Geo QA tests against your Geo GDK setup
+# Run QA tests against your GDK setup
+
+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. Restart your GDK
+1. Run the QA scenario as follows:
+
+  ```
+  $ gitlab-qa Test::Instance::Any CE http://192.168.0.12:3000 -- qa/specs/features/repository/protected_branches_spec.rb:30
+
+  # Or if you want to run your local `gitlab-qa/bin/qa`:
+  $ bin/qa Test::Instance::Any CE http://192.168.0.12:3000 -- qa/specs/features/repository/protected_branches_spec.rb:30
+
+  # And if you want to test your local `gdk/gitlab/qa` changes, you'll need to
+  # build the QA image first
+  # In gdk/gitlab/qa:
+  $ docker build -t gitlab/gitlab-ce-qa:your-custom-tag .
+
+  # Then in gitlab-qa:
+  $ bin/qa Test::Instance::Any gitlab/gitlab-ce:your-custom-tag http://192.168.0.12:3000 -- qa/specs/features/repository/protected_branches_spec.rb:30
+  ```
+
+## Run Geo QA tests against your Geo GDK setup
 
 Run from the `gdk-ee/gitlab/qa` directory with GDK primary and secondary running:
 
@@ -10,7 +36,7 @@ bin/qa QA::EE::Scenario::Test::Geo --primary-address http://localhost:3001 --sec
 CHROME_HEADLESS=false bin/qa QA::EE::Scenario::Test::Geo --primary-address http://localhost:3001 --secondary-address http://localhost:3002 --primary-name primary --secondary-name secondary --without-setup
 ```
 
-# QA Tool support on macOS
+### QA Tool support on macOS
 
 Most of our development for GitLab is done on macOS. This brings some challenges as Docker on
 macOS doesn't have feature parity with it's Linux conterpart.
@@ -38,7 +64,7 @@ When using the `route` command to expose the internet network, you still need to
 There is another tool called [dnsdock][dnsdock] that may do the trick. That means you need to change
 your DNS and point to the IP/port of `dnsdock` application.
 
-# Docker on macOS caveats
+### Docker on macOS caveats
 
 When using OS X Docker, you need to go to Preferences > Advanced and allocate at least **5.0 GB**,
 otherwise some steps may fail to execute the `chrome-webdriver`.
@@ -59,7 +85,7 @@ Docker Inc [doesn't want to fix][Docker bridge issue].
 
 To see if this limitation is still present, check the [documentation][Docker Networking].
 
-## Workarounds
+#### Workarounds
 
 One possible workaround to connect to a multi-node environment like Geo, is to run a reverse proxy on your
 development machine that maps the VHOST to `localhost:port`, changing to the ports listed in `docker ps`.

data/docs/what_tests_can_be_run.md

@@ -35,10 +35,8 @@ For more details on the internals, please read the
 * `GITLAB_LDAP_PASSWORD` - LDAP password to use when signing into GitLab
 * `GITLAB_SANDBOX_NAME` - The sandbox group name the test suite is going to use (default: `gitlab-qa-sandbox`)
 * `EE_LICENSE` - Enterprise Edition license
-* `QA_SCREENSHOTS_DIR` - Path to a directory where screenshots for failing tests
-  will be saved (default: `/tmp/gitlab-qa/screenshots`)
-* `QA_LOGS_DIR` - Path to a directory where logs will be saved (default:
-  `/tmp/gitlab-qa/logs`)
+* `QA_ARTIFACTS_DIR` - Path to a directory where artifacts (logs and screenshots)
+  for failing tests will be saved (default: `/tmp/gitlab-qa`)
 * `DOCKER_HOST` - Docker host to run tests against (default: `http://localhost`)
 * `CHROME_HEADLESS` - when running locally, set to `false` to allow Chrome tests to be visible - watch your tests being run
 
@@ -248,11 +246,21 @@ in the GitLab CE project).
 
 - `GITLAB_QA_ACCESS_TOKEN`: A valid personal access token with the `api` scope.
   This is used to retrieve the version that staging is currently running.
+  This can be found in the shared 1Password vault.
+
+**Optional environment variables:**
+
+- `GITLAB_QA_DEV_ACCESS_TOKEN`: A valid personal access token for the
+  `gitlab-qa-bot` on `dev.gitlab.org` with the `registry` scope.
+  This is used to pull the QA Docker from the Omnibus GitLab `dev` Container Registry.
+  If the variable isn't present, the QA image from Docker Hub will be used.
+  This can be found in the shared 1Password vault.
 
 Example:
 
 ```
 $ export GITLAB_QA_ACCESS_TOKEN=your_api_access_token
+$ export GITLAB_QA_DEV_ACCESS_TOKEN=your_dev_registry_access_token
 $ export GITLAB_USERNAME="gitlab-qa"
 $ export GITLAB_PASSWORD="$GITLAB_QA_PASSWORD"
 

data/lib/gitlab/qa.rb

@@ -29,6 +29,7 @@ module Gitlab
           autoload :Geo, 'qa/scenario/test/integration/geo'
           autoload :LDAP, 'qa/scenario/test/integration/ldap'
           autoload :Mattermost, 'qa/scenario/test/integration/mattermost'
+          autoload :Kubernetes, 'qa/scenario/test/integration/kubernetes'
         end
 
         module Sanity
@@ -39,6 +40,7 @@ module Gitlab
 
     module Component
       autoload :Gitlab, 'qa/component/gitlab'
+      autoload :InternetTunnel, 'qa/component/internet_tunnel'
       autoload :LDAP, 'qa/component/ldap'
       autoload :Specs, 'qa/component/specs'
       autoload :Staging, 'qa/component/staging'

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

@@ -38,7 +38,7 @@ module Gitlab
         end
 
         def name
-          @name ||= "gitlab-qa-#{edition}-#{SecureRandom.hex(4)}"
+          @name ||= "gitlab-#{edition}-#{SecureRandom.hex(4)}"
         end
 
         def address
@@ -83,9 +83,7 @@ module Gitlab
               command.volume(to, from, 'Z')
             end
 
-            File.join(Runtime::Env.logs_dir, name).tap do |logs_dir|
-              command.volume(logs_dir, '/var/log/gitlab', '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)

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

@@ -0,0 +1,94 @@
+require 'tempfile'
+
+module Gitlab
+  module QA
+    module Component
+      class InternetTunnel
+        include Scenario::Actable
+
+        DOCKER_IMAGE = 'dylangriffith/ssh'.freeze
+        DOCKER_IMAGE_TAG = 'latest'.freeze
+
+        attr_writer :gitlab_hostname, :name
+        attr_accessor :network
+
+        def initialize
+          @docker = Docker::Engine.new
+          @volumes = {}
+
+          key_dir = ENV['CI_PROJECT_DIR'] || Dir.tmpdir
+          @ssh_key = Tempfile.new('tunnel-ssh-private-key', key_dir)
+          @ssh_key.write(ENV.fetch('TUNNEL_SSH_PRIVATE_KEY'))
+          @ssh_key.close
+
+          File.chmod(0o600, @ssh_key.path)
+
+          @volumes['/root/.ssh/id_rsa'] = @ssh_key.path
+        end
+
+        def instance
+          raise ArgumentError, 'Please provide a block!' unless block_given?
+
+          prepare
+          start
+
+          yield self
+
+          teardown
+        end
+
+        def url
+          "https://#{subdomain}.#{tunnel_server_hostname}"
+        end
+
+        private
+
+        def name
+          @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
+
+        def subdomain
+          @subdomain ||= rand(20_000..30_000)
+        end
+
+        def start
+          raise "Must set gitlab_hostname" unless @gitlab_hostname
+
+          @docker.run(DOCKER_IMAGE, DOCKER_IMAGE_TAG, "-o StrictHostKeyChecking=no -N -R #{subdomain}:#{@gitlab_hostname}:80 #{ENV.fetch('TUNNEL_SSH_USER')}@#{tunnel_server_hostname}") do |command|
+            command << '-d '
+            command << "--name #{name}"
+            command << "--net #{network}"
+
+            @volumes.to_h.each do |to, from|
+              command.volume(from, to, 'Z')
+            end
+          end
+        end
+
+        def restart
+          @docker.restart(name)
+        end
+
+        def teardown
+          raise 'Invalid instance name!' unless name
+
+          @docker.stop(name)
+          @docker.remove(name)
+          @ssh_key.unlink
+        end
+      end
+    end
+  end
+end

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

@@ -1,3 +1,5 @@
+require 'securerandom'
+
 module Gitlab
   module QA
     module Component
@@ -17,17 +19,19 @@ module Gitlab
 
           puts "Running test suite `#{suite}` for #{release.project_name}"
 
+          name = "gitlab-#{release.edition}-qa-#{SecureRandom.hex(4)}"
+
           @docker.run(release.qa_image, release.qa_tag, suite, *args) do |command|
             command << "-t --rm --net=#{network || 'bridge'}"
 
-            variables = Runtime::Env.variables
-            variables.each do |key, value|
+            Runtime::Env.variables.each do |key, value|
               command.env(key, value)
             end
 
             command.volume('/var/run/docker.sock', '/var/run/docker.sock')
-            command.volume(Runtime::Env.screenshots_dir, '/home/qa/tmp')
-            command.name("gitlab-specs-#{Time.now.to_i}")
+            command.volume(File.join(Runtime::Env.host_artifacts_dir, name), '/home/qa/tmp')
+
+            command.name(name)
           end
         end
       end

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

@@ -10,8 +10,14 @@ module Gitlab
 
         def self.release
           version = Version.new(ADDRESS).fetch!
+          image =
+            if Runtime::Env.dev_access_token_variable
+              "dev.gitlab.org:5005/gitlab/omnibus-gitlab/gitlab-ee:#{version}"
+            else
+              "ee:#{version}"
+            end
 
-          Release.new("EE:#{version}")
+          Release.new(image)
         rescue InvalidResponseError => ex
           warn ex.message
           warn "#{ex.response.code} #{ex.response.message}: #{ex.response.body}"

data/lib/gitlab/qa/release.rb

@@ -5,6 +5,7 @@ module Gitlab
       CUSTOM_GITLAB_IMAGE_REGEX = %r{/gitlab-(?<edition>[ce]e):(?<tag>.+)\z}
       DEFAULT_TAG = 'latest'.freeze
       DEFAULT_CANONICAL_TAG = 'nightly'.freeze
+      DEV_REGISTRY = 'dev.gitlab.org:5005'.freeze
 
       attr_reader :release
       attr_writer :tag
@@ -72,6 +73,10 @@ module Gitlab
         tag.sub(/\.([ce]e)/, '-\1').sub(/\.(\d+)\z/, '')
       end
 
+      def dev_gitlab_org?
+        image.start_with?(DEV_REGISTRY)
+      end
+
       private
 
       def canonical?

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

@@ -1,3 +1,5 @@
+require 'securerandom'
+
 module Gitlab
   module QA
     module Runtime
@@ -14,23 +16,31 @@ module Gitlab
           'GITLAB_QA_ACCESS_TOKEN' => :qa_access_token,
           'GITHUB_ACCESS_TOKEN' => :github_access_token,
           'GITLAB_URL' => :gitlab_url,
-          'EE_LICENSE' => :ee_license
+          'EE_LICENSE' => :ee_license,
+          'GCLOUD_ACCOUNT_EMAIL' => :gcloud_account_email,
+          'GCLOUD_ACCOUNT_KEY' => :gcloud_account_key,
+          'CLOUDSDK_CORE_PROJECT' => :cloudsdk_core_project,
+          'GCLOUD_ZONE' => :gcloud_zone
         }.freeze
 
         ENV_VARIABLES.each_value do |accessor|
           send(:attr_accessor, accessor) # rubocop:disable GitlabSecurity/PublicSend
         end
 
+        def run_id
+          @run_id ||= "gitlab-qa-run-#{Time.now.strftime('%Y-%m-%d-%H-%M-%S')}-#{SecureRandom.hex(4)}"
+        end
+
         def qa_access_token
           ENV['GITLAB_QA_ACCESS_TOKEN']
         end
 
-        def screenshots_dir
-          ENV['QA_SCREENSHOTS_DIR'] || '/tmp/gitlab-qa/screenshots'
+        def dev_access_token_variable
+          env_value_if_defined('GITLAB_QA_DEV_ACCESS_TOKEN')
         end
 
-        def logs_dir
-          ENV['QA_LOGS_DIR'] || '/tmp/gitlab-qa/logs'
+        def host_artifacts_dir
+          @host_artifacts_dir ||= File.join(ENV['QA_ARTIFACTS_DIR'] || '/tmp/gitlab-qa', Runtime::Env.run_id)
         end
 
         def variables
@@ -64,6 +74,12 @@ module Gitlab
           raise ArgumentError, "Please provide GITLAB_QA_ACCESS_TOKEN"
         end
 
+        def require_kubernetes_environment!
+          %w[GCLOUD_ACCOUNT_EMAIL GCLOUD_ACCOUNT_KEY CLOUDSDK_CORE_PROJECT GCLOUD_ZONE].each do |env_key|
+            raise ArgumentError, "Environment variable #{env_key} must be set to run kubernetes specs" unless ENV.key?(env_key)
+          end
+        end
+
         private
 
         def env_value_if_defined(variable)

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

@@ -7,15 +7,26 @@ module Gitlab
           # Run test suite against staging.gitlab.com
           #
           class Staging < Scenario::Template
-            def perform(*)
+            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'
                 specs.release = release
-                specs.args = [Component::Staging::ADDRESS]
+                specs.args = [Component::Staging::ADDRESS, *rspec_args]
               end
             end
           end

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

@@ -0,0 +1,56 @@
+require 'yaml'
+
+module Gitlab
+  module QA
+    module Scenario
+      module Test
+        module Integration
+          class Kubernetes < Scenario::Template
+            # rubocop:disable Metrics/AbcSize
+            def perform(release)
+              Runtime::Env.require_kubernetes_environment!
+
+              Component::Gitlab.perform do |gitlab|
+                gitlab.release = release
+                gitlab.network = 'test'
+
+                Component::InternetTunnel.perform do |tunnel_gitlab|
+                  Component::InternetTunnel.perform do |tunnel_registry|
+                    tunnel_gitlab.gitlab_hostname = gitlab.hostname
+                    tunnel_gitlab.network = 'test'
+                    tunnel_registry.gitlab_hostname = gitlab.hostname
+                    tunnel_registry.network = 'test'
+
+                    gitlab.omnibus_config = <<~OMNIBUS
+                      external_url '#{tunnel_gitlab.url}';
+                      nginx['listen_port'] = 80;
+                      nginx['listen_https'] = false;
+
+                      registry_external_url '#{tunnel_registry.url}';
+                      registry_nginx['listen_port'] = 80;
+                      registry_nginx['listen_https'] = false;
+                    OMNIBUS
+
+                    tunnel_gitlab.instance do
+                      tunnel_registry.instance do
+                        gitlab.instance do
+                          Component::Specs.perform do |specs|
+                            specs.suite = 'Test::Integration::Kubernetes'
+                            specs.release = gitlab.release
+                            specs.network = gitlab.network
+                            specs.args = [tunnel_gitlab.url]
+                          end
+                        end
+                      end
+                    end
+                  end
+                end
+              end
+            end
+            # rubocop:enable Metrics/AbcSize
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -7,11 +7,9 @@ module Gitlab
       module Test
         module Omnibus
           class Update < Scenario::Template
-            def perform(previous_edition, next_edition = nil)
-              next_edition ||= previous_edition
-
-              previous_release = Release.new(previous_edition).previous_stable
-              next_release = Release.new(next_edition)
+            def perform(from_release, to_release = nil)
+              previous_release = Release.new(from_release).previous_stable
+              current_release = Release.new(to_release || from_release)
 
               Docker::Volumes.new.with_temporary_volumes do |volumes|
                 Scenario::Test::Instance::Image
@@ -20,7 +18,7 @@ module Gitlab
                 end
 
                 Scenario::Test::Instance::Image
-                  .perform(next_release) do |scenario|
+                  .perform(current_release) do |scenario|
                   scenario.volumes = volumes
                 end
               end

data/lib/gitlab/qa/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module QA
-    VERSION = '1.0.1'.freeze
+    VERSION = '2.0.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Grzegorz Bizon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-05 00:00:00.000000000 Z
+date: 2018-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control
@@ -133,7 +133,7 @@ files:
 - docs/README.md
 - docs/architecture.md
 - docs/how_it_works.md
-- docs/run_geo_qa_against_gdk.md
+- docs/run_qa_against_gdk.md
 - docs/trainings.md
 - docs/waits.md
 - docs/what_tests_can_be_run.md
@@ -142,6 +142,7 @@ files:
 - gitlab-qa.gemspec
 - lib/gitlab/qa.rb
 - lib/gitlab/qa/component/gitlab.rb
+- lib/gitlab/qa/component/internet_tunnel.rb
 - lib/gitlab/qa/component/ldap.rb
 - lib/gitlab/qa/component/specs.rb
 - lib/gitlab/qa/component/staging.rb
@@ -157,6 +158,7 @@ files:
 - lib/gitlab/qa/scenario/test/instance/image.rb
 - lib/gitlab/qa/scenario/test/instance/staging.rb
 - lib/gitlab/qa/scenario/test/integration/geo.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/omnibus/image.rb