fix which APK is published for e2e builds
Signed-off-by: Jakub Sokołowski <jakub@status.im>
This commit is contained in:
parent
9f6db66ab6
commit
599ed98093
|
@ -106,7 +106,11 @@ pipeline {
|
||||||
script {
|
script {
|
||||||
def urls = apks.collect { cmn.utils.uploadArtifact(it) }
|
def urls = apks.collect { cmn.utils.uploadArtifact(it) }
|
||||||
/* return only the universal APK */
|
/* return only the universal APK */
|
||||||
env.PKG_URL = urls.find { it.contains('universal') }
|
if (urls.size() > 1) {
|
||||||
|
env.PKG_URL = urls.find { it.contains('universal') }
|
||||||
|
} else { /* if no universal is available pick first */
|
||||||
|
env.PKG_URL = urls.first()
|
||||||
|
}
|
||||||
/* build type specific */
|
/* build type specific */
|
||||||
switch (btype) {
|
switch (btype) {
|
||||||
case 'release':
|
case 'release':
|
||||||
|
@ -114,7 +118,7 @@ pipeline {
|
||||||
case 'nightly':
|
case 'nightly':
|
||||||
env.DIAWI_URL = android.uploadToDiawi(); break;
|
env.DIAWI_URL = android.uploadToDiawi(); break;
|
||||||
case 'e2e':
|
case 'e2e':
|
||||||
env.SAUCE_URL = android.uploadToSauceLabs()
|
env.SAUCE_URL = android.uploadToSauceLabs(); break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -14,9 +14,11 @@ def bundle() {
|
||||||
switch (btype) {
|
switch (btype) {
|
||||||
case 'e2e':
|
case 'e2e':
|
||||||
env.ANDROID_ABI_INCLUDE="x86" /* e2e builds are used with simulators */
|
env.ANDROID_ABI_INCLUDE="x86" /* e2e builds are used with simulators */
|
||||||
|
break
|
||||||
case 'release':
|
case 'release':
|
||||||
env.ANDROID_ABI_SPLIT="true"
|
env.ANDROID_ABI_SPLIT="true"
|
||||||
gradleOpt += "-PreleaseVersion='${utils.getVersion()}'"
|
gradleOpt += "-PreleaseVersion='${utils.getVersion()}'"
|
||||||
|
break
|
||||||
}
|
}
|
||||||
|
|
||||||
/* credentials necessary to open the keystore and sign the APK */
|
/* credentials necessary to open the keystore and sign the APK */
|
||||||
|
@ -69,6 +71,9 @@ def extractArchFromAPK(name) {
|
||||||
if (matches.size() > 0) {
|
if (matches.size() > 0) {
|
||||||
return matches[0][1]
|
return matches[0][1]
|
||||||
}
|
}
|
||||||
|
if (utils.getBuildType() == 'e2e') {
|
||||||
|
return 'x86'
|
||||||
|
}
|
||||||
/* non-release builds make universal APKs */
|
/* non-release builds make universal APKs */
|
||||||
return 'universal'
|
return 'universal'
|
||||||
}
|
}
|
||||||
|
@ -82,7 +87,7 @@ def renameAPKs() {
|
||||||
def apkGlob = 'result/*.apk'
|
def apkGlob = 'result/*.apk'
|
||||||
def found = findFiles(glob: apkGlob)
|
def found = findFiles(glob: apkGlob)
|
||||||
if (found.size() == 0) {
|
if (found.size() == 0) {
|
||||||
error("APKs not found via glob: ${apkGlob}")
|
throw "APKs not found via glob: ${apkGlob}"
|
||||||
}
|
}
|
||||||
def renamed = []
|
def renamed = []
|
||||||
/* rename each for upload & archiving */
|
/* rename each for upload & archiving */
|
||||||
|
@ -113,7 +118,7 @@ def uploadToSauceLabs() {
|
||||||
if (changeId != null) {
|
if (changeId != null) {
|
||||||
env.SAUCE_LABS_NAME = "${changeId}.apk"
|
env.SAUCE_LABS_NAME = "${changeId}.apk"
|
||||||
} else {
|
} else {
|
||||||
def pkg = utils.pkgFilename(utils.getBuildType(), 'apk')
|
def pkg = utils.pkgFilename(utils.getBuildType(), 'apk', 'x86')
|
||||||
env.SAUCE_LABS_NAME = "${pkg}"
|
env.SAUCE_LABS_NAME = "${pkg}"
|
||||||
}
|
}
|
||||||
withCredentials([
|
withCredentials([
|
||||||
|
|
|
@ -55,7 +55,7 @@ def postBuild(success) {
|
||||||
/* We're not using --fail because it suppresses server response */
|
/* We're not using --fail because it suppresses server response */
|
||||||
if (!stdout.contains('HTTP_CODE:201')) {
|
if (!stdout.contains('HTTP_CODE:201')) {
|
||||||
println("STDOUT:\n${stdout}")
|
println("STDOUT:\n${stdout}")
|
||||||
error("Notifying GHCMGR failed with: TODO")
|
error("Notifying GHCMGR failed")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue