gitlab-qa 5.3.0 → 5.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e9cf3fd69ecf574cc318f194a49e715050b7fe6708327c1555264c589722de3
-  data.tar.gz: 695c6e1e0b2f49615b42b83765353c80c0613b832636231bad0022dbddb2efcb
+  metadata.gz: 6c05160ceef2a5c1f1cb655a1a0e00dafe3fc741c83cf3720cceaf5c052e99e6
+  data.tar.gz: c734271a54bd03542af38490299bf88d9f9feb1038862852c4b3ae9fd2bb4955
 SHA512:
-  metadata.gz: 2cc293bccacd51527427585000e3058fc2853254c890f4965d3cb0245395b0e12455cbf57f50b1555414a7dd74b375d6f6061a2a7be24d0ecc3dc59360e732eb
-  data.tar.gz: 4b4de8b9fdb59f1ac502a9d5c0d25184bf80121aea31a549cb8577c578ea7fbaa8166803b886872f59a5873eee430c0435a70641d4d20c87d90febca1ff372a1
+  metadata.gz: b71209010fc236f2907dc7cb03cccc3761ecc28b65ca698503f05f24503ac8963cb3018288c301f6e78dff1a11d41cc315600f84c6bbc74ed02ea67b13efec0f
+  data.tar.gz: df6c7202be25a0dc0d6e0f8c0283313d4bd38f374ad62e0e66403be5be066471e779e45481d683c76b5267eaa4bbba330ff49f38898a38d5c89aee9b59ef9eed

data/.gitlab-ci.yml

@@ -693,44 +693,6 @@ ee:object_storage-quarantine:
   variables:
     QA_SCENARIO: "Test::Integration::ObjectStorage"
 
-ce:oauth:
-  extends:
-    - .test
-    - .high-capacity
-    - .ce-qa
-    - .rspec-report-opts
-  variables:
-    QA_SCENARIO: "Test::Integration::OAuth"
-
-ce:oauth-quarantine:
-  extends:
-    - .test
-    - .high-capacity
-    - .ce-qa
-    - .quarantine
-    - .rspec-report-opts
-  variables:
-    QA_SCENARIO: "Test::Integration::OAuth"
-
-ee:oauth:
-  extends:
-    - .test
-    - .high-capacity
-    - .ee-qa
-    - .rspec-report-opts
-  variables:
-    QA_SCENARIO: "Test::Integration::OAuth"
-
-ee:oauth-quarantine:
-  extends:
-    - .test
-    - .high-capacity
-    - .ee-qa
-    - .quarantine
-    - .rspec-report-opts
-  variables:
-    QA_SCENARIO: "Test::Integration::OAuth"
-
 ee:packages:
   extends:
     - .test

data/docs/what_tests_can_be_run.md

@@ -74,14 +74,8 @@ For more details on the internals, please read the
 * `QA_SLOW_CONNECTION_LATENCY_MS` - the additional latency (in ms) of the simulated slow connection (default 2000 ms).
 * `QA_SLOW_CONNECTION_THROUGHPUT_KBPS` - the maximum throughput (in kbps) of the simulated slow connection (default 32 kbps).
 * `QA_SKIP_PULL` - set to `true` to skip pulling docker images (e.g., to use one you built locally).
-* `GITHUB_OAUTH_APP_ID` - Client ID for GitHub OAuth app. See https://docs.gitlab.com/ce/integration/github.html for steps to generate this token.
-* `GITHUB_OAUTH_APP_SECRET` - Client Secret for GitHub OAuth app. See https://docs.gitlab.com/ce/integration/github.html for steps to generate this token.
 * `GITHUB_USERNAME` - Username for authenticating with GitHub.
 * `GITHUB_PASSWORD` - Password for authenticating with GitHub.
-* `GITLAB_QA_1P_EMAIL` - Email address for authenticating into 1Password
-* `GITLAB_QA_1P_PASSWORD` - Password for authenticating into 1Password.
-* `GITLAB_QA_1P_SECRET` - Secret for authenticating into 1Password.
-* `GITLAB_QA_1P_GITHUB_UUID` - UUID for GitHub item in GitLab-QA 1Password vault.
 * `GITLAB_QA_LOOP_RUNNER_MINUTES` - Minutes to run and repeat a spec while using the '--loop' option; default value is 1 minute.
 * `CI_SERVER_PERSONAL_ACCESS_TOKEN` - Personal access token of the server that is running the CI pipeline. This is used for pulling CI_RUNNER information in certain tests.
 
@@ -387,49 +381,6 @@ $ export EE_LICENSE=$(cat /path/to/Geo.gitlab_license)
 $ gitlab-qa Test::Integration::InstanceSAML EE
 ```
 
-### `Test::Integration::OAuth CE|EE|<full image address>`
-
-This tests that users can sign in to GitLab instance using external OAuth services.
-
-The tests currently integrate with the following OAuth service providers:
-* GitHub
-
-To run tests against the GitLab containers, a GitLab QA (`gitlab/gitlab-qa`)
-container is spun up and tests are run from it by running the
-`Test::Integration::OAuth` scenario (located under [`gitlab-org/gitlab-ce@qa/qa/scenario/test/integration/oauth.rb`](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/qa/qa/scenario/test/integration/oauth.rb) in the GitLab CE project).
-
-**Required environment variables:**
-
-- [For EE only] `EE_LICENSE`: A valid EE license.
-- `GITHUB_OAUTH_APP_ID`: Client ID for GitHub OAuth app. This can be found in the shared 1Password vault.
-- `GITHUB_OAUTH_APP_SECRET`: Client Secret for GitHub OAuth app. This can be found in the shared 1Password vault.
-- `GITHUB_USERNAME`: Username for authenticating with GitHub. This can be found in the shared 1Password vault.
-- `GITHUB_PASSWORD`: Password for authenticating with GitHub. This can be found in the shared 1Password vault.
-- `GITLAB_QA_1P_EMAIL`: Email address for authenticating into 1Password for GitLab-QA vault. This can be found in the shared 1Password vault.
-- `GITLAB_QA_1P_PASSWORD`: Password for authenticating into 1Password for GitLab-QA vault. This can be found in the shared 1Password vault.
-- `GITLAB_QA_1P_SECRET`: Secret for authenticating into 1Password. This can be found in the GitLab-QA 1Password vault.
-- `GITLAB_QA_1P_GITHUB_UUID`: UUID for GitHub item in GitLab-QA 1Password vault. This can be found in the GitLab-QA 1Password vault.
-
-Example:
-
-```
-$ export GITHUB_OAUTH_APP_ID=your_github_oauth_client_id
-$ export GITHUB_OAUTH_APP_SECRET=your_github_oauth_client_secret
-$ export GITHUB_USERNAME=your_github_username
-$ export GITHUB_PASSWORD=your_github_password
-$ export GITLAB_QA_1P_EMAIL=1password_email
-$ export GITLAB_QA_1P_PASSWORD=1password_password
-$ export GITLAB_QA_1P_SECRET=1password_secret
-$ export GITLAB_QA_1P_GITHUB_UUID=1password_gihub_item_uuid
-
-$ gitlab-qa Test::Integration::OAuth CE
-
-# For EE
-$ export EE_LICENSE=$(cat /path/to/gitlab_license)
-
-$ gitlab-qa Test::Integration::OAuth EE
-```
-
 ### `Test::Integration::Mattermost CE|EE|<full image address>`
 
 This tests that a GitLab instance works as expected when enabling the embedded

data/lib/gitlab/qa.rb

@@ -46,7 +46,6 @@ module Gitlab
           autoload :Mattermost, 'gitlab/qa/scenario/test/integration/mattermost'
           autoload :Kubernetes, 'gitlab/qa/scenario/test/integration/kubernetes'
           autoload :ObjectStorage, 'gitlab/qa/scenario/test/integration/object_storage'
-          autoload :OAuth, 'gitlab/qa/scenario/test/integration/oauth'
           autoload :Packages, 'gitlab/qa/scenario/test/integration/packages'
           autoload :Praefect, 'gitlab/qa/scenario/test/integration/praefect'
           autoload :Elasticsearch, 'gitlab/qa/scenario/test/integration/elasticsearch'

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

@@ -177,7 +177,14 @@ module Gitlab
         end
 
         def failure_summary
-          ":x: ~\"#{pipeline}::failed\" in job `#{Runtime::Env.ci_job_name}` in #{Runtime::Env.ci_job_url}"
+          summary = [":x: ~\"#{pipeline}::failed\""]
+          summary << "~\"quarantine\"" if quarantine_job?
+          summary << "in job `#{Runtime::Env.ci_job_name}` in #{Runtime::Env.ci_job_url}"
+          summary.join(' ')
+        end
+
+        def quarantine_job?
+          Runtime::Env.ci_job_name&.include?('quarantine')
         end
 
         def new_note_matches_discussion?(note, discussion)
@@ -196,6 +203,7 @@ module Gitlab
           labels = issue.labels
           labels.delete_if { |label| label.start_with?("#{pipeline}::") }
           labels << (failures(test).empty? ? "#{pipeline}::passed" : "#{pipeline}::failed")
+          quarantine_job? ? labels << "quarantine" : labels.delete("quarantine")
 
           Gitlab.edit_issue(project, issue.iid, labels: labels)
         end

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

@@ -51,8 +51,6 @@ module Gitlab
           'GITLAB_QA_PASSWORD_1' => :gitlab_qa_password_1,
           'GITLAB_QA_USERNAME_2' => :gitlab_qa_username_2,
           'GITLAB_QA_PASSWORD_2' => :gitlab_qa_password_2,
-          'GITHUB_OAUTH_APP_ID' => :github_oauth_app_id,
-          'GITHUB_OAUTH_APP_SECRET' => :github_oauth_app_secret,
           'GITHUB_USERNAME' => :github_username,
           'GITHUB_PASSWORD' => :github_password,
           'KNAPSACK_GENERATE_REPORT' => :knapsack_generate_report,
@@ -68,10 +66,6 @@ module Gitlab
           'GITLAB_CI' => :gitlab_ci,
           'QA_SKIP_PULL' => :qa_skip_pull,
           'ELASTIC_URL' => :elastic_url,
-          'GITLAB_QA_1P_EMAIL' => :gitlab_qa_1p_email,
-          'GITLAB_QA_1P_PASSWORD' => :gitlab_qa_1p_password,
-          'GITLAB_QA_1P_SECRET' => :gitlab_qa_1p_secret,
-          'GITLAB_QA_1P_GITHUB_UUID' => :gitlab_qa_1p_github_uuid,
           'GITLAB_QA_LOOP_RUNNER_MINUTES' => :gitlab_qa_loop_runner_minutes,
           'MAILHOG_HOSTNAME' => :mailhog_hostname,
           'SLACK_QA_CHANNEL' => :slack_qa_channel,
@@ -168,12 +162,6 @@ module Gitlab
           raise ArgumentError, "Please provide GITLAB_QA_DEV_ACCESS_TOKEN"
         end
 
-        def require_oauth_environment!
-          %w[GITHUB_OAUTH_APP_ID GITHUB_OAUTH_APP_SECRET GITHUB_USERNAME GITHUB_PASSWORD GITLAB_QA_1P_EMAIL GITLAB_QA_1P_PASSWORD GITLAB_QA_1P_SECRET GITLAB_QA_1P_GITHUB_UUID].each do |env_key|
-            raise ArgumentError, "Environment variable #{env_key} must be set to run OAuth specs" unless ENV.key?(env_key)
-          end
-        end
-
         def require_slack_qa_channel!
           return unless ENV['SLACK_QA_CHANNEL'].to_s.strip.empty?
 

data/lib/gitlab/qa/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module QA
-    VERSION = '5.3.0'.freeze
+    VERSION = '5.4.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 5.3.0
+  version: 5.4.0
 platform: ruby
 authors:
 - Grzegorz Bizon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-24 00:00:00.000000000 Z
+date: 2020-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control
@@ -282,7 +282,6 @@ files:
 - lib/gitlab/qa/scenario/test/integration/ldap_no_tls.rb
 - lib/gitlab/qa/scenario/test/integration/ldap_tls.rb
 - lib/gitlab/qa/scenario/test/integration/mattermost.rb
-- lib/gitlab/qa/scenario/test/integration/oauth.rb
 - lib/gitlab/qa/scenario/test/integration/object_storage.rb
 - lib/gitlab/qa/scenario/test/integration/packages.rb
 - lib/gitlab/qa/scenario/test/integration/praefect.rb

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

@@ -1,57 +0,0 @@
-require 'yaml'
-
-module Gitlab
-  module QA
-    module Scenario
-      module Test
-        module Integration
-          class OAuth < Scenario::Template
-            attr_reader :gitlab_name
-
-            def initialize
-              @gitlab_name = 'gitlab-oauth'
-            end
-
-            def perform(release, *rspec_args)
-              Runtime::Env.require_oauth_environment!
-              release = Release.new(release)
-
-              Component::Gitlab.perform do |gitlab|
-                gitlab.release = release
-                gitlab.network = 'test'
-                gitlab.name = gitlab_name
-
-                gitlab.omnibus_config = <<~OMNIBUS
-                gitlab_rails['omniauth_enabled'] = true;
-                gitlab_rails['omniauth_allow_single_sign_on'] = ['github'];
-                gitlab_rails['omniauth_block_auto_created_users'] = false;
-                gitlab_rails['omniauth_providers'] = [
-                  {
-                    name: 'github',
-                    app_id: '$GITHUB_OAUTH_APP_ID',
-                    app_secret: '$GITHUB_OAUTH_APP_SECRET',
-                    url: 'https://github.com/',
-                    verify_ssl: false,
-                    args: { scope: 'user:email' }
-                  }
-                ];
-                OMNIBUS
-
-                gitlab.instance do
-                  puts 'Running OAuth specs!'
-
-                  Component::Specs.perform do |specs|
-                    specs.suite = 'Test::Integration::OAuth'
-                    specs.release = release
-                    specs.network = gitlab.network
-                    specs.args = [gitlab.address, *rspec_args]
-                  end
-                end
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end