gitlab-qa 5.6.1 → 5.7.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/gitlab/qa/component/gitlab.rb +7 -0
- data/lib/gitlab/qa/runtime/env.rb +6 -1
- data/lib/gitlab/qa/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 52c596539017e81dd575680f7451cfbb764d95a9f7939573b6f8fef623bb3309
|
|
4
|
+
data.tar.gz: 00723a33b5a92546e8a0350f26b8ae6cc896172b6a792de2961197ffc4b3dc90
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 77bd47b7914acb9fe9f4e5fcfa49ea57853c6efd6274041ea61b888bbf23a2203268687fe66a4640a2b6c17aa6430c86fdeb60444ce04220ebe936072caa28be
|
|
7
|
+
data.tar.gz: 7bce2159f193a39ef524f1c6400aa5e5e39244ba1c6f45ce1bb8723daeabd49bb890440ce0ae8ecec6eab8d7009ed78750c3099125ea8ad46f2640b22edafd35
|
|
@@ -37,6 +37,12 @@ module Gitlab
|
|
|
37
37
|
@environment['GITLAB_OMNIBUS_CONFIG'] = config.tr("\n", ' ')
|
|
38
38
|
end
|
|
39
39
|
|
|
40
|
+
def set_formless_login_token
|
|
41
|
+
return if Runtime::Env.gitlab_qa_formless_login_token.to_s.strip.empty?
|
|
42
|
+
|
|
43
|
+
@environment['GITLAB_OMNIBUS_CONFIG'] = "gitlab_rails['env'] = { 'GITLAB_QA_FORMLESS_LOGIN_TOKEN' => '#{Runtime::Env.gitlab_qa_formless_login_token}' }; #{@environment['GITLAB_OMNIBUS_CONFIG'] || ''}"
|
|
44
|
+
end
|
|
45
|
+
|
|
40
46
|
def elastic_url=(url)
|
|
41
47
|
@environment['ELASTIC_URL'] = url
|
|
42
48
|
end
|
|
@@ -93,6 +99,7 @@ module Gitlab
|
|
|
93
99
|
|
|
94
100
|
def prepare
|
|
95
101
|
setup_disable_animations if disable_animations
|
|
102
|
+
set_formless_login_token
|
|
96
103
|
|
|
97
104
|
@docker.pull(image, tag) unless Runtime::Env.skip_pull?
|
|
98
105
|
|
|
@@ -70,7 +70,8 @@ module Gitlab
|
|
|
70
70
|
'MAILHOG_HOSTNAME' => :mailhog_hostname,
|
|
71
71
|
'SLACK_QA_CHANNEL' => :slack_qa_channel,
|
|
72
72
|
'CI_SLACK_WEBHOOK_URL' => :ci_slack_webhook_url,
|
|
73
|
-
'SLACK_ICON_EMOJI' => :slack_icon_emoji
|
|
73
|
+
'SLACK_ICON_EMOJI' => :slack_icon_emoji,
|
|
74
|
+
'GITLAB_QA_FORMLESS_LOGIN_TOKEN' => :gitlab_qa_formless_login_token
|
|
74
75
|
}.freeze
|
|
75
76
|
|
|
76
77
|
ENV_VARIABLES.each_value do |accessor|
|
|
@@ -188,6 +189,10 @@ module Gitlab
|
|
|
188
189
|
(ENV['QA_SKIP_PULL'] =~ /^(false|no|0)$/i) != 0
|
|
189
190
|
end
|
|
190
191
|
|
|
192
|
+
def gitlab_qa_formless_login_token
|
|
193
|
+
env_value_if_defined('GITLAB_QA_FORMLESS_LOGIN_TOKEN')
|
|
194
|
+
end
|
|
195
|
+
|
|
191
196
|
private
|
|
192
197
|
|
|
193
198
|
def env_value_if_defined(variable)
|
data/lib/gitlab/qa/version.rb
CHANGED