run e2e by default only for nightlies

Signed-off-by: Jakub Sokołowski <jakub@status.im>

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}")]
-        )
-      } }
-    }
   }
 }

ci/Jenkinsfile.combined

@@ -70,17 +70,12 @@ pipeline {
           )+
           "<${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>"
-            )
+          "<${appUrl}|AppImage>"
         )
         slackSend(
           message: message,
@@ -88,11 +83,7 @@ pipeline {
         )
         if (env.CHANGE_ID != null) {
           cmn.githubNotify(
-                apkUrl, 
-                e2eUrl,
-                ipaUrl,
-                dmgUrl,
-                appUrl,
+            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}")]
+          )
+      } }
+    }
   }
 }