From 361ddb338e5617feb0736c70fe836551ed3b854f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= <jakub@status.im>
Date: Fri, 3 Feb 2023 17:09:08 +0100
Subject: [PATCH] ci: drop uploading e2e builds to SauceLabs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Since uploads to SauceLabs were dropped from `Fastfile` in:
https://github.com/status-im/status-mobile/pull/14969

Also dropped:
- Useless Diawi upload of APK
- Useless DO Spaces upload of IPA

Signed-off-by: Jakub Sokołowski <jakub@status.im>
---
 ci/Jenkinsfile.android | 14 +++-----------
 ci/Jenkinsfile.ios     | 12 ++++--------
 fastlane/Fastfile      | 12 ------------
 3 files changed, 7 insertions(+), 31 deletions(-)

diff --git a/ci/Jenkinsfile.android b/ci/Jenkinsfile.android
index 0a8e06cf7f..8431783cf9 100644
--- a/ci/Jenkinsfile.android
+++ b/ci/Jenkinsfile.android
@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.6.3'
+library 'status-jenkins-lib@v1.6.5'
 
 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()
@@ -75,20 +75,12 @@ pipeline {
         stage('Upload') {
           steps { script {
             def urls = apks.collect { s3.uploadArtifact(it) }
-            /* return only the universal APK */
-            if (urls.size() > 1) {
+            if (urls.size() > 1) { /* Return only the universal APK. */
               env.PKG_URL = urls.find { it.contains('universal') }
-            } else { /* if no universal is available pick first */
+            } else { /* If no universal is available pick first. */
               env.PKG_URL = urls.first()
             }
             jenkins.setBuildDesc(APK: env.PKG_URL)
-            /* e2e builds get tested in SauceLabs */
-            if (utils.isE2EBuild()) {
-              env.SAUCE_URL = android.uploadToSauceLabs()
-            }
-            if (utils.isNightlyBuild()) {
-              env.DIAWI_URL = android.uploadToDiawi()
-            }
           } }
         }
       }
diff --git a/ci/Jenkinsfile.ios b/ci/Jenkinsfile.ios
index 4708f3d0d7..8dab5d5d94 100644
--- a/ci/Jenkinsfile.ios
+++ b/ci/Jenkinsfile.ios
@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.6.3'
+library 'status-jenkins-lib@v1.6.5'
 
 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()
@@ -72,15 +72,11 @@ pipeline {
           }
         }
         stage('Upload') {
+          when { expression { !utils.isReleaseBuild() } }
           steps { script {
-            env.PKG_URL = s3.uploadArtifact(api)
+            env.DIAWI_URL = ios.uploadToDiawi()
+            env.PKG_URL = env.DIAWI_URL
             jenkins.setBuildDesc(IPA: env.PKG_URL)
-            /* e2e builds get tested in SauceLabs */
-            if (utils.isE2EBuild()) {
-              env.SAUCE_URL = ios.uploadToSauceLabs()
-            } else if (!utils.isReleaseBuild()) {
-              env.DIAWI_URL = ios.uploadToDiawi()
-            }
           } }
         }
       }
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index e11d219542..ad82ab464c 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -334,16 +334,4 @@ platform :android do
       version_code: '2020042307'
     )
   end
-
-  desc '`fastlane android upload_diawi` - upload .apk to diawi'
-  desc 'expects to have an .apk prepared: `result/app.apk`'
-  desc 'expects to have a diawi token as DIAWI_TOKEN env variable'
-  desc 'expects to have a github token as GITHUB_TOKEN env variable'
-  desc "will fails if file isn't there"
-  desc '---'
-  desc 'Output: writes `fastlane/diawi.out` file url of the uploded file'
-  lane :upload_diawi do
-    uniApk = APK_PATHS.detect { |a| a.include? 'universal' }
-    upload_to_diawi(uniApk)
-  end
 end