gitlab-qa 4.0.2 → 4.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24166ef8a063c67281e10c9bd1933ac67799f0a892856c509573e24e5dbcd2e9
-  data.tar.gz: 1cd746a4f6bb6a19f512d02394a249f00808f758b9e8ae32741665a205453ed5
+  metadata.gz: da9b79756063aeb0b6d6b6c84801beb2ca01de377bae9ad0d0b17f321a54a849
+  data.tar.gz: cfef59276173f0bf4d89160aac549915d3d837130fb6866ca833a428baefd066
 SHA512:
-  metadata.gz: 3580bec115f3d69bfc18b6b81dde200356a8ee648060541549973c74370fe2c097821de707c7afab265191d37043c742061c547e41ffb2c3c6f5339688cd759c
-  data.tar.gz: b1edb800484465e80240803b72c8192a56237326b48d085a6af34de6b7d4cd661c1c1a6a4ed383cc660021989b5091074bc5cdb374ba391cfcdf689ab0b6d639
+  metadata.gz: 898048f538eb137b9bc75351471e3b09a530a129013b1debc8e0244c18690791f6385f20889583dde75028efef25407a3e1b73b5f8241585928db6260b5c890e
+  data.tar.gz: ade0be7fe84a637fb00ef4ab9dbb527afff18107e85f1fd18ed516daa74e93ffb3ce01e2b7f1358ca265b0141c3bf8996cc9ff71ad52e4f316711b0926d3b706

data/lib/gitlab/qa/release.rb

@@ -24,11 +24,15 @@ module Gitlab
       DEFAULT_CANONICAL_TAG = 'nightly'.freeze
       DEV_REGISTRY = 'dev.gitlab.org:5005'.freeze
 
+      InvalidImageNameError = Class.new(RuntimeError)
+
       attr_reader :release
       attr_writer :tag
 
       def initialize(release)
         @release = release.to_s.downcase
+
+        raise InvalidImageNameError, "The release image name '#{@release}' does not have the expected format." unless valid?
       end
 
       def to_s
@@ -101,6 +105,10 @@ module Gitlab
         image.start_with?(DEV_REGISTRY)
       end
 
+      def valid?
+        canonical? || release.match?(CUSTOM_GITLAB_IMAGE_REGEX)
+      end
+
       private
 
       def canonical?

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

@@ -7,18 +7,16 @@ module Gitlab
           # Base class to be used to define deployment environment scenarios
           #
           class DeploymentBase < Scenario::Template
-            def perform(release_name = nil, *rspec_args)
+            def perform(release_name = nil, *args)
               Runtime::Env.require_no_license!
 
-              release_name ||= '--'
+              release = if release_name.nil? || release_name.start_with?('--')
+                          deployment_component.release
+                        else
+                          Release.new(release_name)
+                        end
 
-              case release_name
-              when '--'
-                rspec_args.unshift('--')
-                release = deployment_component.release
-              else
-                release = Release.new(release_name)
-              end
+              args.unshift(release_name) if release_name&.start_with?('--')
 
               if release.dev_gitlab_org?
                 Docker::Command.execute(
@@ -34,7 +32,7 @@ module Gitlab
               Component::Specs.perform do |specs|
                 specs.suite = 'Test::Instance::All'
                 specs.release = release
-                specs.args = [deployment_component::ADDRESS, *rspec_args]
+                specs.args = [deployment_component::ADDRESS, *args]
               end
             end
 

data/lib/gitlab/qa/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module QA
-    VERSION = '4.0.2'.freeze
+    VERSION = '4.0.3'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 4.0.2
+  version: 4.0.3
 platform: ruby
 authors:
 - Grzegorz Bizon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-16 00:00:00.000000000 Z
+date: 2019-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control