gitlab-qa 7.0.3 → 7.0.4
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/gitlab.rb +1 -15
- data/lib/gitlab/qa/runtime/omnibus_configuration.rb +12 -2
- 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: 94fd458767a2190eeba5094962dca4d1eb9d1ec2769c3ed6815e0750c4d95d3e
|
4
|
+
data.tar.gz: 38f5336f05c2bb558c7099d410ceea33cf1f0ea254b978e18c32c96f5e7fdc62
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 8a146c677f1b78dde5755e9d0d0445c100f4264d2e862dc98c75c8bf7265b84df9167565702c88556877c48747eb18b677a6deb4ff4489bf5e05a54c0fb0bd5c
|
7
|
+
data.tar.gz: e386131381bdfc7e1f7c4f9644586279af44e8996c0f4fc23a70559d821f127856e56ec37391407346982058b9377f78979f269e2d0d49b49d074845fad7c37a
|
@@ -33,7 +33,7 @@ module Gitlab
|
|
33
33
|
@volumes[GITLAB_CERTIFICATES_PATH] = SSL_PATH
|
34
34
|
@volumes[AUTHORITY_CERTIFICATES_PATH] = TRUSTED_PATH
|
35
35
|
|
36
|
-
@omnibus_configuration ||= OmnibusConfiguration.new
|
36
|
+
@omnibus_configuration ||= Runtime::OmnibusConfiguration.new(Runtime::Scenario.omnibus_configuration)
|
37
37
|
|
38
38
|
self.release = 'CE'
|
39
39
|
end
|
@@ -206,20 +206,6 @@ module Gitlab
|
|
206
206
|
@uri.scheme == 'https' ? { use_ssl: true, verify_mode: OpenSSL::SSL::VERIFY_NONE } : {}
|
207
207
|
end
|
208
208
|
end
|
209
|
-
|
210
|
-
class OmnibusConfiguration
|
211
|
-
def initialize
|
212
|
-
@config = [Runtime::Scenario.attributes[:omnibus_configuration].to_s] || []
|
213
|
-
end
|
214
|
-
|
215
|
-
def <<(configuration)
|
216
|
-
@config << configuration
|
217
|
-
end
|
218
|
-
|
219
|
-
def to_s
|
220
|
-
@config.join("\n")
|
221
|
-
end
|
222
|
-
end
|
223
209
|
end
|
224
210
|
end
|
225
211
|
end
|
@@ -6,8 +6,18 @@ module Gitlab
|
|
6
6
|
module QA
|
7
7
|
module Runtime
|
8
8
|
class OmnibusConfiguration
|
9
|
-
|
9
|
+
# @param prefixed_config The configuration to be prefixed to the new configuration
|
10
|
+
def initialize(prefixed_config = nil)
|
10
11
|
@config = ["# Generated by GitLab QA Omnibus Configurator at #{Time.now.strftime('%Y-%m-%d %H:%M:%S')}"]
|
12
|
+
|
13
|
+
return unless prefixed_config
|
14
|
+
|
15
|
+
# remove generation statement if it exists within the prefixed configuration that was passed
|
16
|
+
# and insert the rest AFTER the very first generation statement
|
17
|
+
config_to_insert = prefixed_config.to_s
|
18
|
+
generation_regexp = /# Generated by GitLab QA Omnibus Configurator.*\n/
|
19
|
+
config_to_insert = config_to_insert.gsub(generation_regexp, '') if config_to_insert.match?(generation_regexp)
|
20
|
+
@config.insert(1, config_to_insert)
|
11
21
|
end
|
12
22
|
|
13
23
|
def to_s
|
@@ -28,7 +38,7 @@ module Gitlab
|
|
28
38
|
[]
|
29
39
|
end
|
30
40
|
|
31
|
-
# Ensures no duplicate entries
|
41
|
+
# Ensures no duplicate entries and sanitizes configurations
|
32
42
|
# @raise RuntimeError if competing configurations exist
|
33
43
|
# rubocop:disable Metrics/AbcSize
|
34
44
|
def sanitize!
|
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: 7.0.
|
4
|
+
version: 7.0.4
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- GitLab Quality
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2021-03-
|
11
|
+
date: 2021-03-29 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: climate_control
|