gitlab-qa 4.17.0 → 4.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5672c0e755fe027bb4848cb20e9df5b67c43d9855411e46c72ffc4d0c8b960c2
-  data.tar.gz: c0994879e81941382496597036a79067f0e959f197a98ba2852162f6f98134a7
+  metadata.gz: 2b8e33bf4d877487bb51ea8065ebf88f3d994d185e7ae726231de792f940eb7b
+  data.tar.gz: 629036685c9ca7bb1e5bb95e2969bf406b91968d237f80af57e312c7a68b9018
 SHA512:
-  metadata.gz: 833284d43adec815bf2fe2c518d88c3d3786200f17fa4234d949a90ffc9602752846106c821532a1932dcccbbcc16cb5e1e42ae8e6c6b352356229683143cad2
-  data.tar.gz: 07a4d40365d3e56e9e0f5a8ecd49a5658274691d0fe2c8a64310be30075851a78d28941a31566016a32c41dc828cf5769e7475d7ebed2403c932c4e37a065ea8
+  metadata.gz: d3bd1fa727d5b757183ab56eec1caedc7371abc2721db21d5d461fee75dde415788437162211ab7aa7bdaf21c1cf754fb7a040a0296a1c1ae9fd4494156feb3a
+  data.tar.gz: 459de3a08075be669907795af61fb2dd253268f90b9600e15b0386a1d8f61192e5e203ec3fe9b3ec1c2332140b9fe1bf3bb8e7c07ec5ddb00ab347fa8a95c7f8

data/.gitlab-ci.yml

@@ -61,12 +61,16 @@ check:rspec:
       junit: gitlab-qa-run-*/**/rspec-*.xml
 
 .ce-qa:
+  variables:
+    DEFAULT_RELEASE: "CE"
   only:
     variables:
       - $RELEASE == null
       - $RELEASE =~ /gitlab-ce/
 
 .ee-qa:
+  variables:
+    DEFAULT_RELEASE: "EE"
   only:
     variables:
       - $RELEASE == null
@@ -98,6 +102,14 @@ check:rspec:
   allow_failure: true
   when: manual
 
+.echo-custom-variables-before-calling-gitlab-qa:
+  script:
+    - echo "${QA_SCENARIO:=Test::Instance::Image}"
+    - echo "${QA_TESTS}"
+    - echo "${QA_RSPEC_TAGS}"
+    - echo "${RELEASE:=$DEFAULT_RELEASE}"
+    - exe/gitlab-qa ${QA_SCENARIO} ${RELEASE} -- ${QA_TESTS} ${QA_RSPEC_TAGS} $RSPEC_REPORT_OPTS
+
 ce:sanity-framework:
   script:
     - ./bin/expect_exit_code_and_text "exe/gitlab-qa Test::Instance::Image ${RELEASE:=CE} -- --tag framework" 1 "2 examples, 1 failure"
@@ -114,25 +126,25 @@ ee:sanity-framework:
     - .high-capacity
     - .ee-qa
 
-ce:custom:
-  script:
-    - exe/gitlab-qa ${QA_SCENARIO:=Test::Instance::Image} ${RELEASE:=CE} -- ${QA_TESTS} ${QA_RSPEC_TAGS} $RSPEC_REPORT_OPTS
+ce:custom-parallel:
   extends:
     - .test
     - .high-capacity
     - .ce-qa
     - .rspec-report-opts
+    - .echo-custom-variables-before-calling-gitlab-qa
   when: manual
+  parallel: 10
 
-ee:custom:
-  script:
-    - exe/gitlab-qa ${QA_SCENARIO:=Test::Instance::Image} ${RELEASE:=EE} -- ${QA_TESTS} ${QA_RSPEC_TAGS} $RSPEC_REPORT_OPTS
+ee:custom-parallel:
   extends:
     - .test
     - .high-capacity
     - .ee-qa
     - .rspec-report-opts
+    - .echo-custom-variables-before-calling-gitlab-qa
   when: manual
+  parallel: 10
 
 ce:instance:
   script:

data/docs/run_qa_against_gdk.md

@@ -4,21 +4,28 @@ To run the `Test::Instance::Any` scenario against your local GDK, you'll need to
 make a few changes to your `gdk/gitlab/config/gitlab.yml` file.
 
 1. Retrieve your current local IP with `ifconfig`, e.g. `192.168.0.12`.
-1. Create a file named `host` in your GDK directory containing your IP. E.g.:
-   `echo "192.168.0.12" > host`
-1. Edit `gdk/gitlab/config/gitlab.yml` and
-   - replace `host: localhost` under `production:gitlab` with `host: 192.168.0.12`.
-   - replace `ssh_host: localhost` under `production:gitlab_shell` with
-   `ssh_host: 192.168.0.12`.
-   - replace `host: localhost` under `production:webpack:dev_server` with
-   `host: 192.168.0.12`.
-1. Edit `Procfile` in your GDK directory and
-   - enable the `sshd` service by uncommenting the relevant line
-1. Edit `openssh/sshd_config` in your GDK directory and
-   - set `ListenAddress` to `192.168.0.12:2222`
-   - add `AcceptEnv GIT_PROTOCOL` to allow the use of the [Git protocol v2][Git protocol]
-1. Restart your GDK
-1. Run the QA scenario as follows:
+2. In your gdk directory, create file `gdk.yml`. Within `gdk.yml` add:
+    ```yaml
+    ---
+    gdk:
+        overwrite_changes: true
+    hostname: 192.168.0.12
+    sshd:
+        enabled: true
+        listen_address: 192.168.0.12
+    webpack:
+        host: 192.168.0.12
+    ```
+3. Run `gdk reconfigure`
+    - This should update `localhost` in your `gitlab/config/gitlab.yml`.
+        and `gdk/Procfile` as well as `gdk/openssh/sshd_config` to the provided IP address.
+4. Edit `gdk/gitlab/config/gitlab.yml` and
+   - Replace `ssh_host: localhost` under `production:gitlab_shell` with `ssh_host: 192.168.0.12`.
+5. Edit `openssh/sshd_config` in your GDK directory and
+   - Add `AcceptEnv GIT_PROTOCOL` to allow the use of the [Git protocol v2][Git protocol]
+6. Restart your GDK by running `gdk restart`
+   - If reconfigure is successful, you should now be able to browse to `http://192.168.0.12:3000` instead of `http://localhost:3000`
+7. Run the QA scenario as follows:
 
   ```
   $ gitlab-qa Test::Instance::Any CE http://192.168.0.12:3000 -- qa/specs/features/browser_ui/1_manage/login/log_in_spec.rb

data/gitlab-qa.gemspec

@@ -27,4 +27,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rubocop', '~> 0.54.0'
   spec.add_development_dependency 'rubocop-rspec', '1.20.1'
   spec.add_development_dependency 'webmock', '3.7.0'
+  spec.add_runtime_dependency 'nokogiri', '~> 1.10'
 end

data/lib/gitlab/qa.rb

@@ -82,5 +82,9 @@ module Gitlab
       autoload :Shellout, 'gitlab/qa/docker/shellout'
       autoload :Volumes, 'gitlab/qa/docker/volumes'
     end
+
+    module Report
+      autoload :PrepareStageReports, 'gitlab/qa/report/prepare_stage_reports'
+    end
   end
 end

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

@@ -5,7 +5,7 @@ module Gitlab
         include Scenario::Actable
 
         ELASTIC_IMAGE = 'docker.elastic.co/elasticsearch/elasticsearch'.freeze
-        ELASTIC_IMAGE_TAG = '6.8.1'.freeze
+        ELASTIC_IMAGE_TAG = '6.4.2'.freeze
 
         attr_reader :docker
         attr_accessor :environment, :network

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

@@ -0,0 +1,81 @@
+require 'nokogiri'
+
+module Gitlab
+  module QA
+    module Report
+      class PrepareStageReports
+        def initialize(input_files:)
+          @input_files = input_files
+        end
+
+        # Create a new JUnit report file for each Stage, containing tests from that Stage alone
+        def invoke!
+          collate_test_cases(@input_files).each do |stage, tests|
+            filename = "#{stage}.xml"
+
+            File.write(filename, new_junit_report(tests))
+
+            puts "Saved #{filename}"
+          end
+        end
+
+        private
+
+        def collate_test_cases(input_files)
+          # Collect the test cases from the original reports and group them by Stage
+          testcases = {}
+
+          Dir.glob(input_files).each do |rspec_report_file|
+            report = Nokogiri::XML(File.open(rspec_report_file))
+            report.xpath('//testcase').each do |test|
+              # The test file paths could start with any of
+              #  /qa/specs/features/api/<stage>
+              #  /qa/specs/features/browser_ui/<stage>
+              #  /qa/specs/features/ee/api/<stage>
+              #  /qa/specs/features/ee/browser_ui/<stage>
+              # For now we assume the Stage is whatever follows api/ or browser_ui/
+              stage = strip_number_prefix(test['file'].match(%r{(api|browser_ui)/([a-z0-9_]+)}i)[2])
+              testcases[stage] = [] unless testcases.key?(stage)
+              testcases[stage] << test
+            end
+          end
+
+          testcases
+        end
+
+        def strip_number_prefix(stage)
+          stage.sub(/^\d+_/, '')
+        end
+
+        def new_junit_report(testcases)
+          report = Nokogiri::XML::Document.new
+          testsuite_node = report.create_element('testsuite', name: 'rspec', **collect_stats(testcases))
+          report.root = testsuite_node
+
+          testcases.each do |test|
+            testsuite_node.add_child(test)
+          end
+
+          report.to_s
+        end
+
+        def collect_stats(testcases)
+          stats = {
+            tests: testcases.size,
+            failures: 0,
+            errors: 0,
+            skipped: 0
+          }
+
+          testcases.each do |test|
+            stats[:failures] += 1 unless test.search('failure').empty?
+            stats[:errors] += 1 unless test.search('error').empty?
+            stats[:skipped] += 1 unless test.search('skipped').empty?
+          end
+
+          stats
+        end
+      end
+    end
+  end
+end

data/lib/gitlab/qa/runner.rb

@@ -15,6 +15,8 @@ module Gitlab
 
       # rubocop:disable Metrics/AbcSize
       def self.run(args)
+        report_options = {}
+
         options = OptionParser.new do |opts|
           opts.banner = 'Usage: gitlab-qa [options] Scenario URL [[--] path] [rspec_options]'
 
@@ -22,6 +24,11 @@ module Gitlab
             opts.on(*opt)
           end
 
+          opts.on('--prepare-stage-reports FILES', 'Prepare separate reports for each Stage from the provided JUnit XML files') do |files|
+            report_options[:prepare_stage_reports] = true
+            report_options[:input_files] = files if files
+          end
+
           opts.on_tail('-v', '--version', 'Show the version') do
             require 'gitlab/qa/version'
             puts "#{$PROGRAM_NAME} : #{VERSION}"
@@ -37,6 +44,13 @@ module Gitlab
         end
 
         if args.size >= 1
+          if report_options[:prepare_stage_reports]
+            report_options.delete(:prepare_stage_reports)
+            Gitlab::QA::Report::PrepareStageReports.new(**report_options).invoke!
+
+            exit
+          end
+
           Scenario
             .const_get(args.shift)
             .perform(*args)

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

@@ -8,6 +8,8 @@ module Gitlab
           class ObjectStorage < Scenario::Template
             include Scenario::CLICommands
 
+            TYPES = %w[artifacts external_diffs lfs uploads packages dependency_proxy].freeze
+
             def perform(release, *rspec_args)
               Component::Gitlab.perform do |gitlab|
                 gitlab.release = release
@@ -16,26 +18,12 @@ module Gitlab
 
                 Component::Minio.perform do |minio|
                   minio.network = 'test'
-                  ['upload-bucket', 'lfs-bucket'].each do |bucket_name|
-                    minio.add_bucket(bucket_name)
+
+                  TYPES.each do |bucket_name|
+                    minio.add_bucket("#{bucket_name}-bucket")
                   end
 
-                  gitlab.omnibus_config = <<~OMNIBUS
-                    gitlab_rails['uploads_object_store_enabled'] = true;
-                    gitlab_rails['uploads_object_store_remote_directory'] = 'upload-bucket';
-                    gitlab_rails['uploads_object_store_background_upload'] = false;
-                    gitlab_rails['uploads_object_store_direct_upload'] = true;
-                    gitlab_rails['uploads_object_store_proxy_download'] = true;
-                    gitlab_rails['uploads_object_store_connection'] = #{minio.to_config};
-                    gitlab_rails['lfs_enabled'] = true;
-                    gitlab_rails['lfs_storage_path'] = '/var/opt/gitlab/gitlab-rails/shared/lfs-objects';
-                    gitlab_rails['lfs_object_store_enabled'] = true;
-                    gitlab_rails['lfs_object_store_direct_upload'] = true;
-                    gitlab_rails['lfs_object_store_background_upload'] = false;
-                    gitlab_rails['lfs_object_store_proxy_download'] = false;
-                    gitlab_rails['lfs_object_store_remote_directory'] = 'lfs-bucket';
-                    gitlab_rails['lfs_object_store_connection'] = #{minio.to_config};
-                  OMNIBUS
+                  gitlab.omnibus_config = object_storage_config(minio)
                   gitlab.exec_commands = git_lfs_install_commands
 
                   minio.instance do
@@ -53,6 +41,21 @@ module Gitlab
                 end
               end
             end
+
+            def object_storage_config(minio)
+              TYPES.map do |object_type|
+                <<~OMNIBUS
+                  gitlab_rails['#{object_type}_enabled'] = true;
+                  gitlab_rails['#{object_type}_storage_path'] = '/var/opt/gitlab/gitlab-rails/shared/#{object_type}';
+                  gitlab_rails['#{object_type}_object_store_enabled'] = true;
+                  gitlab_rails['#{object_type}_object_store_remote_directory'] = '#{object_type}-bucket';
+                  gitlab_rails['#{object_type}_object_store_background_upload'] = false;
+                  gitlab_rails['#{object_type}_object_store_direct_upload'] = true;
+                  gitlab_rails['#{object_type}_object_store_proxy_download'] = true;
+                  gitlab_rails['#{object_type}_object_store_connection'] = #{minio.to_config};
+                OMNIBUS
+              end.join("\n")
+            end
           end
         end
       end

data/lib/gitlab/qa/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module QA
-    VERSION = '4.17.0'.freeze
+    VERSION = '4.18.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 4.17.0
+  version: 4.18.0
 platform: ruby
 authors:
 - Grzegorz Bizon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-07 00:00:00.000000000 Z
+date: 2020-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control
@@ -122,6 +122,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 3.7.0
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.10'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.10'
 description: 
 email:
 - grzesiek.bizon@gmail.com
@@ -180,6 +194,7 @@ files:
 - lib/gitlab/qa/docker/shellout.rb
 - lib/gitlab/qa/docker/volumes.rb
 - lib/gitlab/qa/release.rb
+- lib/gitlab/qa/report/prepare_stage_reports.rb
 - lib/gitlab/qa/runner.rb
 - lib/gitlab/qa/runtime/env.rb
 - lib/gitlab/qa/scenario/actable.rb