gitlab-qa 14.13.0 → 14.14.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 CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: f22d815fd3ac524d090783dfbd902ff3c88aab3e4429cddac39168264524210d
4
- data.tar.gz: 0d68738dc9dd3c5ef7350a5243221aa161919b9e8fc4e4296253124c137189c1
3
+ metadata.gz: d73b967d2138dc5d4937126e2eed2a7bf79869c7dbba222bb2288eeb5579b7fa
4
+ data.tar.gz: c8c5ddbff3b831889fc0f670c00538e936a5528bb2ffc775f5db30abf93366a7
5
5
  SHA512:
6
- metadata.gz: ba2ab93435b8078b4697b9f90bb7e189ff70dd12218890b1333a686f57b4ae498a3ee1b8eaf40861ba0b3e16fe3b65068c385f27345999ccf73e1eb78f9238a0
7
- data.tar.gz: 6d6f7604d765ca59c5072477c28e29e298dc475d13bf614fcebead4e8612ba1dcd427c9920b536cb0bb9b0046e565f85db1e080918519ccbaab1dfef28d940ea
6
+ metadata.gz: c16e9f78c27107f1b512eff6101eb04c7ca39d6b8dd0cdd55cc08b3c07c5d4884a66ce378b61c5526983df982083b7b81e86d0cc3c87913e4050a4ea29ae9fea
7
+ data.tar.gz: 55af607f3fa32af6494800b66c3bf1614426fe02191a21894e2553361b2979421912dcbef0b488f9021c5d6f281965019fc82f245e09a84db8049a6edd18cb18
data/.gitlab-ci.yml CHANGED
@@ -152,7 +152,7 @@ package-and-test:
152
152
  include:
153
153
  - project: gitlab-org/gitlab
154
154
  ref: master
155
- file: .gitlab/ci/package-and-test/main.gitlab-ci.yml
155
+ file: .gitlab/ci/test-on-omnibus/main.gitlab-ci.yml
156
156
  rules:
157
157
  - if: '$CI_MERGE_REQUEST_IID'
158
158
  when: manual
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- gitlab-qa (14.13.0)
4
+ gitlab-qa (14.14.0)
5
5
  activesupport (>= 6.1, < 7.2)
6
6
  gitlab (~> 4.19)
7
7
  http (~> 5.0)
@@ -59,6 +59,12 @@ variable.
59
59
  export GITLAB_INITIAL_ROOT_PASSWORD="<GDK root password>"
60
60
  ```
61
61
 
62
+ **Note**: If you encounter the following error, you can resolve it by unsetting the Docker host environment variable using the command `unset DOCKER_HOST`:
63
+
64
+ ```
65
+ ERROR: error during connect: get "http://docker.local:2375/v1.24/images/json": dial tcp: lookup docker.local: no such host
66
+ ```
67
+
62
68
  ### Running EE tests
63
69
 
64
70
  When running EE tests you'll need to have a license available. GitLab engineers can [request a license](https://about.gitlab.com/handbook/developer-onboarding/#working-on-gitlab-ee).
@@ -1166,7 +1166,7 @@ Testing import [by direct transfer](https://docs.gitlab.com/ee/user/group/import
1166
1166
 
1167
1167
  ### `AiGateway` Scenarios
1168
1168
 
1169
- The following `AiGateway` scenarios spin up a GitLab Omnibus instance integrated with a test AI Gateway using [fake models](https://gitlab.com/gitlab-org/modelops/applied-ml/code-suggestions/ai-assist#faking-out-ai-models). These scenarios help to verify various configurations of cloud licensing and seat assignment work as expected when authenticating for AI features on self-managed instances.
1169
+ The following `AiGateway` scenarios spin up a GitLab Omnibus instance integrated with a test AI Gateway using [mocked models](https://gitlab.com/gitlab-org/modelops/applied-ml/code-suggestions/ai-assist#mocking-ai-model-responses). These scenarios help to verify various configurations of cloud licensing and seat assignment work as expected when authenticating for AI features on self-managed instances.
1170
1170
 
1171
1171
  **Required environment variables:**
1172
1172
 
@@ -76,6 +76,14 @@ module Gitlab
76
76
  -----END PRIVATE KEY-----
77
77
  VALIDATION_KEY
78
78
 
79
+ def initialize
80
+ super
81
+
82
+ # These keys are test keys and are safe to be shared, but masking them in logs so they do not raise concern
83
+ @secrets << TEST_SIGNING_KEY
84
+ @secrets << TEST_VALIDATION_KEY
85
+ end
86
+
79
87
  def name
80
88
  @name ||= 'ai-gateway'
81
89
  end
@@ -17,7 +17,8 @@ module Gitlab
17
17
  :environment,
18
18
  :runner_network,
19
19
  :airgapped_network,
20
- :additional_hosts
20
+ :additional_hosts,
21
+ :secrets
21
22
 
22
23
  def initialize
23
24
  @docker = Docker::Engine.new
@@ -28,6 +29,7 @@ module Gitlab
28
29
  @network_aliases = []
29
30
  @exec_commands = []
30
31
  @additional_hosts = []
32
+ @secrets = []
31
33
  end
32
34
 
33
35
  def add_network_alias(name)
@@ -109,7 +111,7 @@ module Gitlab
109
111
  end
110
112
 
111
113
  def start # rubocop:disable Metrics/AbcSize
112
- docker.run(image: image, tag: tag) do |command|
114
+ docker.run(image: image, tag: tag, mask_secrets: secrets) do |command|
113
115
  command << "-d"
114
116
  command << "--name #{name}"
115
117
  command << "--net #{network}"
@@ -29,8 +29,7 @@ module Gitlab
29
29
  :seed_admin_token,
30
30
  :seed_db,
31
31
  :skip_server_hooks,
32
- :gitaly_tls,
33
- :secrets
32
+ :gitaly_tls
34
33
 
35
34
  attr_writer :name, :relative_path
36
35
 
@@ -52,7 +51,6 @@ module Gitlab
52
51
  @seed_admin_token = Runtime::Scenario.seed_admin_token
53
52
  @seed_db = Runtime::Scenario.seed_db
54
53
  @skip_server_hooks = Runtime::Scenario.skip_server_hooks
55
- @secrets = []
56
54
 
57
55
  self.release = 'CE'
58
56
  end
@@ -2,6 +2,6 @@
2
2
 
3
3
  module Gitlab
4
4
  module QA
5
- VERSION = '14.13.0'
5
+ VERSION = '14.14.0'
6
6
  end
7
7
  end
@@ -18,6 +18,7 @@ class AdminAccessTokenSeed
18
18
 
19
19
  admin_user.personal_access_tokens.build(token_params).tap do |pat|
20
20
  pat.set_token(TOKEN_VALUE)
21
+ pat.organization = Organizations::Organization.default_organization
21
22
  pat.save!
22
23
  end
23
24
 
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: 14.13.0
4
+ version: 14.14.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: 2024-07-18 00:00:00.000000000 Z
11
+ date: 2024-09-11 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: climate_control