From cca2af6875d01fdf6bdb7fb872d7ba793e82e0a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= <jakub@status.im>
Date: Mon, 1 Jul 2019 11:39:16 -0400
Subject: [PATCH] don't provide --apk=, it's already there
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jakub Sokołowski <jakub@status.im>
---
 ci/Jenkinsfile.combined           | 2 +-
 ci/Jenkinsfile.nightly-end-to-end | 6 +++++-
 ci/android.groovy                 | 7 +++++--
 ci/ios.groovy                     | 7 +++++--
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/ci/Jenkinsfile.combined b/ci/Jenkinsfile.combined
index 6516d3c86f..185100081d 100644
--- a/ci/Jenkinsfile.combined
+++ b/ci/Jenkinsfile.combined
@@ -106,7 +106,7 @@ pipeline {
         e2eApk = cmn.utils.getEnv(apke2e, 'SAUCE_URL')
         build(
           job: 'end-to-end-tests/status-app-nightly', wait: false,
-          parameters: [string(name: 'apk', value: "--apk=${e2eApk}")]
+          parameters: [string(name: 'APK_NAME', value: e2eApk)]
         )
       } }
     }
diff --git a/ci/Jenkinsfile.nightly-end-to-end b/ci/Jenkinsfile.nightly-end-to-end
index dd17a4949c..7b815b0e9f 100644
--- a/ci/Jenkinsfile.nightly-end-to-end
+++ b/ci/Jenkinsfile.nightly-end-to-end
@@ -51,9 +51,13 @@ pipeline {
   post {
     always {
       script {
-        sauce('12e007ad-48cf-4c20-92f3-b923bb5641bd') {
+        sauce('sauce-labs-cred') {
           saucePublisher()
         }
+      }
+    }
+    success {
+      script {
         junit(
           testDataPublishers: [[$class: 'SauceOnDemandReportPublisher', jobVisibility: 'public']],
           testResults: 'test/appium/tests/*.xml'
diff --git a/ci/android.groovy b/ci/android.groovy
index e4071d5088..36144138fd 100644
--- a/ci/android.groovy
+++ b/ci/android.groovy
@@ -71,8 +71,11 @@ def uploadToSauceLabs() {
     env.SAUCE_LABS_NAME = "${pkg}"
   }
   withCredentials([
-    string(credentialsId: 'SAUCE_ACCESS_KEY', variable: 'SAUCE_ACCESS_KEY'),
-    string(credentialsId: 'SAUCE_USERNAME', variable: 'SAUCE_USERNAME'),
+    usernamePassword(
+      credentialsId:  'sauce-labs-api',
+      usernameVariable: 'SAUCE_USERNAME',
+      passwordVariable: 'SAUCE_ACCESS_KEY'
+    ),
   ]) {
     nix.shell(
       'fastlane android saucelabs',
diff --git a/ci/ios.groovy b/ci/ios.groovy
index 7f3c9268cc..f08f3a4eb2 100644
--- a/ci/ios.groovy
+++ b/ci/ios.groovy
@@ -81,8 +81,11 @@ def uploadToSauceLabs() {
     env.SAUCE_LABS_NAME = "im.status.ethereum-e2e-${utils.gitCommit()}.app.zip"
   }
   withCredentials([
-    string(credentialsId: 'SAUCE_ACCESS_KEY', variable: 'SAUCE_ACCESS_KEY'),
-    string(credentialsId: 'SAUCE_USERNAME', variable: 'SAUCE_USERNAME'),
+    usernamePassword(
+      credentialsId:  'sauce-labs-api',
+      usernameVariable: 'SAUCE_USERNAME',
+      passwordVariable: 'SAUCE_ACCESS_KEY'
+    ),
   ]) {
     nix.shell(
       'bundle exec --gemfile=fastlane/Gemfile fastlane ios saucelabs',