gitlab-qa 5.1.0 → 5.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77a9207808fc033a918c2096734e3511fe8cf5126ddc791f16477c4062c13e8f
-  data.tar.gz: 62c66c8604fcb5a73825a0e0e8e8c34aec1eca0e58e20c5effe17d2078fc82c6
+  metadata.gz: 30e6e754d6c1e8272e5e82f3601895f64f1612a5f1ca8a2b7255d1276114dee4
+  data.tar.gz: b7c4ad654f11d2a7adbbb893cfbb4bf839fa9858bf97e87bfd3b89b3ae53525e
 SHA512:
-  metadata.gz: db859779d4aba13388c527e9183998d80e64422fa30fabd1446af46d2a6af540165ae3d0b5932059159c245104ecb528213977d281684fb75034e240efe48807
-  data.tar.gz: 5f3160b6db99a7c4f0ae247b4990971a162b4728560c353842b79cf872a348c915ecf836be1549547aedd29ea4d0c2ea358276fe03a1e3df2c7fa3008f9a7d93
+  metadata.gz: 03516d22897b193f7748422519b52cfa70465cedeaf1ef405afdc88ea399ca748bb054723d67238bf0983c1fafbd23c469757ac4dc39b26481bc3813116407f7
+  data.tar.gz: 7df1fe3331bec065736ad9491d71c9eecdef50f2a7270dc0b94dbf6a72eff7ae9eb4d7575f976676f615a239fdca419a8155e8f4ab8e806864fdae56e061eafa

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

@@ -73,7 +73,8 @@ module Gitlab
           'QA_CAN_TEST_ADMIN_FEATURES' => :qa_can_test_admin_features,
           'MAILHOG_HOSTNAME' => :mailhog_hostname,
           'SLACK_QA_CHANNEL' => :slack_qa_channel,
-          'SLACK_QA_BOT_TOKEN' => :slack_qa_bot_token
+          'CI_SLACK_WEBHOOK_URL' => :ci_slack_webhook_url,
+          'SLACK_ICON_EMOJI' => :slack_icon_emoji
         }.freeze
 
         ENV_VARIABLES.each_value do |accessor|
@@ -96,6 +97,18 @@ module Gitlab
           ENV['CI_PROJECT_NAME']
         end
 
+        def ci_slack_webhook_url
+          ENV['CI_SLACK_WEBHOOK_URL']
+        end
+
+        def slack_qa_channel
+          ENV['SLACK_QA_CHANNEL']
+        end
+
+        def slack_icon_emoji
+          ENV['SLACK_ICON_EMOJI']
+        end
+
         def run_id
           @run_id ||= "gitlab-qa-run-#{Time.now.strftime('%Y-%m-%d-%H-%M-%S')}-#{SecureRandom.hex(4)}"
         end
@@ -165,10 +178,10 @@ module Gitlab
           raise ArgumentError, "Please provide SLACK_QA_CHANNEL"
         end
 
-        def require_slack_qa_bot_token!
-          return unless ENV['SLACK_QA_BOT_TOKEN'].to_s.strip.empty?
+        def require_ci_slack_webhook_url!
+          return unless ENV['CI_SLACK_WEBHOOK_URL'].to_s.strip.empty?
 
-          raise ArgumentError, "Please provide SLACK_QA_BOT_TOKEN"
+          raise ArgumentError, "Please provide CI_SLACK_WEBHOOK_URL"
         end
 
         def require_kubernetes_environment!

data/lib/gitlab/qa/slack/post_to_slack.rb

@@ -8,14 +8,15 @@ module Gitlab
 
         def invoke!
           Runtime::Env.require_slack_qa_channel!
-          Runtime::Env.require_slack_qa_bot_token!
+          Runtime::Env.require_ci_slack_webhook_url!
 
           params = {}
-          params['token'] = Runtime::Env.slack_qa_bot_token
           params['channel'] = Runtime::Env.slack_qa_channel
+          params['username'] = "GitLab QA Bot"
+          params['icon_emoji'] = Runtime::Env.slack_icon_emoji
           params['text'] = @message
 
-          url = "https://slack.com/api/chat.postMessage"
+          url = Runtime::Env.ci_slack_webhook_url
 
           Support::HttpRequest.make_http_request(method: 'post', url: url, params: params)
         end

data/lib/gitlab/qa/support/http_request.rb

@@ -9,7 +9,7 @@ module Gitlab
         def self.make_http_request(method: 'get', url: nil, params: {}, headers: {}, show_response: false, fail_on_error: true)
           raise "URL not defined for making request. Exiting..." unless url
 
-          res = HTTP.follow.method(method).call(url, form: params, headers: headers)
+          res = HTTP.follow.method(method).call(url, json: params, headers: headers)
 
           if show_response
             if res.content_type.mime_type == "application/json"

data/lib/gitlab/qa/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module QA
-    VERSION = '5.1.0'.freeze
+    VERSION = '5.1.1'.freeze
   end
 end

metadata

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