gitlab-qa 11.2.0 → 12.0.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.gitignore +1 -1
- data/.gitlab/merge_request_templates/Release.md +7 -1
- data/.gitlab-ci.yml +3 -1
- data/.rubocop.yml +13 -2
- data/.rubocop_todo.yml +57 -85
- data/Gemfile.lock +44 -36
- data/docs/release_process.md +1 -1
- data/docs/running_against_remote_grid.md +6 -6
- data/gitlab-qa.gemspec +4 -2
- data/lib/gitlab/qa/component/base.rb +9 -9
- data/lib/gitlab/qa/component/gitaly.rb +2 -2
- data/lib/gitlab/qa/component/gitaly_cluster.rb +14 -8
- data/lib/gitlab/qa/component/gitlab.rb +27 -20
- data/lib/gitlab/qa/component/mail_hog.rb +1 -0
- data/lib/gitlab/qa/component/praefect.rb +2 -2
- data/lib/gitlab/qa/component/selenoid.rb +9 -6
- data/lib/gitlab/qa/component/specs.rb +5 -2
- data/lib/gitlab/qa/component/staging.rb +4 -4
- data/lib/gitlab/qa/component/telegraf.rb +2 -1
- data/lib/gitlab/qa/docker/engine.rb +6 -3
- data/lib/gitlab/qa/docker/volumes.rb +1 -1
- data/lib/gitlab/qa/release.rb +4 -4
- data/lib/gitlab/qa/runner.rb +10 -3
- data/lib/gitlab/qa/runtime/env.rb +23 -25
- data/lib/gitlab/qa/runtime/logger.rb +1 -1
- data/lib/gitlab/qa/runtime/omnibus_configuration.rb +1 -0
- data/lib/gitlab/qa/runtime/omnibus_configurations/object_storage_gcs.rb +2 -1
- data/lib/gitlab/qa/runtime/scenario.rb +1 -5
- data/lib/gitlab/qa/scenario/actable.rb +4 -4
- data/lib/gitlab/qa/scenario/test/instance/airgapped.rb +2 -2
- data/lib/gitlab/qa/scenario/test/instance/deployment_base.rb +2 -1
- data/lib/gitlab/qa/scenario/test/integration/group_saml.rb +1 -1
- data/lib/gitlab/qa/scenario/test/integration/ldap.rb +5 -6
- data/lib/gitlab/qa/scenario/test/integration/oauth.rb +6 -3
- data/lib/gitlab/qa/scenario/test/integration/registry_with_cdn.rb +3 -0
- data/lib/gitlab/qa/scenario/test/omnibus/update_from_previous.rb +1 -1
- data/lib/gitlab/qa/scenario/test/omnibus/upgrade.rb +1 -3
- data/lib/gitlab/qa/scenario/test/sanity/version.rb +1 -1
- data/lib/gitlab/qa/support/config_scripts.rb +1 -1
- data/lib/gitlab/qa/support/gitlab_version_info.rb +3 -5
- data/lib/gitlab/qa/support/shell_command.rb +1 -0
- data/lib/gitlab/qa/test_logger.rb +2 -2
- data/lib/gitlab/qa/version.rb +1 -1
- data/support/data/admin_access_token_seed.rb +1 -0
- data/support/data/license_usage_seed.rb +3 -1
- metadata +13 -8
- data/lib/gitlab/qa/runtime/omnibus_configurations/packages.rb +0 -17
@@ -71,7 +71,7 @@ module Gitlab
|
|
71
71
|
end
|
72
72
|
|
73
73
|
def commit_within_hours?(commit_time_string, hours)
|
74
|
-
Time.at(Time.parse(commit_time_string).utc).to_datetime > Time.at((Time.now - hours * 60 * 60).utc).to_datetime
|
74
|
+
Time.at(Time.parse(commit_time_string).utc).to_datetime > Time.at((Time.now - (hours * 60 * 60)).utc).to_datetime
|
75
75
|
end
|
76
76
|
|
77
77
|
def api_commit_detail(host, project, sha)
|
@@ -10,7 +10,7 @@ module Gitlab
|
|
10
10
|
global_server_prereceive_hook = <<~SCRIPT
|
11
11
|
#!/usr/bin/env bash
|
12
12
|
|
13
|
-
if [[
|
13
|
+
if [[ \\$GL_PROJECT_PATH =~ 'reject-prereceive' ]]; then
|
14
14
|
echo 'GL-HOOK-ERR: Custom error message rejecting prereceive hook for projects with GL_PROJECT_PATH matching pattern reject-prereceive'
|
15
15
|
exit 1
|
16
16
|
fi
|
@@ -4,8 +4,8 @@ module Gitlab
|
|
4
4
|
module QA
|
5
5
|
module Support
|
6
6
|
class GitlabVersionInfo
|
7
|
-
VERSION_PATTERN = /^(?<version>\d+\.\d+\.\d+)
|
8
|
-
COMPONENT_PATTERN = /^(?<major>\d+)\.(?<minor>\d+)\.(?<patch>\d+)
|
7
|
+
VERSION_PATTERN = /^(?<version>\d+\.\d+\.\d+)/
|
8
|
+
COMPONENT_PATTERN = /^(?<major>\d+)\.(?<minor>\d+)\.(?<patch>\d+)/
|
9
9
|
|
10
10
|
# Get previous gitlab version
|
11
11
|
#
|
@@ -155,7 +155,6 @@ module Gitlab
|
|
155
155
|
# All available docker tags
|
156
156
|
#
|
157
157
|
# @return [Array<String>]
|
158
|
-
# rubocop:disable Metrics/AbcSize
|
159
158
|
def tags
|
160
159
|
return @tags if defined?(@tags)
|
161
160
|
|
@@ -174,9 +173,8 @@ module Gitlab
|
|
174
173
|
.parse(response.body, symbolize_names: true)
|
175
174
|
.fetch(:results)
|
176
175
|
.map { |tag| tag[:name] }
|
177
|
-
.
|
176
|
+
.grep(VERSION_PATTERN)
|
178
177
|
end
|
179
|
-
# rubocop:enable Metrics/AbcSize
|
180
178
|
end
|
181
179
|
end
|
182
180
|
end
|
@@ -41,7 +41,7 @@ module Gitlab
|
|
41
41
|
# @return [ActiveSupport::Logger]
|
42
42
|
def console_logger(level:, source:)
|
43
43
|
ActiveSupport::Logger.new($stdout, level: level, datetime_format: TIME_FORMAT).tap do |logger|
|
44
|
-
logger.formatter = proc do |severity, datetime,
|
44
|
+
logger.formatter = proc do |severity, datetime, _progname, msg|
|
45
45
|
msg_prefix = message_prefix(datetime, source, severity)
|
46
46
|
|
47
47
|
Rainbow(msg_prefix).public_send(LEVEL_COLORS.fetch(severity, :silver)) + "#{msg}\n" # rubocop:disable GitlabSecurity/PublicSend
|
@@ -58,7 +58,7 @@ module Gitlab
|
|
58
58
|
log_file = "#{path}/#{source.downcase.tr(' ', '-')}.log"
|
59
59
|
|
60
60
|
ActiveSupport::Logger.new(log_file, level: :debug, datetime_format: TIME_FORMAT).tap do |logger|
|
61
|
-
logger.formatter = proc do |severity, datetime,
|
61
|
+
logger.formatter = proc do |severity, datetime, _progname, msg|
|
62
62
|
msg_prefix = message_prefix(datetime, source, severity)
|
63
63
|
|
64
64
|
"#{msg_prefix}#{msg}\n".gsub(/\e\[(\d+)(?:;\d+)*m/, "")
|
data/lib/gitlab/qa/version.rb
CHANGED
@@ -1,4 +1,5 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
|
+
|
2
3
|
# rubocop:disable Metrics/AbcSize
|
3
4
|
|
4
5
|
class LicenseUsageSeed
|
@@ -66,7 +67,8 @@ class LicenseUsageSeed
|
|
66
67
|
def self.create_license_usage_record
|
67
68
|
# Force update daily billable users and historical license data
|
68
69
|
identifier = Analytics::UsageTrends::Measurement.identifiers[:billable_users]
|
69
|
-
::Analytics::UsageTrends::CounterJobWorker.new.perform(identifier, User.minimum(:id), User.maximum(:id),
|
70
|
+
::Analytics::UsageTrends::CounterJobWorker.new.perform(identifier, User.minimum(:id), User.maximum(:id),
|
71
|
+
Time.zone.now)
|
70
72
|
|
71
73
|
HistoricalData.track!
|
72
74
|
end
|
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: 12.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-06-
|
11
|
+
date: 2023-06-28 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: climate_control
|
@@ -44,14 +44,14 @@ dependencies:
|
|
44
44
|
requirements:
|
45
45
|
- - "~>"
|
46
46
|
- !ruby/object:Gem::Version
|
47
|
-
version:
|
47
|
+
version: '10'
|
48
48
|
type: :development
|
49
49
|
prerelease: false
|
50
50
|
version_requirements: !ruby/object:Gem::Requirement
|
51
51
|
requirements:
|
52
52
|
- - "~>"
|
53
53
|
- !ruby/object:Gem::Version
|
54
|
-
version:
|
54
|
+
version: '10'
|
55
55
|
- !ruby/object:Gem::Dependency
|
56
56
|
name: lefthook
|
57
57
|
requirement: !ruby/object:Gem::Requirement
|
@@ -182,16 +182,22 @@ dependencies:
|
|
182
182
|
name: activesupport
|
183
183
|
requirement: !ruby/object:Gem::Requirement
|
184
184
|
requirements:
|
185
|
-
- - "
|
185
|
+
- - ">="
|
186
186
|
- !ruby/object:Gem::Version
|
187
187
|
version: '6.1'
|
188
|
+
- - "<"
|
189
|
+
- !ruby/object:Gem::Version
|
190
|
+
version: '7.1'
|
188
191
|
type: :runtime
|
189
192
|
prerelease: false
|
190
193
|
version_requirements: !ruby/object:Gem::Requirement
|
191
194
|
requirements:
|
192
|
-
- - "
|
195
|
+
- - ">="
|
193
196
|
- !ruby/object:Gem::Version
|
194
197
|
version: '6.1'
|
198
|
+
- - "<"
|
199
|
+
- !ruby/object:Gem::Version
|
200
|
+
version: '7.1'
|
195
201
|
- !ruby/object:Gem::Dependency
|
196
202
|
name: gitlab
|
197
203
|
requirement: !ruby/object:Gem::Requirement
|
@@ -401,7 +407,6 @@ files:
|
|
401
407
|
- lib/gitlab/qa/runtime/omnibus_configurations/object_storage.rb
|
402
408
|
- lib/gitlab/qa/runtime/omnibus_configurations/object_storage_aws.rb
|
403
409
|
- lib/gitlab/qa/runtime/omnibus_configurations/object_storage_gcs.rb
|
404
|
-
- lib/gitlab/qa/runtime/omnibus_configurations/packages.rb
|
405
410
|
- lib/gitlab/qa/runtime/omnibus_configurations/registry_object_storage.rb
|
406
411
|
- lib/gitlab/qa/runtime/scenario.rb
|
407
412
|
- lib/gitlab/qa/scenario/actable.rb
|
@@ -500,7 +505,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
500
505
|
requirements:
|
501
506
|
- - ">="
|
502
507
|
- !ruby/object:Gem::Version
|
503
|
-
version:
|
508
|
+
version: 3.0.0
|
504
509
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
505
510
|
requirements:
|
506
511
|
- - ">="
|
@@ -1,17 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
module Gitlab
|
4
|
-
module QA
|
5
|
-
module Runtime
|
6
|
-
module OmnibusConfigurations
|
7
|
-
class Packages < Default
|
8
|
-
def configuration
|
9
|
-
<<~OMNIBUS
|
10
|
-
gitlab_rails['packages_enabled'] = true
|
11
|
-
OMNIBUS
|
12
|
-
end
|
13
|
-
end
|
14
|
-
end
|
15
|
-
end
|
16
|
-
end
|
17
|
-
end
|