gitlab-qa 8.15.2 → 9.0.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile.lock +1 -1
- data/lib/gitlab/qa/component/gitlab.rb +1 -1
- data/lib/gitlab/qa/runtime/env.rb +8 -4
- data/lib/gitlab/qa/scenario/test/integration/import.rb +1 -1
- data/lib/gitlab/qa/version.rb +1 -1
- metadata +2 -3
- data/lib/gitlab/qa/runtime/omnibus_configurations/license_mode.rb +0 -24
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: fff29a089097412047c17a713152bab09d779b6b81632e2762501c2ea37eeed0
|
4
|
+
data.tar.gz: 74c1d481f56ff0497e14cac6f235b282aa121031be0a77dab0a95bf0b490fdc3
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: b6d43ecfbe3359130fc691e1057113da2705f551d0149f5183192451b42c4608dd3daf6760a304c3ef710a0ed03e7a232e21ed6c93006fa873c55a37746f6d10
|
7
|
+
data.tar.gz: 0f4eb1b06e9bcfd11c6782cba8da19c2ac489c4adf5f14b43e6e2be823bc8f71b2be04fa7b5a6eca4c018cf805a04e1794b4a3676f081c999852cbe4ff4a2d4b
|
data/Gemfile.lock
CHANGED
@@ -63,7 +63,7 @@ module Gitlab
|
|
63
63
|
end
|
64
64
|
|
65
65
|
def set_license_mode
|
66
|
-
return unless Runtime::Env.
|
66
|
+
return unless Runtime::Env.gitlab_license_mode == 'test'
|
67
67
|
|
68
68
|
@omnibus_gitlab_rails_env['GITLAB_LICENSE_MODE'] = 'test'
|
69
69
|
@omnibus_gitlab_rails_env['CUSTOMER_PORTAL_URL'] = Runtime::Env.customer_portal_url
|
@@ -328,10 +328,6 @@ module Gitlab
|
|
328
328
|
enabled?(env_var_value_if_defined('GEO_FAILOVER'), default: false)
|
329
329
|
end
|
330
330
|
|
331
|
-
def test_license_mode?
|
332
|
-
enabled?(env_var_value_if_defined('TEST_LICENSE_MODE'), default: false)
|
333
|
-
end
|
334
|
-
|
335
331
|
def qa_export_test_metrics?
|
336
332
|
enabled?(env_var_value_if_defined('QA_EXPORT_TEST_METRICS'), default: true)
|
337
333
|
end
|
@@ -369,6 +365,10 @@ module Gitlab
|
|
369
365
|
env_var_value_if_defined('QA_COM_REGISTRY') || 'registry.gitlab.com'
|
370
366
|
end
|
371
367
|
|
368
|
+
def gitlab_license_mode
|
369
|
+
env_var_value_if_defined('GITLAB_LICENSE_MODE')
|
370
|
+
end
|
371
|
+
|
372
372
|
def customer_portal_url
|
373
373
|
env_var_value_if_defined('CUSTOMER_PORTAL_URL') || 'https://customers.staging.gitlab.com'
|
374
374
|
end
|
@@ -377,6 +377,10 @@ module Gitlab
|
|
377
377
|
enabled?(env_var_value_if_defined('GITLAB_ALLOW_SEPARATE_CI_DATABASE'), default: false)
|
378
378
|
end
|
379
379
|
|
380
|
+
def mock_github_enabled?
|
381
|
+
enabled?(env_var_value_if_defined('QA_MOCK_GITHUB'), default: false)
|
382
|
+
end
|
383
|
+
|
380
384
|
private
|
381
385
|
|
382
386
|
def enabled?(value, default: true)
|
@@ -90,7 +90,7 @@ module Gitlab
|
|
90
90
|
# @return [Array]
|
91
91
|
def mocked_hosts
|
92
92
|
hosts = []
|
93
|
-
hosts << "api.github.com:#{mock_server.ip_address}" if Runtime::Env.
|
93
|
+
hosts << "api.github.com:#{mock_server.ip_address}" if Runtime::Env.mock_github_enabled?
|
94
94
|
|
95
95
|
hosts
|
96
96
|
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
|
+
version: 9.0.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- GitLab Quality
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2023-
|
11
|
+
date: 2023-02-03 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: climate_control
|
@@ -396,7 +396,6 @@ files:
|
|
396
396
|
- lib/gitlab/qa/runtime/omnibus_configurations/decomposition_multiple_db.rb
|
397
397
|
- lib/gitlab/qa/runtime/omnibus_configurations/decomposition_single_db.rb
|
398
398
|
- lib/gitlab/qa/runtime/omnibus_configurations/default.rb
|
399
|
-
- lib/gitlab/qa/runtime/omnibus_configurations/license_mode.rb
|
400
399
|
- lib/gitlab/qa/runtime/omnibus_configurations/object_storage.rb
|
401
400
|
- lib/gitlab/qa/runtime/omnibus_configurations/object_storage_aws.rb
|
402
401
|
- lib/gitlab/qa/runtime/omnibus_configurations/object_storage_gcs.rb
|
@@ -1,24 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
module Gitlab
|
4
|
-
module QA
|
5
|
-
module Runtime
|
6
|
-
module OmnibusConfigurations
|
7
|
-
class LicenseMode < Default
|
8
|
-
def configuration
|
9
|
-
<<~OMNIBUS
|
10
|
-
gitlab_rails['env'] = { 'GITLAB_LICENSE_MODE' => 'test', 'CUSTOMER_PORTAL_URL' => '#{customer_portal_url}' }
|
11
|
-
OMNIBUS
|
12
|
-
end
|
13
|
-
|
14
|
-
private
|
15
|
-
|
16
|
-
# Customer Portal URL that is targeted
|
17
|
-
def customer_portal_url
|
18
|
-
Runtime::Env.customer_portal_url
|
19
|
-
end
|
20
|
-
end
|
21
|
-
end
|
22
|
-
end
|
23
|
-
end
|
24
|
-
end
|