gitlab-qa 4.15.0 → 4.16.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/gitlab/qa/component/staging.rb +20 -5
- data/lib/gitlab/qa/release.rb +14 -0
- data/lib/gitlab/qa/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 44176b72e05747e12a5771aee22efe598eb5e011084e1ba9c6321ce9b4e31223
|
4
|
+
data.tar.gz: e027918ad570725dcd3bea734e93ac3c2585ae26b43aa7ce27345ff127b46d6b
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 3fff8c026a55a8a7021bda1d2b6af3a8b1b59ed604bdc1be7645a833ab6b80f5a2e88ed3d70d98ea0c1d8f9616f7e41b3c4ca8d51f693f0ad62c217d9c5a3b3a
|
7
|
+
data.tar.gz: 25c308f137ce4b048bf0ecc6c4defa078b7a4ceb3528a3a9cde54c68ab70e20c4d671ff8966551ed5f49b80b157ac38b6727192ae66961900b42d956d816440c
|
@@ -30,7 +30,10 @@ module Gitlab
|
|
30
30
|
# - https://gitlab.com/gitlab-org/quality/staging/issues/56
|
31
31
|
# - https://gitlab.com/gitlab-org/release/framework/issues/421
|
32
32
|
# - https://gitlab.com/gitlab-org/gitlab-qa/issues/398
|
33
|
-
|
33
|
+
#
|
34
|
+
# For official builds (currently deployed on preprod) we use the version
|
35
|
+
# string e.g. '12.5.4-ee' for tag matching
|
36
|
+
Support::DevEEQAImage.new.retrieve_image_from_container_registry!(tag_end)
|
34
37
|
else
|
35
38
|
# Auto-deploy builds have a tag formatted like 12.0.12345+5159f2949cb.59c9fa631
|
36
39
|
# but the version api returns a semver version like 12.0.1
|
@@ -46,8 +49,8 @@ module Gitlab
|
|
46
49
|
self::ADDRESS
|
47
50
|
end
|
48
51
|
|
49
|
-
def self.
|
50
|
-
@
|
52
|
+
def self.tag_end
|
53
|
+
@tag_end ||= Version.new(address).tag_end
|
51
54
|
end
|
52
55
|
|
53
56
|
class Version
|
@@ -59,8 +62,8 @@ module Gitlab
|
|
59
62
|
Runtime::Env.require_qa_access_token!
|
60
63
|
end
|
61
64
|
|
62
|
-
def
|
63
|
-
|
65
|
+
def tag_end
|
66
|
+
official? ? version : revision
|
64
67
|
end
|
65
68
|
|
66
69
|
def major_minor_revision
|
@@ -73,6 +76,18 @@ module Gitlab
|
|
73
76
|
|
74
77
|
private
|
75
78
|
|
79
|
+
def official?
|
80
|
+
Release::DEV_OFFICIAL_TAG_REGEX.match?(version)
|
81
|
+
end
|
82
|
+
|
83
|
+
def revision
|
84
|
+
api_get!.fetch('revision')
|
85
|
+
end
|
86
|
+
|
87
|
+
def version
|
88
|
+
api_get!.fetch('version')
|
89
|
+
end
|
90
|
+
|
76
91
|
def api_get!
|
77
92
|
@response_body ||= # rubocop:disable Naming/MemoizedInstanceVariableName
|
78
93
|
begin
|
data/lib/gitlab/qa/release.rb
CHANGED
@@ -21,6 +21,20 @@ module Gitlab
|
|
21
21
|
\z
|
22
22
|
}xi
|
23
23
|
|
24
|
+
# Official dev tag example:
|
25
|
+
# 12.5.4-ee
|
26
|
+
# |------|--|
|
27
|
+
# | |
|
28
|
+
# | |
|
29
|
+
# | |
|
30
|
+
# | edition
|
31
|
+
# version
|
32
|
+
DEV_OFFICIAL_TAG_REGEX = /
|
33
|
+
\A
|
34
|
+
(?<version>\d+\.\d+.\d+)-(?<edition>ce|ee)
|
35
|
+
\z
|
36
|
+
/xi
|
37
|
+
|
24
38
|
# Dev tag example:
|
25
39
|
# 12.1.201906121026-325a6632895.b340d0bd35d
|
26
40
|
# |----|------------|-----------|-----------|
|
data/lib/gitlab/qa/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: gitlab-qa
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 4.
|
4
|
+
version: 4.16.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Grzegorz Bizon
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2019-12-
|
11
|
+
date: 2019-12-13 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: climate_control
|