gitlab-qa 2.11.0 → 2.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fbdc07d475c334682d19f722cc53a23ecc9e701e0faf1e44d17d6177649ea97a
-  data.tar.gz: 3d6dd8396cae8b7ed3ebe0a54143b024651baf8eb2e9c3664607933a33bf9299
+  metadata.gz: 0fbcfe2effed0e891ccaa98dab7238ee078727e01348f8f4669a6b9ed62cd8c1
+  data.tar.gz: '0271782dcad8bae1da2894d3490eb9ed38a1f6912e8b6036d72b164c455c0bba'
 SHA512:
-  metadata.gz: b3f1b8e302f00c3f01d7d0aa98d8b2ede1e35205b3e7ee30db30defbe5d2dee8f9e43d1123a0bf8a54300ddfc14ab5f260ae7e0354dbf309ff94ccc90b4bf108
-  data.tar.gz: 578b24ccbc63f39637a7b00d26ba05bd5de70bc48516253d9e195bfa43c1d6b1be1e913b3aa2f67d6b7bf63168b8c67a3e669e681875ca450c73a523f48ab6c1
+  metadata.gz: 9fd00c0536cc2e88b1d90f1004499f80155666cc0bef534e3674ca6e5a8f448ada0630f853d4461a22fddcc935ba4616649f8d0da5db8f8a1fdb6ddca01e0e24
+  data.tar.gz: ee77ef08427d485c0770882bf44319dcad5a06ec8af8b90009a355dc0836945fb7dc89af7e5bb947856ff30f100603c9755c47026ea62a401b9d5bd47b861bda

data/.gitlab-ci.yml

@@ -92,6 +92,14 @@ ce:instance:
   <<: *high-capacity
   <<: *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
+
 ee:instance:
   script:
     - bin/qa Test::Instance::Image ${RELEASE:=EE}
@@ -99,6 +107,14 @@ ee:instance:
   <<: *high-capacity
   <<: *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
+
 ce:relative_url:
   script:
     - bin/qa Test::Instance::RelativeUrl ${RELEASE:=CE}
@@ -181,6 +197,14 @@ ce:ldap_no_tls:
   <<: *high-capacity
   <<: *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
+
 ee:ldap_no_tls:
   script:
     - bin/qa Test::Integration::LDAPNoTLS ${RELEASE:=EE}
@@ -188,6 +212,14 @@ ee:ldap_no_tls:
   <<: *high-capacity
   <<: *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
+
 ce:ldap_tls:
   script:
     - bin/qa Test::Integration::LDAPTLS ${RELEASE:=CE}
@@ -195,6 +227,14 @@ ce:ldap_tls:
   <<: *high-capacity
   <<: *ce-qa
 
+ce:ldap_tls-quarantine:
+  allow_failure: true
+  script:
+    - bin/qa Test::Integration::LDAPTLS ${RELEASE:=CE} --tag quarantine
+  <<: *test
+  <<: *high-capacity
+  <<: *ce-qa
+
 ee:ldap_tls:
   script:
     - bin/qa Test::Integration::LDAPTLS ${RELEASE:=EE}
@@ -202,6 +242,14 @@ ee:ldap_tls:
   <<: *high-capacity
   <<: *ee-qa
 
+ee:ldap_tls-quarantine:
+  allow_failure: true
+  script:
+    - bin/qa Test::Integration::LDAPTLS ${RELEASE:=EE} --tag quarantine
+  <<: *test
+  <<: *high-capacity
+  <<: *ee-qa
+
 ce:instance_saml:
   script:
   - bin/qa Test::Integration::InstanceSAML ${RELEASE:=CE}
@@ -230,6 +278,14 @@ ce:kubernetes:
   <<: *high-capacity
   <<: *ce-qa
 
+ce:kubernetes-quarantine:
+  allow_failure: true
+  script:
+    - bin/qa Test::Integration::Kubernetes ${RELEASE:=CE} --tag quarantine
+  <<: *test
+  <<: *high-capacity
+  <<: *ce-qa
+
 ee:kubernetes:
   script:
     - bin/qa Test::Integration::Kubernetes ${RELEASE:=EE}
@@ -237,6 +293,14 @@ ee:kubernetes:
   <<: *high-capacity
   <<: *ee-qa
 
+ee:kubernetes-quarantine:
+  allow_failure: true
+  script:
+    - bin/qa Test::Integration::Kubernetes ${RELEASE:=EE} --tag quarantine
+  <<: *test
+  <<: *high-capacity
+  <<: *ee-qa
+
 ce:object_storage:
   script:
     - bin/qa Test::Integration::ObjectStorage ${RELEASE:=CE}
@@ -251,6 +315,20 @@ ee:object_storage:
   <<: *high-capacity
   <<: *ee-qa
 
+ce:oauth:
+  script:
+    - bin/qa Test::Integration::OAuth ${RELEASE:=CE}
+  <<: *test
+  <<: *high-capacity
+  <<: *ce-qa
+
+ee:oauth:
+  script:
+    - bin/qa Test::Integration::OAuth ${RELEASE:=EE}
+  <<: *test
+  <<: *high-capacity
+  <<: *ee-qa
+
 .notify_upstream_commit: &notify_upstream_commit
   stage: notify
   image: $TEST_IMAGE

data/docs/what_tests_can_be_run.md

@@ -50,6 +50,10 @@ For more details on the internals, please read the
 * `QA_DEBUG` - set to `true` to verbosely log page object actions. Note: if enabled be aware that sensitive data might be logged. If an input element has a QA selector with `password` in the name, data entered into the input element will be masked. If the element doesn't have `password` in its name it won't be masked.
 * `QA_LOG_PATH` - path to output debug logging to. If not set logging will be output to STDOUT
 * `QA_CAN_TEST_GIT_PROTOCOL_V2` - set to `false` to skip tests that require Git protocol v2 if your environment doesn't support it.
+* `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.
 
 ## [Supported Remote Grid environment variables](./running_against_remote_grid.md)
 
@@ -290,6 +294,41 @@ $ 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.
+
+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
+
+$ 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

@@ -39,6 +39,7 @@ module Gitlab
           autoload :Mattermost, 'qa/scenario/test/integration/mattermost'
           autoload :Kubernetes, 'qa/scenario/test/integration/kubernetes'
           autoload :ObjectStorage, 'qa/scenario/test/integration/object_storage'
+          autoload :OAuth, 'qa/scenario/test/integration/oauth'
         end
 
         module Sanity

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

@@ -40,7 +40,11 @@ module Gitlab
           'GITLAB_QA_USERNAME_1' => :gitlab_qa_username_1,
           'GITLAB_QA_PASSWORD_1' => :gitlab_qa_password_1,
           'GITLAB_QA_USERNAME_2' => :gitlab_qa_username_2,
-          'GITLAB_QA_PASSWORD_2' => :gitlab_qa_password_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
         }.freeze
 
         ENV_VARIABLES.each_value do |accessor|
@@ -94,6 +98,12 @@ module Gitlab
           raise ArgumentError, "Please provide GITLAB_QA_ACCESS_TOKEN"
         end
 
+        def require_oauth_environment!
+          %w[GITHUB_OAUTH_APP_ID GITHUB_OAUTH_APP_SECRET GITHUB_USERNAME GITHUB_PASSWORD].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_kubernetes_environment!
           %w[GCLOUD_ACCOUNT_EMAIL GCLOUD_ACCOUNT_KEY CLOUDSDK_CORE_PROJECT GCLOUD_ZONE].each do |env_key|
             raise ArgumentError, "Environment variable #{env_key} must be set to run kubernetes specs" unless ENV.key?(env_key)

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

@@ -7,7 +7,7 @@ module Gitlab
         module Integration
           class Kubernetes < Scenario::Template
             # rubocop:disable Metrics/AbcSize
-            def perform(release)
+            def perform(release, *rspec_args)
               Runtime::Env.require_kubernetes_environment!
 
               Component::Gitlab.perform do |gitlab|
@@ -38,7 +38,7 @@ module Gitlab
                             specs.suite = 'Test::Integration::Kubernetes'
                             specs.release = gitlab.release
                             specs.network = gitlab.network
-                            specs.args = [tunnel_gitlab.url]
+                            specs.args = [tunnel_gitlab.url, *rspec_args]
                           end
                         end
                       end

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

@@ -13,7 +13,7 @@ module Gitlab
             end
 
             # rubocop:disable Metrics/AbcSize
-            def perform(release)
+            def perform(release, *rspec_args)
               Component::Gitlab.perform do |gitlab|
                 gitlab.release = release
                 gitlab.name = gitlab_name
@@ -36,7 +36,7 @@ module Gitlab
                         specs.suite = spec_suite
                         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/oauth.rb

@@ -0,0 +1,57 @@
+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: '#{ENV['GITHUB_OAUTH_APP_ID']}',
+                    app_secret: '#{ENV['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

data/lib/gitlab/qa/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 2.11.0
+  version: 2.12.0
 platform: ruby
 authors:
 - Grzegorz Bizon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-10 00:00:00.000000000 Z
+date: 2019-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control
@@ -179,6 +179,7 @@ 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/saml.rb
 - lib/gitlab/qa/scenario/test/omnibus/image.rb
@@ -207,8 +208,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.2
 signing_key: 
 specification_version: 4
 summary: Integration tests for GitLab