gitlab-qa 15.3.0 → 15.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4bc0f25e1bbf4c9d82910a6b8a2da29df78bbe683d620d82cb0d36e28a906dcb
-  data.tar.gz: '0283a7bc128cc2e86f1e4aa1a7c0c0020be2a6c62c543019c1879e73bf5b9e2f'
+  metadata.gz: 560a6652160efd3d50f067a9025aabe2a50444e2c3a8109793abbb329812bb02
+  data.tar.gz: 1a99c243bd9f380dbcd68138c787dc1603424da7fa9e35ee8183820501926a30
 SHA512:
-  metadata.gz: 0a14c2e7949b7cbe2b031e13ad5c12488160025c256d831e6bda9158890fc311277f31d10279b1a1b184fbef463b95bac2767b80103fa41a6d011d42ffc2be71
-  data.tar.gz: e4180225aa649c4796a85c4c016651adc8200cf6b8e2c69e451b8f64e26a32caf7f71bfd28159d026bcd1d6355b541631f6c8ae6f8c28fef38e94929b4216d87
+  metadata.gz: ebd9339eab6959505dd2bfd60512b4053a0705952e5285ba13c8d8fe6735731600b3d6bf1614f43202b5a852baf51845405d5adb9f9a10641827c218a602b0f8
+  data.tar.gz: 662a700afcf694d62ab07a7f49454bb0d580a3108b1ff35556bc7f4b84965878b5eae3e4eded2d97cc56c02272d0b527e59725bdc8f401e6070f663b97793361

data/.gitlab/ci/omnibus.gitlab-ci.yml

@@ -0,0 +1,15 @@
+include:
+  - project: gitlab-org/gitlab
+    ref: master
+    file: .gitlab/ci/test-on-omnibus/main.gitlab-ci.yml
+
+# Override git strategy because pipeline template is designed to install 'gitlab-qa' from rubygems and thus does not require
+# cloning the project, yet here we need to clone repo to run 'gitlab-qa' with all local changes
+
+cache-gitlab-qa:
+  variables:
+    GIT_STRATEGY: clone
+
+.omnibus-e2e:
+  variables:
+    GIT_STRATEGY: clone

data/.gitlab/ci/versions.yml

@@ -0,0 +1,6 @@
+variables:
+  DEBIAN_VERSION: bookworm
+  DOCKER_VERSION: "24.0.5"
+  RUBY_VERSION: "3.3.7"
+  RUBYGEMS_VERSION: "3.6"
+  GIT_VERSION: "2.49"

data/.gitlab-ci.yml

@@ -8,9 +8,10 @@
     - vendor/ruby
 
 include:
+  - local: .gitlab/ci/versions.yml
   - 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_image: "${CI_REGISTRY}/gitlab-org/gitlab-build-images/ci/debian-${DEBIAN_VERSION}-slim-ruby-${RUBY_VERSION}:rubygems-${RUBYGEMS_VERSION}-git-${GIT_VERSION}"
       job_stage: "check"
   - component: gitlab.com/gitlab-org/components/gem-release/gem-release@~latest
 
@@ -21,7 +22,7 @@ stages:
   - deploy
 
 default:
-  image: ${CI_REGISTRY}/gitlab-org/gitlab-build-images/debian-${DEBIAN_VERSION}-ruby-${RUBY_VERSION}
+  image: ${CI_REGISTRY}/gitlab-org/gitlab-build-images/ci/debian-${DEBIAN_VERSION}-slim-ruby-${RUBY_VERSION}:rubygems-${RUBYGEMS_VERSION}-git-${GIT_VERSION}
   tags:
     - gitlab-org
   cache:
@@ -42,9 +43,6 @@ workflow:
     - if: '$CI_PIPELINE_SOURCE == "web"'
 
 variables:
-  DEBIAN_VERSION: bookworm
-  DOCKER_VERSION: "24.0.5"
-  RUBY_VERSION: "3.1.5"
   BUNDLE_PATH: vendor
   BUNDLE_SILENCE_ROOT_WARNING: "true"
   BUNDLE_SUPPRESS_INSTALL_USING_MESSAGES: "true"
@@ -55,7 +53,7 @@ variables:
     - if: '$CI_PIPELINE_SOURCE == "push" && ($CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH || $CI_COMMIT_REF_NAME =~ /^[\d-]+-stable$/)'
       changes: ["lib/**/version.rb"]
 
-package-and-test-env:
+test-on-omnibus-env:
   image: ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/alpine:latest
   stage: .pre
   variables:
@@ -71,11 +69,13 @@ package-and-test-env:
     - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
       changes:
         - Gemfile.lock
+        - .gitlab/ci/versions.yml
       variables:
         UPDATE_QA_CACHE: "true"
     - if: '$CI_MERGE_REQUEST_IID'
       changes:
         - Gemfile.lock
+        - .gitlab/ci/versions.yml
       variables:
         UPDATE_QA_CACHE: "true"
     - when: always
@@ -94,9 +94,11 @@ cache-gems:
     - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
       changes:
         - Gemfile.lock
+        - .gitlab/ci/versions.yml
     - if: '$CI_MERGE_REQUEST_IID'
       changes:
         - Gemfile.lock
+        - .gitlab/ci/versions.yml
 
 danger-review:
   needs:
@@ -125,10 +127,10 @@ rspec:
         coverage_format: cobertura
         path: coverage/coverage.xml
 
-package-and-test:
+test-on-omnibus:
   stage: qa
   needs:
-    - package-and-test-env
+    - test-on-omnibus-env
   variables:
     RELEASE: EE
     RUN_WITH_BUNDLE: "true"
@@ -136,25 +138,23 @@ package-and-test:
     SKIP_REPORT_IN_ISSUES: "true"
     UPDATE_QA_CACHE: $UPDATE_QA_CACHE
     GITLAB_QA_CACHE_KEY: $GITLAB_QA_CACHE_KEY
-    QA_RETRY_FAILED_SPECS: "true"
+    RUN_ALL_TESTS: "true"
+    QA_PATH: "."
+    QA_RETRY_FAILED_SPECS: "false" # do not retry test failures as gitlab-qa mostly affect deploy part only
     QA_RUN_TYPE: gitlab-qa
     QA_EXPORT_TEST_METRICS: "false" # skip metrics export as this pipeline is only used to validate gitlab-qa changes
   inherit:
     variables:
       - RUBY_VERSION
       - DEBIAN_VERSION
-      - DOCKER_VERSION
   trigger:
+    include: .gitlab/ci/omnibus.gitlab-ci.yml
     strategy: depend
     forward:
       yaml_variables: true
       pipeline_variables: true
-    include:
-      - project: gitlab-org/gitlab
-        ref: master
-        file: .gitlab/ci/test-on-omnibus/main.gitlab-ci.yml
   rules:
     - if: '$CI_MERGE_REQUEST_IID'
       when: manual
       allow_failure: true
-    - when: always
+    - if: '$CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH || $CI_COMMIT_REF_NAME =~ /^[\d-]+-stable$/'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gitlab-qa (15.3.0)
+    gitlab-qa (15.5.0)
       activesupport (>= 6.1, < 7.2)
       ffi (~> 1.17)
       gitlab (~> 4.19)

data/README.md

@@ -90,9 +90,8 @@ of tests.
 - [Release process](docs/release_process.md)
 - [Run QA tests against your GDK setup](docs/run_qa_against_gdk.md)
 - [Trainings](docs/trainings.md)
-- [Waits](docs/waits.md)
 - [What tests can be run?](docs/what_tests_can_be_run.md)
-- [Specifics for Mac OS with M1, M2 processors & Docker Desktop](docs/specifics_for_macos_m1_m2.md)
+- [Troubleshooting](docs/troubleshooting.md)
 
 ## How do we use it
 

data/docs/developer/http_mocking.md

@@ -24,5 +24,5 @@ end
 ```
 
 Mock server will be accessible from within gitlab or qa test container via `http://smocker.test` url and admin interface will be
-accessible via `http://smocker.test:8081`. Refer to [Getting Started](https://smocker.dev/guide/getting-started.html) guide on
+accessible via `http://smocker.test:8081`. Refer to [Getting Started](https://smocker.dev/docs/guide/getting-started) guide on
 how to use the server and define mocked requests and responses.

data/docs/what_tests_can_be_run.md

@@ -321,6 +321,9 @@ $ gitlab-qa Test::Omnibus::UpdateFromPrevious gitlab-ee:dev-tag 15.6.0-pre major
 
 # Patch upgrade - will perform upgrade from 17.8.1 -> gitlab-ee:dev-tag (17.8.2-pre)
 $ gitlab-qa Test::Omnibus::UpdateFromPrevious gitlab-ee:dev-tag 17.8.2-pre patch
+
+# Internal patch upgrade - will perform upgrade from dev.gitlab.org:5005/gitlab/omnibus-gitlab/gitlab-ee:17.8.1-internal0-0 -> gitlab-ee:dev-tag (17.8.2-pre)
+$ gitlab-qa Test::Omnibus::UpdateFromPrevious gitlab-ee:dev-tag 17.8.2-pre internal_patch
 ```
 
 ### `Test::Omnibus::UpdateToNext <full image address> <current_version> <from_edition>`

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

@@ -68,15 +68,16 @@ module Gitlab
               'listen_addr': '0.0.0.0:#{gitaly_port}',
               'prometheus_listen_addr': '0.0.0.0:9236',
               'auth_token': 'PRAEFECT_INTERNAL_TOKEN',
-              'transactions': {'enabled': #{Runtime::Env.qa_gitaly_transactions_enabled?}}
+              'transactions': {'enabled': #{Runtime::Env.qa_gitaly_transactions_enabled?}},
+              storage: [
+                          {
+                            name: '#{name}',
+                            path: '/var/opt/gitlab/git-data/repositories',
+                          },
+                        ]
             }
             gitlab_shell['secret_token'] = 'GITLAB_SHELL_SECRET_TOKEN';
             gitlab_rails['internal_api_url'] = 'http://#{cluster_config.gitlab_name}.#{cluster_config.network}';
-            git_data_dirs({
-              '#{name}' => {
-                'path' => '/var/opt/gitlab/git-data'
-              }
-            });
           OMNIBUS
         end
       end

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

@@ -86,7 +86,7 @@ module Gitlab
           )
 
           <<~CMD.strip
-            echo "#{runner_config}" > /etc/gitlab-runner/config.toml &&
+            printf '#{runner_config.chomp.gsub(/\n/, '\\n').gsub('"', '\"')}' > /etc/gitlab-runner/config.toml  &&
             gitlab-runner register #{registration_args} &&
             gitlab-runner run
           CMD

data/lib/gitlab/qa/release.rb

@@ -37,7 +37,7 @@ module Gitlab
       # version
       DEV_OFFICIAL_TAG_REGEX = /
         \A
-          (?<version>\d+\.\d+.\d+(?:-rc\d+)?)-(?<edition>ce|ee|jh)
+          (?<version>\d+\.\d+.\d+(?:-rc\d+)?)-(?<edition>ce|ee|jh)(?:\.(?<build>\d+))?
         \z
       /xi
 
@@ -115,6 +115,11 @@ module Gitlab
                         omnibus_project = image.match(CUSTOM_GITLAB_IMAGE_REGEX)[:project]
                         gitlab_project = ci_project_path ? "/#{ci_project_path}/" : "/gitlab-org/gitlab/"
 
+                        "#{image.gsub(omnibus_project, gitlab_project)}-qa"
+                      elsif dev_gitlab_org?
+                        omnibus_project = image.match(CUSTOM_GITLAB_IMAGE_REGEX)[:project]
+                        gitlab_project = "/gitlab/gitlab-ee/"
+
                         "#{image.gsub(omnibus_project, gitlab_project)}-qa"
                       else
                         "#{image}-qa"
@@ -140,9 +145,14 @@ module Gitlab
           end
       end
 
-      # Tag scheme for gitlab-{ce,ee}-qa images is like 11.1.0-rc12-ee
       def qa_tag
-        if dev_gitlab_org? && (match_data = tag.match(DEV_TAG_REGEX))
+        # Case 1: Official packages (e.g., 11.1.0-rc12.ee.0 or 12.5.4-ce.1)
+        if match_data = tag.match(DEV_OFFICIAL_TAG_REGEX)
+          version = match_data[:version]
+          edition = match_data[:edition]
+          "#{version}-#{edition}"
+        # Case 2: Auto-deploy packages from dev.gitlab.org (e.g., 12.1.201906121026-325a6632895.b340d0bd35d)
+        elsif match_data = tag.match(DEV_TAG_REGEX)
           match_data[:gitlab_ref]
         else
           tag.sub(/[-.]([ce]e)(\.(\d+))?\z/, '-\1')

data/lib/gitlab/qa/scenario/test/instance/airgapped.rb

@@ -102,12 +102,12 @@ module Gitlab
               <<~OMNIBUS
                 external_url 'http://#{config.gitlab_name}.#{iptables_restricted_network}';
 
-                git_data_dirs({
+                gitlab_rails['repositories_storages'] = {
                   'default' => {
-                    'gitaly_address' => 'tcp://#{config.praefect_addr}:#{config.praefect_port}',
+                    'gitaly_address' => "tcp://#{config.praefect_addr}:#{config.praefect_port}",
                     'gitaly_token' => 'PRAEFECT_EXTERNAL_TOKEN'
                   }
-                });
+                };
                 gitaly['enable'] = false;
                 gitlab_shell['secret_token'] = 'GITLAB_SHELL_SECRET_TOKEN';
                 prometheus['scrape_configs'] = [

data/lib/gitlab/qa/scenario/test/instance/repository_storage.rb

@@ -47,20 +47,19 @@ module Gitlab
               <<~OMNIBUS
                 external_url 'http://gitlab.test';
 
-                git_data_dirs({
-                  'default' => {
-                    'gitaly_address' => 'tcp://praefect.test:2305',
-                    'gitaly_token' => 'PRAEFECT_EXTERNAL_TOKEN'
+                gitlab_rails['repositories_storages'] = {
+                  "default" => {
+                    "gitaly_address" => "tcp://praefect.test:2305",
+                    "gitaly_token" => "PRAEFECT_EXTERNAL_TOKEN"
                   },
-                  'gitaly' => {
-                    'gitaly_address' => 'tcp://gitlab.test:8075',
-                    'path' => '/var/opt/gitlab/git-data/gitaly'
+                  "gitaly" => {
+                    "gitaly_address" => "tcp://gitlab.test:8075"
                   },
-                  'secondary' => {
-                    'gitaly_address' => 'tcp://gitlab.test:8075',
-                    'path' => '/var/opt/gitlab/git-data/secondary'
+                  "secondary" => {
+                    "gitaly_address" => "tcp://gitlab.test:8075"
                   }
-                });
+                };
+
                 gitaly['enable'] = true;
                 gitaly['configuration'] = {
                   auth: {
@@ -70,11 +69,11 @@ module Gitlab
                   storage: [
                     {
                       name: 'gitaly',
-                      path: '/var/opt/gitlab/git-data/gitaly',
+                      path: '/var/opt/gitlab/git-data/gitaly/repositories',
                     },
                     {
                       name: 'secondary',
-                      path: '/var/opt/gitlab/git-data/secondary',
+                      path: '/var/opt/gitlab/git-data/secondary/repositories',
                     },
                   ],
                 };

data/lib/gitlab/qa/scenario/test/integration/gitaly_cluster.rb

@@ -51,12 +51,12 @@ module Gitlab
               <<~OMNIBUS
                 external_url 'http://#{config.gitlab_name}.#{config.network}';
 
-                git_data_dirs({
+                gitlab_rails['repositories_storages'] = {
                   'default' => {
-                    'gitaly_address' => 'tcp://#{config.praefect_addr}:#{config.praefect_port}',
+                    'gitaly_address' => "tcp://#{config.praefect_addr}:#{config.praefect_port}",
                     'gitaly_token' => 'PRAEFECT_EXTERNAL_TOKEN'
                   }
-                });
+                };
                 gitaly['enable'] = false;
                 gitlab_shell['secret_token'] = 'GITLAB_SHELL_SECRET_TOKEN';
                 prometheus['scrape_configs'] = [

data/lib/gitlab/qa/scenario/test/integration/mtls.rb

@@ -73,10 +73,14 @@ module Gitlab
                 gitlab_rails['gitaly_token'] = 'abc123secret';
                 gitlab_shell['secret_token'] = 'shellsecret';
 
-                git_data_dirs({
-                  'default' => { 'gitaly_address' => 'tls://#{@gitaly_name}.#{@network}:9999' },
-                  'storage1' => { 'gitaly_address' => 'tls://#{@gitaly_name}.#{@network}:9999' },
-                });
+                gitlab_rails['repositories_storages'] = {
+                  'default' => {
+                    'gitaly_address' => "tls://#{@gitaly_name}.#{@network}:9999"
+                  },
+                  'storage1' => {
+                    'gitaly_address' => "tls://#{@gitaly_name}.#{@network}:9999"
+                  }
+                }
               OMNIBUS
             end
 
@@ -118,11 +122,6 @@ module Gitlab
                 gitlab_shell['secret_token'] = 'shellsecret';
 
                 gitlab_rails['internal_api_url'] = 'https://#{@gitlab_name}.#{@network}';
-
-                git_data_dirs({
-                  'default' => { 'path' => '/var/opt/gitlab/git-data' },
-                  'storage1' => { 'path' => '/mnt/gitlab/git-data' },
-                })
               OMNIBUS
             end
           end

data/lib/gitlab/qa/scenario/test/integration/praefect.rb

@@ -19,16 +19,16 @@ module Gitlab
               <<~OMNIBUS
                 external_url 'http://#{config.gitlab_name}.#{config.network}';
 
-                git_data_dirs({
+                gitlab_rails['repositories_storages'] = {
                   'default' => {
-                    'gitaly_address' => 'tcp://#{config.praefect_addr}:#{config.praefect_port}',
+                    'gitaly_address' => "tcp://#{config.praefect_addr}:#{config.praefect_port}",
                     'gitaly_token' => 'PRAEFECT_EXTERNAL_TOKEN'
                   },
                   'gitaly' => {
-                    'gitaly_address' => 'tcp://#{config.gitlab_name}.#{config.network}:8075',
-                    'path' => '/var/opt/gitlab/git-data'
+                    'gitaly_address' => "tcp://#{config.gitlab_name}.#{config.network}:8075"
                   }
-                });
+                }
+
                 gitaly['enable'] = true;
                 gitaly['configuration'] = {
                   auth: {

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

@@ -41,6 +41,8 @@ module Gitlab
             major_upgrade_path
           when "from_patch"
             from_patch_upgrade_path
+          when "internal_patch"
+            internal_patch_upgrade_path
           else
             raise ArgumentError, "Unknown semver component: #{semver_component}"
           end
@@ -106,6 +108,69 @@ module Gitlab
           [release(latest_patch(next_version))]
         end
 
+        # Upgrade path for internal patch version
+        # Sets up authentication for internal registry
+        # Finds the latest internal build for the current version
+        #
+        # @return [Array<QA::Release>] Array with the latest internal build for current version or exits with message
+        def internal_patch_upgrade_path
+          unless Runtime::Env.dev_access_token_variable
+            logger.error("Skipping upgrade test as internal patch upgrades are not supported without dev access token")
+            exit 0
+          end
+
+          verify_current_version_exists
+          gitlab_int_reg_repo = "dev.gitlab.org:5005/gitlab/omnibus-gitlab/gitlab-ee"
+
+          # Internal releases are stored in private repo and
+          # not available for search with API
+          release = QA::Release.new("#{gitlab_int_reg_repo}:latest")
+          docker = Docker::Engine.new
+          docker.login(**release.login_params) if release.login_params
+          latest_internal_tag = find_latest_internal_tag(gitlab_int_reg_repo, docker)
+
+          if latest_internal_tag
+            [QA::Release.new("#{gitlab_int_reg_repo}:#{latest_internal_tag}")]
+          else
+            logger.warn("No internal image found for GitLab version #{current_version}")
+            exit 0
+          end
+        end
+
+        # Find the latest internal tag for the current version
+        # Searches for tags in descending order, from 10 down to 0
+        # Returns the first available tag or nil if none found
+        #
+        # @param [String] gitlab_int_reg_repo Registry repository path
+        # @param [Docker::Engine] docker_engine Docker engine instance
+        # @return [String, nil] Tag name if found, nil otherwise
+        def find_latest_internal_tag(gitlab_int_reg_repo, docker)
+          # Try to find the highest internal release tag, starting from 10
+          latest_internal_tag = nil
+          logger.info("Start searching for the latest released internal image for gitlab version: #{current_version}...")
+
+          # Release team note: no more than 10 internal releases expected for version
+          10.downto(0) do |internal_num|
+            tag = "#{current_version}-internal#{internal_num}-0"
+            image_uri = "#{gitlab_int_reg_repo}:#{tag}"
+
+            logger.info("Checking for image: #{image_uri}")
+
+            begin
+              # Try to pull the image (this will fail if image doesn't exist)
+              docker.pull(image: gitlab_int_reg_repo, tag: tag)
+
+              latest_internal_tag = tag
+              logger.info("Found image: #{image_uri}")
+              break
+            rescue Support::ShellCommand::StatusError => e
+              logger.info("x - Image not found: #{image_uri}, \n #{e}")
+            end
+          end
+
+          latest_internal_tag
+        end
+
         # Docker release image
         #
         # @param [String] version

data/lib/gitlab/qa/version.rb

@@ -2,6 +2,6 @@
 
 module Gitlab
   module QA
-    VERSION = '15.3.0'
+    VERSION = '15.5.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 15.3.0
+  version: 15.5.0
 platform: ruby
 authors:
 - GitLab Quality
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-02-25 00:00:00.000000000 Z
+date: 2025-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control
@@ -354,6 +354,8 @@ files:
 - ".gitignore"
 - ".gitlab-ci.yml"
 - ".gitlab/changelog_config.yml"
+- ".gitlab/ci/omnibus.gitlab-ci.yml"
+- ".gitlab/ci/versions.yml"
 - ".gitlab/issue_templates/Default.md"
 - ".gitlab/merge_request_templates/Default.md"
 - ".gitlab/merge_request_templates/Release.md"
@@ -556,7 +558,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.27
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: Integration tests for GitLab