From 5532510c56f10352f01d3a8f4cdc7548154a413e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= <jakub@status.im>
Date: Wed, 29 Aug 2018 11:39:49 -0400
Subject: [PATCH] run e2e by default only for nightlies
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.android  | 11 +--------
 ci/Jenkinsfile.combined | 51 +++++++++++++++++++++--------------------
 2 files changed, 27 insertions(+), 35 deletions(-)

diff --git a/ci/Jenkinsfile.android b/ci/Jenkinsfile.android
index 34293fde51..b3e1061bf2 100644
--- a/ci/Jenkinsfile.android
+++ b/ci/Jenkinsfile.android
@@ -67,19 +67,10 @@ pipeline {
             case 'nightly':
               env.DIAWI_URL = mobile.android.uploadToDiawi()
             case 'e2e':
-              e2eApk = mobile.android.uploadToSauceLabs()
+              env.SAUCE_URL = mobile.android.uploadToSauceLabs()
           } 
         }
       }
     }
-    stage('Run e2e') {
-      when { expression { cmn.getBuildType() == 'e2e' } }
-      steps { script {
-        build(
-          job: 'end-to-end-tests/status-app-nightly', wait: false,
-          parameters: [string(name: 'apk', value: "--apk=${e2eApk}")]
-        )
-      } }
-    }
   }
 }
diff --git a/ci/Jenkinsfile.combined b/ci/Jenkinsfile.combined
index 093595dd8a..5e321105df 100644
--- a/ci/Jenkinsfile.combined
+++ b/ci/Jenkinsfile.combined
@@ -64,37 +64,28 @@ pipeline {
     stage('Notify') {
       steps { script {
         def message = (
-            (env.CHANGE_ID != null ?
-              "Build PR #${BRANCH_NAME}(${CHANGE_BRANCH}) success! " :
-              "Build ${cmn.getBuildType()} success! "
-            )+
-            "<${currentBuild.absoluteUrl}|${currentBuild.displayName}> "+
-            "(${currentBuild.durationString})\n"+
-            (cmn.getBuildType() == 'nightly' || cmn.getBuildType() == 'pr' ?
-              "Packages: "+
-              "<${apkUrl}|Android>, "+
-              "(<${e2eUrl}|e2e>), "+
-              "<${ipaUrl}|iOS>, "+
-              "<${dmgUrl}|MacOS>, "+
-              "<${appUrl}|AppImage>" :
-              "Packages: "+
-              "<${dro.getBuildVariables().get('DIAWI_URL')}|Android>, "+
-              "<${ios.getBuildVariables().get('DIAWI_URL')}|iOS>"
-            )
+          (env.CHANGE_ID != null ?
+            "Build PR #${BRANCH_NAME}(${CHANGE_BRANCH}) success! " :
+            "Build ${cmn.getBuildType()} success! "
+          )+
+          "<${currentBuild.absoluteUrl}|${currentBuild.displayName}> "+
+          "(${currentBuild.durationString})\n"+
+          "Packages: "+
+          "<${apkUrl}|Android>, "+
+          "(<${e2eUrl}|e2e>), "+
+          "<${ipaUrl}|iOS>, "+
+          "<${dmgUrl}|MacOS>, "+
+          "<${appUrl}|AppImage>"
         )
         slackSend(
           message: message,
           color: 'good'
         )
         if (env.CHANGE_ID != null) {
-            cmn.githubNotify(
-                apkUrl, 
-                e2eUrl,
-                ipaUrl,
-                dmgUrl,
-                appUrl,
-                env.CHANGE_ID
-            )
+          cmn.githubNotify(
+            apkUrl, e2eUrl, ipaUrl, dmgUrl, appUrl,
+            env.CHANGE_ID
+          )
         }
       } }
     }
@@ -112,5 +103,15 @@ pipeline {
         )
       }
     }
+    stage('Run e2e') {
+      when { expression { cmn.getBuildType() == 'nightly' } }
+      steps { script {
+        e2eApk = e2e.getBuildVariables().get('SAUCE_URL')
+          build(
+            job: 'end-to-end-tests/status-app-nightly', wait: false,
+            parameters: [string(name: 'apk', value: "--apk=${e2eApk}")]
+          )
+      } }
+    }
   }
 }