diff --git a/meta/folder.groovy b/meta/folder.groovy
index f8c033b..ddc99c4 100644
--- a/meta/folder.groovy
+++ b/meta/folder.groovy
@@ -571,6 +571,7 @@ class MetaInfo extends GISJsonSerialised {
}
def deserialiseJson(String filepath) {
+ script.echo("Deserialising JSON at file: ${filepath}")
def rawmeta = script.readJSON(file: filepath)
deserialiseJson(rawmeta)
}
@@ -617,6 +618,8 @@ class MetaInfo extends GISJsonSerialised {
def importedmetafile = adjustedpath + "/" + metafilepath()
if (script.fileExists(importedmetafile)) {
mi.deserialiseJson(importedmetafile)
+ } else {
+ script.echo("Could not deserialise meta at file: ${importedmetafile} (destpath: ${destpath})- Does not exist")
}
RelatedMetaInfo rmi = new RelatedMetaInfo(script, adjustedpath, mi)
diff --git a/release/do.groovy b/release/do.groovy
index 738c04a..1b21bcf 100644
--- a/release/do.groovy
+++ b/release/do.groovy
@@ -92,9 +92,10 @@ def checkoutsourcerepo(buildmeta, String checkoutfolder) {
}
}
-def getcomponentartifacts(toplevelbuildmeta, buildinfo, String repofolder, String tempfolder) {
+def boolean getcomponentartifacts(toplevelbuildmeta, buildinfo, String repofolder, String tempfolder) {
// Copy relevant artifacts to temp folder
summaryappend("Artifacts: ")
+ def boolean result = true
for (artifactfilter in buildinfo.meta.releaseinfo.releaseitems) {
def filterpath = artifactfilter
if (buildinfo.offsetpath) {
@@ -102,22 +103,31 @@ def getcomponentartifacts(toplevelbuildmeta, buildinfo, String repofolder, Strin
}
// Copy relevant artifacts to temp folder
echo "Copying artifacts: ${filterpath} to ${tempfolder}"
- copyArtifacts(
- filter: filterpath,
- projectName: toplevelbuildmeta.jenkinsbuildinfo.buildjobname,
- selector: [
- $class: 'ParameterizedBuildSelector',
- parameterName: "${toplevelbuildmeta.jenkinsbuildinfo.buildnumber}"
- ],
- target: tempfolder
- )
- // Move relevant artifacts from temp folder to release position
- def originalrootdir = tempfolder + "/" + buildinfo.offsetpath
- dir(originalrootdir) {
- sh("mv * ${repofolder}")
+ try {
+ copyArtifacts(
+ filter: filterpath,
+ projectName: toplevelbuildmeta.jenkinsbuildinfo.buildjobname,
+ selector: [
+ $class: 'ParameterizedBuildSelector',
+ parameterName: "${toplevelbuildmeta.jenkinsbuildinfo.buildnumber}"
+ ],
+ target: tempfolder
+ )
+ } catch (Exception e) {
+ echo "Exception occurred while copying artifacts from ${toplevelbuildmeta.jenkinsbuildinfo.buildjobname}: ${e.getMessage()}"
+ result = false
+ summaryappend("Does not exist:")
+ }
+ if (result) {
+ // Move relevant artifacts from temp folder to release position
+ def originalrootdir = tempfolder + "/" + buildinfo.offsetpath
+ dir(originalrootdir) {
+ sh("mv * ${repofolder}")
+ }
}
summaryappend("${artifactfilter},")
}
+ return result
}
def releasegitadd() {
@@ -357,9 +367,9 @@ def releasecomponent(toplevelbuildmeta, buildinfo, String otherreleasetags, Stri
checkoutsourcerepo(buildmeta, uniquefolderforsourcerepo)
- getcomponentartifacts(toplevelbuildmeta, buildinfo, uniquefolderforrepo, uniquefoldertemp)
-
- gitrelease(buildmeta, previousreleasemeta, uniquefolderforrepo, uniquefolderforsourcerepo, otherreleasetags, dryrunpush)
+ if (getcomponentartifacts(toplevelbuildmeta, buildinfo, uniquefolderforrepo, uniquefoldertemp)) {
+ gitrelease(buildmeta, previousreleasemeta, uniquefolderforrepo, uniquefolderforsourcerepo, otherreleasetags, dryrunpush)
+ }
summaryappend("\n")
}