gitlab-qa 14.12.0 → 14.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd465ad052ddf27bfec3d32c3223690dc815b71b805443619f01ee2f59a5e598
-  data.tar.gz: a8624cdb6d986a4db3cb951202e4050906023986e83a5876c30806db0ee4be30
+  metadata.gz: d73b967d2138dc5d4937126e2eed2a7bf79869c7dbba222bb2288eeb5579b7fa
+  data.tar.gz: c8c5ddbff3b831889fc0f670c00538e936a5528bb2ffc775f5db30abf93366a7
 SHA512:
-  metadata.gz: 5e4e1b15180da4d39924afaa31e26ddd7e95b89c69a05f5602ccdc762428091754d97181791824c9c184a3d862bbdb17e0fd7a6579703d5ef5421c96d190bfbc
-  data.tar.gz: 63ff9aa5f91a6be51968f96322ff607d3769b4b269e71ac7c37712e8526cd8f414b1e25035523d64512819f0ab1cfb8dc1421a14fafcc9373b27853e79ade60d
+  metadata.gz: c16e9f78c27107f1b512eff6101eb04c7ca39d6b8dd0cdd55cc08b3c07c5d4884a66ce378b61c5526983df982083b7b81e86d0cc3c87913e4050a4ea29ae9fea
+  data.tar.gz: 55af607f3fa32af6494800b66c3bf1614426fe02191a21894e2553361b2979421912dcbef0b488f9021c5d6f281965019fc82f245e09a84db8049a6edd18cb18

data/.gitlab-ci.yml

@@ -152,7 +152,7 @@ package-and-test:
     include:
       - project: gitlab-org/gitlab
         ref: master
-        file: .gitlab/ci/package-and-test/main.gitlab-ci.yml
+        file: .gitlab/ci/test-on-omnibus/main.gitlab-ci.yml
   rules:
     - if: '$CI_MERGE_REQUEST_IID'
       when: manual

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gitlab-qa (14.12.0)
+    gitlab-qa (14.14.0)
       activesupport (>= 6.1, < 7.2)
       gitlab (~> 4.19)
       http (~> 5.0)

data/docs/run_qa_against_gdk.md

@@ -59,6 +59,12 @@ variable.
 export GITLAB_INITIAL_ROOT_PASSWORD="<GDK root password>"
 ```
 
+**Note**: If you encounter the following error, you can resolve it by unsetting the Docker host environment variable using the command `unset DOCKER_HOST`:
+
+```
+ERROR: error during connect: get "http://docker.local:2375/v1.24/images/json": dial tcp: lookup docker.local: no such host
+```
+
 ### Running EE tests
 
 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).

data/docs/what_tests_can_be_run.md

@@ -1166,7 +1166,7 @@ Testing import [by direct transfer](https://docs.gitlab.com/ee/user/group/import
 
 ### `AiGateway` Scenarios
 
-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.
+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.
 
 **Required environment variables:**
 

data/lib/gitlab/qa/component/ai_gateway.rb

@@ -76,6 +76,14 @@ module Gitlab
             -----END PRIVATE KEY-----
           VALIDATION_KEY
 
+        def initialize
+          super
+
+          # These keys are test keys and are safe to be shared, but masking them in logs so they do not raise concern
+          @secrets << TEST_SIGNING_KEY
+          @secrets << TEST_VALIDATION_KEY
+        end
+
         def name
           @name ||= 'ai-gateway'
         end

data/lib/gitlab/qa/component/base.rb

@@ -17,7 +17,8 @@ module Gitlab
           :environment,
           :runner_network,
           :airgapped_network,
-          :additional_hosts
+          :additional_hosts,
+          :secrets
 
         def initialize
           @docker = Docker::Engine.new
@@ -28,6 +29,7 @@ module Gitlab
           @network_aliases = []
           @exec_commands = []
           @additional_hosts = []
+          @secrets = []
         end
 
         def add_network_alias(name)
@@ -109,7 +111,7 @@ module Gitlab
         end
 
         def start # rubocop:disable Metrics/AbcSize
-          docker.run(image: image, tag: tag) do |command|
+          docker.run(image: image, tag: tag, mask_secrets: secrets) do |command|
             command << "-d"
             command << "--name #{name}"
             command << "--net #{network}"

data/lib/gitlab/qa/component/gitlab.rb

@@ -29,8 +29,7 @@ module Gitlab
           :seed_admin_token,
           :seed_db,
           :skip_server_hooks,
-          :gitaly_tls,
-          :secrets
+          :gitaly_tls
 
         attr_writer :name, :relative_path
 
@@ -52,7 +51,6 @@ module Gitlab
           @seed_admin_token = Runtime::Scenario.seed_admin_token
           @seed_db = Runtime::Scenario.seed_db
           @skip_server_hooks = Runtime::Scenario.skip_server_hooks
-          @secrets = []
 
           self.release = 'CE'
         end

data/lib/gitlab/qa/support/gitlab_version_info.rb

@@ -7,6 +7,8 @@ module Gitlab
         VERSION_PATTERN = /^(?<version>\d+\.\d+\.\d+)/
         COMPONENT_PATTERN = /^(?<major>\d+)\.(?<minor>\d+)\.(?<patch>\d+)/
 
+        VersionNotFoundError = Class.new(RuntimeError)
+
         # Get previous gitlab version
         #
         # @param [String] current_version
@@ -101,7 +103,8 @@ module Gitlab
           return fallback_minor unless tags
           return previous_major if current_minor.zero?
 
-          versions.find { |version| version.to_s.match?(/^#{current_major}\.#{current_minor - 1}/) }
+          versions.find { |version| version.to_s.match?(/^#{current_major}\.#{current_minor - 1}/) } ||
+            raise(VersionNotFoundError, "Previous minor version for current version #{current_version} not available on Dockerhub (yet)")
         end
 
         # Previous first minor version

data/lib/gitlab/qa/version.rb

@@ -2,6 +2,6 @@
 
 module Gitlab
   module QA
-    VERSION = '14.12.0'
+    VERSION = '14.14.0'
   end
 end

data/support/data/admin_access_token_seed.rb

@@ -18,6 +18,7 @@ class AdminAccessTokenSeed
 
     admin_user.personal_access_tokens.build(token_params).tap do |pat|
       pat.set_token(TOKEN_VALUE)
+      pat.organization = Organizations::Organization.default_organization
       pat.save!
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 14.12.0
+  version: 14.14.0
 platform: ruby
 authors:
 - GitLab Quality
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-07-09 00:00:00.000000000 Z
+date: 2024-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control