gitlab-qa 4.1.0 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea9e523ef0fc39362a2a35e77694548c63d14750853b0ddfba1c66f05b0b6cf6
-  data.tar.gz: 3a91922fdfa44a6ccdebfb6be608ce20a3498d278288d520ed08b092cabca3e6
+  metadata.gz: e66787cfbd1b151a55db80cfda368315899534bdc89cf2a18ba45ebe0eb37c38
+  data.tar.gz: 998d63b9deca2e4cbff1bf312375fd01e3634f6b6efcef9ceaefed19f1995042
 SHA512:
-  metadata.gz: e6012168b5a75bf16c2f10767f4b32120bb963389d03660dfa9e427b6c60ca6e4ea33b845d7ec6a5655d9b038083bc68acc66773867f5b50de46cd0287d6f6c3
-  data.tar.gz: 7d512021e26054c9a67b7225bc2248459f2e78aeecb8cd9be51227a1bfdd260c8b774e6c0d7274d37aeb131514e869ee1288400b0b5b0156c4d70e9222572313
+  metadata.gz: 98d1bac9f731b3b250702f5b28abf7d0c0aa46bc9d3cc3155b02342fff5851150bbdd5d66f874ffb23b932de59646a575942a3a358b3c6a0b573efb1feabe2b4
+  data.tar.gz: 22ccf813d797cdd72277a55a58da1580fc9ba9e58860e6ef76328e68123118a03d5b26b83571a817def35f0f5ddd3f7e78a1d647d37579da0876bbc845c86e42

data/.gitlab-ci.yml

@@ -71,6 +71,20 @@ check:rspec:
     - 7gb
     - triggered-packages
 
+.ee-parallel-knapsack: &ee-parallel-knapsack
+  parallel: 5
+  variables:
+    KNAPSACK_REPORT_PATH: "qa/ee/knapsack/nightly_master_report.json"
+    KNAPSACK_TEST_FILE_PATTERN: "qa/specs/features/**/*_spec.rb"
+    KNAPSACK_GENERATE_REPORT: "true"
+
+.ce-parallel-knapsack: &ce-parallel-knapsack
+  parallel: 5
+  variables:
+    KNAPSACK_REPORT_PATH: "qa/ce/knapsack/nightly_master_report.json"
+    KNAPSACK_TEST_FILE_PATTERN: "qa/specs/features/**/*_spec.rb"
+    KNAPSACK_GENERATE_REPORT: "true"
+
 .quarantine: &quarantine
   allow_failure: true
 
@@ -94,6 +108,7 @@ ce:instance:
   <<: *test
   <<: *high-capacity
   <<: *ce-qa
+  <<: *ce-parallel-knapsack
 
 ce:instance-quarantine:
   script:
@@ -109,6 +124,7 @@ ee:instance:
   <<: *test
   <<: *high-capacity
   <<: *ee-qa
+  <<: *ee-parallel-knapsack
 
 ee:instance-quarantine:
   script:
@@ -138,6 +154,7 @@ ce:relative_url:
   <<: *test
   <<: *high-capacity
   <<: *ce-qa
+  <<: *ce-parallel-knapsack
 
 ce:relative_url-quarantine:
   script:
@@ -153,6 +170,7 @@ ee:relative_url:
   <<: *test
   <<: *high-capacity
   <<: *ee-qa
+  <<: *ee-parallel-knapsack
 
 ee:relative_url-quarantine:
   script:
@@ -180,6 +198,7 @@ ce:update:
   <<: *test
   <<: *high-capacity
   <<: *ce-qa
+  <<: *ce-parallel-knapsack
 
 ce:update-quarantine:
   script:
@@ -195,6 +214,7 @@ ee:update:
   <<: *test
   <<: *high-capacity
   <<: *ee-qa
+  <<: *ee-parallel-knapsack
 
 ee:update-quarantine:
   script:
@@ -474,6 +494,13 @@ ee:oauth-quarantine:
   <<: *ee-qa
   <<: *quarantine
 
+ee:elasticsearch:
+  script:
+    - exe/gitlab-qa Test::Integration::Elasticsearch ${RELEASE:=EE}
+  <<: *test
+  <<: *high-capacity
+  <<: *ee-qa
+
 .notify_upstream_commit: &notify_upstream_commit
   stage: notify
   image: $TEST_IMAGE

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 = '5.6.12'.freeze
+        ELASTIC_IMAGE_TAG = '6.8.1'.freeze
 
         attr_reader :docker
         attr_accessor :environment, :network
@@ -17,7 +17,7 @@ module Gitlab
         end
 
         def name
-          @name ||= "elastic56"
+          @name ||= "elastic68"
         end
 
         def instance

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

@@ -36,6 +36,10 @@ module Gitlab
           @environment['GITLAB_OMNIBUS_CONFIG'] = config.tr("\n", ' ')
         end
 
+        def elastic_url=(url)
+          @environment['ELASTIC_URL'] = url
+        end
+
         def add_network_alias(name)
           @network_aliases.push(name)
         end

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

@@ -54,7 +54,8 @@ module Gitlab
           'CI_NODE_INDEX' => :ci_node_index,
           'CI_NODE_TOTAL' => :ci_node_total,
           'GITLAB_CI' => :gitlab_ci,
-          'QA_SKIP_PULL' => :qa_skip_pull
+          'QA_SKIP_PULL' => :qa_skip_pull,
+          'ELASTIC_URL' => :elastic_url
         }.freeze
 
         ENV_VARIABLES.each_value do |accessor|

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

@@ -8,7 +8,7 @@ module Gitlab
 
             def initialize
               @gitlab_name = 'gitlab-elastic'
-              @spec_suite = 'Test::Integration::Elasticsearch'
+              @spec_suite = 'QA::EE::Scenario::Test::Integration::Elasticsearch'
             end
 
             def before_perform(release)
@@ -21,10 +21,10 @@ module Gitlab
 
               Component::Gitlab.perform do |gitlab|
                 gitlab.release = release
-                gitlab.name = gitlab_name
-                gitlab.network = 'test'
+                setup_elasticsearch_on gitlab
 
                 Component::Elasticsearch.perform do |elastic|
+                  elastic.network = 'test'
                   elastic.instance do
                     gitlab.instance do
                       puts "Running #{spec_suite} specs!"
@@ -40,6 +40,17 @@ module Gitlab
                 end
               end
             end
+
+            def empty_index
+              @empty_index ||= ["gitlab-rake gitlab:elastic:create_empty_index"]
+            end
+
+            def setup_elasticsearch_on(instance)
+              instance.name = gitlab_name
+              instance.network = 'test'
+              instance.elastic_url = 'http://elastic68:9200'
+              instance.exec_commands = empty_index
+            end
           end
         end
       end

data/lib/gitlab/qa/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module QA
-    VERSION = '4.1.0'.freeze
+    VERSION = '4.2.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.2.0
 platform: ruby
 authors:
 - Grzegorz Bizon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-24 00:00:00.000000000 Z
+date: 2019-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control
@@ -213,8 +213,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Integration tests for GitLab