From 59fc362770b6541653abb921d5e679ae099f9d9f Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Sun, 6 Jun 2021 12:09:48 +0200 Subject: 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. --- vars/buildPackage.groovy | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/vars/buildPackage.groovy b/vars/buildPackage.groovy index dd1f24db..11c9da38 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()) { -- cgit v1.2.3