From e3a212896f4f8d0a8971d192b301a362b2e1c0ca Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Thu, 14 Oct 2021 20:49:46 +0100 Subject: [PATCH] Allow quick builds --- autobuilder.groovy | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/autobuilder.groovy b/autobuilder.groovy index d181f21..d622d9e 100644 --- a/autobuilder.groovy +++ b/autobuilder.groovy @@ -43,17 +43,23 @@ def alterreleaserepo(String releaserepo, String releaserepovariantsuffix) { return altered } -def setBuildType(meta, boolean dofullbuild = true, boolean userquickbuild = false) { +def setBuildType(meta, boolean dofullbuild = true) { def doquickbuild = false - if (dofullbuild) { - echo "Doing full build" - } else if (userquickbuild) { - echo "Marking as quick build" - doquickbuild = true - } else if (currentBuild.getBuildCauses('jenkins.branch.BranchEventCause')) { - echo "Marking as quick build as it was triggered by a commit" - doquickbuild = true + if (currentBuild.getBuildCauses('hudson.model.Cause$UserIdCause')) { + echo "Build triggered by user" + if (!dofullbuild) { + echo "Marking as quick build as user wanted one" + doquickbuild = true + } + } else { + echo "Build triggered automatically" + if (currentBuild.getBuildCauses('jenkins.branch.BranchEventCause')) { + echo "Marking as quick build as it was triggered by a commit" + doquickbuild = true + } else if (currentBuild.getBuildCauses('hudson.triggers.TimerTrigger$TimerTriggerCause')) { + echo "Marking as full build as it was triggered by timer" + } } echo "Build type is ${doquickbuild ? "quick" : "full"}" meta.jenkinsbuildinfo.set(!doquickbuild)