gitlab-qa 4.15.0 → 4.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 415519ce7e943e339896c4d2bc9882351b3a7de574663846d6ff5d3d79a2eaea
-  data.tar.gz: c40c62933d70c3915a3bfe529322901e08418d399e886e4d100a7e37709d6ee3
+  metadata.gz: 44176b72e05747e12a5771aee22efe598eb5e011084e1ba9c6321ce9b4e31223
+  data.tar.gz: e027918ad570725dcd3bea734e93ac3c2585ae26b43aa7ce27345ff127b46d6b
 SHA512:
-  metadata.gz: 9f0af9c37ef4051fa141031c035794427f2c34e1b72d992aea5b1703def825fdc41dfd6c52065646ca95373b914165d224a0cc6ed0be4867909d6259fcd27d41
-  data.tar.gz: d25f9adf618a485f60ac278618e723512c8ee1ad1d500a7e919c17d147128b68d908a85263a39463a3b226866ccd38acbc71d243fc2706080404baf0a4f7aa37
+  metadata.gz: 3fff8c026a55a8a7021bda1d2b6af3a8b1b59ed604bdc1be7645a833ab6b80f5a2e88ed3d70d98ea0c1d8f9616f7e41b3c4ca8d51f693f0ad62c217d9c5a3b3a
+  data.tar.gz: 25c308f137ce4b048bf0ecc6c4defa078b7a4ceb3528a3a9cde54c68ab70e20c4d671ff8966551ed5f49b80b157ac38b6727192ae66961900b42d956d816440c

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

@@ -30,7 +30,10 @@ module Gitlab
             #  - 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
-            Support::DevEEQAImage.new.retrieve_image_from_container_registry!(staging_revision)
+            #
+            # For official builds (currently deployed on preprod) we use the version
+            # string e.g. '12.5.4-ee' for tag matching
+            Support::DevEEQAImage.new.retrieve_image_from_container_registry!(tag_end)
           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
@@ -46,8 +49,8 @@ module Gitlab
           self::ADDRESS
         end
 
-        def self.staging_revision
-          @staging_revision ||= Version.new(address).revision
+        def self.tag_end
+          @tag_end ||= Version.new(address).tag_end
         end
 
         class Version
@@ -59,8 +62,8 @@ module Gitlab
             Runtime::Env.require_qa_access_token!
           end
 
-          def revision
-            api_get!.fetch('revision')
+          def tag_end
+            official? ? version : revision
           end
 
           def major_minor_revision
@@ -73,6 +76,18 @@ module Gitlab
 
           private
 
+          def official?
+            Release::DEV_OFFICIAL_TAG_REGEX.match?(version)
+          end
+
+          def revision
+            api_get!.fetch('revision')
+          end
+
+          def version
+            api_get!.fetch('version')
+          end
+
           def api_get!
             @response_body ||= # rubocop:disable Naming/MemoizedInstanceVariableName
               begin

data/lib/gitlab/qa/release.rb

@@ -21,6 +21,20 @@ module Gitlab
         \z
       }xi
 
+      # Official dev tag example:
+      #  12.5.4-ee
+      # |------|--|
+      #   |      |
+      #   |      |
+      #   |      |
+      #   |   edition
+      # version
+      DEV_OFFICIAL_TAG_REGEX = /
+        \A
+          (?<version>\d+\.\d+.\d+)-(?<edition>ce|ee)
+        \z
+      /xi
+
       # Dev tag example:
       #  12.1.201906121026-325a6632895.b340d0bd35d
       # |----|------------|-----------|-----------|

data/lib/gitlab/qa/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module QA
-    VERSION = '4.15.0'.freeze
+    VERSION = '4.16.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 4.15.0
+  version: 4.16.0
 platform: ruby
 authors:
 - Grzegorz Bizon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-09 00:00:00.000000000 Z
+date: 2019-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control