gitlab-qa 15.3.0 → 15.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4bc0f25e1bbf4c9d82910a6b8a2da29df78bbe683d620d82cb0d36e28a906dcb
-  data.tar.gz: '0283a7bc128cc2e86f1e4aa1a7c0c0020be2a6c62c543019c1879e73bf5b9e2f'
+  metadata.gz: 8f1e475ea2c0271c08caf2de2d91881fb387148ee9a0686922e5c13905dfbae9
+  data.tar.gz: aecf00278bb4ae18d9a4b0b3e1d42d80f3a9b5482a38d755c83a2fa0fc3046ef
 SHA512:
-  metadata.gz: 0a14c2e7949b7cbe2b031e13ad5c12488160025c256d831e6bda9158890fc311277f31d10279b1a1b184fbef463b95bac2767b80103fa41a6d011d42ffc2be71
-  data.tar.gz: e4180225aa649c4796a85c4c016651adc8200cf6b8e2c69e451b8f64e26a32caf7f71bfd28159d026bcd1d6355b541631f6c8ae6f8c28fef38e94929b4216d87
+  metadata.gz: 164f25be24c4f6800d9dbb150776876a38e85c5bebcac4a72f449a0ed8e6ac2b65b89502cff82c588f101b6a9b299f3fbc2735f99d4a829990e85cdf5fc5674d
+  data.tar.gz: f1bbdd00cb493f5f6cb0a4f48af319503e3526515f12edceb631868194183e0910b08cedbdbf9e92f59177a7632a63b459bef681555b806eecf72bd6def571a7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gitlab-qa (15.3.0)
+    gitlab-qa (15.4.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/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/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.4.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.4.0
 platform: ruby
 authors:
 - GitLab Quality
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-02-25 00:00:00.000000000 Z
+date: 2025-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control
@@ -556,7 +556,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