summaryrefslogtreecommitdiff
path: root/vars/buildPackage.groovy
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2021-06-06 12:09:48 +0200
committerChristian Poessinger <christian@poessinger.com>2021-06-06 12:09:48 +0200
commit59fc362770b6541653abb921d5e679ae099f9d9f (patch)
tree5538b5e7365de12cf81d04ec353ce683cfe3cc6b /vars/buildPackage.groovy
parent98e275a6e6b33418e3e9188a7ab7f41aa664fbbb (diff)
downloadvyos-build-59fc362770b6541653abb921d5e679ae099f9d9f.tar.gz
vyos-build-59fc362770b6541653abb921d5e679ae099f9d9f.zip
Jenkins: lib: fix unstage and deploy logic to package mirror
Commit c67a6eb542e9 ("Jenkins: lib: it is also possible that unstaging of the amd64 binaries fail") returned early if no arm64 package was build but an amd64 package. This resulted in valid packages not beeing deployed at all.
Diffstat (limited to 'vars/buildPackage.groovy')
-rw-r--r--vars/buildPackage.groovy5
1 files changed, 1 insertions, 4 deletions
diff --git a/vars/buildPackage.groovy b/vars/buildPackage.groovy
index dd1f24d..11c9da3 100644
--- a/vars/buildPackage.groovy
+++ b/vars/buildPackage.groovy
@@ -129,11 +129,8 @@ def call(description=null, pkgList=null, buildCmd=null, buildArm=false) {
unstash 'binary-amd64'
unstash 'binary-arm64'
} catch (e) {
- print "Unstash failed, ignoring"
- println(e.toString())
+ print "Unstash failed, ignoring - could be because there exists no arm64 build"
currentBuild.result = 'SUCCESS'
- // return here instead of throwing error to keep the build "green"
- return
}
if (isCustomBuild()) {