status-im
/
status-react
mirror of https://github.com/status-im/status-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

run e2e by default only for nightlies 

Signed-off-by: Jakub Sokołowski <jakub@status.im>
This commit is contained in:
Jakub Sokołowski 2018-08-29 11:39:49 -04:00
parent c11cf17009
commit 5532510c56
No known key found for this signature in database
GPG Key ID: 4EF064D0E6D63020
2 changed files with 27 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ci/Jenkinsfile.android
View File

@ -67,19 +67,10 @@ pipeline {
case 'nightly': case 'nightly':
env.DIAWI_URL = mobile.android.uploadToDiawi() env.DIAWI_URL = mobile.android.uploadToDiawi()
case 'e2e': 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}")]
)
} }
}
} }
} }

23
ci/Jenkinsfile.combined
View File

@ -70,17 +70,12 @@ pipeline {
)+ )+
"<${currentBuild.absoluteUrl}|${currentBuild.displayName}> "+ "<${currentBuild.absoluteUrl}|${currentBuild.displayName}> "+
"(${currentBuild.durationString})\n"+ "(${currentBuild.durationString})\n"+
(cmn.getBuildType() == 'nightly' || cmn.getBuildType() == 'pr' ?
"Packages: "+ "Packages: "+
"<${apkUrl}|Android>, "+ "<${apkUrl}|Android>, "+
"(<${e2eUrl}|e2e>), "+ "(<${e2eUrl}|e2e>), "+
"<${ipaUrl}|iOS>, "+ "<${ipaUrl}|iOS>, "+
"<${dmgUrl}|MacOS>, "+ "<${dmgUrl}|MacOS>, "+
"<${appUrl}|AppImage>" : "<${appUrl}|AppImage>"
"Packages: "+
"<${dro.getBuildVariables().get('DIAWI_URL')}|Android>, "+
"<${ios.getBuildVariables().get('DIAWI_URL')}|iOS>"
)
) )
slackSend( slackSend(
message: message, message: message,
@ -88,11 +83,7 @@ pipeline {
) )
if (env.CHANGE_ID != null) { if (env.CHANGE_ID != null) {
cmn.githubNotify( cmn.githubNotify(
apkUrl, apkUrl, e2eUrl, ipaUrl, dmgUrl, appUrl,
e2eUrl,
ipaUrl,
dmgUrl,
appUrl,
env.CHANGE_ID 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}")]
)
} }
}
} }
} }