gitlab-qa 8.5.0 → 8.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dca93a1000f4f0b6db2759a97ae3a6a7edf18e06576d689edd42180d794da943
-  data.tar.gz: bcd56912a666905a27513c07c24ef1ae72c24b463d68aba9b2dcff84e0011743
+  metadata.gz: 4a59adb2954b85b2adb1eddb1f0fbc568c01fa9d2d466a3a6c16fa4c5bb12e3b
+  data.tar.gz: c362d1e370e23f891e9a23a785ee88e48431fd466fd2aa1b38d2596f68ceeabf
 SHA512:
-  metadata.gz: 0563f087686a1bf24c5fa1581993897d0cf553465636748d51929bcdad1b35d2a26362c7f40849cd5979ecb9eb4b476f3efde52f1c59142892fddbb497b254fb
-  data.tar.gz: 50f84dd5ae8abca78d6b2488e9213c1f1195e0c58279697eac7a2d943c7dd147f857a328840f9369d16829b2fc581c882a1bcee28093ee1b68400d924897f5f3
+  metadata.gz: 4de67f7a4bc50f6a28503ea6bfaf988f1ca18db321dba31006eac49de6cf5159c981862909ed57cef6f61126fa1d429843a912f59445ebab270e104dd5f0f382
+  data.tar.gz: 956a7115f74b6b563289feb1e75cfcb0d4901c2b1bef1fd8480508c7197c2e0934f0dd812a3a3ced498a430ccad3eeabb49751d2253cc02955e34db358cd83d9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gitlab-qa (8.5.0)
+    gitlab-qa (8.7.0)
       activesupport (~> 6.1)
       gitlab (~> 4.18.0)
       http (~> 5.0)

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

@@ -61,7 +61,7 @@ module Gitlab
                 command << hosts # override /etc/hosts in docker container when test runs
               end
 
-              env.merge(Runtime::Env.variables).each do |key, value|
+              Runtime::Env.variables.merge(env).each do |key, value|
                 command.env(key, value)
               end
 

data/lib/gitlab/qa/report/find_set_dri.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require 'json'
+
+module Gitlab
+  module QA
+    module Report
+      module FindSetDri
+        def set_dri_via_group(product_group, test)
+          parse_json_with_sets
+          fetch_stage_sets(test)
+
+          return @sets.sample['username'] if @stage_sets.empty?
+
+          fetch_group_sets(product_group)
+
+          if @group_sets.empty?
+            @stage_sets.sample['username']
+          else
+            @group_sets.sample['username']
+          end
+        end
+
+        private
+
+        def parse_json_with_sets
+          response = Support::HttpRequest.make_http_request(
+            url: 'https://gitlab-org.gitlab.io/gitlab-roulette/roulette.json'
+          )
+          @sets = JSON.parse(response.body).select { |user| user['role'].include?('software-engineer-in-test') }
+        end
+
+        def fetch_stage_sets(test)
+          @stage_sets = @sets.select { |user| user['role'].include?(test.stage.split("_").map(&:capitalize).join(" ")) }
+        end
+
+        def fetch_group_sets(product_group)
+          @group_sets = @stage_sets.select { |user| user['role'].include?(product_group.split("_").map { |word| word == 'and' ? word : word.capitalize }.join(" ")) }
+        end
+      end
+    end
+  end
+end

data/lib/gitlab/qa/report/gitlab_issue_client.rb

@@ -101,6 +101,13 @@ module Gitlab
           end
         end
 
+        def find_user_id(username:)
+          handle_gitlab_client_exceptions do
+            user = Gitlab.users(username: username)&.first
+            user['id'] unless user.nil?
+          end
+        end
+
         def upload_file(file_fullpath:)
           ignore_gitlab_client_exceptions do
             Gitlab.upload_file(project, file_fullpath)

data/lib/gitlab/qa/report/relate_failure_issue.rb

@@ -3,12 +3,15 @@
 require 'nokogiri'
 require 'active_support/core_ext/enumerable'
 require 'rubygems/text'
+require 'active_support/core_ext/integer/time'
 
 module Gitlab
   module QA
     module Report
       # Uses the API to create or update GitLab issues with the results of tests from RSpec report files.
       class RelateFailureIssue < ReportAsIssue
+        include FindSetDri
+
         DEFAULT_MAX_DIFF_RATIO_FOR_DETECTION = 0.15
         FAILURE_STACKTRACE_REGEX = %r{((.*Failure\/Error:(?<stacktrace>.+))|(?<stacktrace>.+))}m.freeze
         ISSUE_STACKTRACE_REGEX = /### Stack trace\s*(```)#{FAILURE_STACKTRACE_REGEX}(```)/m.freeze
@@ -74,6 +77,8 @@ module Gitlab
 
           post_or_update_failed_job_note(issue, test)
 
+          assign_dri(issue, test)
+
           issue
         end
 
@@ -218,6 +223,17 @@ module Gitlab
 
           section
         end
+
+        def assign_dri(issue, test)
+          if test.product_group?
+            dri = set_dri_via_group(test.product_group, test)
+            dri_id = gitlab.find_user_id(username: dri)
+            gitlab.edit_issue(iid: issue.iid, options: { assignee_id: dri_id, due_date: Date.today + 1.month })
+            puts "  => Assigning #{dri} as DRI for the issue."
+          else
+            puts "  => No product group metadata found for test '#{test.name}'"
+          end
+        end
       end
     end
   end

data/lib/gitlab/qa/report/test_result.rb

@@ -103,6 +103,14 @@ module Gitlab
             report['screenshot']['image'] if screenshot?
           end
 
+          def product_group?
+            report['product_group'].present?
+          end
+
+          def product_group
+            report['product_group'] if product_group?
+          end
+
           private
 
           # rubocop:disable Metrics/AbcSize

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

@@ -279,14 +279,6 @@ module Gitlab
           raise ArgumentError, "Please provide GITLAB_QA_CONTAINER_REGISTRY_ACCESS_TOKEN"
         end
 
-        def require_kubernetes_environment!
-          %w[GCLOUD_ACCOUNT_EMAIL GCLOUD_ACCOUNT_KEY CLOUDSDK_CORE_PROJECT].each do |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|
             unless ENV.key?(env_key)
@@ -320,14 +312,6 @@ module Gitlab
           )
         end
 
-        def require_ssh_tunnel!
-          %w[TUNNEL_SSH_PRIVATE_KEY TUNNEL_SERVER_HOSTNAME TUNNEL_SSH_USER].each do |env_key|
-            unless ENV.key?(env_key)
-              raise ArgumentError, "Environment variable #{env_key} must be set to run tunnel specs"
-            end
-          end
-        end
-
         def override_default_password!
           require_initial_password!
 

data/lib/gitlab/qa/scenario/test/omnibus/update_from_previous.rb

@@ -93,6 +93,8 @@ module Gitlab
                 specs.hostname = "qa-e2e-specs.#{gitlab.network}"
                 specs.network = gitlab.network
                 specs.args = [gitlab.address, *rspec_args]
+                # do not generate reports for non release runs
+                specs.env = { 'QA_GENERATE_ALLURE_REPORT' => false } unless release == current_release
               end
             rescue Support::ShellCommand::StatusError => e
               raise e if release == current_release # only fail on current release

data/lib/gitlab/qa/version.rb

@@ -2,6 +2,6 @@
 
 module Gitlab
   module QA
-    VERSION = '8.5.0'
+    VERSION = '8.7.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 8.5.0
+  version: 8.7.0
 platform: ruby
 authors:
 - GitLab Quality
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-09-28 00:00:00.000000000 Z
+date: 2022-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control
@@ -313,7 +313,6 @@ files:
 - lib/gitlab/qa/component/base.rb
 - lib/gitlab/qa/component/elasticsearch.rb
 - lib/gitlab/qa/component/gitlab.rb
-- lib/gitlab/qa/component/internet_tunnel.rb
 - lib/gitlab/qa/component/jira.rb
 - lib/gitlab/qa/component/ldap.rb
 - lib/gitlab/qa/component/mail_hog.rb
@@ -334,6 +333,7 @@ files:
 - lib/gitlab/qa/docker/volumes.rb
 - lib/gitlab/qa/release.rb
 - lib/gitlab/qa/report/base_test_results.rb
+- lib/gitlab/qa/report/find_set_dri.rb
 - lib/gitlab/qa/report/generate_test_session.rb
 - lib/gitlab/qa/report/gitlab_issue_client.rb
 - lib/gitlab/qa/report/gitlab_issue_dry_client.rb
@@ -391,7 +391,6 @@ files:
 - lib/gitlab/qa/scenario/test/integration/instance_saml.rb
 - lib/gitlab/qa/scenario/test/integration/integrations.rb
 - lib/gitlab/qa/scenario/test/integration/jira.rb
-- lib/gitlab/qa/scenario/test/integration/kubernetes.rb
 - lib/gitlab/qa/scenario/test/integration/ldap.rb
 - lib/gitlab/qa/scenario/test/integration/ldap_no_server.rb
 - lib/gitlab/qa/scenario/test/integration/ldap_no_tls.rb
@@ -407,7 +406,6 @@ files:
 - lib/gitlab/qa/scenario/test/integration/saml.rb
 - lib/gitlab/qa/scenario/test/integration/service_ping_disabled.rb
 - lib/gitlab/qa/scenario/test/integration/smtp.rb
-- lib/gitlab/qa/scenario/test/integration/ssh_tunnel.rb
 - lib/gitlab/qa/scenario/test/integration/suggested_reviewer.rb
 - lib/gitlab/qa/scenario/test/omnibus/image.rb
 - lib/gitlab/qa/scenario/test/omnibus/update.rb

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

@@ -1,76 +0,0 @@
-# frozen_string_literal: true
-
-require 'tempfile'
-
-module Gitlab
-  module QA
-    module Component
-      class InternetTunnel < Base
-        DOCKER_IMAGE = 'gitlab/ssh-tunnel'
-        DOCKER_IMAGE_TAG = '1.0.0'
-
-        attr_writer :gitlab_hostname
-
-        def initialize
-          super
-
-          key_dir = ENV['CI_PROJECT_DIR'] || Dir.tmpdir
-          @ssh_key = Tempfile.new('tunnel-ssh-private-key', key_dir)
-          @ssh_key.write(ENV.fetch('TUNNEL_SSH_PRIVATE_KEY'))
-          @ssh_key.close
-
-          File.chmod(0o600, @ssh_key.path)
-
-          @volumes['/root/.ssh/id_rsa'] = @ssh_key.path
-        end
-
-        def instance
-          raise 'Please provide a block!' unless block_given?
-
-          super
-        end
-
-        def url
-          "https://#{subdomain}.#{tunnel_server_hostname}"
-        end
-
-        private
-
-        def name
-          @name ||= "ssh-tunnel-#{SecureRandom.hex(4)}"
-        end
-
-        def tunnel_server_hostname
-          ENV.fetch("TUNNEL_SERVER_HOSTNAME")
-        end
-
-        def subdomain
-          @subdomain ||= rand(30_000..49_000)
-        end
-
-        def start
-          raise "Must set gitlab_hostname" unless @gitlab_hostname
-
-          @docker.run(
-            image: DOCKER_IMAGE,
-            tag: DOCKER_IMAGE_TAG,
-            args: ["-o StrictHostKeyChecking=no -N -R #{subdomain}:#{@gitlab_hostname}:80 #{ENV.fetch('TUNNEL_SSH_USER')}@#{tunnel_server_hostname}"]) do |command|
-            command << '-d '
-            command << "--name #{name}"
-            command << "--net #{network}"
-
-            @volumes.to_h.each do |to, from|
-              command.volume(from, to, 'Z')
-            end
-          end
-        end
-
-        def teardown
-          super
-
-          @ssh_key.unlink
-        end
-      end
-    end
-  end
-end

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

@@ -1,56 +0,0 @@
-# frozen_string_literal: true
-
-require 'yaml'
-
-module Gitlab
-  module QA
-    module Scenario
-      module Test
-        module Integration
-          class Kubernetes < Scenario::Template
-            def perform(release, *rspec_args)
-              Runtime::Env.require_kubernetes_environment!
-
-              Component::Gitlab.perform do |gitlab|
-                gitlab.release = release
-                gitlab.network = 'test'
-
-                Component::InternetTunnel.perform do |tunnel_gitlab|
-                  Component::InternetTunnel.perform do |tunnel_registry|
-                    tunnel_gitlab.gitlab_hostname = gitlab.hostname
-                    tunnel_gitlab.network = 'test'
-                    tunnel_registry.gitlab_hostname = gitlab.hostname
-                    tunnel_registry.network = 'test'
-
-                    gitlab.omnibus_configuration << <<~OMNIBUS
-                      external_url '#{tunnel_gitlab.url}';
-                      nginx['listen_port'] = 80;
-                      nginx['listen_https'] = false;
-
-                      registry_external_url '#{tunnel_registry.url}';
-                      registry_nginx['listen_port'] = 80;
-                      registry_nginx['listen_https'] = false;
-                    OMNIBUS
-
-                    tunnel_gitlab.instance do
-                      tunnel_registry.instance do
-                        gitlab.instance do
-                          Component::Specs.perform do |specs|
-                            specs.suite = 'Test::Integration::Kubernetes'
-                            specs.release = gitlab.release
-                            specs.network = gitlab.network
-                            specs.args = [tunnel_gitlab.url, *rspec_args]
-                          end
-                        end
-                      end
-                    end
-                  end
-                end
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,56 +0,0 @@
-# frozen_string_literal: true
-
-module Gitlab
-  module QA
-    module Scenario
-      module Test
-        module Integration
-          class SSHTunnel < Scenario::Template
-            def perform(release, *rspec_args)
-              Runtime::Env.override_default_password!
-              Runtime::Env.require_ssh_tunnel!
-
-              Component::Gitlab.perform do |gitlab|
-                gitlab.release = release
-                gitlab.network = 'test'
-
-                Component::InternetTunnel.perform do |tunnel_gitlab|
-                  Component::InternetTunnel.perform do |tunnel_registry|
-                    tunnel_gitlab.gitlab_hostname = gitlab.hostname
-                    tunnel_gitlab.network = 'test'
-                    tunnel_registry.gitlab_hostname = gitlab.hostname
-                    tunnel_registry.network = 'test'
-
-                    gitlab.omnibus_configuration << <<~OMNIBUS
-                      external_url '#{tunnel_gitlab.url}';
-                      nginx['listen_port'] = 80;
-                      nginx['listen_https'] = false;
-                      gitlab_rails['initial_root_password'] = '#{Runtime::Env.require_initial_password!}';
-
-                      registry_external_url '#{tunnel_registry.url}';
-                      registry_nginx['listen_port'] = 80;
-                      registry_nginx['listen_https'] = false;
-                    OMNIBUS
-
-                    tunnel_gitlab.instance do
-                      tunnel_registry.instance do
-                        gitlab.instance do
-                          Component::Specs.perform do |specs|
-                            specs.suite = 'Test::Integration::SSHTunnel'
-                            specs.release = gitlab.release
-                            specs.network = gitlab.network
-                            specs.args = [tunnel_gitlab.url, *rspec_args]
-                          end
-                        end
-                      end
-                    end
-                  end
-                end
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end