gitlab-qa 4.3.2 → 4.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 046b62bccb952e70582f416d33a6d8e91812cecd62b6b824fe32502dfb6fa98b
-  data.tar.gz: af1b0fd85c07dfca53d920a7e3ee1da9d28a06ed7c5401ba1e0f94c6b753d8be
+  metadata.gz: b490e047aff19f334639e7e5126a773fb9aad830469a00e45e5f9b0f0bcae4a8
+  data.tar.gz: 35a094676936573b20a09a904cb5e63ed59d8b8a74a85529dcc31b76a10b1f5e
 SHA512:
-  metadata.gz: 6e1a3cbb30e225c1f9bd98be82eecf5a26c1c00a363f09b2934df98857803936f3a71afac09d8a1eba202ddcc64684a97f0c61d53ac4ce34dbfa5c2a87e99fb1
-  data.tar.gz: e16f0d7166c8cb3c5af3a8af06269f256f4f3f95b2e96631b4d6a794fd99559e496d66873d38aa424466625b1ff33ee9f134baaaf8e5c8d6e0a90e4a19f99ee6
+  metadata.gz: b7ab9084af4a9103007127fb433936872d86a2fdcad15aac3a935e08791a55111f18285dd09a6ec20615fbb83704939de47884052af7ef34c9cb022baafc56c8
+  data.tar.gz: a0d7b6d521c0f4ffe7166c1ec78afcb0068fabea12f4ed59ac9db92a7eea8ab8bb9876ff241d0f2649dc40c97f43f14fd083c01fde4d41b4ad60c0d228afc161

data/docs/run_qa_against_gdk.md

@@ -26,8 +26,8 @@ make a few changes to your `gdk/gitlab/config/gitlab.yml` file.
 
   # And if you want to test your local `gdk/gitlab/qa` changes, you'll need to
   # build the QA image first
-  # In gdk/gitlab/qa:
-  $ docker build -t gitlab/gitlab-ce-qa:your-custom-tag .
+  # In gdk/gitlab:
+  $ docker build -t gitlab/gitlab-ce-qa:your-custom-tag --file ./qa/Dockerfile ./
 
   # Then in gitlab-qa:
   $ exe/gitlab-qa Test::Instance::Any gitlab/gitlab-ce:your-custom-tag http://192.168.0.12:3000 -- qa/specs/features/browser_ui/1_manage/login/log_in_spec.rb

data/docs/what_tests_can_be_run.md

@@ -62,6 +62,10 @@ For more details on the internals, please read the
 * `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.
 
 ## [Supported Remote Grid environment variables](./running_against_remote_grid.md)
 
@@ -357,6 +361,10 @@ container is spun up and tests are run from it by running the
 - `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:
 
@@ -365,6 +373,10 @@ $ 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
 

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

@@ -55,7 +55,11 @@ module Gitlab
           'CI_NODE_TOTAL' => :ci_node_total,
           'GITLAB_CI' => :gitlab_ci,
           'QA_SKIP_PULL' => :qa_skip_pull,
-          'ELASTIC_URL' => :elastic_url
+          '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
         }.freeze
 
         ENV_VARIABLES.each_value do |accessor|
@@ -120,7 +124,7 @@ module Gitlab
         end
 
         def require_oauth_environment!
-          %w[GITHUB_OAUTH_APP_ID GITHUB_OAUTH_APP_SECRET GITHUB_USERNAME GITHUB_PASSWORD].each do |env_key|
+          %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

data/lib/gitlab/qa/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module QA
-    VERSION = '4.3.2'.freeze
+    VERSION = '4.3.3'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 4.3.2
+  version: 4.3.3
 platform: ruby
 authors:
 - Grzegorz Bizon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-25 00:00:00.000000000 Z
+date: 2019-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control
@@ -228,7 +228,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Integration tests for GitLab