gitlab-qa 14.11.0 → 14.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f1cb43d060925e3dd20830d8412563a94fca6fb8ad0636de7da5176b984c4e5
-  data.tar.gz: c6096e3712816f0c5667208d219f7e25ce125a869dc4c8b689e89e7c8c85242e
+  metadata.gz: f22d815fd3ac524d090783dfbd902ff3c88aab3e4429cddac39168264524210d
+  data.tar.gz: 0d68738dc9dd3c5ef7350a5243221aa161919b9e8fc4e4296253124c137189c1
 SHA512:
-  metadata.gz: 526945385fb2c815c5cc5b7d17b7327523f099f0f08d123185041cde9142231664c62d253b96ae5262dc9519420cf79aa924750313e07af2c822c1bae528509d
-  data.tar.gz: 2782d95be4f96c1a67a1696b96bb0e8cdaa84fc0a273ac671c39925615b884c6f7e2645df4a3e95d5e74b812e82ad00af0a0a741bf4d144536764fa1d5b16a60
+  metadata.gz: ba2ab93435b8078b4697b9f90bb7e189ff70dd12218890b1333a686f57b4ae498a3ee1b8eaf40861ba0b3e16fe3b65068c385f27345999ccf73e1eb78f9238a0
+  data.tar.gz: 6d6f7604d765ca59c5072477c28e29e298dc475d13bf614fcebead4e8612ba1dcd427c9920b536cb0bb9b0046e565f85db1e080918519ccbaab1dfef28d940ea

data/.gitlab-ci.yml

@@ -8,9 +8,10 @@
     - vendor/ruby
 
 include:
-  - component: gitlab.com/gitlab-org/components/danger-review/danger-review@~latest
+  - component: ${CI_SERVER_FQDN}/gitlab-org/components/danger-review/danger-review@1.4.0
     inputs:
       job_image: "${CI_REGISTRY}/gitlab-org/gitlab-build-images/debian-${DEBIAN_VERSION}-ruby-${RUBY_VERSION}"
+      job_stage: "check"
   - component: gitlab.com/gitlab-org/components/gem-release/gem-release@~latest
 
 stages:
@@ -98,7 +99,6 @@ cache-gems:
         - Gemfile.lock
 
 danger-review:
-  stage: check
   needs:
     - job: cache-gems
       optional: true

data/Gemfile.lock

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

data/docs/what_tests_can_be_run.md

@@ -86,7 +86,7 @@ All environment variables used by GitLab QA should be defined in [`lib/gitlab/qa
 | `QA_INFLUXDB_TOKEN` |- | InfluxDB token for test metrics reporting | No|
 | `QA_RUN_TYPE` |- | QA run type like `staging-full`, `canary`, `production` etc. Used in test metrics reporting | No|
 | `QA_VALIDATE_RESOURCE_REUSE` | `false` | Set to `true` to [validate resource reuse](https://docs.gitlab.com/ee/development/testing_guide/end_to_end/resources.html#reusable-resources) after a test suite | No |
-| `QA_USE_PUBLIC_IP_API` | `false` | When performing Instance tests against a remote/pre-existing instance, use an API to detect the public API for requests coming from gitlab-qa.  Used by tests that exercise IP-address restrictions and similar
+| `QA_USE_PUBLIC_IP_API` | `false` | When performing Instance tests against a remote/pre-existing instance, use an API to detect the public API for requests coming from gitlab-qa.  Used by tests that exercise IP-address restrictions and similar | No |
 | `QA_GITHUB_USERNAME` |-  | Username for authenticating with GitHub. | No|
 | `QA_GITHUB_PASSWORD` |-  | Password for authenticating with GitHub. | No|
 | `GITLAB_QA_LOOP_RUNNER_MINUTES` | `1` | Minutes to run and repeat a spec while using the '--loop' option; default value is 1 minute. | No|

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

@@ -8,6 +8,74 @@ module Gitlab
         DOCKER_IMAGE_TAG = 'latest'
         LOG_DIR = '/var/log'
 
+        # Test signing key to enable direct connection code completions
+        # https://gitlab.com/gitlab-org/modelops/applied-ml/code-suggestions/ai-assist/-/blob/97f54f4b7e43258a39bba7f29f38fe44bd316ce5/example.env#L79
+        TEST_SIGNING_KEY =
+          <<~SIGNING_KEY
+            -----BEGIN PRIVATE KEY-----
+            MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQD35X6SQq7VuIV8
+            jRNta9yfQJzVLqfYOFwSqismmvR1/2y/pO7HWsXo1HhkQdzF7U1zJLh8b0PiSkDE
+            dpUzkt5b4mPIit7khx7/wMi+t+gi1dpP+gTXxqOB8A/UzvQxBEKhizoGw/hG7vzT
+            MYqJRO1xHCYsMNU2TfWuoGR/7RXIidXzXmEShZ6bFeEWqupV7D0X6n8WVMd+NrZZ
+            lCNP0O67kCZGpABHcQ/uDUcRhyHYFkGHoSwp7KS2416PXMiRs01VRUG7fnOkgo4C
+            zyPWfuzSMjkKPm9gr9P0qYGsNrOBmV0guyLg4JWcVhDvkuh32r/kHrwxwUDYSLyI
+            GfAKKmZDAgMBAAECggEAKLfCEdVw0PCywayNKQdIgRf51W0JFhOGfBewvXHs/ty/
+            nhLsmEN+sn8DxLlUwWX4YhYBVN8UcBJGOn7yhDrML0eA9asUcBu0VHSer0TslPGP
+            dFzazXPL3kdHh8BJN9aSozoyg8ijT/NoBRXkGCasNvdVWyOCQfM4NutoK+MOFZbL
+            krtGPWfjTPByaZnV1PDJq95wz6LQeSdNwZLABE4YIrBxg0V1zu1gb0paltHZjPaM
+            68rm6Hp78CqI/5v9/RqQaso8aYVdjBaEkEI40CgKZY8Jm04NE4EcQM4Z4IYFc8I/
+            Ewj0giQIkZrGuucOA9S8TNqDjerv+8NoLMRCRcTk8QKBgQD9nHZGdW+2+IjShTal
+            EzjHH37APQKXYi0R9IESdzRnkUrL/8Rnxe5f7VxmDXJys0+IGo+8JoqGRUWJD8WZ
+            oBNW8oqJ4OH/dH07v2W0a0L0Z0Fcq6lv6tFcq1inSLPlk6EW3h4vTlrknuQ6QaKq
+            74SksBB4dCGDLlOaL8jldg9YVwKBgQD6O0CciiL3xVdnx4cGHDEjs9UU10z0EeVs
+            0gNxdAdkQEdgj9wI1yzNywFXtI+UA26j7207vYcU0hQ029roJN5ogTOkcCuf9WPQ
+            RV/+BQhiEJGYmZF8KlWiCB1HTxvc3p04EmIsp1N6yuqoE0jUFIS3A4GYYHPDZwDa
+            G8Y+W68d9QKBgQC7aFxqcqusDPqmfrRDxfGGC7sRecQpc+4UP5cFuzrpcY9RMl7D
+            xJsDHhbSfwtcwS57SA2BHwXsdNIOl64QeR7xeGdxvdGjgURt22DfsweWLZs6TMv3
+            nRE7Jo9rhqkRdEds65RopsE6AkRq3EfFgxuEy2pQaJi/JIO5A6i0D8sFHwKBgQCI
+            rtDuMO5E1QCXaX+xsLiOve5IggpAz324YUcMM8rN0earMimIkrCggKDtHW3H9c/7
+            sA7EsRQWJWJwNR9v6qOqBdkFm1fY+htZamuyv2EC3/YHmurDHgTEixYjG20mylqq
+            hDAoIAYTbr+aq13+qm6L4VhquVTCiYMHoGA7M62F+QKBgQCfTv5XVu+bEEBKyTkf
+            oVWjaLbO99zrgRYmZ9zhiRtlYFKefQ4kKxr+SRcia2dxQiNVPh5qUkX6ukvgCEVl
+            GoFTlopsX/CbilNarkwa/nvgQQeZAlrFpONifrtfZffV2Cs6wcwYAL8W5qFtl6iy
+            ZpLGJZdEWAPTxB6ppnDC75/KOg==
+            -----END PRIVATE KEY-----
+          SIGNING_KEY
+
+        # Test validation key to enable direct connection code completions
+        # https://gitlab.com/gitlab-org/modelops/applied-ml/code-suggestions/ai-assist/-/blob/97f54f4b7e43258a39bba7f29f38fe44bd316ce5/example.env#L79
+        TEST_VALIDATION_KEY =
+          <<~VALIDATION_KEY
+            -----BEGIN PRIVATE KEY-----
+            MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDOAJNEB8EoyCAk
+            acSevXg5md0/JJGxBrHpIHqDuSf5FEENU0eGCc3PLZh5IjFcijGThMy0r/OMQn/n
+            /KAVCLlyPBaLEGsxqXJcW2CmNM24A3zyR4b7ghB+POKJY9lD2JoUWe57+B0IgZuz
+            PQbwRvuO7ULsw4xgGoLcoiscYMzKEWuFKDrteim+2vjCif5DDohKZQc3Ic8dwOtL
+            2C6+dV2TdyK0JPD7Kc1ONnH3S/VWJ8W5DDO1q5MrwJ+CQMaofHRqpbZrc66i5v2y
+            6/ooB0W14D1Qy4GmMIkLnkdP9UcYRHL7cVDv0D+bHs0xIyTXgbZaL78VFUyqeq23
+            qR4opOmFAgMBAAECggEABiJ5lZFkN4ew1VoaUzPclwfgUSy7SKSkuwbkPx9OHm/I
+            +XxHvqkfaj0MXlxzUIiDrhtKpqgwE4w4wjrWtZRQmXif9JI6RFIB0thHH4v7rbAv
+            kgjT7zzSAEBl6qYrkTFWcqa0Sxgkx90RkEaP+gB90KV7fxDaZv5DHrjsRGhpkNbi
+            8qtJOrvY6we6nx/YaD3iK69qQk6ktRg1AYUDH3xjBIIzo6brqlL2NJ+Q4VerrHFU
+            2EhTXto+4Y51Qjpas5B7DHmEhghZtYsMceuqFNvDQgGg1IsBPB4icTIREzHJ0rj3
+            Xgh5DMJGYb0p7Ktm74jciTdFIHeDMUCLoxxSPTZavQKBgQDs1njL0VR1hZKiGihO
+            fP0L3BwNL0H6uqKOlPP+DwdnNv7Q99xMKe9qcGWeiFXrLDkVMkd0M2LfU4SH5XUO
+            mt0YSC7Fn/pwozbk61k9+oEnL9cwDpwFwr46ccY6hmp3iihLTrgDuAi0CMSurZrC
+            mnqOOAxuSq6D7a/yhNKdEvckqwKBgQDeq2tIXlWVPXBY6CgIhUakq0oqHn35lhx4
+            CJuc1cujm1C68/UiZvxRK1LLAcFlDLl7+lnCSKnNn6fwK+jCsEsGT8ZuCJ2FznGH
+            wN6B3qrgEsB+FgC6qLir/o83E8I0tSOITaWHHvIc/l1PuXHJbwfCd2yB1sdeshID
+            x9o38/pKjwKBgH1YQRQ11IpiSCnMyDpKAi7Nrnb35OaK8k+d28hBMfzZaWE1XP1e
+            UFy34cBWjYpqnEdwlcqVC6YAcKrvsNUq9wrL4R0svwHwD7R2LoQT2VjhA/VmNgMC
+            f2U1I+GDlENx9kNtBQzK0Khf36BHNxn5YhV06ndQxS4DlNQ4obMJ/40DAoGBAIWm
+            DfaZ6HRzNAOpFJ5IoGYmCZXOR36PAvdo8z3ndRr2FjagRvonJjrx7fe7TgEA6jPn
+            yAg85O5ubbZSJJr2hZF8QHW65hFyH+KDeQoqRBXKK4+CVV2z92QEnqFIUsCgGHuv
+            XzMC9/8/DXLUs99brSSj2ZT0/SVxbC6ovennnssxAoGALtm2AUBMgsU6b9B+Fp2L
+            ZBQSwkyd3bOD7sFJHhbmiRE/ag2lsaE+dNg9H42fhOV0MXfPkEBWCIaGt931T5+q
+            FVATlTTDAx2CRmJCOyXkQ6mGBFTkQPqDwmWvwjbK9B5r0SnGfCpk4uEYWoYYsX05
+            t14Huwf9VVUTCfEi0+wWcko=
+            -----END PRIVATE KEY-----
+          VALIDATION_KEY
+
         def name
           @name ||= 'ai-gateway'
         end
@@ -26,7 +94,9 @@ module Gitlab
             'AIGW_CUSTOMER_PORTAL_URL' => Runtime::Env.customer_portal_url,
             'AIGW_MOCK_MODEL_RESPONSES' => true,
             'AIGW_LOGGING__LEVEL' => 'debug',
-            'AIGW_LOGGING__TO_FILE' => "..#{LOG_DIR}/modelgateway_debug.log"
+            'AIGW_LOGGING__TO_FILE' => "..#{LOG_DIR}/modelgateway_debug.log",
+            'AIGW_SELF_SIGNED_JWT__SIGNING_KEY' => TEST_SIGNING_KEY,
+            'AIGW_SELF_SIGNED_JWT__VALIDATION_KEY' => TEST_VALIDATION_KEY
           }
         end
       end

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

@@ -154,6 +154,7 @@ module Gitlab
 
           docker.run(image: image, tag: tag) do |command|
             command << "-d"
+            command << "--shm-size 256m"
             command << "--name #{name}"
             command << "--net #{network}"
             command << "--hostname #{hostname}"

data/lib/gitlab/qa/scenario/test/omnibus/update_from_previous.rb

@@ -9,7 +9,7 @@ module Gitlab
             using Rainbow
 
             # Test update from N - 1 (major|minor|patch) version to current release
-            # Run smoke test suite on previous release to populate some data in database before update
+            # Run health check (or smoke if below 17.1.0) test suite on previous release to populate some data in database before update
             #
             # @example
             # perform(gitlab-ee:dev-tag, 15.3.0-pre, major)
@@ -24,6 +24,7 @@ module Gitlab
             def perform(release, current_version, semver_component, from_edition = nil, *rspec_args)
               # When from_edition isn't actually passed but RSpec args arg passed with `-- rspec_args...`,
               # from_edition is wrongly set to `--`, so we fix that here.
+
               if from_edition == "--"
                 rspec_args.prepend('--')
                 from_edition = nil
@@ -46,15 +47,31 @@ module Gitlab
 
             attr_reader :current_release, :upgrade_path
 
+            # Extract version number from a string, for example: "gitlab/gitlab-ee:15.11.13-ee.0"
+            #
+            # @param [String] version_string version string to extract from
+            # @return [String] extracted version number
+            def extract_version(version_string)
+              QA::Release.new(version_string).tag.split('-').first
+            end
+
             # Perform update
             #
             # @param [Array] rspec_args
             # @return [void]
+            # rubocop:disable Metrics/AbcSize
             def update(rspec_args)
               Docker::Volumes.new.with_temporary_volumes do |volumes|
+                first_release_version = extract_version(upgrade_path.first.release)
+                seeding_suite_args = if Gem::Version.new(first_release_version) < Gem::Version.new("17.1.0")
+                                       ["--", "--tag", "smoke"]
+                                     else
+                                       ["--", "--tag", "health_check"]
+                                     end
+
                 # deploy first release in upgrade path and run specs to populate db
                 Runtime::Logger.info("Running the first release in upgrade path: #{upgrade_path.first}")
-                run_gitlab(upgrade_path.first, volumes, ["--", "--tag", "smoke"])
+                run_gitlab(upgrade_path.first, volumes, seeding_suite_args)
 
                 # deploy releases in upgrade path
                 upgrade_path[1..].each do |release|
@@ -67,6 +84,7 @@ module Gitlab
                 run_gitlab(current_release, volumes, rspec_args, skip_setup: true)
               end
             end
+            # rubocop:enable Metrics/AbcSize
 
             # Deploy gitlab instance and optionally run specs
             #
@@ -100,8 +118,8 @@ module Gitlab
             # @param [Array] rspec_args
             # @return [void]
             def run_specs(gitlab, release, rspec_args) # rubocop:disable Metrics/AbcSize
-              Runtime::Logger.info("Running smoke test to verify update and seed data in environment") unless upgrade_path.first != release
-              Runtime::Logger.info("Running smoke test to verify update") unless current_release != release
+              Runtime::Logger.info("Running test suite to verify update and seed data in environment") unless upgrade_path.first != release
+              Runtime::Logger.info("Running test suite to verify update") unless current_release != release
 
               Component::Specs.perform do |specs|
                 specs.release = release
@@ -119,11 +137,11 @@ module Gitlab
               end
             rescue Support::ShellCommand::StatusError => e
               if release == current_release # only fail on current release
-                Runtime::Logger.error("Failed to run test suite after final upgrade to release '#{release}'")
+                Runtime::Logger.error("Failed to run health check after final upgrade to release '#{release}'")
                 raise e
               end
 
-              Runtime::Logger.warn("Test run for release '#{gitlab.release}' finished with errors!")
+              Runtime::Logger.warn("Health check verification for release '#{gitlab.release}' finished with errors!")
             end
 
             # Run specs on first release to populate database and release being tested

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.11.0'
+    VERSION = '14.13.0'
   end
 end

metadata

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