gitlab-qa 4.18.0 → 4.19.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.gitlab-ci.yml +1 -1
- data/lib/gitlab/qa/component/gitlab.rb +4 -0
- data/lib/gitlab/qa/component/saml.rb +0 -4
- data/lib/gitlab/qa/scenario/test/integration/group_saml.rb +1 -6
- data/lib/gitlab/qa/scenario/test/integration/instance_saml.rb +1 -1
- data/lib/gitlab/qa/scenario/test/integration/ldap_tls.rb +1 -5
- data/lib/gitlab/qa/scenario/test/integration/saml.rb +24 -14
- 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: 6daf214b1c52ad13c9f871a2c225b2ab9545cab483edcd7ab141fc111910e493
|
4
|
+
data.tar.gz: dabd1832bb37451082e1e78a19b994cfe04b217eabc228aaa6b564ba14ea13e2
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 274e8aeeb5cef88b33d600188608da7a2d0376114846857329ea5c49436ea186906433a1bd7a2a74338655d9b003825e5224dbb32293d086b04c8c395715f832
|
7
|
+
data.tar.gz: 3a0b15e9b58854fe34cd3b02917e27d3411c3e62d985197735096ebc169dd745fa035820f4e6beaa9254100b4973ba28b70b115624bbc77774bf598e117e462e
|
data/.gitlab-ci.yml
CHANGED
@@ -10,7 +10,7 @@ stages:
|
|
10
10
|
- notify
|
11
11
|
|
12
12
|
variables:
|
13
|
-
TEST_IMAGE: registry.gitlab.com/gitlab-org/gitlab-build-images:gitlab-qa
|
13
|
+
TEST_IMAGE: registry.gitlab.com/gitlab-org/gitlab-build-images:gitlab-qa-ruby-2.6
|
14
14
|
DOCKER_DRIVER: overlay
|
15
15
|
DOCKER_HOST: tcp://docker:2375
|
16
16
|
QA_ARTIFACTS_DIR: $CI_PROJECT_DIR
|
@@ -113,10 +113,6 @@ module Gitlab
|
|
113
113
|
def set_simple_saml_hostname
|
114
114
|
::Gitlab::QA::Runtime::Env.simple_saml_hostname = hostname
|
115
115
|
end
|
116
|
-
|
117
|
-
def set_accept_insecure_certs
|
118
|
-
::Gitlab::QA::Runtime::Env.accept_insecure_certs = 'true'
|
119
|
-
end
|
120
116
|
end
|
121
117
|
end
|
122
118
|
end
|
@@ -9,6 +9,7 @@ module Gitlab
|
|
9
9
|
def initialize
|
10
10
|
@gitlab_name = 'gitlab-group-saml'
|
11
11
|
@spec_suite = 'QA::EE::Scenario::Test::Integration::GroupSAML'
|
12
|
+
@saml_component = false
|
12
13
|
end
|
13
14
|
|
14
15
|
def before_perform(release)
|
@@ -16,12 +17,6 @@ module Gitlab
|
|
16
17
|
end
|
17
18
|
|
18
19
|
def configure(gitlab, saml)
|
19
|
-
saml.set_entity_id("#{gitlab.address}/groups/#{saml.group_name}")
|
20
|
-
saml.set_assertion_consumer_service("#{gitlab.address}/groups/#{saml.group_name}/-/saml/callback")
|
21
|
-
saml.set_sandbox_name(saml.group_name)
|
22
|
-
saml.set_simple_saml_hostname
|
23
|
-
saml.set_accept_insecure_certs
|
24
|
-
|
25
20
|
gitlab.omnibus_config = <<~OMNIBUS
|
26
21
|
gitlab_rails['omniauth_enabled'] = true;
|
27
22
|
gitlab_rails['omniauth_providers'] = [{ name: 'group_saml' }];
|
@@ -9,13 +9,13 @@ module Gitlab
|
|
9
9
|
def initialize
|
10
10
|
@gitlab_name = 'gitlab-instance-saml'
|
11
11
|
@spec_suite = 'Test::Integration::InstanceSAML'
|
12
|
+
@saml_component = true
|
12
13
|
end
|
13
14
|
|
14
15
|
def configure(gitlab, saml)
|
15
16
|
saml.set_entity_id(gitlab.address)
|
16
17
|
saml.set_assertion_consumer_service("#{gitlab.address}/users/auth/saml/callback")
|
17
18
|
saml.set_simple_saml_hostname
|
18
|
-
saml.set_accept_insecure_certs
|
19
19
|
|
20
20
|
gitlab.omnibus_config = <<~OMNIBUS
|
21
21
|
gitlab_rails['omniauth_enabled'] = true;
|
@@ -14,12 +14,8 @@ module Gitlab
|
|
14
14
|
super
|
15
15
|
end
|
16
16
|
|
17
|
-
def set_accept_insecure_certs
|
18
|
-
::Gitlab::QA::Runtime::Env.accept_insecure_certs = 'true'
|
19
|
-
end
|
20
|
-
|
21
17
|
def configure_omnibus(gitlab)
|
22
|
-
set_accept_insecure_certs
|
18
|
+
gitlab.set_accept_insecure_certs
|
23
19
|
gitlab.omnibus_config = <<~OMNIBUS
|
24
20
|
gitlab_rails['ldap_enabled'] = true;
|
25
21
|
gitlab_rails['ldap_servers'] = #{ldap_servers_omnibus_config};
|
@@ -6,7 +6,7 @@ module Gitlab
|
|
6
6
|
module Test
|
7
7
|
module Integration
|
8
8
|
class SAML < Scenario::Template
|
9
|
-
attr_reader :gitlab_name, :spec_suite
|
9
|
+
attr_reader :gitlab_name, :spec_suite, :saml_component
|
10
10
|
|
11
11
|
def configure(gitlab, saml)
|
12
12
|
raise NotImplementedError
|
@@ -24,23 +24,33 @@ module Gitlab
|
|
24
24
|
gitlab.release = release
|
25
25
|
gitlab.network = 'test'
|
26
26
|
gitlab.name = gitlab_name
|
27
|
+
gitlab.set_accept_insecure_certs
|
27
28
|
|
28
|
-
|
29
|
-
|
30
|
-
|
29
|
+
if saml_component
|
30
|
+
Component::SAML.perform do |saml|
|
31
|
+
saml.network = 'test'
|
32
|
+
configure(gitlab, saml)
|
31
33
|
|
32
|
-
|
33
|
-
|
34
|
-
puts "Running #{spec_suite} specs!"
|
35
|
-
|
36
|
-
Component::Specs.perform do |specs|
|
37
|
-
specs.suite = spec_suite
|
38
|
-
specs.release = release
|
39
|
-
specs.network = gitlab.network
|
40
|
-
specs.args = [gitlab.address, *rspec_args]
|
41
|
-
end
|
34
|
+
saml.instance do
|
35
|
+
run_specs(gitlab, release, *rspec_args)
|
42
36
|
end
|
43
37
|
end
|
38
|
+
else
|
39
|
+
configure(gitlab, nil)
|
40
|
+
run_specs(gitlab, release, *rspec_args)
|
41
|
+
end
|
42
|
+
end
|
43
|
+
end
|
44
|
+
|
45
|
+
def run_specs(gitlab, release, *rspec_args)
|
46
|
+
gitlab.instance do
|
47
|
+
puts "Running #{spec_suite} specs!"
|
48
|
+
|
49
|
+
Component::Specs.perform do |specs|
|
50
|
+
specs.suite = spec_suite
|
51
|
+
specs.release = release
|
52
|
+
specs.network = gitlab.network
|
53
|
+
specs.args = [gitlab.address, *rspec_args]
|
44
54
|
end
|
45
55
|
end
|
46
56
|
end
|
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.19.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: 2020-02-
|
11
|
+
date: 2020-02-06 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: climate_control
|