gitlab-qa 7.9.3 → 7.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87fb79561aa8d1d600bbcc8d8bf39de04bd951450b48bc445bf9b479c31f2fc0
-  data.tar.gz: fd36e810543f04eb94cc8e490ec9851dc56a429a1fb5d5b496795293f9922520
+  metadata.gz: 6bdd2d8930d98c4af896a15b4f43a724a2c24300ae44d3498f7db96914592880
+  data.tar.gz: 3db21c904e7b711d167f465f9a75abe32526bf89edfa095e2551d91786962e6d
 SHA512:
-  metadata.gz: f0935847d3898e27a24fc2552040682aa1782f1da2ab83086983e7d51979468920e26e84a5bac48495d2b683c2d5f2ad869e583807b9dc3295637f2f1a1884cf
-  data.tar.gz: 873e3ebb9efa18b8b85a197436a10fb5411514228396158fb5dfa250bc7284afee75b01af5c97fd8d57eca2a2e0009b26fef56eae401fe33504c421927d41f6a
+  metadata.gz: 7fcfe4c12d04ebcb175e7fc7f7d3a282e2a759eb89e07cff001741d80b476658a033de10e32acd7ed05b6c1008025ad0dda15ecf6dd4e8b2f347eb4c9c023080
+  data.tar.gz: 70767539d91c219907646c5197127db1070317ea8038f2d01b7a5bcb150fcde36a6f6efad73c71357f8301069845b15c148fdf452a63c2a739a6c68eb229012f

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

@@ -49,6 +49,9 @@ module Gitlab
           'GITLAB_SANDBOX_NAME' => :gitlab_sandbox_name,
           'GITLAB_QA_ACCESS_TOKEN' => :qa_access_token,
           'GITLAB_QA_ADMIN_ACCESS_TOKEN' => :qa_admin_access_token,
+          'GITLAB_QA_DEV_ACCESS_TOKEN' => :qa_dev_access_token,
+          'GITLAB_QA_CONTAINER_REGISTRY_ACCESS_TOKEN' => :qa_container_registry_access_token,
+          'GITLAB_QA_ISSUE_URL' => :qa_issue_url,
           'GITHUB_ACCESS_TOKEN' => :github_access_token,
           'GITLAB_URL' => :gitlab_url,
           'SIMPLE_SAML_HOSTNAME' => :simple_saml_hostname,
@@ -60,6 +63,7 @@ module Gitlab
           'CLOUDSDK_CORE_PROJECT' => :cloudsdk_core_project,
           'GCLOUD_REGION' => :gcloud_region,
           'SIGNUP_DISABLED' => :signup_disabled,
+          'GITLAB_CI_API_TOKEN' => :gitlab_ci_api_token,
           'GITLAB_QA_USERNAME_1' => :gitlab_qa_username_1,
           'GITLAB_QA_PASSWORD_1' => :gitlab_qa_password_1,
           'GITLAB_QA_USERNAME_2' => :gitlab_qa_username_2,
@@ -71,17 +75,24 @@ module Gitlab
           'KNAPSACK_TEST_FILE_PATTERN' => :knapsack_test_file_pattern,
           'KNAPSACK_TEST_DIR' => :knapsack_test_dir,
           'CI' => :ci,
+          'CI_COMMIT_REF_NAME' => :ci_commit_ref_name,
           'CI_JOB_NAME' => :ci_job_name,
           'CI_JOB_URL' => :ci_job_url,
+          'CI_JOB_TOKEN' => :ci_job_token,
           'CI_RUNNER_ID' => :ci_runner_id,
           'CI_SERVER_HOST' => :ci_server_host,
           'CI_SERVER_PERSONAL_ACCESS_TOKEN' => :ci_server_personal_access_token,
           'CI_NODE_INDEX' => :ci_node_index,
           'CI_NODE_TOTAL' => :ci_node_total,
+          'CI_PROJECT_ID' => :ci_project_id,
           'CI_PROJECT_NAME' => :ci_project_name,
           'CI_SLACK_WEBHOOK_URL' => :ci_slack_webhook_url,
+          'CI_PIPELINE_ID' => :ci_pipeline_id,
+          'CI_PIPELINE_SOURCE' => :ci_pipeline_source,
+          'CI_PIPELINE_URL' => :ci_pipeline_url,
           'CI_PIPELINE_CREATED_AT' => :ci_pipeline_created_at,
           'CI_MERGE_REQUEST_IID' => :ci_merge_request_iid,
+          'CI_API_V4_URL' => :ci_api_v4_url,
           'GITLAB_CI' => :gitlab_ci,
           'ELASTIC_URL' => :elastic_url,
           'GITLAB_QA_LOOP_RUNNER_MINUTES' => :gitlab_qa_loop_runner_minutes,
@@ -108,20 +119,32 @@ module Gitlab
           'GOOGLE_PROJECT' => :google_project,
           'GOOGLE_CLIENT_EMAIL' => :google_client_email,
           'GOOGLE_JSON_KEY' => :google_json_key,
-          'GCS_BUCKET_NAME' => :gcs_bucket_name
+          'GCS_BUCKET_NAME' => :gcs_bucket_name,
+          'SMOKE_ONLY' => :smoke_only,
+          'NO_ADMIN' => :no_admin
         }.freeze
 
         ENV_VARIABLES.each do |env_name, method_name|
           attr_writer(method_name)
 
           define_method(method_name) do
-            ENV[env_name] ||
-              if instance_variable_defined?("@#{method_name}")
-                instance_variable_get("@#{method_name}")
-              end
+            ENV[env_name] || (instance_variable_get("@#{method_name}") if instance_variable_defined?("@#{method_name}"))
           end
         end
 
+        def variables
+          vars = {}
+
+          ENV_VARIABLES.each do |name, attribute|
+            # Variables that are overridden in the environment take precedence
+            # over the defaults specified by the QA runtime.
+            value = env_value_if_defined(name) || send(attribute) # rubocop:disable GitlabSecurity/PublicSend
+            vars[name] = value if value
+          end
+
+          vars
+        end
+
         def default_branch
           ENV['QA_DEFAULT_BRANCH'] || 'main'
         end
@@ -142,42 +165,6 @@ module Gitlab
           ENV['GITLAB_API_BASE'] || 'https://gitlab.com/api/v4'
         end
 
-        def gitlab_ci_api_token
-          ENV['GITLAB_CI_API_TOKEN']
-        end
-
-        def ci_api_v4_url
-          ENV['CI_API_V4_URL']
-        end
-
-        def ci_job_name
-          ENV['CI_JOB_NAME']
-        end
-
-        def ci_job_token
-          ENV['CI_JOB_TOKEN']
-        end
-
-        def ci_pipeline_source
-          ENV['CI_PIPELINE_SOURCE']
-        end
-
-        def ci_pipeline_url
-          ENV['CI_PIPELINE_URL']
-        end
-
-        def ci_pipeline_id
-          ENV['CI_PIPELINE_ID']
-        end
-
-        def ci_project_id
-          ENV['CI_PROJECT_ID']
-        end
-
-        def ci_commit_ref_name
-          ENV['CI_COMMIT_REF_NAME']
-        end
-
         def pipeline_from_project_name
           if ci_project_name.to_s.start_with?('gitlab-qa')
             if ENV['TOP_UPSTREAM_SOURCE_JOB'].to_s.start_with?('https://ops.gitlab.net')
@@ -198,22 +185,10 @@ module Gitlab
           env_value_if_defined('GITLAB_QA_DEV_ACCESS_TOKEN')
         end
 
-        def qa_dev_access_token
-          ENV['GITLAB_QA_DEV_ACCESS_TOKEN']
-        end
-
         def initial_root_password
           ENV['GITLAB_INITIAL_ROOT_PASSWORD'] || '5iveL!fe'
         end
 
-        def qa_container_registry_access_token
-          ENV['GITLAB_QA_CONTAINER_REGISTRY_ACCESS_TOKEN']
-        end
-
-        def qa_issue_url
-          ENV['GITLAB_QA_ISSUE_URL']
-        end
-
         def deploy_environment
           ENV['DEPLOY_ENVIRONMENT'] || pipeline_from_project_name
         end
@@ -226,35 +201,6 @@ module Gitlab
           ENV['ELASTIC_VERSION'] || '6.4.2'.freeze
         end
 
-        def aws_s3_region
-          ENV['AWS_S3_REGION']
-        end
-
-        def aws_s3_key_id
-          ENV['AWS_S3_KEY_ID']
-        end
-
-        def aws_s3_access_key
-          ENV['AWS_S3_ACCESS_KEY']
-        end
-
-        def aws_s3_bucket_name
-          ENV['AWS_S3_BUCKET_NAME']
-        end
-
-        def variables
-          vars = {}
-
-          ENV_VARIABLES.each do |name, attribute|
-            # Variables that are overridden in the environment take precedence
-            # over the defaults specified by the QA runtime.
-            value = env_value_if_defined(name) || send(attribute) # rubocop:disable GitlabSecurity/PublicSend
-            vars[name] = value if value
-          end
-
-          vars
-        end
-
         def require_license!
           return if ENV.include?('EE_LICENSE')
 
@@ -293,31 +239,42 @@ module Gitlab
 
         def require_kubernetes_environment!
           %w[GCLOUD_ACCOUNT_EMAIL GCLOUD_ACCOUNT_KEY CLOUDSDK_CORE_PROJECT].each do |env_key|
-            raise ArgumentError, "Environment variable #{env_key} must be set to run kubernetes specs" unless ENV.key?(env_key)
+            unless ENV.key?(env_key)
+              raise ArgumentError, "Environment variable #{env_key} must be set to run kubernetes specs"
+            end
           end
         end
 
         def require_aws_s3_environment!
           %w[AWS_S3_REGION AWS_S3_KEY_ID AWS_S3_ACCESS_KEY AWS_S3_BUCKET_NAME].each do |env_key|
-            raise ArgumentError, "Environment variable #{env_key} must be set to run AWS S3 object storage specs" unless ENV.key?(env_key)
+            unless ENV.key?(env_key)
+              raise ArgumentError, "Environment variable #{env_key} must be set to run AWS S3 object storage specs"
+            end
           end
         end
 
         def require_gcs_environment!
           %w[GOOGLE_PROJECT GOOGLE_CLIENT_EMAIL GOOGLE_JSON_KEY GCS_BUCKET_NAME].each do |env_key|
-            raise ArgumentError, "Environment variable #{env_key} must be set to run GCS object storage specs" unless ENV.key?(env_key)
+            unless ENV.key?(env_key)
+              raise ArgumentError, "Environment variable #{env_key} must be set to run GCS object storage specs"
+            end
           end
         end
 
         def require_initial_password!
           return unless ENV['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."
+          raise(
+            ArgumentError,
+            "Environment variable GITLAB_INITIAL_ROOT_PASSWORD must be provided to set an initial root password."
+          )
         end
 
         def require_ssh_tunnel!
           %w[TUNNEL_SSH_PRIVATE_KEY TUNNEL_SERVER_HOSTNAME TUNNEL_SSH_USER].each do |env_key|
-            raise ArgumentError, "Environment variable #{env_key} must be set to run tunnel specs" unless ENV.key?(env_key)
+            unless ENV.key?(env_key)
+              raise ArgumentError, "Environment variable #{env_key} must be set to run tunnel specs"
+            end
           end
         end
 

data/lib/gitlab/qa/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module QA
-    VERSION = '7.9.3'.freeze
+    VERSION = '7.10.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 7.9.3
+  version: 7.10.0
 platform: ruby
 authors:
 - GitLab Quality
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-27 00:00:00.000000000 Z
+date: 2021-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control