gitlab-qa 8.15.0 → 8.15.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f8235a7dbc3c61a6f538089128dc4a5ba7219c435a2fd107b9be7a7f8e79a23
-  data.tar.gz: 3ce7fbdcc46f5f7b7a25e87af2b681c8ef314c48afef9a7e0c139361dcfed7bc
+  metadata.gz: 5e196210d260a788803b5c5d8109b645d8acc3e8d1a60a5bd8ab46110dc94aa9
+  data.tar.gz: c656c359e25150a2e8fde966aee83ca704924704149e6b3413519d9753123590
 SHA512:
-  metadata.gz: a44d2a6d39df421e02e6dcb96b41aa32a53a65366f983e853376bde2c6b0e17ab1099ccd1b675c4c0b4b93e2bdd94bf661fff2e02edf8e68d43a7e2535ae756c
-  data.tar.gz: 919565630e715538ed4867339a27e553d90a80b3185b1caab4303aa65ef026a882f3fbb6446cbf5eb0e95944659da6adf6270ba2ecece62b85e60117248d9aee
+  metadata.gz: 4a6a2bd9405ae3fb3a972609e94d82412f037340c15f9d55a64ff12b6e11aec7e71e730697857de43493b4fea8e022e167f23a98caba4992bf49e06339ca8caa
+  data.tar.gz: 75adc84ac465f2c1f1d2d4ebc4d2c511c929c9b4c5a04b84b7f78fef12e3de9989aca9df7a69a2b359cc66196e1849cd0d25fc8d9432cabb45cff083006e1a67

data/.gitlab/ci/jobs/base.gitlab-ci.yml

@@ -192,29 +192,6 @@ relate_test_failures:
     - export GITLAB_QA_ACCESS_TOKEN="$GITLAB_QA_PRODUCTION_ACCESS_TOKEN"
     - bundle exec exe/gitlab-qa-report --relate-failure-issue "gitlab-qa-run-*/**/rspec-*.json" --project "$QA_FAILURES_REPORTING_PROJECT" --max-diff-ratio "$QA_FAILURES_MAX_DIFF_RATIO" $QA_FAILURES_REPORTER_OPTIONS
 
-.notify_upstream:
-  stage: notify
-  image: ruby:3.0-alpine
-  dependencies: []
-  before_script:
-    - gem install gitlab --no-document
-
-notify_upstream:success:
-  extends: .notify_upstream
-  script:
-    - bin/notify_upstream success
-  rules:
-    - if: '$TOP_UPSTREAM_SOURCE_PROJECT && $TOP_UPSTREAM_MERGE_REQUEST_IID && $TOP_UPSTREAM_SOURCE_SHA'
-      when: on_success
-
-notify_upstream:failure:
-  extends: .notify_upstream
-  script:
-    - bin/notify_upstream failure
-  rules:
-    - if: '$TOP_UPSTREAM_SOURCE_PROJECT && $TOP_UPSTREAM_MERGE_REQUEST_IID && $TOP_UPSTREAM_SOURCE_SHA'
-      when: on_failure
-
 .notify_slack:
   image: alpine
   stage: notify

data/.gitlab/ci/jobs/decomposition_multiple_db.gitlab-ci.yml

@@ -10,6 +10,7 @@ ce:decomposition_multiple_db:
   parallel: 5
   variables:
     GITLAB_QA_OPTIONS_COMBINED: "$GITLAB_QA_OPTIONS --omnibus-config decomposition_multiple_db"
+    GITLAB_ALLOW_SEPARATE_CI_DATABASE: "true"
 
 ee:decomposition_multiple_db:
   extends:
@@ -23,3 +24,4 @@ ee:decomposition_multiple_db:
   parallel: 5
   variables:
     GITLAB_QA_OPTIONS_COMBINED: "$GITLAB_QA_OPTIONS --omnibus-config decomposition_multiple_db"
+    GITLAB_ALLOW_SEPARATE_CI_DATABASE: "true"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gitlab-qa (8.15.0)
+    gitlab-qa (8.15.2)
       activesupport (~> 6.1)
       gitlab (~> 4.18.0)
       http (~> 5.0)
@@ -249,4 +249,4 @@ DEPENDENCIES
   webmock (= 3.7.0)
 
 BUNDLED WITH
-   2.3.24
+   2.4.2

data/docs/what_tests_can_be_run.md

@@ -1114,3 +1114,12 @@ $ gitlab-qa Test::Instance::Chaos
 
 [test-instance]: https://gitlab.com/gitlab-org/gitlab/blob/master/qa/qa/scenario/test/instance/all.rb
 [smoke-instance]: https://gitlab.com/gitlab-org/gitlab/blob/master/qa/qa/scenario/test/instance/smoke.rb
+
+### `Test::Integration::Import`
+
+This scenario will run specs tagged with `:import` tags.
+
+These tests are designed to validate import functionality by importing projects from `GitHub` or another `GitLab` instance.
+This scenario type spins up 2 gitlab instances and additionally an instance with simple http mock server.
+
+If environment variable `QA_MOCK_GITHUB` is set to `true`, all calls to `github.com` are rerouted to mock server.

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

@@ -14,7 +14,7 @@ module Gitlab
 
         def initialize
           super
-          self.release = 'EE'
+          self.release = 'CE'
           @cluster_config = Component::GitalyCluster::GitalyClusterConfig.new
           @gitaly_port = 8075
           @ports = [gitaly_port]
@@ -28,6 +28,12 @@ module Gitlab
           @release = QA::Release.new(release)
         end
 
+        def pull
+          docker.login(**release.login_params) if release.login_params
+
+          super
+        end
+
         def reconfigure
           setup_omnibus
           @docker.attach(name) do |line, wait|

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

@@ -28,7 +28,8 @@ module Gitlab
                       :seed_admin_token,
                       :seed_db,
                       :skip_server_hooks,
-                      :gitaly_tls
+                      :gitaly_tls,
+                      :secrets
 
         attr_writer :name, :relative_path
 
@@ -50,6 +51,7 @@ module Gitlab
           @seed_admin_token = Runtime::Scenario.seed_admin_token
           @seed_db = Runtime::Scenario.seed_db
           @skip_server_hooks = Runtime::Scenario.skip_server_hooks
+          @secrets = []
 
           self.release = 'CE'
         end
@@ -64,7 +66,16 @@ module Gitlab
           return unless Runtime::Env.test_license_mode?
 
           @omnibus_gitlab_rails_env['GITLAB_LICENSE_MODE'] = 'test'
-          @omnibus_gitlab_rails_env['CUSTOMER_PORTAL_URL'] = 'https://customers.staging.gitlab.com'
+          @omnibus_gitlab_rails_env['CUSTOMER_PORTAL_URL'] = Runtime::Env.customer_portal_url
+        end
+
+        # Sets GITLAB_QA_USER_AGENT as a Rail environment variable so that it can be used by GitLab to bypass features
+        # that can't be automated.
+        def set_qa_user_agent
+          return if Runtime::Env.gitlab_qa_user_agent.to_s.strip.empty?
+
+          @omnibus_gitlab_rails_env['GITLAB_QA_USER_AGENT'] = Runtime::Env.gitlab_qa_user_agent
+          secrets << Runtime::Env.gitlab_qa_user_agent
         end
 
         def elastic_url=(url)
@@ -119,9 +130,14 @@ module Gitlab
         def prepare_gitlab_omnibus_config
           set_formless_login_token
           set_license_mode
-          return if omnibus_gitlab_rails_env.empty?
+          set_qa_user_agent
+          env = @omnibus_gitlab_rails_env.merge(
+            {
+              'GITLAB_ALLOW_SEPARATE_CI_DATABASE' => Runtime::Env.allow_separate_ci_database.to_s
+            }
+          )
 
-          @omnibus_configuration << "gitlab_rails['env'] = #{@omnibus_gitlab_rails_env}"
+          @omnibus_configuration << "gitlab_rails['env'] = #{env}"
         end
 
         def start # rubocop:disable Metrics/AbcSize
@@ -203,7 +219,7 @@ module Gitlab
           return if commands.empty?
 
           Runtime::Logger.info("Running exec_commands...")
-          commands.each { |command| @docker.exec(name, command) }
+          commands.each { |command| @docker.exec(name, command, mask_secrets: secrets) }
         end
 
         def rails_version
@@ -263,7 +279,7 @@ module Gitlab
         end
 
         def setup_omnibus
-          @docker.write_files(name) do |f|
+          @docker.write_files(name, mask_secrets: secrets) do |f|
             f.write('/etc/gitlab/gitlab.rb', @omnibus_configuration.to_s)
           end
         end

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

@@ -14,7 +14,7 @@ module Gitlab
 
         def initialize
           super
-          self.release = 'EE'
+          self.release = 'CE'
           @cluster_config = Component::GitalyCluster::GitalyClusterConfig.new
           @ports = [cluster_config.praefect_port]
         end
@@ -27,6 +27,12 @@ module Gitlab
           @release = QA::Release.new(release)
         end
 
+        def pull
+          docker.login(**release.login_params) if release.login_params
+
+          super
+        end
+
         def reconfigure
           setup_omnibus
           @docker.attach(name) do |line|

data/lib/gitlab/qa/docker/engine.rb

@@ -58,7 +58,7 @@ module Gitlab
         #       This is content
         #       That goes within /opt/other
         #     TEXT)
-        def write_files(name)
+        def write_files(name, mask_secrets: nil)
           exec(name, yield(
             Class.new do
               # @param file The name of the file
@@ -76,13 +76,13 @@ module Gitlab
                 %(echo "#{contents}" >> #{file};)
               end
             end
-          ))
+          ), mask_secrets: mask_secrets)
         end
 
-        def exec(name, command)
+        def exec(name, command, mask_secrets: nil)
           cmd = ['exec']
           cmd << '--privileged' if privileged_command?(command)
-          Docker::Command.execute(%(#{cmd.join(' ')} #{name} bash -c "#{command.gsub('"', '\\"')}"))
+          Docker::Command.execute(%(#{cmd.join(' ')} #{name} bash -c "#{command.gsub('"', '\\"')}"), mask_secrets: mask_secrets)
         end
 
         def read_file(image, tag, path, &block)

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

@@ -369,6 +369,14 @@ module Gitlab
           env_var_value_if_defined('QA_COM_REGISTRY') || 'registry.gitlab.com'
         end
 
+        def customer_portal_url
+          env_var_value_if_defined('CUSTOMER_PORTAL_URL') || 'https://customers.staging.gitlab.com'
+        end
+
+        def allow_separate_ci_database
+          enabled?(env_var_value_if_defined('GITLAB_ALLOW_SEPARATE_CI_DATABASE'), default: false)
+        end
+
         private
 
         def enabled?(value, default: true)

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

@@ -15,7 +15,7 @@ module Gitlab
 
           # Customer Portal URL that is targeted
           def customer_portal_url
-            ENV.fetch('CUSTOMER_PORTAL_URL', 'https://customers.staging.gitlab.com')
+            Runtime::Env.customer_portal_url
           end
         end
       end

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

@@ -52,11 +52,7 @@ module Gitlab
             def start_gitlab_instances(release)
               instances = [
                 { instance: source_gitlab, name: "import-source", additional_hosts: [] },
-                {
-                  instance: target_gitlab,
-                  name: "import-target",
-                  additional_hosts: ["api.github.com:#{mock_server.ip_address}"]
-                }
+                { instance: target_gitlab, name: "import-target", additional_hosts: mocked_hosts }
               ]
 
               ::Parallel.each(instances, in_threads: 2) do |gitlab_instance|
@@ -88,6 +84,16 @@ module Gitlab
                 }
               end
             end
+
+            # List of hosts that should be redirected to mock server
+            #
+            # @return [Array]
+            def mocked_hosts
+              hosts = []
+              hosts << "api.github.com:#{mock_server.ip_address}" if Runtime::Env.enabled?(ENV["QA_MOCK_GITHUB"])
+
+              hosts
+            end
           end
         end
       end

data/lib/gitlab/qa/version.rb

@@ -2,6 +2,6 @@
 
 module Gitlab
   module QA
-    VERSION = '8.15.0'
+    VERSION = '8.15.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 8.15.0
+  version: 8.15.2
 platform: ruby
 authors:
 - GitLab Quality
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-01-05 00:00:00.000000000 Z
+date: 2023-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control
@@ -318,7 +318,6 @@ files:
 - bin/expect_exit_code_and_text
 - bin/gen-cert.sh
 - bin/merge_html_reports
-- bin/notify_upstream
 - bin/setup
 - bin/slack
 - docs/README.md

data/bin/notify_upstream

@@ -1,98 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-require 'gitlab'
-
-# Default to "Multi-pipeline (from 'gitlab-org/gitlab-qa' 'notify_upstream:*' jobs)" from current project
-api_token = ENV.fetch('GITLAB_QA_PROJECT_ACCESS_TOKEN') do
-  puts "The $GITLAB_BOT_MULTI_PROJECT_PIPELINE_POLLING_TOKEN variable is deprecated in favor of a dedicated project access token: $GITLAB_QA_PROJECT_ACCESS_TOKEN."
-  puts "See https://gitlab.com/groups/gitlab-org/quality/-/epics/17 for more details."
-  ENV['GITLAB_BOT_MULTI_PROJECT_PIPELINE_POLLING_TOKEN']
-end
-
-# Configure credentials to be used with gitlab gem
-Gitlab.configure do |config|
-  config.endpoint = 'https://gitlab.com/api/v4'
-  config.private_token = api_token
-end
-
-class CommitComment
-  UPSTREAM_COMMENT = <<~COMMENT
-    - The [`gitlab-qa-mirror` downstream pipeline](%<pipeline_url>s) for https://gitlab.com/%<project_path>s/-/merge_requests/%<mr_iid>s/diffs?commit_id=%<commit_sha>s %<status_with_icon>s
-  COMMENT
-  IDENTIFIABLE_NOTE_TAG = 'gitlab-qa:upstream-notification-note'
-
-  def self.mr?
-    ENV.key?('TOP_UPSTREAM_SOURCE_PROJECT') &&
-      ENV.key?('TOP_UPSTREAM_MERGE_REQUEST_IID') &&
-      ENV.key?('TOP_UPSTREAM_SOURCE_SHA') &&
-      !ENV['TOP_UPSTREAM_SOURCE_PROJECT'].to_s.empty? &&
-      !ENV['TOP_UPSTREAM_MERGE_REQUEST_IID'].to_s.empty? &&
-      !ENV['TOP_UPSTREAM_SOURCE_SHA'].to_s.empty?
-  end
-
-  def self.post!(status)
-    unless mr?
-      puts "All the 'TOP_UPSTREAM_SOURCE_PROJECT', 'TOP_UPSTREAM_MERGE_REQUEST_IID', and 'TOP_UPSTREAM_SOURCE_SHA' environment variables need to be present. We cannot post a comment on the upstream merge request."
-      return
-    end
-
-    # Look for an existing note
-    upstream_notification_note = Gitlab.merge_request_notes(project_path, mr_iid).auto_paginate.find do |note|
-      note.body.include?(IDENTIFIABLE_NOTE_TAG)
-    end
-
-    if upstream_notification_note
-      Gitlab.edit_merge_request_note(project_path, mr_iid, upstream_notification_note.id, [upstream_notification_note.body, build_comment(status)].join("\n"))
-    else
-      Gitlab.create_merge_request_comment(project_path, mr_iid, "<!-- #{IDENTIFIABLE_NOTE_TAG} -->\n#{build_comment(status)}")
-    end
-  rescue Gitlab::Error::Error => error
-    puts "Ignoring the following error: #{error}"
-  end
-
-  def self.project_path
-    ENV['TOP_UPSTREAM_SOURCE_PROJECT']
-  end
-
-  def self.mr_iid
-    ENV['TOP_UPSTREAM_MERGE_REQUEST_IID']
-  end
-
-  def self.pipeline_url
-    ENV['CI_PIPELINE_URL']
-  end
-
-  def self.commit_sha
-    ENV['TOP_UPSTREAM_SOURCE_SHA']
-  end
-
-  def self.build_comment(status)
-    format(UPSTREAM_COMMENT,
-      project_path: project_path,
-      mr_iid: mr_iid,
-      pipeline_url: pipeline_url,
-      status_with_icon: status_with_icon(status),
-      commit_sha: commit_sha
-    )
-  end
-
-  def self.status_with_icon(status)
-    case status
-    when :success
-      "passed. :white_check_mark:"
-    when :failure
-      "failed! :boom:"
-    end
-  end
-
-  def self.post_to_mr(project_id, mr_iid, comment)
-    Gitlab.create_merge_request_comment(project_id, mr_iid, comment)
-  end
-end
-
-status = ARGV.shift.to_s.strip
-
-abort "Please provide a status!" if status == ''
-
-CommitComment.post!(status.to_sym)