gitlab-qa 4.0.2 → 4.0.3
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/release.rb +8 -0
- data/lib/gitlab/qa/scenario/test/instance/deployment_base.rb +8 -10
- 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: da9b79756063aeb0b6d6b6c84801beb2ca01de377bae9ad0d0b17f321a54a849
|
4
|
+
data.tar.gz: cfef59276173f0bf4d89160aac549915d3d837130fb6866ca833a428baefd066
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 898048f538eb137b9bc75351471e3b09a530a129013b1debc8e0244c18690791f6385f20889583dde75028efef25407a3e1b73b5f8241585928db6260b5c890e
|
7
|
+
data.tar.gz: ade0be7fe84a637fb00ef4ab9dbb527afff18107e85f1fd18ed516daa74e93ffb3ce01e2b7f1358ca265b0141c3bf8996cc9ff71ad52e4f316711b0926d3b706
|
data/lib/gitlab/qa/release.rb
CHANGED
@@ -24,11 +24,15 @@ module Gitlab
|
|
24
24
|
DEFAULT_CANONICAL_TAG = 'nightly'.freeze
|
25
25
|
DEV_REGISTRY = 'dev.gitlab.org:5005'.freeze
|
26
26
|
|
27
|
+
InvalidImageNameError = Class.new(RuntimeError)
|
28
|
+
|
27
29
|
attr_reader :release
|
28
30
|
attr_writer :tag
|
29
31
|
|
30
32
|
def initialize(release)
|
31
33
|
@release = release.to_s.downcase
|
34
|
+
|
35
|
+
raise InvalidImageNameError, "The release image name '#{@release}' does not have the expected format." unless valid?
|
32
36
|
end
|
33
37
|
|
34
38
|
def to_s
|
@@ -101,6 +105,10 @@ module Gitlab
|
|
101
105
|
image.start_with?(DEV_REGISTRY)
|
102
106
|
end
|
103
107
|
|
108
|
+
def valid?
|
109
|
+
canonical? || release.match?(CUSTOM_GITLAB_IMAGE_REGEX)
|
110
|
+
end
|
111
|
+
|
104
112
|
private
|
105
113
|
|
106
114
|
def canonical?
|
@@ -7,18 +7,16 @@ module Gitlab
|
|
7
7
|
# Base class to be used to define deployment environment scenarios
|
8
8
|
#
|
9
9
|
class DeploymentBase < Scenario::Template
|
10
|
-
def perform(release_name = nil, *
|
10
|
+
def perform(release_name = nil, *args)
|
11
11
|
Runtime::Env.require_no_license!
|
12
12
|
|
13
|
-
release_name
|
13
|
+
release = if release_name.nil? || release_name.start_with?('--')
|
14
|
+
deployment_component.release
|
15
|
+
else
|
16
|
+
Release.new(release_name)
|
17
|
+
end
|
14
18
|
|
15
|
-
|
16
|
-
when '--'
|
17
|
-
rspec_args.unshift('--')
|
18
|
-
release = deployment_component.release
|
19
|
-
else
|
20
|
-
release = Release.new(release_name)
|
21
|
-
end
|
19
|
+
args.unshift(release_name) if release_name&.start_with?('--')
|
22
20
|
|
23
21
|
if release.dev_gitlab_org?
|
24
22
|
Docker::Command.execute(
|
@@ -34,7 +32,7 @@ module Gitlab
|
|
34
32
|
Component::Specs.perform do |specs|
|
35
33
|
specs.suite = 'Test::Instance::All'
|
36
34
|
specs.release = release
|
37
|
-
specs.args = [deployment_component::ADDRESS, *
|
35
|
+
specs.args = [deployment_component::ADDRESS, *args]
|
38
36
|
end
|
39
37
|
end
|
40
38
|
|
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.0.
|
4
|
+
version: 4.0.3
|
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-07-
|
11
|
+
date: 2019-07-17 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: climate_control
|