gitlab-qa 2.12.0 → 2.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0fbcfe2effed0e891ccaa98dab7238ee078727e01348f8f4669a6b9ed62cd8c1
-  data.tar.gz: '0271782dcad8bae1da2894d3490eb9ed38a1f6912e8b6036d72b164c455c0bba'
+  metadata.gz: 895715c8f6cd7bc3343e8a48a3d61e14d5442ddfa88518fd28910a9fce76d046
+  data.tar.gz: 1d40c6c72c48949fbe5e788e4b37c39e9fc13bb02decd6258d1dfd7d1dbab914
 SHA512:
-  metadata.gz: 9fd00c0536cc2e88b1d90f1004499f80155666cc0bef534e3674ca6e5a8f448ada0630f853d4461a22fddcc935ba4616649f8d0da5db8f8a1fdb6ddca01e0e24
-  data.tar.gz: ee77ef08427d485c0770882bf44319dcad5a06ec8af8b90009a355dc0836945fb7dc89af7e5bb947856ff30f100603c9755c47026ea62a401b9d5bd47b861bda
+  metadata.gz: 82b5831b1ddd007d3a441b152f6cb58e68e2c348c53131954995ca4902d0c40df01017eb995b8c8ce35fdcf4a0f6823882f360aa98e9b0a86f2f2dd0ec91756f
+  data.tar.gz: 516ef5cb80c4a150409bcf91c41cf013d7ee30220b2b4857c41098c7a8f2b263472063de4be4ae0146817420235e9d590bca0ed9d2ffa2fac21cb74dec1c0945

data/.gitlab-ci.yml

@@ -71,6 +71,9 @@ check:rspec:
     - 7gb
     - triggered-packages
 
+.quarantine: &quarantine
+  allow_failure: true
+
 ce:sanity-framework:
   script:
     - ./bin/expect_exit_code_and_text "bin/qa Test::Instance::Image ${RELEASE:=CE} --tag framework" 1 "2 examples, 1 failure"
@@ -93,12 +96,12 @@ ce:instance:
   <<: *ce-qa
 
 ce:instance-quarantine:
-  allow_failure: true
   script:
     - bin/qa Test::Instance::Image ${RELEASE:=CE} --tag quarantine --tag ~orchestrated
   <<: *test
   <<: *high-capacity
   <<: *ce-qa
+  <<: *quarantine
 
 ee:instance:
   script:
@@ -108,12 +111,26 @@ ee:instance:
   <<: *ee-qa
 
 ee:instance-quarantine:
-  allow_failure: true
   script:
     - bin/qa Test::Instance::Image ${RELEASE:=EE} --tag quarantine --tag ~orchestrated
   <<: *test
   <<: *high-capacity
   <<: *ee-qa
+  <<: *quarantine
+
+ce:docker:
+  script:
+    - bin/qa Test::Instance::Image ${RELEASE:=CE} --tag docker
+  <<: *test
+  <<: *high-capacity
+  <<: *ce-qa
+
+ee:docker:
+  script:
+    - bin/qa Test::Instance::Image ${RELEASE:=EE} --tag docker
+  <<: *test
+  <<: *high-capacity
+  <<: *ee-qa
 
 ce:relative_url:
   script:
@@ -122,6 +139,14 @@ ce:relative_url:
   <<: *high-capacity
   <<: *ce-qa
 
+ce:relative_url-quarantine:
+  script:
+    - bin/qa Test::Instance::RelativeUrl ${RELEASE:=CE} --tag quarantine --tag ~orchestrated
+  <<: *test
+  <<: *high-capacity
+  <<: *ce-qa
+  <<: *quarantine
+
 ee:relative_url:
   script:
     - bin/qa Test::Instance::RelativeUrl ${RELEASE:=EE}
@@ -129,6 +154,14 @@ ee:relative_url:
   <<: *high-capacity
   <<: *ee-qa
 
+ee:relative_url-quarantine:
+  script:
+    - bin/qa Test::Instance::RelativeUrl ${RELEASE:=EE} --tag quarantine --tag ~orchestrated
+  <<: *test
+  <<: *high-capacity
+  <<: *ee-qa
+  <<: *quarantine
+
 ce:image:
   script:
     - bin/qa Test::Omnibus::Image ${RELEASE:=CE}
@@ -148,6 +181,14 @@ ce:update:
   <<: *high-capacity
   <<: *ce-qa
 
+ce:update-quarantine:
+  script:
+    - bin/qa Test::Omnibus::Update ${RELEASE:=CE} ${RELEASE:=CE} --tag quarantine --tag ~orchestrated
+  <<: *test
+  <<: *high-capacity
+  <<: *ce-qa
+  <<: *quarantine
+
 ee:update:
   script:
     - bin/qa Test::Omnibus::Update ${RELEASE:=EE}
@@ -155,6 +196,14 @@ ee:update:
   <<: *high-capacity
   <<: *ee-qa
 
+ee:update-quarantine:
+  script:
+    - bin/qa Test::Omnibus::Update ${RELEASE:=EE} ${RELEASE:=EE} --tag quarantine --tag ~orchestrated
+  <<: *test
+  <<: *high-capacity
+  <<: *ee-qa
+  <<: *quarantine
+
 ce:upgrade:
   script:
     - bin/qa Test::Omnibus::Upgrade
@@ -162,6 +211,14 @@ ce:upgrade:
   <<: *high-capacity
   <<: *only-qa
 
+ce:upgrade-quarantine:
+  script:
+    - bin/qa Test::Omnibus::Upgrade CE --tag quarantine --tag ~orchestrated
+  <<: *test
+  <<: *high-capacity
+  <<: *only-qa
+  <<: *quarantine
+
 ee-previous-to-ce:update:
   script:
      - bin/qa Test::Omnibus::Update EE CE
@@ -169,6 +226,14 @@ ee-previous-to-ce:update:
   <<: *high-capacity
   <<: *only-qa
 
+ee-previous-to-ce:update-quarantine:
+  script:
+     - bin/qa Test::Omnibus::Update EE CE --tag quarantine --tag ~orchestrated
+  <<: *test
+  <<: *high-capacity
+  <<: *only-qa
+  <<: *quarantine
+
 ce:mattermost:
   script:
     - bin/qa Test::Integration::Mattermost ${RELEASE:=CE}
@@ -176,6 +241,14 @@ ce:mattermost:
   <<: *high-capacity
   <<: *ce-qa
 
+ce:mattermost-quarantine:
+  script:
+    - bin/qa Test::Integration::Mattermost ${RELEASE:=CE} --tag quarantine
+  <<: *test
+  <<: *high-capacity
+  <<: *ce-qa
+  <<: *quarantine
+
 ee:mattermost:
   script:
     - bin/qa Test::Integration::Mattermost ${RELEASE:=EE}
@@ -183,6 +256,14 @@ ee:mattermost:
   <<: *high-capacity
   <<: *ee-qa
 
+ee:mattermost-quarantine:
+  script:
+    - bin/qa Test::Integration::Mattermost ${RELEASE:=EE} --tag quarantine
+  <<: *test
+  <<: *high-capacity
+  <<: *ee-qa
+  <<: *quarantine
+
 ee:geo:
   script:
     - bin/qa Test::Integration::Geo ${RELEASE:=EE}
@@ -190,6 +271,14 @@ ee:geo:
   <<: *high-capacity
   <<: *ee-qa
 
+ee:geo-quarantine:
+  script:
+    - bin/qa Test::Integration::Geo ${RELEASE:=EE} -- --tag quarantine
+  <<: *test
+  <<: *high-capacity
+  <<: *ee-qa
+  <<: *quarantine
+
 ce:ldap_no_tls:
   script:
     - bin/qa Test::Integration::LDAPNoTLS ${RELEASE:=CE}
@@ -198,12 +287,12 @@ ce:ldap_no_tls:
   <<: *ce-qa
 
 ce:ldap_no_tls-quarantine:
-  allow_failure: true
   script:
     - bin/qa Test::Integration::LDAPNoTLS ${RELEASE:=CE} --tag quarantine
   <<: *test
   <<: *high-capacity
   <<: *ce-qa
+  <<: *quarantine
 
 ee:ldap_no_tls:
   script:
@@ -213,12 +302,12 @@ ee:ldap_no_tls:
   <<: *ee-qa
 
 ee:ldap_no_tls-quarantine:
-  allow_failure: true
   script:
     - bin/qa Test::Integration::LDAPNoTLS ${RELEASE:=EE} --tag quarantine
   <<: *test
   <<: *high-capacity
   <<: *ee-qa
+  <<: *quarantine
 
 ce:ldap_tls:
   script:
@@ -228,12 +317,12 @@ ce:ldap_tls:
   <<: *ce-qa
 
 ce:ldap_tls-quarantine:
-  allow_failure: true
   script:
     - bin/qa Test::Integration::LDAPTLS ${RELEASE:=CE} --tag quarantine
   <<: *test
   <<: *high-capacity
   <<: *ce-qa
+  <<: *quarantine
 
 ee:ldap_tls:
   script:
@@ -243,12 +332,12 @@ ee:ldap_tls:
   <<: *ee-qa
 
 ee:ldap_tls-quarantine:
-  allow_failure: true
   script:
     - bin/qa Test::Integration::LDAPTLS ${RELEASE:=EE} --tag quarantine
   <<: *test
   <<: *high-capacity
   <<: *ee-qa
+  <<: *quarantine
 
 ce:instance_saml:
   script:
@@ -257,6 +346,14 @@ ce:instance_saml:
   <<: *high-capacity
   <<: *ce-qa
 
+ce:instance_saml-quarantine:
+  script:
+  - bin/qa Test::Integration::InstanceSAML ${RELEASE:=CE} --tag quarantine
+  <<: *test
+  <<: *high-capacity
+  <<: *ce-qa
+  <<: *quarantine
+
 ee:instance_saml:
   script:
   - bin/qa Test::Integration::InstanceSAML ${RELEASE:=EE}
@@ -264,6 +361,14 @@ ee:instance_saml:
   <<: *high-capacity
   <<: *ee-qa
 
+ee:instance_saml-quarantine:
+  script:
+  - bin/qa Test::Integration::InstanceSAML ${RELEASE:=EE} --tag quarantine
+  <<: *test
+  <<: *high-capacity
+  <<: *ee-qa
+  <<: *quarantine
+
 ee:group_saml:
   script:
   - bin/qa Test::Integration::GroupSAML ${RELEASE:=EE}
@@ -271,6 +376,14 @@ ee:group_saml:
   <<: *high-capacity
   <<: *ee-qa
 
+ee:group_saml-quarantine:
+  script:
+  - bin/qa Test::Integration::GroupSAML ${RELEASE:=EE} --tag quarantine
+  <<: *test
+  <<: *high-capacity
+  <<: *ee-qa
+  <<: *quarantine
+
 ce:kubernetes:
   script:
     - bin/qa Test::Integration::Kubernetes ${RELEASE:=CE}
@@ -279,12 +392,12 @@ ce:kubernetes:
   <<: *ce-qa
 
 ce:kubernetes-quarantine:
-  allow_failure: true
   script:
     - bin/qa Test::Integration::Kubernetes ${RELEASE:=CE} --tag quarantine
   <<: *test
   <<: *high-capacity
   <<: *ce-qa
+  <<: *quarantine
 
 ee:kubernetes:
   script:
@@ -294,12 +407,12 @@ ee:kubernetes:
   <<: *ee-qa
 
 ee:kubernetes-quarantine:
-  allow_failure: true
   script:
     - bin/qa Test::Integration::Kubernetes ${RELEASE:=EE} --tag quarantine
   <<: *test
   <<: *high-capacity
   <<: *ee-qa
+  <<: *quarantine
 
 ce:object_storage:
   script:
@@ -308,6 +421,14 @@ ce:object_storage:
   <<: *high-capacity
   <<: *ce-qa
 
+ce:object_storage-quarantine:
+  script:
+    - bin/qa Test::Integration::ObjectStorage ${RELEASE:=CE} --tag quarantine
+  <<: *test
+  <<: *high-capacity
+  <<: *ce-qa
+  <<: *quarantine
+
 ee:object_storage:
   script:
     - bin/qa Test::Integration::ObjectStorage ${RELEASE:=EE}
@@ -315,6 +436,14 @@ ee:object_storage:
   <<: *high-capacity
   <<: *ee-qa
 
+ee:object_storage-quarantine:
+  script:
+    - bin/qa Test::Integration::ObjectStorage ${RELEASE:=EE} --tag quarantine
+  <<: *test
+  <<: *high-capacity
+  <<: *ee-qa
+  <<: *quarantine
+
 ce:oauth:
   script:
     - bin/qa Test::Integration::OAuth ${RELEASE:=CE}
@@ -322,6 +451,14 @@ ce:oauth:
   <<: *high-capacity
   <<: *ce-qa
 
+ce:oauth-quarantine:
+  script:
+    - bin/qa Test::Integration::OAuth ${RELEASE:=CE} --tag quarantine
+  <<: *test
+  <<: *high-capacity
+  <<: *ce-qa
+  <<: *quarantine
+
 ee:oauth:
   script:
     - bin/qa Test::Integration::OAuth ${RELEASE:=EE}
@@ -329,6 +466,14 @@ ee:oauth:
   <<: *high-capacity
   <<: *ee-qa
 
+ee:oauth-quarantine:
+  script:
+    - bin/qa Test::Integration::OAuth ${RELEASE:=EE} --tag quarantine
+  <<: *test
+  <<: *high-capacity
+  <<: *ee-qa
+  <<: *quarantine
+
 .notify_upstream_commit: &notify_upstream_commit
   stage: notify
   image: $TEST_IMAGE

data/docs/run_qa_against_gdk.md

@@ -4,6 +4,8 @@ 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` with
    `host: 192.168.0.12`.
 1. Also replace `ssh_host: localhost` (found under `gitlab_shell`) with

data/lib/gitlab/qa/scenario/test/instance/relative_url.rb

@@ -4,7 +4,7 @@ module Gitlab
       module Test
         module Instance
           class RelativeUrl < Image
-            def perform(release)
+            def perform(release, *rspec_args)
               Component::Gitlab.perform do |gitlab|
                 gitlab.release = release
                 gitlab.network = 'test'
@@ -19,7 +19,7 @@ module Gitlab
                     specs.suite = 'Test::Instance'
                     specs.release = gitlab.release
                     specs.network = gitlab.network
-                    specs.args = [gitlab.address]
+                    specs.args = [gitlab.address, *rspec_args]
                   end
                 end
               end

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

@@ -11,7 +11,7 @@ module Gitlab
             # rubocop:disable Metrics/MethodLength
             # rubocop:disable Metrics/AbcSize
             #
-            def perform(release)
+            def perform(release, *rspec_args)
               release = Release.new(release)
 
               raise ArgumentError, 'Geo is EE only!' unless release.ee?
@@ -67,7 +67,8 @@ module Gitlab
                           '--primary-address', primary.address,
                           '--primary-name', primary.name,
                           '--secondary-address', secondary.address,
-                          '--secondary-name', secondary.name
+                          '--secondary-name', secondary.name,
+                          *rspec_args
                         ]
                       end
 

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

@@ -4,7 +4,7 @@ module Gitlab
       module Test
         module Integration
           class Mattermost < Scenario::Template
-            def perform(release)
+            def perform(release, *rspec_args)
               Component::Gitlab.perform do |gitlab|
                 gitlab.release = release
                 gitlab.network = 'test'
@@ -22,7 +22,7 @@ module Gitlab
                     specs.suite = 'Test::Integration::Mattermost'
                     specs.release = gitlab.release
                     specs.network = gitlab.network
-                    specs.args = [gitlab.address, mattermost_external_url]
+                    specs.args = [gitlab.address, mattermost_external_url, *rspec_args]
                   end
                 end
               end

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

@@ -7,7 +7,7 @@ module Gitlab
         module Integration
           class ObjectStorage < Scenario::Template
             # rubocop:disable Metrics/AbcSize
-            def perform(release)
+            def perform(release, *rspec_args)
               Component::Gitlab.perform do |gitlab|
                 gitlab.release = release
                 gitlab.name = 'gitlab-object-storage'
@@ -34,7 +34,7 @@ module Gitlab
                         specs.suite = 'Test::Integration::ObjectStorage'
                         specs.release = gitlab.release
                         specs.network = gitlab.network
-                        specs.args = [gitlab.address]
+                        specs.args = [gitlab.address, *rspec_args]
                       end
                     end
                   end

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

@@ -16,7 +16,7 @@ module Gitlab
               # no-op
             end
 
-            def perform(release)
+            def perform(release, *rspec_args)
               release = Release.new(release)
               before_perform(release)
 
@@ -37,7 +37,7 @@ module Gitlab
                         specs.suite = spec_suite
                         specs.release = release
                         specs.network = gitlab.network
-                        specs.args = [gitlab.address]
+                        specs.args = [gitlab.address, *rspec_args]
                       end
                     end
                   end

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

@@ -7,7 +7,7 @@ module Gitlab
       module Test
         module Omnibus
           class Update < Scenario::Template
-            def perform(from_release, to_release = nil)
+            def perform(from_release, to_release = nil, *rspec_args)
               previous_release = Release.new(from_release).previous_stable
               current_release = Release.new(to_release || from_release)
 
@@ -20,7 +20,7 @@ module Gitlab
                 end
 
                 Scenario::Test::Instance::Image
-                  .perform(current_release) do |scenario|
+                  .perform(current_release, *rspec_args) do |scenario|
                   scenario.volumes = volumes
                 end
               end

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

@@ -7,7 +7,7 @@ module Gitlab
       module Test
         module Omnibus
           class Upgrade < Scenario::Template
-            def perform(image = 'CE')
+            def perform(image = 'CE', *rspec_args)
               ce_release = Release.new(image)
 
               if ce_release.ee?
@@ -16,12 +16,12 @@ module Gitlab
 
               Docker::Volumes.new.with_temporary_volumes do |volumes|
                 Scenario::Test::Instance::Image
-                  .perform(ce_release) do |scenario|
+                  .perform(ce_release, *rspec_args) do |scenario|
                   scenario.volumes = volumes
                 end
 
                 Scenario::Test::Instance::Image
-                  .perform(ce_release.to_ee) do |scenario|
+                  .perform(ce_release.to_ee, *rspec_args) do |scenario|
                   scenario.volumes = volumes
                 end
               end

data/lib/gitlab/qa/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module QA
-    VERSION = '2.12.0'.freeze
+    VERSION = '2.13.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 2.12.0
+  version: 2.13.0
 platform: ruby
 authors:
 - Grzegorz Bizon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-06 00:00:00.000000000 Z
+date: 2019-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control