gitlab-qa 5.14.0 → 5.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50cde662fbba863a232e44eacbb2aa7535762949816bd6281e5e0ce4fd916337
-  data.tar.gz: 67a222363326b5ab0767db8e894d56c351dd10a1e5c63aefd84991b009973a9e
+  metadata.gz: 80b5afa85b80b6c367a00f9e0077782d761bf5ad69d851aa95e5ea4f7ec4af78
+  data.tar.gz: b6940307fb5981a4f7c4468be522916ae4a01f2e65ddb0a5847037ce7099556f
 SHA512:
-  metadata.gz: dcd1486c1b47346d82c1bb5be090ec24ee25e0bd620232b8bbeef32e556cd6a7b8ebad3c5f05132de5ceb90636a78d10f4d5c6d4dd451784eac2d79b69429509
-  data.tar.gz: '0418804183dce1d3e5072381bb0ac6eef32c9eb7c0d98231a8e5ea94cc63255d43e14f94e61a91a6f47a1b3aa8ad44bf628ac7ce77544d80ccb6b13c6f8cccc5'
+  metadata.gz: 95347f6df44ef53110ac29177e3373fecba8d0ea2535f5a642233519c87d4c97edef9120d6a48e22b05739a00e4b01eccd090743894f1f0db52ba6a1ee4e0995
+  data.tar.gz: a688557eb3fb7738f7288dfbd18bf804fbfdbf668ffd1e17f155f1df3fce5b38b5618af10460355f516e26091e93f290651f364ac5f09531827c6a06b4b0fee5

data/.gitlab-ci.yml

@@ -31,6 +31,8 @@ workflow:
     - if: '$CI_COMMIT_BRANCH == "master"'
     # For tags, create a pipeline.
     - if: '$CI_COMMIT_TAG'
+    # For triggers from GitLab MR pipelines (and pipelines from other projects), create a pipeline
+    - if: '$CI_PIPELINE_SOURCE == "pipeline"'
 
 .default-rules:
   rules:

data/lib/gitlab/qa/release.rb

@@ -145,11 +145,17 @@ module Gitlab
             registry: DEV_REGISTRY
           }
         elsif omnibus_mirror?
-          Runtime::Env.require_gitlab_bot_multi_project_pipeline_polling_token!
+          username, password = if Runtime::Env.ci_job_token
+                                 ['gitlab-ci-token', Runtime::Env.ci_job_token]
+                               else
+                                 Runtime::Env.require_qa_access_token!
+
+                                 [Runtime::Env.gitlab_username, Runtime::Env.qa_access_token]
+                               end
 
           {
-            username: Runtime::Env.gitlab_username,
-            password: Runtime::Env.gitlab_bot_multi_project_pipeline_polling_token,
+            username: username,
+            password: password,
             registry: COM_REGISTRY
           }
         end

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

@@ -104,6 +104,10 @@ module Gitlab
           ENV['CI_JOB_NAME']
         end
 
+        def ci_job_token
+          ENV['CI_JOB_TOKEN']
+        end
+
         def ci_job_url
           ENV['CI_JOB_URL']
         end
@@ -207,12 +211,6 @@ module Gitlab
           end
         end
 
-        def require_gitlab_bot_multi_project_pipeline_polling_token!
-          return unless ENV['GITLAB_BOT_MULTI_PROJECT_PIPELINE_POLLING_TOKEN'].to_s.strip.empty?
-
-          raise ArgumentError, "Please provide GITLAB_BOT_MULTI_PROJECT_PIPELINE_POLLING_TOKEN"
-        end
-
         def skip_pull?
           enabled?(ENV['QA_SKIP_PULL'], default: false)
         end

data/lib/gitlab/qa/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module QA
-    VERSION = '5.14.0'.freeze
+    VERSION = '5.14.1'.freeze
   end
 end

metadata

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