gitlab-qa 4.14.0 → 4.15.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.rb +1 -0
- data/lib/gitlab/qa/runtime/env.rb +1 -1
- data/lib/gitlab/qa/scenario/cli_commands.rb +16 -0
- data/lib/gitlab/qa/scenario/test/integration/geo.rb +1 -9
- data/lib/gitlab/qa/scenario/test/integration/object_storage.rb +15 -2
- data/lib/gitlab/qa/version.rb +1 -1
- metadata +3 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 415519ce7e943e339896c4d2bc9882351b3a7de574663846d6ff5d3d79a2eaea
|
|
4
|
+
data.tar.gz: c40c62933d70c3915a3bfe529322901e08418d399e886e4d100a7e37709d6ee3
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 9f0af9c37ef4051fa141031c035794427f2c34e1b72d992aea5b1703def825fdc41dfd6c52065646ca95373b914165d224a0cc6ed0be4867909d6259fcd27d41
|
|
7
|
+
data.tar.gz: d25f9adf618a485f60ac278618e723512c8ee1ad1d500a7e919c17d147128b68d908a85263a39463a3b226866ccd38acbc71d243fc2706080404baf0a4f7aa37
|
data/lib/gitlab/qa.rb
CHANGED
|
@@ -141,7 +141,7 @@ module Gitlab
|
|
|
141
141
|
end
|
|
142
142
|
|
|
143
143
|
def require_kubernetes_environment!
|
|
144
|
-
%w[GCLOUD_ACCOUNT_EMAIL GCLOUD_ACCOUNT_KEY CLOUDSDK_CORE_PROJECT
|
|
144
|
+
%w[GCLOUD_ACCOUNT_EMAIL GCLOUD_ACCOUNT_KEY CLOUDSDK_CORE_PROJECT].each do |env_key|
|
|
145
145
|
raise ArgumentError, "Environment variable #{env_key} must be set to run kubernetes specs" unless ENV.key?(env_key)
|
|
146
146
|
end
|
|
147
147
|
end
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
module Gitlab
|
|
2
|
+
module QA
|
|
3
|
+
module Scenario
|
|
4
|
+
module CLICommands
|
|
5
|
+
GIT_LFS_VERSION = '2.8.0'.freeze
|
|
6
|
+
|
|
7
|
+
def git_lfs_install_commands
|
|
8
|
+
@git_lfs_install_commands ||= [
|
|
9
|
+
"cd /tmp ; curl -qsL https://github.com/git-lfs/git-lfs/releases/download/v#{GIT_LFS_VERSION}/git-lfs-linux-amd64-v#{GIT_LFS_VERSION}.tar.gz | tar xzvf -",
|
|
10
|
+
'cp /tmp/git-lfs /usr/local/bin'
|
|
11
|
+
]
|
|
12
|
+
end
|
|
13
|
+
end
|
|
14
|
+
end
|
|
15
|
+
end
|
|
16
|
+
end
|
|
@@ -4,8 +4,7 @@ module Gitlab
|
|
|
4
4
|
module Test
|
|
5
5
|
module Integration
|
|
6
6
|
class Geo < Scenario::Template
|
|
7
|
-
|
|
8
|
-
|
|
7
|
+
include Scenario::CLICommands
|
|
9
8
|
##
|
|
10
9
|
# rubocop:disable Lint/MissingCopEnableDirective
|
|
11
10
|
# rubocop:disable Metrics/AbcSize
|
|
@@ -103,13 +102,6 @@ module Gitlab
|
|
|
103
102
|
'gitlab-ctl restart sshd'
|
|
104
103
|
]
|
|
105
104
|
end
|
|
106
|
-
|
|
107
|
-
def git_lfs_install_commands
|
|
108
|
-
@git_lfs_install_commands ||= [
|
|
109
|
-
"cd /tmp ; curl -qsL https://github.com/git-lfs/git-lfs/releases/download/v#{GIT_LFS_VERSION}/git-lfs-linux-amd64-v#{GIT_LFS_VERSION}.tar.gz | tar xzvf -",
|
|
110
|
-
'cp /tmp/git-lfs /usr/local/bin'
|
|
111
|
-
]
|
|
112
|
-
end
|
|
113
105
|
end
|
|
114
106
|
end
|
|
115
107
|
end
|
|
@@ -6,6 +6,8 @@ module Gitlab
|
|
|
6
6
|
module Test
|
|
7
7
|
module Integration
|
|
8
8
|
class ObjectStorage < Scenario::Template
|
|
9
|
+
include Scenario::CLICommands
|
|
10
|
+
|
|
9
11
|
def perform(release, *rspec_args)
|
|
10
12
|
Component::Gitlab.perform do |gitlab|
|
|
11
13
|
gitlab.release = release
|
|
@@ -14,7 +16,9 @@ module Gitlab
|
|
|
14
16
|
|
|
15
17
|
Component::Minio.perform do |minio|
|
|
16
18
|
minio.network = 'test'
|
|
17
|
-
|
|
19
|
+
['upload-bucket', 'lfs-bucket'].each do |bucket_name|
|
|
20
|
+
minio.add_bucket(bucket_name)
|
|
21
|
+
end
|
|
18
22
|
|
|
19
23
|
gitlab.omnibus_config = <<~OMNIBUS
|
|
20
24
|
gitlab_rails['uploads_object_store_enabled'] = true;
|
|
@@ -23,11 +27,20 @@ module Gitlab
|
|
|
23
27
|
gitlab_rails['uploads_object_store_direct_upload'] = true;
|
|
24
28
|
gitlab_rails['uploads_object_store_proxy_download'] = true;
|
|
25
29
|
gitlab_rails['uploads_object_store_connection'] = #{minio.to_config};
|
|
30
|
+
gitlab_rails['lfs_enabled'] = true;
|
|
31
|
+
gitlab_rails['lfs_storage_path'] = '/var/opt/gitlab/gitlab-rails/shared/lfs-objects';
|
|
32
|
+
gitlab_rails['lfs_object_store_enabled'] = true;
|
|
33
|
+
gitlab_rails['lfs_object_store_direct_upload'] = true;
|
|
34
|
+
gitlab_rails['lfs_object_store_background_upload'] = false;
|
|
35
|
+
gitlab_rails['lfs_object_store_proxy_download'] = false;
|
|
36
|
+
gitlab_rails['lfs_object_store_remote_directory'] = 'lfs-bucket';
|
|
37
|
+
gitlab_rails['lfs_object_store_connection'] = #{minio.to_config};
|
|
26
38
|
OMNIBUS
|
|
39
|
+
gitlab.exec_commands = git_lfs_install_commands
|
|
27
40
|
|
|
28
41
|
minio.instance do
|
|
29
42
|
gitlab.instance do
|
|
30
|
-
puts 'Running object
|
|
43
|
+
puts 'Running object storage specs!'
|
|
31
44
|
|
|
32
45
|
Component::Specs.perform do |specs|
|
|
33
46
|
specs.suite = 'Test::Integration::ObjectStorage'
|
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.15.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: 2019-12-
|
|
11
|
+
date: 2019-12-09 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: climate_control
|
|
@@ -183,6 +183,7 @@ files:
|
|
|
183
183
|
- lib/gitlab/qa/runner.rb
|
|
184
184
|
- lib/gitlab/qa/runtime/env.rb
|
|
185
185
|
- lib/gitlab/qa/scenario/actable.rb
|
|
186
|
+
- lib/gitlab/qa/scenario/cli_commands.rb
|
|
186
187
|
- lib/gitlab/qa/scenario/template.rb
|
|
187
188
|
- lib/gitlab/qa/scenario/test/instance/any.rb
|
|
188
189
|
- lib/gitlab/qa/scenario/test/instance/deployment_base.rb
|