gitlab-qa 4.2.1 → 4.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc37416edd60d82f954f1751335de2335dd325ed2e5c3406e81a5c643dc1f46f
-  data.tar.gz: 626e2a1972df39529e6d993c920f4f1083f367674e8a8119415a7ef5b5a90cd5
+  metadata.gz: 1b28724b26e74b052e4d47355d5b3c1436caafc8ede501d897435f2775df3a3e
+  data.tar.gz: e3309b6a55190d743cb35577345987802d5b239bdede3e2fc17b2bb9f5685465
 SHA512:
-  metadata.gz: a2a67ce9d98eefa4578123673fede9e1254af2618ac93a062a7aa8ef96ae257c1c5b1786a61af6b0446b1937853ad127e06024ee263897289667dde23e157ab4
-  data.tar.gz: 39ef6988716c1200978d75fff7acf6f4ba826da55596d5b31196cfb706f3f970fd086aea7d77ef9be87287a9b9fbbbdaea3003f7b6596f2c226aaf404159d9f4
+  metadata.gz: 270b33c36d00ddc23b14abd5a3b9f0f58b00782bcfd0f39afb530194a52a37335cd98eb1756d358a2fdd4420abd25fc423a98f2e57c5fe9e39e24e3b9c40c5da
+  data.tar.gz: 5723399e6aeb0980f050d05ce640616224f4e66b5f4c50311e21440e5430dff840751aba88ecf2276cfd60b5276c6029f0079182a0e7db37ca4d776ff8097dcb

data/.gitlab-ci.yml

@@ -522,3 +522,14 @@ notify_upstream_commit:failure:
   script:
     - bin/notify_upstream_commit failure
   when: on_failure
+
+# This job requires the `GITLAB_QA_ACCESS_TOKEN` and `GITLAB_QA_DEV_ACCESS_TOKEN`
+# variable to be passed when triggered.
+staging:
+  script:
+    - unset EE_LICENSE
+    - exe/gitlab-qa Test::Instance::Staging
+  <<: *test
+  <<: *high-capacity
+  <<: *only-qa
+  when: manual

data/gitlab-qa.gemspec

@@ -26,4 +26,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec', '~> 3.7'
   spec.add_development_dependency 'rubocop', '0.52.0'
   spec.add_development_dependency 'rubocop-rspec', '1.20.1'
+  spec.add_development_dependency 'webmock', '3.7.0'
 end

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

@@ -6,8 +6,8 @@ module Gitlab
       class InternetTunnel
         include Scenario::Actable
 
-        DOCKER_IMAGE = 'dylangriffith/ssh'.freeze
-        DOCKER_IMAGE_TAG = 'latest'.freeze
+        DOCKER_IMAGE = 'gitlab/ssh-tunnel'.freeze
+        DOCKER_IMAGE_TAG = '1.0.0'.freeze
 
         attr_writer :gitlab_hostname, :name
         attr_accessor :network

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

@@ -7,21 +7,18 @@ module Gitlab
     module Component
       class Staging
         ADDRESS = 'https://staging.gitlab.com'.freeze
-        def self.release
-          # 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).major_minor_revision
-          image =
-            if Runtime::Env.dev_access_token_variable
-              "dev.gitlab.org:5005/gitlab/omnibus-gitlab/gitlab-ee:#{version}"
-            else
-              "ee:#{version}"
-            end
 
+        class InvalidResponseError < StandardError
+          attr_reader :response
+
+          def initialize(address, response)
+            @response = response
+
+            super "Invalid response received from #{address}"
+          end
+        end
+
+        def self.release
           Release.new(image)
         rescue InvalidResponseError => ex
           warn ex.message
@@ -29,41 +26,55 @@ module Gitlab
           exit 1
         end
 
+        def self.image
+          if Runtime::Env.dev_access_token_variable
+            # Auto-deploy builds have a tag formatted like 12.1.12345+5159f2949cb.59c9fa631
+            # where `5159f2949cb` is the EE commit SHA. QA images are tagged using
+            # the version from the VERSION file and this commit SHA, e.g.
+            # `12.0-5159f2949cb` (note that the `major.minor` doesn't necessarily match).
+            # To work around that, we're fetching the `revision` from the version API
+            # and then find the corresponding QA image in the
+            # `dev.gitlab.org:5005/gitlab/omnibus-gitlab/gitlab-ee-qa` container
+            # registry, based on this revision.
+            # See:
+            #  - https://gitlab.com/gitlab-org/quality/staging/issues/56
+            #  - https://gitlab.com/gitlab-org/release/framework/issues/421
+            #  - https://gitlab.com/gitlab-org/gitlab-qa/issues/398
+            DevEEQAImage.new.retrieve_image_from_container_registry!(staging_revision)
+          else
+            # 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
+            "ee:#{Version.new(address).major_minor_revision}"
+          end
+        end
+
         def self.address
           self::ADDRESS
         end
 
-        class InvalidResponseError < StandardError
-          attr_reader :response
-
-          def initialize(address, response)
-            @response = response
-
-            super "Invalid response received from #{address}"
-          end
+        def self.staging_revision
+          @staging_revision ||= Version.new(address).revision
         end
 
         class Version
+          attr_reader :uri
+
           def initialize(address)
             @uri = URI.join(address, '/api/v4/version')
-          end
 
-          def fetch!
-            response =
-              Net::HTTP.start(@uri.host, @uri.port, use_ssl: true) do |http|
-                http.request(request)
-              end
+            Runtime::Env.require_qa_access_token!
+          end
 
-            case response
-            when Net::HTTPSuccess
-              JSON.parse(response.body)
-            else
-              raise InvalidResponseError.new(@uri.to_s, response)
-            end
+          def revision
+            api_get!.fetch('revision')
           end
 
           def major_minor_revision
-            api_response = fetch!
+            api_response = api_get!
             version_regexp = /^v?(?<major>\d+)\.(?<minor>\d+)\.\d+/
             match = version_regexp.match(api_response.fetch('version'))
 
@@ -72,11 +83,86 @@ module Gitlab
 
           private
 
-          def request
-            Runtime::Env.require_qa_access_token!
+          def api_get!
+            @response_body ||=
+              begin
+                response = GetRequest.new(uri, Runtime::Env.qa_access_token).execute!
+                JSON.parse(response.body)
+              end
+          end
+        end
+
+        class DevEEQAImage
+          attr_reader :base_url
+
+          DEV_ADDRESS = 'https://dev.gitlab.org'.freeze
+          GITLAB_EE_QA_REPOSITORY_ID = 55
+          QAImageNotFoundError = Class.new(StandardError)
+
+          def initialize
+            @base_url = "#{DEV_ADDRESS}/api/v4/projects/gitlab%2Fomnibus-gitlab/registry/repositories/#{GITLAB_EE_QA_REPOSITORY_ID}/tags?per_page=100"
+
+            Runtime::Env.require_qa_dev_access_token!
+          end
+
+          def retrieve_image_from_container_registry!(revision)
+            request_url = base_url
+
+            begin
+              response = api_get!(URI.parse(request_url))
+              tags = JSON.parse(response.body)
+
+              matching_qa_image_tag = find_matching_qa_image_tag(tags, revision)
+              return matching_qa_image_tag['location'] if matching_qa_image_tag
+
+              request_url = next_page_url_from_response(response)
+            end while request_url
+
+            raise QAImageNotFoundError, "No `gitlab-ee-qa` image could be found for the revision `#{revision}`."
+          end
+
+          private
+
+          def api_get!(uri)
+            GetRequest.new(uri, Runtime::Env.qa_dev_access_token).execute!
+          end
+
+          def next_page_url_from_response(response)
+            response['x-next-page'].to_s != '' ? "#{base_url}&page=#{response['x-next-page']}" : nil
+          end
+
+          def find_matching_qa_image_tag(tags, revision)
+            tags.find { |tag| tag['name'].end_with?(revision) }
+          end
+        end
+
+        class GetRequest
+          attr_reader :uri, :token
+
+          def initialize(uri, token)
+            @uri = uri
+            @token = token
+          end
+
+          def execute!
+            response =
+              Net::HTTP.start(uri.host, uri.port, use_ssl: true) do |http|
+                http.request(build_request)
+              end
+
+            case response
+            when Net::HTTPSuccess
+              response
+            else
+              raise InvalidResponseError.new(uri.to_s, response)
+            end
+          end
+
+          private
 
-            @request ||= Net::HTTP::Get.new(@uri.path).tap do |req|
-              req['PRIVATE-TOKEN'] = Runtime::Env.qa_access_token
+          def build_request
+            Net::HTTP::Get.new(uri).tap do |req|
+              req['PRIVATE-TOKEN'] = token
             end
           end
         end

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

@@ -74,6 +74,10 @@ module Gitlab
           env_value_if_defined('GITLAB_QA_DEV_ACCESS_TOKEN')
         end
 
+        def qa_dev_access_token
+          ENV['GITLAB_QA_DEV_ACCESS_TOKEN']
+        end
+
         def host_artifacts_dir
           @host_artifacts_dir ||= File.join(ENV['QA_ARTIFACTS_DIR'] || '/tmp/gitlab-qa', Runtime::Env.run_id)
         end
@@ -109,6 +113,12 @@ module Gitlab
           raise ArgumentError, "Please provide GITLAB_QA_ACCESS_TOKEN"
         end
 
+        def require_qa_dev_access_token!
+          return unless ENV['GITLAB_QA_DEV_ACCESS_TOKEN'].to_s.strip.empty?
+
+          raise ArgumentError, "Please provide GITLAB_QA_DEV_ACCESS_TOKEN"
+        end
+
         def require_oauth_environment!
           %w[GITHUB_OAUTH_APP_ID GITHUB_OAUTH_APP_SECRET GITHUB_USERNAME GITHUB_PASSWORD].each do |env_key|
             raise ArgumentError, "Environment variable #{env_key} must be set to run OAuth specs" unless ENV.key?(env_key)

data/lib/gitlab/qa/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module QA
-    VERSION = '4.2.1'.freeze
+    VERSION = '4.2.2'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 4.2.1
+  version: 4.2.2
 platform: ruby
 authors:
 - Grzegorz Bizon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-30 00:00:00.000000000 Z
+date: 2019-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control
@@ -108,6 +108,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.20.1
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.7.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.7.0
 description: 
 email:
 - grzesiek.bizon@gmail.com