gitlab-qa 14.21.0 → 15.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d84483452fba7a39c684e4b5b7f772a63712c6d400027b579dca7769ce231c7e
-  data.tar.gz: 64e52ceaa976d1dc0a3f513a26e71f4e529c5a9d9eea8c39474f683da963d718
+  metadata.gz: f9382f0cd194cff2449dde64bb2df1726490adedcd2092ba2dbf86f13b29cc61
+  data.tar.gz: 5cd6ade9b04efc469c5f150d7f6d9fb542aa176858dd24be6d5cffb54625d32a
 SHA512:
-  metadata.gz: 8633d6f704664548214395cf5e3b8560e6776f0052d5dcf1da91d3239e5489236877495b9bc077043f4efeb588e15272c595dfda0dc147386818d2a3c505d476
-  data.tar.gz: ca524f4c69c44fab4241cfd836bf2ed0f10047a3b030f942474ed360c8f7356a3ee678aa56dbb59a38697add270dcc8a881789a84fc3c675eb5b65f6395d0425
+  metadata.gz: ec4030accb53dc9962aa48df455f1f5537fdc5549b94d5c4224f223bbe27d98a1c9fcca1b4381d79053710aac1eb450298f3782c8a2b53902fba865eda4da5ef
+  data.tar.gz: 85f0e1f30d57a5d86f94e612cdfe0c1ccb981ea9e12db6433db433301a7ea6836cfc61a83368d7fdc3d3470b917f67e09ce51c2eb095bb39acd0aad1125a04cf

data/Gemfile.lock

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

data/docs/run_qa_against_gdk.md

@@ -54,11 +54,11 @@ If they do not match, a test will be signed out when it visits a page directly b
 **Note:** When you log into your GDK instance of GitLab for the first time, the root password requires a change.
 GitLab QA expects the default initial password to be used in tests; see all default values listed in
 [Supported GitLab environment variables](what_tests_can_be_run.md#supported-gitlab-environment-variables).
-If you have changed your root password, you must set the `GITLAB_INITIAL_ROOT_PASSWORD` environment
+If you have changed your root password, you must set the `GITLAB_ADMIN_PASSWORD` environment
 variable.
 
   ```shell
-  export GITLAB_INITIAL_ROOT_PASSWORD="<GDK root password>"
+  export GITLAB_ADMIN_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`:

data/docs/what_tests_can_be_run.md

@@ -36,20 +36,8 @@ All environment variables used by GitLab QA should be defined in [`lib/gitlab/qa
 |-----------------------|-----------|-----------------------|----------|
 | `GITLAB_USERNAME`       | `root`  | Username to use when signing into GitLab. | Yes|
 | `GITLAB_PASSWORD`       | `5iveL!fe` | Password to use when signing into GitLab. | Yes|
-| `GITLAB_FORKER_USERNAME`|-  | Username to use for forking a project. | Yes|
-| `GITLAB_FORKER_PASSWORD`|-  | Password to use for forking a project. | Yes|
 | `GITLAB_QA_USERNAME_1`  |-  | Username available in environments where signup is disabled. | No|
 | `GITLAB_QA_PASSWORD_1`  |-  | Password for `GITLAB_QA_USERNAME_1` available in environments where signup is disabled (e.g. staging.gitlab.com). | No|
-| `GITLAB_QA_USERNAME_2`  |-  | Another username available in environments where signup is disabled. | No|
-| `GITLAB_QA_PASSWORD_2`  |-  | Password for `GITLAB_QA_USERNAME_2` available in environments where signup is disabled (e.g. staging.gitlab.com). | No|
-| `GITLAB_QA_USERNAME_3`  |-  | Another username available in environments where signup is disabled. | No|
-| `GITLAB_QA_PASSWORD_3`  |-  | Password for `GITLAB_QA_USERNAME_3` available in environments where signup is disabled (e.g. staging.gitlab.com). | No|
-| `GITLAB_QA_USERNAME_4`  |-  | Another username available in environments where signup is disabled. | No|
-| `GITLAB_QA_PASSWORD_4`  |-  | Password for `GITLAB_QA_USERNAME_4` available in environments where signup is disabled (e.g. staging.gitlab.com). | No|
-| `GITLAB_QA_USERNAME_5`  |-  | Another username available in environments where signup is disabled. | No|
-| `GITLAB_QA_PASSWORD_5`  |-  | Password for `GITLAB_QA_USERNAME_5` available in environments where signup is disabled (e.g. staging.gitlab.com). | No|
-| `GITLAB_QA_USERNAME_6`  |-  | Another username available in environments where signup is disabled. | No|
-| `GITLAB_QA_PASSWORD_6`  |-  | Password for `GITLAB_QA_USERNAME_6` available in environments where signup is disabled (e.g. staging.gitlab.com). | No|
 | `GITLAB_LDAP_USERNAME`  |-  | LDAP username to use when signing into GitLab. | No|
 | `GITLAB_LDAP_PASSWORD`  |-  | LDAP password to use when signing into GitLab. | No|
 | `GITLAB_ADMIN_USERNAME` |-  | Admin username to use when adding a license. | No|
@@ -99,7 +87,6 @@ All environment variables used by GitLab QA should be defined in [`lib/gitlab/qa
 | `DEPLOY_VERSION` |- | The version of GitLab being tested against. | No|
 | `GITLAB_QA_USER_AGENT` |- | The browser user-agent to use instead of the default Chrome user-agent. When set to the appropriate value (stored in 1Password), this allows tests to bypass certain login challenges (e.g., reCAPTCHA and ArkoseLabs). | No|
 | `GEO_FAILOVER` | `false` | Set to `true` when a Geo secondary site has been promoted to a Geo primary site. | No|
-| `GITLAB_INITIAL_ROOT_PASSWORD` | `5iveL!fe` | Initial root password for Omnibus installations | No|
 | `COLORIZED_LOGS` | `false` | Colors GitLab QA and test logs to improve readability | No|
 | `QA_DOCKER_ADD_HOSTS` |- | Comma separated list of hosts to add to /etc/hosts in docker container | No|
 | `FIPS` |- | Set to `1` or `true` to indicate that the test is running under FIPS mode | No|
@@ -841,10 +828,6 @@ GitLab project).
 
 - `GITLAB_ADMIN_PASSWORD`: The administrator user's password.
 
-- `GITLAB_QA_USERNAME_X`: The username of a pre-generated test user, where `X` is `1` to `6`.
-
-- `GITLAB_QA_PASSWORD_X`: The pre-generated test user's password.
-
 **Optional environment variables:**
 
 - `GITLAB_QA_DEV_ACCESS_TOKEN`: A valid personal access token for the
@@ -966,9 +949,9 @@ to the canary fleet.
 
 **Required by specific tests:**
 
-- `GITLAB_QA_USERNAME_X`: The username of a pre-generated test user, where `X` is `1` to `6`.
+- `GITLAB_QA_USERNAME_1`: The username of a pre-generated test user.
 
-- `GITLAB_QA_PASSWORD_X`: The pre-generated test user's password.
+- `GITLAB_QA_PASSWORD_1`: The pre-generated test user's password.
 
 **Optional environment variables:**
 

data/lib/gitlab/qa/runtime/env.rb

@@ -11,6 +11,8 @@ module Gitlab
         extend self
         using Rainbow
 
+        DEFAULT_ADMIN_PASSWORD = '5iveL!fe'
+
         # Variables that are used in tests and are passed through to the docker container that executes the tests.
         # These variables should be listed in /docs/what_tests_can_be_run.md#supported-gitlab-environment-variables
         # unless they're defined elsewhere (e.g.: https://docs.gitlab.com/ee/ci/variables/predefined_variables.html).
@@ -62,7 +64,6 @@ module Gitlab
           'GITLAB_ADMIN_USERNAME' => :admin_username,
           'GITLAB_FORKER_PASSWORD' => :forker_password,
           'GITLAB_FORKER_USERNAME' => :forker_username,
-          'GITLAB_INITIAL_ROOT_PASSWORD' => :initial_root_password,
           'GITLAB_LDAP_PASSWORD' => :ldap_password,
           'GITLAB_LDAP_USERNAME' => :ldap_username,
           'GITLAB_PASSWORD' => :user_password,
@@ -76,7 +77,6 @@ module Gitlab
           'GITLAB_QA_PASSWORD_2' => :gitlab_qa_password_2,
           'GITLAB_QA_USER_AGENT' => :gitlab_qa_user_agent,
           'GITLAB_QA_USERNAME_1' => :gitlab_qa_username_1,
-          'GITLAB_QA_USERNAME_2' => :gitlab_qa_username_2,
           'GITLAB_SANDBOX_NAME' => :gitlab_sandbox_name,
           'GITLAB_TLS_CERTIFICATE' => :gitlab_tls_certificate,
           'GITLAB_URL' => :gitlab_url,
@@ -187,6 +187,10 @@ module Gitlab
           qa_variables.merge(defined_variables)
         end
 
+        def admin_password
+          ENV['GITLAB_ADMIN_PASSWORD'] || DEFAULT_ADMIN_PASSWORD
+        end
+
         # Variables that should be masked
         #
         # @return [Array] the values of the variables that should be masked
@@ -231,10 +235,6 @@ module Gitlab
           env_var_name_if_defined('GITLAB_QA_DEV_ACCESS_TOKEN')
         end
 
-        def initial_root_password
-          env_var_value_if_defined('GITLAB_INITIAL_ROOT_PASSWORD') || '5iveL!fe'
-        end
-
         def host_artifacts_dir
           @host_artifacts_dir ||= File.join(
             env_var_value_if_defined('QA_ARTIFACTS_DIR') || '/tmp/gitlab-qa', Runtime::Env.run_id
@@ -333,22 +333,6 @@ module Gitlab
           raise ArgumentError, "Please provide CLOUD_CONNECTOR_BASE_URL"
         end
 
-        def require_initial_password!
-          return unless env_var_value_if_defined('GITLAB_INITIAL_ROOT_PASSWORD').to_s.strip.empty?
-
-          raise(
-            ArgumentError,
-            "Environment variable GITLAB_INITIAL_ROOT_PASSWORD must be provided to set an initial root password."
-          )
-        end
-
-        def override_default_password!
-          require_initial_password!
-
-          ENV['GITLAB_PASSWORD'] = initial_root_password
-          ENV['GITLAB_ADMIN_PASSWORD'] = initial_root_password
-        end
-
         def skip_pull?
           enabled?(env_var_value_if_defined('QA_SKIP_PULL'), default: false)
         end

data/lib/gitlab/qa/runtime/omnibus_configurations/default.rb

@@ -12,7 +12,7 @@ module Gitlab
               gitlab_rails['gitlab_default_theme'] = 10 # Light Red Theme
               gitlab_rails['gitlab_disable_animations'] = true # Disable animations
               gitlab_rails['application_settings_cache_seconds'] = 0 # Settings cache expiry
-              gitlab_rails['initial_root_password'] = '#{Runtime::Env.initial_root_password}' # Initial root password
+              gitlab_rails['initial_root_password'] = '#{Runtime::Env.admin_password}' # Initial root password
             OMNIBUS
           end
 

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

@@ -10,9 +10,9 @@ module Gitlab
             attr_reader :orchestrate_mail_hog_server
 
             def initialize
+              super
               @spec_suite = 'Test::Integration::ImportWithSMTP'
               @orchestrate_mail_hog_server = true
-              super
             end
 
             def configure_omnibus(gitlab, mail_hog)

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

@@ -16,60 +16,55 @@ module Gitlab
             end
 
             def perform(release, *rspec_args)
-              # You can create 2 networks with the same 'human friendly' name if you run network create in parallel
-              # However this causes 'ambiguous network' errors, so lets just create network manually earlier
-              # see https://github.com/moby/moby/issues/18864#issuecomment-167006094
-              # and also api docs https://github.com/moby/moby/blob/master/docs/api/v1.42.yaml#L9932-L9941
-              docker = Docker::Engine.new
-              docker.network_create(@network) unless docker.network_exists?(@network)
-
-              gitaly_thread = Thread.new do
-                Thread.current.abort_on_exception = true
-                @gitaly_node = Component::Gitlab.perform do |gitaly|
-                  gitaly.release = QA::Release.new(release)
-                  gitaly.name = @gitaly_name
-                  gitaly.network = @network
-                  gitaly.skip_availability_check = true
-                  gitaly.seed_admin_token = false
-
-                  gitaly.omnibus_configuration << gitaly_omnibus
-                  gitaly.gitaly_tls = true
-
-                  gitaly.instance(skip_teardown: true)
-                end
-              end
+              gitaly_node = gitaly_node(release)
+              gitaly_node.instance(skip_teardown: true)
 
               Component::Gitlab.perform do |gitlab|
                 gitlab.release = QA::Release.new(release)
                 gitlab.name = @gitlab_name
                 gitlab.network = @network
-
-                gitlab.omnibus_configuration << gitlab_omnibus
+                gitlab.omnibus_configuration << gitlab_omnibus_config
                 gitlab.tls = true
 
                 gitlab.instance do
-                  gitaly_thread.join
                   Runtime::Logger.info("Running mTLS specs!")
-
-                  if @tag
-                    rspec_args << "--" unless rspec_args.include?('--')
-                    rspec_args << "--tag" << @tag
-                  end
-
-                  Component::Specs.perform do |specs|
-                    specs.suite = @spec_suite
-                    specs.release = gitlab.release
-                    specs.network = gitlab.network
-                    specs.args = [gitlab.address, *rspec_args]
-                    specs.env = @env
-                  end
+                  run_mtls_specs(gitlab, *rspec_args)
                 end
               end
-            ensure
-              @gitaly_node&.teardown
+              gitaly_node.teardown
+            end
+
+            private
+
+            def gitaly_node(release)
+              Component::Gitlab.new.tap do |gitaly|
+                gitaly.release = QA::Release.new(release)
+                gitaly.name = @gitaly_name
+                gitaly.network = @network
+                gitaly.skip_availability_check = true
+                gitaly.seed_admin_token = false
+
+                gitaly.omnibus_configuration << gitaly_omnibus_config
+                gitaly.gitaly_tls = true
+              end
+            end
+
+            def run_mtls_specs(gitlab, *rspec_args)
+              if @tag
+                rspec_args << "--" unless rspec_args.include?('--')
+                rspec_args << "--tag" << @tag
+              end
+
+              Component::Specs.perform do |specs|
+                specs.suite = @spec_suite
+                specs.release = gitlab.release
+                specs.network = gitlab.network
+                specs.args = [gitlab.address, *rspec_args]
+                specs.env = @env
+              end
             end
 
-            def gitlab_omnibus
+            def gitlab_omnibus_config
               <<~OMNIBUS
                 gitaly['enable'] = false;
 
@@ -85,7 +80,7 @@ module Gitlab
               OMNIBUS
             end
 
-            def gitaly_omnibus
+            def gitaly_omnibus_config
               <<~OMNIBUS
                 gitaly['configuration'] = {
                   auth: {

data/lib/gitlab/qa/version.rb

@@ -2,6 +2,6 @@
 
 module Gitlab
   module QA
-    VERSION = '14.21.0'
+    VERSION = '15.0.0'
   end
 end

data/rubocop/cop/gitlab/dangerous_interpolation.rb

@@ -67,7 +67,6 @@ module RuboCop
           'GCLOUD_REGION' => :gcloud_region,
           'SIGNUP_DISABLED' => :signup_disabled,
           'GITLAB_QA_USERNAME_1' => :gitlab_qa_username_1,
-          'GITLAB_QA_USERNAME_2' => :gitlab_qa_username_2,
           'QA_GITHUB_USERNAME' => :qa_github_username,
           'QA_GITLAB_HOSTNAME' => :qa_gitlab_hostname,
           'QA_GITLAB_USE_TLS' => :qa_gitlab_use_tls,
@@ -107,7 +106,6 @@ module RuboCop
           'CACHE_NAMESPACE_NAME' => :cache_namespace_name,
           'GITLAB_QA_USER_AGENT' => :gitlab_qa_user_agent,
           'GEO_FAILOVER' => :geo_failover,
-          'GITLAB_INITIAL_ROOT_PASSWORD' => :initial_root_password,
           'GITLAB_TLS_CERTIFICATE' => :gitlab_tls_certificate,
           'AWS_S3_REGION' => :aws_s3_region,
           'AWS_S3_KEY_ID' => :aws_s3_key_id,

metadata

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