gitlab-qa 8.3.1 → 8.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de73ba2a256efc0b8a025d1b46c0299fe8f9906b2a1cb06672a11a04702be170
-  data.tar.gz: e11f0ebabe74afe58b2c5b3621c1114d106aa3c8f828a64a506673b91604b77a
+  metadata.gz: fa9e003021256eefe3a65e372d66dbaa1f93f03f1414c7d5dbf26d0c8426ae1d
+  data.tar.gz: 73bdb9ee88fae3344272a4093ffb44bcc5e856208e69d4b736db13e11cb47464
 SHA512:
-  metadata.gz: aa235104c7be55f5b0276133e4a04231939b5dcceaed4e1e454a84ac17539b15c15a9ac09182c9a1ecf3e199105f5b3556fd26d2120370a43e5cfc1777550617
-  data.tar.gz: ccab7c480393683821ffff87aeee541474dcb126ab7a6d77dd24d890eec90a2c2924a178cb2d6dbec46898fdc9ad5f21a328190eb27389e4d6969140e00f481c
+  metadata.gz: 1b64d8409adeced189d03087cc52e89a4b7336f6292c12302e90374d70c1e1b1e7945315a56d079ae6aa7c3dbb6226093b69eea83ee39f4847bb8f07da744c39
+  data.tar.gz: c6865b83358739d867f33c1f3961a52e3f2c7710ccc0854f83107b96719618f3517ea7229543d5c315798852ee23313a67394806bf3eb0bd8c82f7038b8cd727

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gitlab-qa (8.3.1)
+    gitlab-qa (8.3.2)
       activesupport (~> 6.1)
       gitlab (~> 4.18.0)
       http (~> 5.0)

data/lib/gitlab/qa/release.rb

@@ -9,19 +9,19 @@ module Gitlab
           (-qa)?
           (:(?<tag>.+))?
         \z
-      /xi
+      /xi.freeze
       CUSTOM_GITLAB_IMAGE_REGEX = %r{
         \A
           (?<image_without_tag>
-            (?<registry>[^\/:]+(:(?<port>\d+))?)
-            .+
+            (?<registry>[^/:]+(:(?<port>\d+))?)
+            (?<project>.+)
             gitlab-
             (?<edition>ce|ee)
           )
           (-qa)?
           (:(?<tag>.+))?
         \z
-      }xi
+      }xi.freeze
 
       # Official dev tag example:
       #  12.5.4(-rc42)-ee
@@ -35,7 +35,7 @@ module Gitlab
         \A
           (?<version>\d+\.\d+.\d+(?:-rc\d+)?)-(?<edition>ce|ee)
         \z
-      /xi
+      /xi.freeze
 
       # Dev tag example:
       #  12.1.201906121026-325a6632895.b340d0bd35d
@@ -47,9 +47,9 @@ module Gitlab
       # version
       DEV_TAG_REGEX = /
         \A
-          (?<version>\d+\.\d+(.\d+)?)\.(?<timestamp>\d+)\-(?<gitlab_ref>[A-Za-z0-9]+)\.(?<omnibus_ref>[A-Za-z0-9]+)
+          (?<version>\d+\.\d+(.\d+)?)\.(?<timestamp>\d+)-(?<gitlab_ref>[A-Za-z0-9]+)\.(?<omnibus_ref>[A-Za-z0-9]+)
         \z
-      /xi
+      /xi.freeze
 
       DEFAULT_TAG = 'latest'
       DEFAULT_CANONICAL_TAG = 'nightly'
@@ -63,8 +63,9 @@ module Gitlab
 
       def initialize(release)
         @release = release.to_s.downcase
+        return if valid?
 
-        raise InvalidImageNameError, "The release image name '#{@release}' does not have the expected format." unless valid?
+        raise InvalidImageNameError, "The release image name '#{@release}' does not have the expected format."
       end
 
       def to_s
@@ -106,7 +107,14 @@ module Gitlab
       end
 
       def qa_image
-        "#{image}-qa"
+        @qa_image ||= if omnibus_mirror?
+                        omnibus_project = image.match(CUSTOM_GITLAB_IMAGE_REGEX)[:project]
+                        gitlab_project = "/gitlab-org/gitlab/"
+
+                        "#{image.gsub(omnibus_project, gitlab_project)}-qa"
+                      else
+                        "#{image}-qa"
+                      end
       end
 
       def project_name
@@ -133,7 +141,7 @@ module Gitlab
         if dev_gitlab_org? && (match_data = tag.match(DEV_TAG_REGEX))
           "#{match_data[:version]}-#{match_data[:gitlab_ref]}"
         else
-          tag.sub(/[-\.]([ce]e)(\.(\d+))?\z/, '-\1')
+          tag.sub(/[-.]([ce]e)(\.(\d+))?\z/, '-\1')
         end
       end
 
@@ -158,6 +166,7 @@ module Gitlab
 
                                  [Runtime::Env.gitlab_username, Runtime::Env.qa_access_token]
                                end
+
           {
             username: username,
             password: password,

data/lib/gitlab/qa/version.rb

@@ -2,6 +2,6 @@
 
 module Gitlab
   module QA
-    VERSION = '8.3.1'
+    VERSION = '8.3.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 8.3.1
+  version: 8.3.2
 platform: ruby
 authors:
 - GitLab Quality
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-08-10 00:00:00.000000000 Z
+date: 2022-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control