diff --git a/autobuilder.groovy b/autobuilder.groovy index a8d418d..9101eac 100644 --- a/autobuilder.groovy +++ b/autobuilder.groovy @@ -43,6 +43,22 @@ def alterreleaserepo(String releaserepo, String releaserepovariantsuffix) { return altered } +def setBuildType(meta, boolean dofullbuild = true, boolean userquickbuild = false) { + 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 + } + meta.jenkinsbuildinfo.set(!doquickbuild) + return doquickbuild +} + // Start up boilerplate def startbuild( script, diff --git a/meta/folder.groovy b/meta/folder.groovy index 704bfc8..5c71003 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -135,20 +135,31 @@ class JenkinsBuildInfo extends GISJsonSerialised { int buildnumber private String buildmachine private String builddate + boolean isfullbuild - JenkinsBuildInfo(script, String buildjobname = "", int buildnumber = 0, String buildmachine = "", String builddate = "") { + JenkinsBuildInfo(script, String buildjobname = "", int buildnumber = 0, String buildmachine = "", String builddate = "", boolean isfullbuild = true) { super(script) this.buildjobname = buildjobname this.buildnumber = buildnumber this.buildmachine = buildmachine this.builddate = builddate + this.isfullbuild = isfullbuild } - void set(String buildjobname, int buildnumber, String buildmachine, String builddate) { + void set(String buildjobname, int buildnumber, String buildmachine, String builddate, boolean isfullbuild = true) { this.buildjobname = buildjobname this.buildnumber = buildnumber this.buildmachine = buildmachine this.builddate = builddate + this.isfullbuild = isfullbuild + } + + void set(boolean isfullbuild) { + this.isfullbuild = isfullbuild + } + + boolean isFullBuild() { + return isfullbuild } void deserialiseJson(rawmeta) { @@ -156,6 +167,7 @@ class JenkinsBuildInfo extends GISJsonSerialised { buildnumber = rawmeta['buildnumber'] buildmachine = rawmeta['buildmachine'] builddate = rawmeta['builddate'] + isfullbuild = rawmeta['isfullbuild'] ?: true } LinkedHashMap serialisationdata() { @@ -164,6 +176,7 @@ class JenkinsBuildInfo extends GISJsonSerialised { 'buildnumber' : buildnumber, 'buildmachine' : buildmachine, 'builddate' : builddate, + 'isfullbuild' : isfullbuild ] return data } @@ -539,6 +552,10 @@ class MetaInfo extends GISJsonSerialised { return custominfo.getAt(customId.trim()) } + def isFullBuild() { + return jenkinsbuildinfo.isFullBuild() + } + List publishableinfoserialised() { def publishable = [] for (publishableitem in publishableinfo) {