gitlab-qa 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c17e7bee760ef32484d6f507fd02608e47770000ec56f04b8ea24974e97c6c7d
-  data.tar.gz: cbacf02dfcda7387f1d0e9fcaad84d13ce95f123e25b36b8beb3ddcda6ac68ce
+  metadata.gz: 0a1792891cdd9b76cbc19fd4d505bdbee99bf11c06579d443d2280b24d91d062
+  data.tar.gz: 06d7f8564698ec57242200c7742821f2f157f347bb4c70c74b8ff340f5922e80
 SHA512:
-  metadata.gz: c6dabae50aa76d1495294821144ba623244daaf523d17fe3ff9d4503df5734880e8c4b54017d303d898d192bc638636b0352254d24cf7f62e52bac6973a3e4a1
-  data.tar.gz: 83f9fa4f377e1503551acb8a3eba379e301553f95e4de95c811c86a5d63dd96e54dfed864a16800629d9c0fa3434851b14ee034f939f98904dba1c975dcfb105
+  metadata.gz: be317b77cf388846911a1ca380f1d92716ac93f88095b18b21f6eef0aa5c0b9e8b31dddc8c0712b5424dcd31061b53b19219210f48d64bd5c74bbb68d05fcd90
+  data.tar.gz: 5af3675ee8ab80bc9f1c7e557bf6d7d66c0fcb48f2153d7f5add50f5e61456efe751a8e78caaba4cb665c9d4c3ab5e0fdf34c5563063c64c3a26b86e9448bf40

data/docs/what_tests_can_be_run.md

@@ -225,10 +225,13 @@ $ export GITLAB_USERNAME=your_username
 $ export GITLAB_PASSWORD=your_password
 
 # Runs the QA suite for an instance running GitLab CE 10.8.1
-$ gitlab-qa Test::Instance::Any EE:10.8.1-ce https://your.instance.gitlab
+$ gitlab-qa Test::Instance::Any CE:10.8.1-ce https://your.instance.gitlab
 
 # Runs the QA suite for an instance running GitLab EE 10.7.3
 $ gitlab-qa Test::Instance::Any EE:10.7.3-ee https://your.instance.gitlab
+
+# You can even pass a gitlab-{ce,ee}-qa image directly
+$ gitlab-qa Test::Instance::Any registry.gitlab.com:5000/gitlab/gitlab-ce-qa:v11.1.0-rc12 https://your.instance.gitlab
 ```
 
 ### `Test::Instance::Staging`

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

@@ -19,7 +19,7 @@ module Gitlab
 
           puts "Running test suite `#{suite}` for #{release.project_name}"
 
-          name = "gitlab-#{release.edition}-qa-#{SecureRandom.hex(4)}"
+          name = "#{release.project_name}-qa-#{SecureRandom.hex(4)}"
 
           @docker.run(release.qa_image, release.qa_tag, suite, *args) do |command|
             command << "-t --rm --net=#{network || 'bridge'}"

data/lib/gitlab/qa/release.rb

@@ -1,8 +1,25 @@
 module Gitlab
   module QA
     class Release
-      CANONICAL_REGEX = /\A(?<edition>ce|ee):?(?<tag>.+)?/i
-      CUSTOM_GITLAB_IMAGE_REGEX = %r{/gitlab-(?<edition>[ce]e):(?<tag>.+)\z}
+      CANONICAL_REGEX = /
+        \A
+          (?<edition>ce|ee)
+          (-qa)?
+          (:(?<tag>.+))?
+        \z
+      /xi
+      CUSTOM_GITLAB_IMAGE_REGEX = %r{
+        \A
+          (?<image_without_tag>
+            (?<registry>[^\/:]+(:(?<port>\d+))?)
+            .+
+            gitlab-
+            (?<edition>ce|ee)
+          )
+          (-qa)?
+          (:(?<tag>.+))?
+        \z
+      }xi
       DEFAULT_TAG = 'latest'.freeze
       DEFAULT_CANONICAL_TAG = 'nightly'.freeze
       DEV_REGISTRY = 'dev.gitlab.org:5005'.freeze
@@ -48,7 +65,7 @@ module Gitlab
           if canonical?
             "gitlab/gitlab-#{edition}"
           else
-            release.sub(%r{(?<image_without_tag>.+(?<port>:\d+)?/.+)(?<tag>:.+)\z}, '\k<image_without_tag>')
+            release.match(CUSTOM_GITLAB_IMAGE_REGEX)[:image_without_tag]
           end
       end
 
@@ -57,9 +74,15 @@ module Gitlab
       end
 
       def project_name
-        @project_name ||= image.sub(%r{^gitlab\/}, '')
+        @project_name ||=
+          if canonical?
+            "gitlab-#{edition}"
+          else
+            "gitlab-#{release.match(CUSTOM_GITLAB_IMAGE_REGEX)[:edition]}"
+          end
       end
 
+      # Tag scheme for gitlab-{ce,ee} images is like 11.1.0-rc12.ee.0
       def tag
         @tag ||=
           if canonical?
@@ -69,6 +92,7 @@ module Gitlab
           end
       end
 
+      # Tag scheme for gitlab-{ce,ee}-qa images is like 11.1.0-rc12-ee
       def qa_tag
         tag.sub(/\.([ce]e)/, '-\1').sub(/\.(\d+)\z/, '')
       end

data/lib/gitlab/qa/version.rb

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

metadata

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