From a7da6556d91007e844760c552e804cce87f312ca Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Thu, 28 Feb 2019 00:01:14 +0000 Subject: [PATCH 01/42] Do a dependency check on each binary produced --- compile/eclipsebuild/eclipseds5build.groovy | 42 ++++++++++++++++++--- 1 file changed, 37 insertions(+), 5 deletions(-) diff --git a/compile/eclipsebuild/eclipseds5build.groovy b/compile/eclipsebuild/eclipseds5build.groovy index 93a8064..d333af3 100644 --- a/compile/eclipsebuild/eclipseds5build.groovy +++ b/compile/eclipsebuild/eclipseds5build.groovy @@ -28,22 +28,50 @@ def doKillLeftovers() { } } +def doCheck(checkpathlist, build_variant = "") { + def result = 0 + for (checkpath in checkpathlist) { + echo "Checking file at: ${checkpath}" + script { + echo "Build variant is ${build_variant}" + if (build_variant) { + def srcFile = "${WORKSPACE}/${checkpath}" + def srcFileExpanded = srcFile.replace("-BUILDVARIANT-", "${build_variant}") + result = sh( script: """ + // Print out dependencies of the built file + readelf -d "${srcFileExpanded}" | grep NEEDED + if [ \$? -ne 0 ]; then exit 1; fi + """, + returnStatus: true + ) + if (result != 0) { + return result + } + } + } + } + return result +} + def doExport(exportfolder, exportpathlist, project = "", build_variant = "") { def result = 0 + def destFolder = "" + def srcFile = "" + def srcFileExpanded = "" for (exportpath in exportpathlist) { echo "Export path at: ${exportpath}" script { echo "Build variant is ${build_variant}" if (build_variant) { echo "Build variant is ${build_variant}" - env.destFolder = "${exportfolder}/${build_variant}" - env.srcFile = "${WORKSPACE}/${exportpath}" - env.srcFileExpanded = srcFile.replace("-BUILDVARIANT-", "${build_variant}") + destFolder = "${exportfolder}/${build_variant}" + srcFile = "${WORKSPACE}/${exportpath}" + srcFileExpanded = srcFile.replace("-BUILDVARIANT-", "${build_variant}") } else { echo "No build variant" - env.destFolder = "${exportfolder}/${project}" - env.srcFileExpanded = "${WORKSPACE}/${exportpath}" + destFolder = "${exportfolder}/${project}" + srcFileExpanded = "${WORKSPACE}/${exportpath}" } } dir (env.destFolder) { @@ -162,6 +190,10 @@ def doBuild(apps, ds5folder, toolchainfolder, ds5shellcommand, buildcommand, sou """ } } + result = doCheck(exportpathlist, build_variant) + if (result != 0) { + error "Failed to check files...." + } result = doExport(exportfolder, exportpathlist, "", build_variant) if (result != 0) { error "Failed to copy...." From 4c7053017eadcc4d6fe308bf6abbe087de31f0dc Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Thu, 28 Feb 2019 00:33:36 +0000 Subject: [PATCH 02/42] Do a dependency check on each binary produced --- compile/eclipsebuild/eclipseds5build.groovy | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/compile/eclipsebuild/eclipseds5build.groovy b/compile/eclipsebuild/eclipseds5build.groovy index d333af3..2dbd6ea 100644 --- a/compile/eclipsebuild/eclipseds5build.groovy +++ b/compile/eclipsebuild/eclipseds5build.groovy @@ -74,7 +74,7 @@ def doExport(exportfolder, exportpathlist, project = "", build_variant = "") { srcFileExpanded = "${WORKSPACE}/${exportpath}" } } - dir (env.destFolder) { + dir (destFolder) { echo "Copy \"${srcFileExpanded}\" to \"${destFolder}\"" if (isUnix()) { result = sh( script: """ @@ -88,10 +88,10 @@ def doExport(exportfolder, exportpathlist, project = "", build_variant = "") { } } else { - result = bat( script: ''' - copy \"%srcFileExpanded%\" \"%destFolder%\" + result = bat( script: """ + copy "${srcFileExpanded}" "${destFolder}" if errorlevel 1 EXIT /b 1 - ''', + """, returnStatus: true ) if (result != 0) { From 49f1b99e477c945156e9caaa4215ff8659a360eb Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Thu, 28 Feb 2019 07:55:15 +0000 Subject: [PATCH 03/42] Do a dependency check on each binary produced --- compile/eclipsebuild/eclipseds5build.groovy | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/compile/eclipsebuild/eclipseds5build.groovy b/compile/eclipsebuild/eclipseds5build.groovy index 2dbd6ea..302b4f8 100644 --- a/compile/eclipsebuild/eclipseds5build.groovy +++ b/compile/eclipsebuild/eclipseds5build.groovy @@ -37,8 +37,9 @@ def doCheck(checkpathlist, build_variant = "") { if (build_variant) { def srcFile = "${WORKSPACE}/${checkpath}" def srcFileExpanded = srcFile.replace("-BUILDVARIANT-", "${build_variant}") + // Print out dependencies of the built file + echo "Showing dependencies of ${srcFileExpanded}" result = sh( script: """ - // Print out dependencies of the built file readelf -d "${srcFileExpanded}" | grep NEEDED if [ \$? -ne 0 ]; then exit 1; fi """, From c4247d45ed5bfcfeab751fdb6595158f51c14bdc Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Fri, 1 Mar 2019 18:37:55 +0000 Subject: [PATCH 04/42] Add publish item selector script --- publish/publish_item_select.groovy | 90 ++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) create mode 100755 publish/publish_item_select.groovy diff --git a/publish/publish_item_select.groovy b/publish/publish_item_select.groovy new file mode 100755 index 0000000..747b9f6 --- /dev/null +++ b/publish/publish_item_select.groovy @@ -0,0 +1,90 @@ +#!/usr/local/bin/groovy +metarepo="git@hydra:jenkinsautobuild/Common_scripts.git" + +import hudson.model.* + +def log(message) { + boolean dolog = true + if (dolog) { + println message + } +} + +println "hello" + +def createfolder(String folder) { + def sout = new StringBuilder() + def serr = new StringBuilder() + + log("Creating directory: ${folder}") + def s = ['mkdir', '-p', folder].execute() + s.consumeProcessOutput(sout, serr) + s.waitFor() + + log("Out: ${sout} Err: ${serr}") + return [sout, serr] +} + +def gitCloneOrPull(String repo, String folder) { + def sout = new StringBuilder() + def serr = new StringBuilder() + + if (!new File(folder).exists()) { + log("Cloning: ${repo} to: ${folder}") + createfolder(folder) + def s = ['git', 'clone', repo, folder].execute() + s.consumeProcessOutput(sout, serr) + s.waitFor() + } else { + log("Pull in: ${folder}") + def s = ['/bin/sh', '-c', "cd ${folder}"].execute() | ['git', 'pull'].execute() + s.consumeProcessOutput(sout, serr) + s.waitFor() + } + + log("Out: ${sout} Err: ${serr}") + return [sout, serr] +} + +def String makeworking() { + def r = ['whoami'].execute() + r.waitFor() + def user = r.text.trim() + + log("User is ${user}") + def rootfolder = "/home/${user}/tmp" + createfolder(rootfolder) + + def commonscripts = "${rootfolder}/commonscripts" + gitCloneOrPull(metarepo, commonscripts); + +} + +def List getItems() { + def List items = new ArrayList() + try { + log("Getting items") + def p = ['pwd'].execute() + p.waitFor() + items.add(p.text) + items.add(metarepo) + items.add(metalevels) + + items.add("ATLAS_SERVICES CORE_INSTALL installers/**") + + items.add("Item 2") + items.add("Item 3") + return items + } catch (Exception e) { + items.add("Error ${e}") + return items + } +} + +makeworking() +count = 0 +for (item in getItems()) { + log (count) + count += 1 + log (item) +} \ No newline at end of file From 07c3e7ce16f61f387e878f610c76da079bf79ae0 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Fri, 1 Mar 2019 18:51:12 +0000 Subject: [PATCH 05/42] Add publish item selector script --- publish/publish_item_select.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/publish/publish_item_select.groovy b/publish/publish_item_select.groovy index 747b9f6..50090a8 100755 --- a/publish/publish_item_select.groovy +++ b/publish/publish_item_select.groovy @@ -29,7 +29,7 @@ def gitCloneOrPull(String repo, String folder) { def sout = new StringBuilder() def serr = new StringBuilder() - if (!new File(folder).exists()) { + if (!(new File(folder).exists())) { log("Cloning: ${repo} to: ${folder}") createfolder(folder) def s = ['git', 'clone', repo, folder].execute() @@ -37,7 +37,7 @@ def gitCloneOrPull(String repo, String folder) { s.waitFor() } else { log("Pull in: ${folder}") - def s = ['/bin/sh', '-c', "cd ${folder}"].execute() | ['git', 'pull'].execute() + def s = ["/bin/sh -c cd ${folder}; git pull"].execute() s.consumeProcessOutput(sout, serr) s.waitFor() } From fdff1c1ef7f568673752e35d1db2c138d377a9f4 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Fri, 1 Mar 2019 18:55:44 +0000 Subject: [PATCH 06/42] Add publish item selector script --- publish/publish_item_select.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/publish/publish_item_select.groovy b/publish/publish_item_select.groovy index 50090a8..68215ff 100755 --- a/publish/publish_item_select.groovy +++ b/publish/publish_item_select.groovy @@ -37,7 +37,7 @@ def gitCloneOrPull(String repo, String folder) { s.waitFor() } else { log("Pull in: ${folder}") - def s = ["/bin/sh -c cd ${folder}; git pull"].execute() + def s = ["/bin/bash -c cd ${folder}; pwd; git pull"].execute() s.consumeProcessOutput(sout, serr) s.waitFor() } From d7a8dd14add18cd947df7e4dac99331efe898172 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Fri, 1 Mar 2019 19:28:47 +0000 Subject: [PATCH 07/42] Add publish item selector script --- publish/publish_item_select.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/publish/publish_item_select.groovy b/publish/publish_item_select.groovy index 68215ff..56f7e37 100755 --- a/publish/publish_item_select.groovy +++ b/publish/publish_item_select.groovy @@ -37,7 +37,7 @@ def gitCloneOrPull(String repo, String folder) { s.waitFor() } else { log("Pull in: ${folder}") - def s = ["/bin/bash -c cd ${folder}; pwd; git pull"].execute() + def s = ['git', 'pull'].execute(null, new File(folder)) s.consumeProcessOutput(sout, serr) s.waitFor() } From 6cc9f1928d2dc28693bbc10f1165b80a3724b688 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Fri, 1 Mar 2019 23:34:08 +0000 Subject: [PATCH 08/42] Add publish item selector script --- publish/publish_item_select.groovy | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/publish/publish_item_select.groovy b/publish/publish_item_select.groovy index 56f7e37..ef39d78 100755 --- a/publish/publish_item_select.groovy +++ b/publish/publish_item_select.groovy @@ -1,5 +1,7 @@ #!/usr/local/bin/groovy -metarepo="git@hydra:jenkinsautobuild/Common_scripts.git" +metarepoext = "git@hydra:HMB_XR_5601_Releases/hmb_xr_5601_whole.git" + +commonscriptsrepo="git@hydra:jenkinsautobuild/Common_scripts.git" import hudson.model.* @@ -46,6 +48,15 @@ def gitCloneOrPull(String repo, String folder) { return [sout, serr] } +def loadmetaclass(String commonscripts) { + def metafolderscriptfile = "${commonscripts}/meta/folder.groovy" + log("Loading script: ${metafolderscriptfile}") + def script = new GroovyScriptEngine('.').with { + loadScriptByName(metafolderscriptfile) + } + return script +} + def String makeworking() { def r = ['whoami'].execute() r.waitFor() @@ -56,8 +67,10 @@ def String makeworking() { createfolder(rootfolder) def commonscripts = "${rootfolder}/commonscripts" - gitCloneOrPull(metarepo, commonscripts); + gitCloneOrPull(commonscriptsrepo, commonscripts); + def metascript = loadmetaclass(commonscripts) + return metascript } def List getItems() { @@ -67,7 +80,7 @@ def List getItems() { def p = ['pwd'].execute() p.waitFor() items.add(p.text) - items.add(metarepo) + items.add(metarepoext) items.add(metalevels) items.add("ATLAS_SERVICES CORE_INSTALL installers/**") @@ -82,6 +95,7 @@ def List getItems() { } makeworking() +loadmetaclass() count = 0 for (item in getItems()) { log (count) From 39d54ecfa090ffa7d6f69a97c4b5ca66ccacfca2 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 2 Mar 2019 11:17:25 +0000 Subject: [PATCH 09/42] Add publish item selector script --- meta/folder.groovy | 15 +++++++++- publish/publish_item_select.groovy | 48 ++++++++++++++++++++++-------- 2 files changed, 49 insertions(+), 14 deletions(-) diff --git a/meta/folder.groovy b/meta/folder.groovy index f9d4bf3..9f747ad 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -1,5 +1,6 @@ import java.nio.file.Paths import java.nio.file.Path +import groovy.json.JsonSlurperClassic abstract class GISJsonSerialised implements Serializable { def script @@ -552,7 +553,13 @@ class MetaInfo extends GISJsonSerialised { def rawmeta = script.readJSON(file: filepath) deserialiseJson(rawmeta) } - + + def deserialiseJsonSlurper(String filepath) { + def jsonfile = readFile(file: filepath) + def rawmeta = new JsonSlurperClassic().parseText(jsonfile) + deserialiseJson(rawmeta) + } + String relativize(String mypath) { String pathRelative script.echo("Seeing if ${mypath} begins with ${script.WORKSPACE}") @@ -726,4 +733,10 @@ MetaInfo metafromfolder(String folder = "") { return buildmeta } +MetaInfo metafromfolderSlurper(String folder = "") { + MetaInfo buildmeta = new MetaInfo(this) + buildmeta.deserialiseJsonSlurper("${folder}/${MetaInfo.metafilepath()}") + return buildmeta +} + return this; diff --git a/publish/publish_item_select.groovy b/publish/publish_item_select.groovy index ef39d78..7eeae29 100755 --- a/publish/publish_item_select.groovy +++ b/publish/publish_item_select.groovy @@ -1,5 +1,7 @@ #!/usr/local/bin/groovy +jobname="anything" metarepoext = "git@hydra:HMB_XR_5601_Releases/hmb_xr_5601_whole.git" +metalevels = 2 commonscriptsrepo="git@hydra:jenkinsautobuild/Common_scripts.git" @@ -48,13 +50,25 @@ def gitCloneOrPull(String repo, String folder) { return [sout, serr] } -def loadmetaclass(String commonscripts) { +def loadmetaclass(String commonscripts, String metafolder) { def metafolderscriptfile = "${commonscripts}/meta/folder.groovy" log("Loading script: ${metafolderscriptfile}") - def script = new GroovyScriptEngine('.').with { - loadScriptByName(metafolderscriptfile) - } - return script + + GroovyShell shell = new GroovyShell() + def metafolderscript = shell.parse(new File(metafolderscriptfile)) + log("metafolderscript is ${metafolderscript.getClass()}") + def meta = metafolderscript.metafromfolder(metafolder) + log("meta is ${meta.getClass()}") + + + + //Class groovyClass = new GroovyClassLoader(getClass().getClassLoader()).parseClass(metafolderscriptfile) + //log("groovyClass is ${groovyClass.getClass()}") + //GroovyObject metafolderobject = (GroovyObject) groovyClass.newInstance() + //log("metafolderobject is ${metafolderobject.getClass()}") + //metaObject = new metafolderobject.MetaInfo(this) + //log("metaobject is ${metaObject.getClass()}") + return meta } def String makeworking() { @@ -67,10 +81,19 @@ def String makeworking() { createfolder(rootfolder) def commonscripts = "${rootfolder}/commonscripts" - gitCloneOrPull(commonscriptsrepo, commonscripts); + gitCloneOrPull(commonscriptsrepo, commonscripts) - def metascript = loadmetaclass(commonscripts) - return metascript + // Clone or pull the relevant meta repo + def metareporoot = "${rootfolder}/${jobname}" + gitCloneOrPull(metarepoext, metareporoot) + def metafolder = "${metareporoot}/meta" + + // Load the meta folder class that interprets the meta repo + def metascript = loadmetaclass(commonscripts, metafolder) + + // Read in the meta + meta = metascript.metafromfolder(metafolder) + return meta } def List getItems() { @@ -79,7 +102,7 @@ def List getItems() { log("Getting items") def p = ['pwd'].execute() p.waitFor() - items.add(p.text) + items.add(p.text.trim()) items.add(metarepoext) items.add(metalevels) @@ -95,10 +118,9 @@ def List getItems() { } makeworking() -loadmetaclass() count = 0 -for (item in getItems()) { - log (count) +def items = getItems() +for (item in items) { count += 1 - log (item) + log ("${count}: ${item}") } \ No newline at end of file From 6746c4dccf1ca52ad77424e1917a989880107542 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 2 Mar 2019 11:24:26 +0000 Subject: [PATCH 10/42] Add publish item selector script --- meta/folder.groovy | 5 +++-- publish/publish_item_select.groovy | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/meta/folder.groovy b/meta/folder.groovy index 9f747ad..d751f5e 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -555,8 +555,9 @@ class MetaInfo extends GISJsonSerialised { } def deserialiseJsonSlurper(String filepath) { - def jsonfile = readFile(file: filepath) - def rawmeta = new JsonSlurperClassic().parseText(jsonfile) + File jsonfile = new File(filepath) + def jsonfiletext = jsonfile.getText() + def rawmeta = new JsonSlurperClassic().parseText(jsonfiletext) deserialiseJson(rawmeta) } diff --git a/publish/publish_item_select.groovy b/publish/publish_item_select.groovy index 7eeae29..4af7c2b 100755 --- a/publish/publish_item_select.groovy +++ b/publish/publish_item_select.groovy @@ -57,7 +57,7 @@ def loadmetaclass(String commonscripts, String metafolder) { GroovyShell shell = new GroovyShell() def metafolderscript = shell.parse(new File(metafolderscriptfile)) log("metafolderscript is ${metafolderscript.getClass()}") - def meta = metafolderscript.metafromfolder(metafolder) + def meta = metafolderscript.metafromfolderSlurper(metafolder) log("meta is ${meta.getClass()}") From 875e21b092e721f5e35183da36a11832d57c18da Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 2 Mar 2019 11:53:57 +0000 Subject: [PATCH 11/42] Add publish item selector script --- publish/publish_item_select.groovy | 53 +++++++++++++++--------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/publish/publish_item_select.groovy b/publish/publish_item_select.groovy index 4af7c2b..f02b800 100755 --- a/publish/publish_item_select.groovy +++ b/publish/publish_item_select.groovy @@ -60,18 +60,10 @@ def loadmetaclass(String commonscripts, String metafolder) { def meta = metafolderscript.metafromfolderSlurper(metafolder) log("meta is ${meta.getClass()}") - - - //Class groovyClass = new GroovyClassLoader(getClass().getClassLoader()).parseClass(metafolderscriptfile) - //log("groovyClass is ${groovyClass.getClass()}") - //GroovyObject metafolderobject = (GroovyObject) groovyClass.newInstance() - //log("metafolderobject is ${metafolderobject.getClass()}") - //metaObject = new metafolderobject.MetaInfo(this) - //log("metaobject is ${metaObject.getClass()}") return meta } -def String makeworking() { +def makeworking() { def r = ['whoami'].execute() r.waitFor() def user = r.text.trim() @@ -89,37 +81,46 @@ def String makeworking() { def metafolder = "${metareporoot}/meta" // Load the meta folder class that interprets the meta repo - def metascript = loadmetaclass(commonscripts, metafolder) - - // Read in the meta - meta = metascript.metafromfolder(metafolder) + def meta = loadmetaclass(commonscripts, metareporoot) + log("2: meta is ${meta.getClass()}") + return meta } -def List getItems() { - def List items = new ArrayList() +def List getItems(meta) { + def List menuitems = new ArrayList() + def metaitems = meta.releasewalkerunique(metalevels) + log("metaitems is ${metaitems.getClass()}") + try { log("Getting items") def p = ['pwd'].execute() p.waitFor() - items.add(p.text.trim()) - items.add(metarepoext) - items.add(metalevels) + menuitems.add(p.text.trim()) + menuitems.add(metarepoext) + menuitems.add(metalevels) - items.add("ATLAS_SERVICES CORE_INSTALL installers/**") + menuitems.add("ATLAS_SERVICES CORE_INSTALL installers/**") - items.add("Item 2") - items.add("Item 3") - return items + menuitems.add("Item 2") + menuitems.add("Item 3") + for (key in metaitems.keySet()) { + def releaseinfo = metaitems[key] + menuitems.add(releaseinfo.offsetpath) + //MetaInfo meta + } + return menuitems } catch (Exception e) { - items.add("Error ${e}") - return items + menuitems.add("Error ${e}") + return menuitems } } -makeworking() +def meta = makeworking() +log("3: meta is ${meta.getClass()}") + count = 0 -def items = getItems() +def items = getItems(meta) for (item in items) { count += 1 log ("${count}: ${item}") From b480d4a965d99e1463a7f96046b36bcf7491facf Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 2 Mar 2019 12:40:37 +0000 Subject: [PATCH 12/42] Add publish item selector script --- publish/publish_item_select.groovy | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/publish/publish_item_select.groovy b/publish/publish_item_select.groovy index f02b800..47b64dc 100755 --- a/publish/publish_item_select.groovy +++ b/publish/publish_item_select.groovy @@ -1,6 +1,6 @@ #!/usr/local/bin/groovy -jobname="anything" -metarepoext = "git@hydra:HMB_XR_5601_Releases/hmb_xr_5601_whole.git" +jobname="anythingnew" +metarepoext = "git@hydra:print-server-releases/print_server_whole.git" metalevels = 2 commonscriptsrepo="git@hydra:jenkinsautobuild/Common_scripts.git" @@ -124,4 +124,6 @@ def items = getItems(meta) for (item in items) { count += 1 log ("${count}: ${item}") -} \ No newline at end of file +} + +return items \ No newline at end of file From 18f6b42a56f11aee83ea1d62b0a8d013d70782fe Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sun, 3 Mar 2019 18:02:51 +0000 Subject: [PATCH 13/42] Add publish item selector script; Add eclipse groovy project --- publish/.classpath | 9 +++++++ publish/.gitignore | 7 ++++++ publish/.project | 18 ++++++++++++++ .../org.eclipse.jdt.groovy.core.prefs | 3 +++ publish/publish_item_select.groovy | 24 +------------------ 5 files changed, 38 insertions(+), 23 deletions(-) create mode 100644 publish/.classpath create mode 100644 publish/.gitignore create mode 100644 publish/.project create mode 100644 publish/.settings/org.eclipse.jdt.groovy.core.prefs diff --git a/publish/.classpath b/publish/.classpath new file mode 100644 index 0000000..287c1ab --- /dev/null +++ b/publish/.classpath @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/publish/.gitignore b/publish/.gitignore new file mode 100644 index 0000000..abed335 --- /dev/null +++ b/publish/.gitignore @@ -0,0 +1,7 @@ +/do$_publish_closure4.class +/do$_resetfolders_closure1.class +/do$_resetfolders_closure2.class +/do$_resetfolders_closure3.class +/do$_stripgithistory_closure5.class +/do.class +/publish_item_select.class diff --git a/publish/.project b/publish/.project new file mode 100644 index 0000000..5c60328 --- /dev/null +++ b/publish/.project @@ -0,0 +1,18 @@ + + + publish_item_select + + + + + + org.eclipse.jdt.core.javabuilder + + + + + + org.eclipse.jdt.groovy.core.groovyNature + org.eclipse.jdt.core.javanature + + diff --git a/publish/.settings/org.eclipse.jdt.groovy.core.prefs b/publish/.settings/org.eclipse.jdt.groovy.core.prefs new file mode 100644 index 0000000..1e68ed6 --- /dev/null +++ b/publish/.settings/org.eclipse.jdt.groovy.core.prefs @@ -0,0 +1,3 @@ +eclipse.preferences.version=1 +groovy.compiler.level=25 +groovy.script.filters=**/*.dsld,y,**/*.gradle,n diff --git a/publish/publish_item_select.groovy b/publish/publish_item_select.groovy index 47b64dc..a7cfa1b 100755 --- a/publish/publish_item_select.groovy +++ b/publish/publish_item_select.groovy @@ -5,8 +5,6 @@ metalevels = 2 commonscriptsrepo="git@hydra:jenkinsautobuild/Common_scripts.git" -import hudson.model.* - def log(message) { boolean dolog = true if (dolog) { @@ -52,14 +50,10 @@ def gitCloneOrPull(String repo, String folder) { def loadmetaclass(String commonscripts, String metafolder) { def metafolderscriptfile = "${commonscripts}/meta/folder.groovy" - log("Loading script: ${metafolderscriptfile}") GroovyShell shell = new GroovyShell() def metafolderscript = shell.parse(new File(metafolderscriptfile)) - log("metafolderscript is ${metafolderscript.getClass()}") def meta = metafolderscript.metafromfolderSlurper(metafolder) - log("meta is ${meta.getClass()}") - return meta } @@ -68,7 +62,6 @@ def makeworking() { r.waitFor() def user = r.text.trim() - log("User is ${user}") def rootfolder = "/home/${user}/tmp" createfolder(rootfolder) @@ -82,8 +75,6 @@ def makeworking() { // Load the meta folder class that interprets the meta repo def meta = loadmetaclass(commonscripts, metareporoot) - log("2: meta is ${meta.getClass()}") - return meta } @@ -93,21 +84,9 @@ def List getItems(meta) { log("metaitems is ${metaitems.getClass()}") try { - log("Getting items") - def p = ['pwd'].execute() - p.waitFor() - menuitems.add(p.text.trim()) - menuitems.add(metarepoext) - menuitems.add(metalevels) - - menuitems.add("ATLAS_SERVICES CORE_INSTALL installers/**") - - menuitems.add("Item 2") - menuitems.add("Item 3") for (key in metaitems.keySet()) { def releaseinfo = metaitems[key] menuitems.add(releaseinfo.offsetpath) - //MetaInfo meta } return menuitems } catch (Exception e) { @@ -117,10 +96,9 @@ def List getItems(meta) { } def meta = makeworking() -log("3: meta is ${meta.getClass()}") +def items = getItems(meta) count = 0 -def items = getItems(meta) for (item in items) { count += 1 log ("${count}: ${item}") From c4a5e7a36177d7218b0af68c618bb9122516360c Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sun, 3 Mar 2019 22:24:58 +0000 Subject: [PATCH 14/42] Add publish item selector script; Add eclipse groovy project --- publish/publish_item_select.groovy | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/publish/publish_item_select.groovy b/publish/publish_item_select.groovy index a7cfa1b..2299f37 100755 --- a/publish/publish_item_select.groovy +++ b/publish/publish_item_select.groovy @@ -1,19 +1,18 @@ #!/usr/local/bin/groovy jobname="anythingnew" metarepoext = "git@hydra:print-server-releases/print_server_whole.git" +outputselect = "description" metalevels = 2 +dolog = false commonscriptsrepo="git@hydra:jenkinsautobuild/Common_scripts.git" def log(message) { - boolean dolog = true if (dolog) { println message } } -println "hello" - def createfolder(String folder) { def sout = new StringBuilder() def serr = new StringBuilder() @@ -78,6 +77,22 @@ def makeworking() { return meta } +def String outputDescription(menuitems, releaseinfo) { + meta = releaseinfo.meta + + for (publishableitem in meta.publishableinfo) { + menuitems.add("${meta.productinfo.productname} ${meta.productinfo.subcomponentname} ${publishableitem.filepath}") + } +} + +def String outputSelection(menuitems, releaseinfo) { + meta = releaseinfo.meta + + for (publishableitem in meta.publishableinfo) { + menuitems.add("${meta.productinfo.productname}#${meta.productinfo.subcomponentname}#${publishableitem.filepath}") + } +} + def List getItems(meta) { def List menuitems = new ArrayList() def metaitems = meta.releasewalkerunique(metalevels) @@ -85,8 +100,13 @@ def List getItems(meta) { try { for (key in metaitems.keySet()) { - def releaseinfo = metaitems[key] - menuitems.add(releaseinfo.offsetpath) + def releaseinfo = metaitems[key] + if (outputselect == "description") { + outputDescription(menuitems, releaseinfo) + } + if (outputselect == "selection") { + outputSelection(menuitems, releaseinfo) + } } return menuitems } catch (Exception e) { From 2426465d7db8aab7801a86e1e6c1bbd105baabc7 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sun, 3 Mar 2019 22:57:57 +0000 Subject: [PATCH 15/42] Add publish item selector script --- publish/publish_item_select.groovy | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/publish/publish_item_select.groovy b/publish/publish_item_select.groovy index 2299f37..99e424f 100755 --- a/publish/publish_item_select.groovy +++ b/publish/publish_item_select.groovy @@ -1,8 +1,16 @@ #!/usr/local/bin/groovy -jobname="anythingnew" -metarepoext = "git@hydra:print-server-releases/print_server_whole.git" -outputselect = "description" -metalevels = 2 + +jobnameext = jobname ?: "jobunique" +metarepoext = metarepo ?: "git@hydra:print-server-releases/print_server_whole.git" +outputselectext = outputselect ?: "description" +metalevelsstringext = metalevels ?: "2" + +//jobnameext = "jobunique" +//metarepoext = "git@hydra:print-server-releases/print_server_whole.git" +//outputselectext = "description" +//metalevelsstringext = "2" + +metalevelsext = metalevelsstringext.toInteger() dolog = false commonscriptsrepo="git@hydra:jenkinsautobuild/Common_scripts.git" @@ -68,7 +76,7 @@ def makeworking() { gitCloneOrPull(commonscriptsrepo, commonscripts) // Clone or pull the relevant meta repo - def metareporoot = "${rootfolder}/${jobname}" + def metareporoot = "${rootfolder}/${jobnameext}" gitCloneOrPull(metarepoext, metareporoot) def metafolder = "${metareporoot}/meta" @@ -95,16 +103,16 @@ def String outputSelection(menuitems, releaseinfo) { def List getItems(meta) { def List menuitems = new ArrayList() - def metaitems = meta.releasewalkerunique(metalevels) + def metaitems = meta.releasewalkerunique(metalevelsext) log("metaitems is ${metaitems.getClass()}") try { for (key in metaitems.keySet()) { def releaseinfo = metaitems[key] - if (outputselect == "description") { + if (outputselectext == "description") { outputDescription(menuitems, releaseinfo) } - if (outputselect == "selection") { + if (outputselectext == "selection") { outputSelection(menuitems, releaseinfo) } } From bb65e72373fe39938ef6f96b13128db3c53b7e77 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Wed, 13 Mar 2019 18:57:10 +0000 Subject: [PATCH 16/42] Clone jobs --- versionnumbering/generate.groovy | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/versionnumbering/generate.groovy b/versionnumbering/generate.groovy index 4761174..f4f1bdc 100644 --- a/versionnumbering/generate.groovy +++ b/versionnumbering/generate.groovy @@ -56,7 +56,7 @@ def getGitRevision(String gitrootpath, int basebuildnumber) { // Handle: // origin/master // origin/2.0.x -def getVersionPrefix(String sourcebranch) { +def getVersionPrefix(String sourcebranch, boolean droptrailingdot = false) { echo "Determining version number prefix from source branch name: ${sourcebranch}" sourcebranch = sourcebranch.toLowerCase() @@ -121,6 +121,9 @@ def getVersionPrefix(String sourcebranch) { versionprefix += "0." } } + if (droptrailingdot == true) { + versionprefix = versionprefix.substring(0, versionprefix.length() - 1); + } echo "Determined version prefix to be: ${versionprefix}" return versionprefix } From 79038df4d3eae65cbfa51ed46a0e82692e4e75ec Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Tue, 19 Mar 2019 00:32:36 +0000 Subject: [PATCH 17/42] Add filtered publishing --- publish/do.groovy | 66 ++++++++++++++++++++++++++++++++++++++---- publish/publish.groovy | 2 +- 2 files changed, 61 insertions(+), 7 deletions(-) diff --git a/publish/do.groovy b/publish/do.groovy index 7844289..7ec8be8 100644 --- a/publish/do.groovy +++ b/publish/do.groovy @@ -5,6 +5,7 @@ summaryfolder = "${WORKSPACE}/summary" summaryfile = "${summaryfolder}/summary.txt" summarystring = "" releaserepofolder = "${WORKSPACE}/releaserepos" +filteredreleaserepofolder = "${WORKSPACE}/filteredreleaserepos" tempfolder = "${WORKSPACE}/temp" def resetfolders() { @@ -14,6 +15,9 @@ def resetfolders() { dir(releaserepofolder) { deleteDir() } + dir(filteredreleaserepofolder) { + deleteDir() + } dir(tempfolder) { deleteDir() } @@ -59,7 +63,7 @@ def getcomponentartifacts(releaseinfo, String repofolder, String tempfolder) { } } -def publish(String customer) { +def publish(String customer, String finalreleaserepofolder = releaserepofolder) { summaryappend(" FTP operations: ") def String FTP_CLIENT_LOCATION='ftp' @@ -67,15 +71,41 @@ def publish(String customer) { def String FTP_USER='ftp@globalinkjetsystems.com' def String FTP_CUSTOMER_ROOT="/Customers/${customer}" def String FTP_PASSWORD='ramshorn42' - dir(releaserepofolder) { + dir(finalreleaserepofolder) { summaryappend("FTP operations: Transferring to ${FTP_CUSTOMER_ROOT}") sh """#!/bin/bash - ncftpput -u ${FTP_USER} -p ${FTP_PASSWORD} -R ${FTP_URL} "${FTP_CUSTOMER_ROOT}" . + ncftpput -u ${FTP_USER} -p ${FTP_PASSWORD} -R ${FTP_URL} "${FTP_CUSTOMER_ROOT}" . """ summaryappend(", Transferred ") } } +def copydirectory(File dirFrom, File dirTo) { + if (!dirTo.exists()) { + dirTo.mkdir(); + } + dirFrom.eachFile(FILES) { File source -> + File target = new File(dirTo, source.getName()) + target.bytes = source.bytes + } + dirFrom.eachFile(DIRECTORIES) { File source -> + File target = new File(dirTo, source.getName()) + copyLargeDir(source, target) + } +} + +def filteredpublish(itempathstopublish, customer) { + for (String itempath : itempathstopublish) { + def srcpath = "${releaserepofolder}/${itempath}" + File srcpathfile = new File(srcpath) + def dstpath = "${filteredreleaserepofolder}/${itempath}" + File dstpathfile = new File(dstpath) + def dstpathdirname = dstpathfile.getParent() + copydirectory(srcpath, dstpath) + } + publish(customer, filteredreleaserepofolder) +} + def recallcomponent(releaseinfo, String softwarerelease) { def releasemeta = releaseinfo.meta def String uniquefolder = "Software/${PRODUCT_NAME} ${software_release}/${releasemeta.productinfo.productname}_${releasemeta.productinfo.subcomponentname}" @@ -102,11 +132,25 @@ def stripgithistory() { } } -def publishhierarchy(releasemeta, String customer, String softwarerelease, String maxdepth) { +def convertitemstopublish(String itemstopublishstring) { + def List paths = [] + + def String[] items = itemstopublishstring.split(',') + for(String item : items) { + def String[] pathitems = item.split('#') + def String path = "${pathitems[0]}_${pathitems[1]}/${pathitems[2]}" + paths.add(path) + } + return paths +} + +// Publish selected items from a release to the customer folder on the ftp site +// itemstopublishstring is a comma-seperated set of strings in this format ## +def publishhierarchy(releasemeta, String itemstopublishstring, String customer, String softwarerelease, String maxdepth) { int md = maxdepth.toInteger() resetfolders() preconditions() - + // Walk the meta information to a max depth, looking for artifacts to publish def componentReleaseInfoVersionUnique = releasemeta.releasewalkerversionunique(md) @@ -122,9 +166,19 @@ def publishhierarchy(releasemeta, String customer, String softwarerelease, Strin recallcomponent(releaseinfo, softwarerelease) } stripgithistory() - publish(customer) + + itempathstopublish = convertitemstopublish(itemstopublishstring) + if (itempathstopublish.isEmpty()) { + publish(customer) + } else { + filteredpublish(itempathstopublish, customer) + } return [summarystring, markunstable, unstablereason] } +def publishhierarchy(releasemeta, String customer, String softwarerelease, String maxdepth) { + return publishhierarchy(releasemeta, "", customer, softwarerelease, maxdepth) +} + return this; diff --git a/publish/publish.groovy b/publish/publish.groovy index a703c9e..b478a5d 100644 --- a/publish/publish.groovy +++ b/publish/publish.groovy @@ -44,7 +44,7 @@ pipeline { steps { script { def publisher = load("${autobuilder.commonscripts()}/publish/do.groovy") - (summarystring, markunstable, unstablereason) = publisher.publishhierarchy(releasemeta, CUSTOMER, SOFTWARE_RELEASE, MAX_META_DEPTH) + (summarystring, markunstable, unstablereason) = publisher.publishhierarchy(releasemeta, ITEMS_TO_PUBLISH, CUSTOMER, SOFTWARE_RELEASE, MAX_META_DEPTH) if (markunstable) { env.unstablereason = unstablereason currentBuild.result = 'UNSTABLE' From 9fad59a8a8c08b0fac03e5160d21212e0cdb9874 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Tue, 19 Mar 2019 07:44:00 +0000 Subject: [PATCH 18/42] Add filtered publishing --- publish/do.groovy | 2 ++ 1 file changed, 2 insertions(+) diff --git a/publish/do.groovy b/publish/do.groovy index 7ec8be8..996123c 100644 --- a/publish/do.groovy +++ b/publish/do.groovy @@ -101,6 +101,7 @@ def filteredpublish(itempathstopublish, customer) { def dstpath = "${filteredreleaserepofolder}/${itempath}" File dstpathfile = new File(dstpath) def dstpathdirname = dstpathfile.getParent() + echo "Copying recursively from ${srcpath} to ${dstpath}" copydirectory(srcpath, dstpath) } publish(customer, filteredreleaserepofolder) @@ -140,6 +141,7 @@ def convertitemstopublish(String itemstopublishstring) { def String[] pathitems = item.split('#') def String path = "${pathitems[0]}_${pathitems[1]}/${pathitems[2]}" paths.add(path) + echo "Selected item to publish: ${path}" } return paths } From 9ee093481dc01085da4318e4ce3e12a32e28270a Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Tue, 19 Mar 2019 08:34:07 +0000 Subject: [PATCH 19/42] Add filtered publishing --- publish/do.groovy | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/publish/do.groovy b/publish/do.groovy index 996123c..572c2e3 100644 --- a/publish/do.groovy +++ b/publish/do.groovy @@ -41,6 +41,16 @@ def summaryappend(String summary) { summarystring += summary } +def guessreporoot(componentURL) { + if (env.REPOROOT || env.REPOROOT.length() == 0) { + return '' + } + def guess = componentURL.replaceFirst(/.*\/(.*).git/, '$1') + def reporoot = "${REPOROOT}/${guess}" + echo "Guessing reporoot is: ${reporoot}" + return reporoot +} + gh = load("${autobuilder.commonscripts()}/versioncontrol/git.groovy") def getcomponentartifacts(releaseinfo, String repofolder, String tempfolder) { // Copy relevant artifacts to temp folder @@ -56,7 +66,8 @@ def getcomponentartifacts(releaseinfo, String repofolder, String tempfolder) { publishablePaths.add(publishableitem.filepath) summaryappend("${publishableitem.filepath},") } - gh.gitCheckout(componentURL, revision, repofolder, "", 1, true, publishablePaths) // Shallow clone + def reporoot = guessreporoot(componentURL) + gh.gitCheckout(componentURL, revision, repofolder, reporoot, 1, true, publishablePaths) // Shallow clone } else { summaryappend("None ") From 6a334f56f12470738342f88bdb58c28d06c317db Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Tue, 19 Mar 2019 08:42:18 +0000 Subject: [PATCH 20/42] Add filtered publishing --- publish/do.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/publish/do.groovy b/publish/do.groovy index 572c2e3..ade1c3f 100644 --- a/publish/do.groovy +++ b/publish/do.groovy @@ -42,7 +42,7 @@ def summaryappend(String summary) { } def guessreporoot(componentURL) { - if (env.REPOROOT || env.REPOROOT.length() == 0) { + if (!env.REPOROOT || env.REPOROOT.size() == 0) { return '' } def guess = componentURL.replaceFirst(/.*\/(.*).git/, '$1') From e328e823e4db25723952a5a900c20c9bd7a9cbcd Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Tue, 19 Mar 2019 08:47:47 +0000 Subject: [PATCH 21/42] Add filtered publishing --- publish/do.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/publish/do.groovy b/publish/do.groovy index ade1c3f..14286b9 100644 --- a/publish/do.groovy +++ b/publish/do.groovy @@ -42,11 +42,11 @@ def summaryappend(String summary) { } def guessreporoot(componentURL) { - if (!env.REPOROOT || env.REPOROOT.size() == 0) { + if (!env.REPO_ROOT || env.REPO_ROOT.size() == 0) { return '' } def guess = componentURL.replaceFirst(/.*\/(.*).git/, '$1') - def reporoot = "${REPOROOT}/${guess}" + def reporoot = "${REPO_ROOT}/${guess}" echo "Guessing reporoot is: ${reporoot}" return reporoot } From 94a966c7cd4e055acf894b34a4edd4bcdd3d4740 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Tue, 19 Mar 2019 08:52:40 +0000 Subject: [PATCH 22/42] Add filtered publishing --- publish/do.groovy | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/publish/do.groovy b/publish/do.groovy index 14286b9..e637e8f 100644 --- a/publish/do.groovy +++ b/publish/do.groovy @@ -41,14 +41,9 @@ def summaryappend(String summary) { summarystring += summary } -def guessreporoot(componentURL) { - if (!env.REPO_ROOT || env.REPO_ROOT.size() == 0) { - return '' - } +def guessreporootsuffix(componentURL) { def guess = componentURL.replaceFirst(/.*\/(.*).git/, '$1') - def reporoot = "${REPO_ROOT}/${guess}" - echo "Guessing reporoot is: ${reporoot}" - return reporoot + return guess } gh = load("${autobuilder.commonscripts()}/versioncontrol/git.groovy") @@ -66,8 +61,8 @@ def getcomponentartifacts(releaseinfo, String repofolder, String tempfolder) { publishablePaths.add(publishableitem.filepath) summaryappend("${publishableitem.filepath},") } - def reporoot = guessreporoot(componentURL) - gh.gitCheckout(componentURL, revision, repofolder, reporoot, 1, true, publishablePaths) // Shallow clone + def reporootsuffix = guessreporootsuffix(componentURL) + gh.gitCheckout(componentURL, revision, reporootsuffix, reporoot, 1, true, publishablePaths) // Shallow clone } else { summaryappend("None ") From 944f732e896a578636bc72be9851eba8032aa0ae Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Tue, 19 Mar 2019 08:54:45 +0000 Subject: [PATCH 23/42] Add filtered publishing --- versioncontrol/git.groovy | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/versioncontrol/git.groovy b/versioncontrol/git.groovy index f7d10bb..9a313f2 100644 --- a/versioncontrol/git.groovy +++ b/versioncontrol/git.groovy @@ -19,6 +19,16 @@ def SparseCheckoutPaths sparsecheckoutconfig(ArrayList paths) { return new SparseCheckoutPaths(sparsecheckoutpaths) } +def guessreporoot(componentURL) { + if (!env.REPO_ROOT || env.REPO_ROOT.size() == 0) { + return '' + } + def guess = componentURL.replaceFirst(/.*\/(.*).git/, '$1') + def reporoot = "${REPO_ROOT}/${guess}" + echo "Guessing reporoot is: ${reporoot}" + return reporoot +} + def gitCheckout(String gitURL, String revision, String targetDir, String repoRootSuffix = "", int cloneDepth = 1, boolean shallowClone = true, ArrayList sparseitemlist = new ArrayList()) { reporootenv = env.REPO_ROOT if (reporootenv != null && repoRootSuffix != "") { From 7c4d1df78d2022f6ba5fcf626d45257d35fee93c Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Tue, 19 Mar 2019 08:56:32 +0000 Subject: [PATCH 24/42] Add filtered publishing --- publish/do.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/publish/do.groovy b/publish/do.groovy index e637e8f..20e332a 100644 --- a/publish/do.groovy +++ b/publish/do.groovy @@ -62,7 +62,7 @@ def getcomponentartifacts(releaseinfo, String repofolder, String tempfolder) { summaryappend("${publishableitem.filepath},") } def reporootsuffix = guessreporootsuffix(componentURL) - gh.gitCheckout(componentURL, revision, reporootsuffix, reporoot, 1, true, publishablePaths) // Shallow clone + gh.gitCheckout(componentURL, revision, repofolder, reporootsuffix, 1, true, publishablePaths) // Shallow clone } else { summaryappend("None ") From df095fec9622a63f8591a9a5d65d11979c6af685 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Tue, 19 Mar 2019 11:04:52 +0000 Subject: [PATCH 25/42] Add filtered publishing --- publish/do.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/publish/do.groovy b/publish/do.groovy index 20e332a..c3d229e 100644 --- a/publish/do.groovy +++ b/publish/do.groovy @@ -108,7 +108,7 @@ def filteredpublish(itempathstopublish, customer) { File dstpathfile = new File(dstpath) def dstpathdirname = dstpathfile.getParent() echo "Copying recursively from ${srcpath} to ${dstpath}" - copydirectory(srcpath, dstpath) + copydirectory(srcpathfile, dstpathfile) } publish(customer, filteredreleaserepofolder) } From 889d2b87977862468d0358e752395773537e10e4 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Tue, 19 Mar 2019 11:20:02 +0000 Subject: [PATCH 26/42] Add filtered publishing --- publish/do.groovy | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/publish/do.groovy b/publish/do.groovy index c3d229e..eea1015 100644 --- a/publish/do.groovy +++ b/publish/do.groovy @@ -88,7 +88,7 @@ def publish(String customer, String finalreleaserepofolder = releaserepofolder) def copydirectory(File dirFrom, File dirTo) { if (!dirTo.exists()) { - dirTo.mkdir(); + dirTo.mkdirs(); } dirFrom.eachFile(FILES) { File source -> File target = new File(dirTo, source.getName()) @@ -103,12 +103,12 @@ def copydirectory(File dirFrom, File dirTo) { def filteredpublish(itempathstopublish, customer) { for (String itempath : itempathstopublish) { def srcpath = "${releaserepofolder}/${itempath}" - File srcpathfile = new File(srcpath) + def File srcpathfile = new File(srcpath) def dstpath = "${filteredreleaserepofolder}/${itempath}" - File dstpathfile = new File(dstpath) - def dstpathdirname = dstpathfile.getParent() - echo "Copying recursively from ${srcpath} to ${dstpath}" - copydirectory(srcpathfile, dstpathfile) + def File dstpathfile = new File(dstpath) + def dstpathparentdir = dstpathfile.getParentFile() + echo "Copying recursively from ${srcpath} to ${dstpathparentdir.getName()}" + copydirectory(srcpathfile, dstpathparentdir) } publish(customer, filteredreleaserepofolder) } From e4e83a02f747485eb5f2aa47e63aaa0c9757aea0 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Tue, 19 Mar 2019 11:26:40 +0000 Subject: [PATCH 27/42] Add filtered publishing --- publish/do.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/publish/do.groovy b/publish/do.groovy index eea1015..255fae9 100644 --- a/publish/do.groovy +++ b/publish/do.groovy @@ -107,7 +107,7 @@ def filteredpublish(itempathstopublish, customer) { def dstpath = "${filteredreleaserepofolder}/${itempath}" def File dstpathfile = new File(dstpath) def dstpathparentdir = dstpathfile.getParentFile() - echo "Copying recursively from ${srcpath} to ${dstpathparentdir.getName()}" + echo "Copying recursively from ${srcpath} to ${dstpathparentdir.getAbsolutePath()}" copydirectory(srcpathfile, dstpathparentdir) } publish(customer, filteredreleaserepofolder) From 9160ff3e7c3600be0bda79ef55d94520151f5e11 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Tue, 19 Mar 2019 11:45:43 +0000 Subject: [PATCH 28/42] Add filtered publishing --- publish/do.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/publish/do.groovy b/publish/do.groovy index 255fae9..e5e7965 100644 --- a/publish/do.groovy +++ b/publish/do.groovy @@ -90,11 +90,11 @@ def copydirectory(File dirFrom, File dirTo) { if (!dirTo.exists()) { dirTo.mkdirs(); } - dirFrom.eachFile(FILES) { File source -> + dirFrom.eachFile(FileType.FILES) { File source -> File target = new File(dirTo, source.getName()) target.bytes = source.bytes } - dirFrom.eachFile(DIRECTORIES) { File source -> + dirFrom.eachFile(FileType.DIRECTORIES) { File source -> File target = new File(dirTo, source.getName()) copyLargeDir(source, target) } From d868c21c174d8157ef3820dd0bd0ea1dc5699325 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Tue, 19 Mar 2019 11:48:13 +0000 Subject: [PATCH 29/42] Add filtered publishing --- publish/do.groovy | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/publish/do.groovy b/publish/do.groovy index e5e7965..7ce778c 100644 --- a/publish/do.groovy +++ b/publish/do.groovy @@ -143,12 +143,14 @@ def convertitemstopublish(String itemstopublishstring) { def List paths = [] def String[] items = itemstopublishstring.split(',') + def String allpaths for(String item : items) { def String[] pathitems = item.split('#') def String path = "${pathitems[0]}_${pathitems[1]}/${pathitems[2]}" paths.add(path) - echo "Selected item to publish: ${path}" + allpaths += path } + echo "Selected item to publish: ${allpaths}" return paths } From 76f24173a3091d3c5b652159adb3769bfe917374 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Tue, 19 Mar 2019 11:54:08 +0000 Subject: [PATCH 30/42] Add filtered publishing --- publish/do.groovy | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/publish/do.groovy b/publish/do.groovy index 7ce778c..c4bf7eb 100644 --- a/publish/do.groovy +++ b/publish/do.groovy @@ -1,3 +1,5 @@ +import groovy.io.FileType + markunstable = false unstablereason = "" @@ -143,14 +145,14 @@ def convertitemstopublish(String itemstopublishstring) { def List paths = [] def String[] items = itemstopublishstring.split(',') - def String allpaths + def String allpaths = "" for(String item : items) { def String[] pathitems = item.split('#') def String path = "${pathitems[0]}_${pathitems[1]}/${pathitems[2]}" paths.add(path) - allpaths += path + allpaths += "${path}\n" } - echo "Selected item to publish: ${allpaths}" + echo "Selected item to publish:\n${allpaths}" return paths } From 7f8b0cf8667f2df714f1aeefc187e0366b148d4f Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Tue, 19 Mar 2019 12:54:50 +0000 Subject: [PATCH 31/42] Add filtered publishing --- publish/do.groovy | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/publish/do.groovy b/publish/do.groovy index c4bf7eb..749497a 100644 --- a/publish/do.groovy +++ b/publish/do.groovy @@ -104,13 +104,16 @@ def copydirectory(File dirFrom, File dirTo) { def filteredpublish(itempathstopublish, customer) { for (String itempath : itempathstopublish) { - def srcpath = "${releaserepofolder}/${itempath}" - def File srcpathfile = new File(srcpath) - def dstpath = "${filteredreleaserepofolder}/${itempath}" - def File dstpathfile = new File(dstpath) - def dstpathparentdir = dstpathfile.getParentFile() - echo "Copying recursively from ${srcpath} to ${dstpathparentdir.getAbsolutePath()}" - copydirectory(srcpathfile, dstpathparentdir) + def srcpathglob = "${releaserepofolder}/${itempath}" + def srcpaths = new FileNameFinder().getFileNames(srcpathglob) + for (String srcpath: srcpaths) { + def File srcpathfile = new File(srcpath) + def dstpath = "${filteredreleaserepofolder}/${itempath}" + def File dstpathfile = new File(dstpath) + def dstpathparentdir = dstpathfile.getParentFile() + echo "Copying recursively from ${srcpath} to ${dstpathparentdir.getAbsolutePath()}" + copydirectory(srcpathfile, dstpathparentdir) + } } publish(customer, filteredreleaserepofolder) } From b822e39e2a591c86fe35ad4ed014fff8a7d5205a Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Tue, 19 Mar 2019 13:04:43 +0000 Subject: [PATCH 32/42] Add filtered publishing --- publish/do.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/publish/do.groovy b/publish/do.groovy index 749497a..7262a3a 100644 --- a/publish/do.groovy +++ b/publish/do.groovy @@ -104,8 +104,8 @@ def copydirectory(File dirFrom, File dirTo) { def filteredpublish(itempathstopublish, customer) { for (String itempath : itempathstopublish) { - def srcpathglob = "${releaserepofolder}/${itempath}" - def srcpaths = new FileNameFinder().getFileNames(srcpathglob) + // Convert glob wildcard paths to real paths + def srcpaths = new FileNameFinder().getFileNames(releaserepofolder, itempath) for (String srcpath: srcpaths) { def File srcpathfile = new File(srcpath) def dstpath = "${filteredreleaserepofolder}/${itempath}" From f9a078c895c5facd1c3f8273d416907444169abe Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Tue, 19 Mar 2019 13:15:54 +0000 Subject: [PATCH 33/42] Add filtered publishing --- publish/do.groovy | 2 ++ 1 file changed, 2 insertions(+) diff --git a/publish/do.groovy b/publish/do.groovy index 7262a3a..2d5ee05 100644 --- a/publish/do.groovy +++ b/publish/do.groovy @@ -105,7 +105,9 @@ def copydirectory(File dirFrom, File dirTo) { def filteredpublish(itempathstopublish, customer) { for (String itempath : itempathstopublish) { // Convert glob wildcard paths to real paths + echo "Finding files at base folder: ${releaserepofolder} and glob filter: ${itempath}" def srcpaths = new FileNameFinder().getFileNames(releaserepofolder, itempath) + echo "Paths found: ${srcpaths}" for (String srcpath: srcpaths) { def File srcpathfile = new File(srcpath) def dstpath = "${filteredreleaserepofolder}/${itempath}" From 36ca33077f74c74c11dc747d33e345a165a904ee Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Tue, 19 Mar 2019 13:34:40 +0000 Subject: [PATCH 34/42] Add filtered publishing --- publish/do.groovy | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/publish/do.groovy b/publish/do.groovy index 2d5ee05..732373e 100644 --- a/publish/do.groovy +++ b/publish/do.groovy @@ -104,9 +104,14 @@ def copydirectory(File dirFrom, File dirTo) { def filteredpublish(itempathstopublish, customer) { for (String itempath : itempathstopublish) { - // Convert glob wildcard paths to real paths - echo "Finding files at base folder: ${releaserepofolder} and glob filter: ${itempath}" - def srcpaths = new FileNameFinder().getFileNames(releaserepofolder, itempath) + def defaultsrcpath = "${releaserepofolder}/${itempath}" + def srcpaths = [ defaultsrcpath ] + if (itempath.endsWith('**') { // Convert glob wildcard paths to real paths + File srcfilepath = new File(defaultsrcpath).getParentFile() + def globpattern = '**' + echo "Finding files at base folder: ${srcfilepath} and glob filter: ${globpattern}" + srcpaths = new FileNameFinder().getFileNames(releaserepofolder, globpattern) + } echo "Paths found: ${srcpaths}" for (String srcpath: srcpaths) { def File srcpathfile = new File(srcpath) From 36ea650ea7dfa7601b75ae3244bfb0a80f3390f7 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Tue, 19 Mar 2019 13:42:43 +0000 Subject: [PATCH 35/42] Add filtered publishing --- publish/do.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/publish/do.groovy b/publish/do.groovy index 732373e..dcc88ca 100644 --- a/publish/do.groovy +++ b/publish/do.groovy @@ -106,7 +106,7 @@ def filteredpublish(itempathstopublish, customer) { for (String itempath : itempathstopublish) { def defaultsrcpath = "${releaserepofolder}/${itempath}" def srcpaths = [ defaultsrcpath ] - if (itempath.endsWith('**') { // Convert glob wildcard paths to real paths + if (itempath.endsWith('**')) { // Convert glob wildcard paths to real paths File srcfilepath = new File(defaultsrcpath).getParentFile() def globpattern = '**' echo "Finding files at base folder: ${srcfilepath} and glob filter: ${globpattern}" From aa100d8731cea24e75714c07a85e86c011c4040b Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Tue, 19 Mar 2019 14:21:51 +0000 Subject: [PATCH 36/42] Add filtered publishing - different approach for filtering --- publish/do.groovy | 68 ++++++++++++++++++++--------------------------- 1 file changed, 29 insertions(+), 39 deletions(-) diff --git a/publish/do.groovy b/publish/do.groovy index dcc88ca..a10fe51 100644 --- a/publish/do.groovy +++ b/publish/do.groovy @@ -25,6 +25,14 @@ def resetfolders() { } } +def uniquereleasefolder(String softwarerelease, releasemeta) { + return "Software/${PRODUCT_NAME} ${softwarerelease}/${releasemeta.productinfo.productname}_${releasemeta.productinfo.subcomponentname}" +} + +def uniqueabsoluterreleasefolder(String releaserepofolder, String softwarerelease, releasemeta) { + return "${releaserepofolder}/${uniquereleasefolder(softwarerelease, releasemeta)}" +} + def preconditions() { markunstable = false unstablereason = "" @@ -49,7 +57,7 @@ def guessreporootsuffix(componentURL) { } gh = load("${autobuilder.commonscripts()}/versioncontrol/git.groovy") -def getcomponentartifacts(releaseinfo, String repofolder, String tempfolder) { +def getcomponentartifacts(releaseinfo, String repofolder, String tempfolder, itempathstopublish) { // Copy relevant artifacts to temp folder summaryappend("Artifacts: ") @@ -57,14 +65,18 @@ def getcomponentartifacts(releaseinfo, String repofolder, String tempfolder) { def String componentURL = releasemeta.releaseinfo.releaserepoURL def String revision = "refs/tags/${releasemeta.buildstampinfo.buildstamp}_${releasemeta.jenkinsbuildinfo.buildnumber}" def publishableitems = releasemeta.publishableinfo - def ArrayList publishablePaths = new ArrayList() + def ArrayList publishablepaths = new ArrayList() if (publishableitems.size() > 0) { for (publishableitem in publishableitems) { - publishablePaths.add(publishableitem.filepath) - summaryappend("${publishableitem.filepath},") + if (itempathstopublish.size() == 0 || publishableitem in itempathstopublish) { + publishablepaths.add(publishableitem.filepath) + summaryappend("${publishableitem.filepath},") + } } + } + if (publishablepaths.size() > 0) { def reporootsuffix = guessreporootsuffix(componentURL) - gh.gitCheckout(componentURL, revision, repofolder, reporootsuffix, 1, true, publishablePaths) // Shallow clone + gh.gitCheckout(componentURL, revision, repofolder, reporootsuffix, 1, true, publishablepaths) // Shallow clone } else { summaryappend("None ") @@ -102,38 +114,22 @@ def copydirectory(File dirFrom, File dirTo) { } } -def filteredpublish(itempathstopublish, customer) { - for (String itempath : itempathstopublish) { - def defaultsrcpath = "${releaserepofolder}/${itempath}" - def srcpaths = [ defaultsrcpath ] - if (itempath.endsWith('**')) { // Convert glob wildcard paths to real paths - File srcfilepath = new File(defaultsrcpath).getParentFile() - def globpattern = '**' - echo "Finding files at base folder: ${srcfilepath} and glob filter: ${globpattern}" - srcpaths = new FileNameFinder().getFileNames(releaserepofolder, globpattern) - } - echo "Paths found: ${srcpaths}" - for (String srcpath: srcpaths) { - def File srcpathfile = new File(srcpath) - def dstpath = "${filteredreleaserepofolder}/${itempath}" - def File dstpathfile = new File(dstpath) - def dstpathparentdir = dstpathfile.getParentFile() - echo "Copying recursively from ${srcpath} to ${dstpathparentdir.getAbsolutePath()}" - copydirectory(srcpathfile, dstpathparentdir) - } - } - publish(customer, filteredreleaserepofolder) +def uniquereleasefolder(String softwarerelease, releasemeta) { + return "Software/${PRODUCT_NAME} ${softwarerelease}/${releasemeta.productinfo.productname}_${releasemeta.productinfo.subcomponentname}" } -def recallcomponent(releaseinfo, String softwarerelease) { +def uniqueabsoluterreleasefolder(String releaserepofolder, String softwarerelease, releasemeta) { + return "${releaserepofolder}/${uniquereleasefolder(softwarerelease, releasemeta)}" +} + +def recallcomponent(releaseinfo, String softwarerelease, itempathstopublish) { def releasemeta = releaseinfo.meta - def String uniquefolder = "Software/${PRODUCT_NAME} ${software_release}/${releasemeta.productinfo.productname}_${releasemeta.productinfo.subcomponentname}" - def String uniquefolderforrepo = "${releaserepofolder}/${uniquefolder}" - def String uniquefoldertemp = "${tempfolder}/${uniquefolder}" + def String uniquefolderforrepo = uniqueabsoluterreleasefolder(releaserepofolder, softwarerelease, releasemeta) + def String uniquefoldertemp = uniqueabsoluterreleasefolder(tempfolder, softwarerelease, releasemeta) summaryappend("${releasemeta.productinfo.productname} ${releasemeta.productinfo.subcomponentname}: ") - getcomponentartifacts(releaseinfo, uniquefolderforrepo, uniquefoldertemp) + getcomponentartifacts(releaseinfo, uniquefolderforrepo, uniquefoldertemp, itempathstopublish) summaryappend("\n") } @@ -183,19 +179,13 @@ def publishhierarchy(releasemeta, String itemstopublishstring, String customer, } echo versionuniquecomponent + def itempathstopublish = convertitemstopublish(itemstopublishstring) for (key in componentReleaseInfoVersionUnique.keySet()) { def releaseinfo = componentReleaseInfoVersionUnique[key] - recallcomponent(releaseinfo, softwarerelease) + recallcomponent(releaseinfo, softwarerelease, itempathstopublish) } stripgithistory() - itempathstopublish = convertitemstopublish(itemstopublishstring) - if (itempathstopublish.isEmpty()) { - publish(customer) - } else { - filteredpublish(itempathstopublish, customer) - } - return [summarystring, markunstable, unstablereason] } From e05f6a2da23d5c6d621365322c3fb3200edf3feb Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Tue, 19 Mar 2019 14:26:14 +0000 Subject: [PATCH 37/42] Add filtered publishing - different approach for filtering --- publish/do.groovy | 8 -------- 1 file changed, 8 deletions(-) diff --git a/publish/do.groovy b/publish/do.groovy index a10fe51..62dea7c 100644 --- a/publish/do.groovy +++ b/publish/do.groovy @@ -114,14 +114,6 @@ def copydirectory(File dirFrom, File dirTo) { } } -def uniquereleasefolder(String softwarerelease, releasemeta) { - return "Software/${PRODUCT_NAME} ${softwarerelease}/${releasemeta.productinfo.productname}_${releasemeta.productinfo.subcomponentname}" -} - -def uniqueabsoluterreleasefolder(String releaserepofolder, String softwarerelease, releasemeta) { - return "${releaserepofolder}/${uniquereleasefolder(softwarerelease, releasemeta)}" -} - def recallcomponent(releaseinfo, String softwarerelease, itempathstopublish) { def releasemeta = releaseinfo.meta def String uniquefolderforrepo = uniqueabsoluterreleasefolder(releaserepofolder, softwarerelease, releasemeta) From 755172bc503eb7e7bd9b89c7c67c282b9815e1c2 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Tue, 19 Mar 2019 14:32:52 +0000 Subject: [PATCH 38/42] Add filtered publishing - different approach for filtering --- publish/do.groovy | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/publish/do.groovy b/publish/do.groovy index 62dea7c..53fc791 100644 --- a/publish/do.groovy +++ b/publish/do.groovy @@ -65,6 +65,10 @@ def getcomponentartifacts(releaseinfo, String repofolder, String tempfolder, ite def String componentURL = releasemeta.releaseinfo.releaserepoURL def String revision = "refs/tags/${releasemeta.buildstampinfo.buildstamp}_${releasemeta.jenkinsbuildinfo.buildnumber}" def publishableitems = releasemeta.publishableinfo + + echo "itempathstopublish: ${itempathstopublish}" + echo "publishableitems: ${publishableitems}" + def ArrayList publishablepaths = new ArrayList() if (publishableitems.size() > 0) { for (publishableitem in publishableitems) { From 14a6291d3dd39cbddfad5c92cc2715a7c105c4cc Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Tue, 19 Mar 2019 14:40:16 +0000 Subject: [PATCH 39/42] Add filtered publishing - different approach for filtering --- publish/do.groovy | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/publish/do.groovy b/publish/do.groovy index 53fc791..f4aad08 100644 --- a/publish/do.groovy +++ b/publish/do.groovy @@ -66,13 +66,10 @@ def getcomponentartifacts(releaseinfo, String repofolder, String tempfolder, ite def String revision = "refs/tags/${releasemeta.buildstampinfo.buildstamp}_${releasemeta.jenkinsbuildinfo.buildnumber}" def publishableitems = releasemeta.publishableinfo - echo "itempathstopublish: ${itempathstopublish}" - echo "publishableitems: ${publishableitems}" - def ArrayList publishablepaths = new ArrayList() if (publishableitems.size() > 0) { for (publishableitem in publishableitems) { - if (itempathstopublish.size() == 0 || publishableitem in itempathstopublish) { + if (itempathstopublish.size() == 0 || publishableitem.filepath in itempathstopublish) { publishablepaths.add(publishableitem.filepath) summaryappend("${publishableitem.filepath},") } From 19932d9f1549f8d9cfc449f07e9d4127d94b8492 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Tue, 19 Mar 2019 14:50:46 +0000 Subject: [PATCH 40/42] Add filtered publishing - different approach for filtering --- publish/do.groovy | 1 + 1 file changed, 1 insertion(+) diff --git a/publish/do.groovy b/publish/do.groovy index f4aad08..9073b85 100644 --- a/publish/do.groovy +++ b/publish/do.groovy @@ -69,6 +69,7 @@ def getcomponentartifacts(releaseinfo, String repofolder, String tempfolder, ite def ArrayList publishablepaths = new ArrayList() if (publishableitems.size() > 0) { for (publishableitem in publishableitems) { + echo "publishableitem: ${publishableitem.filepath}" if (itempathstopublish.size() == 0 || publishableitem.filepath in itempathstopublish) { publishablepaths.add(publishableitem.filepath) summaryappend("${publishableitem.filepath},") From d112e4f7d187ee601f6ecd1d9c1ba1b12808dafc Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Tue, 19 Mar 2019 14:59:06 +0000 Subject: [PATCH 41/42] Add filtered publishing - different approach for filtering --- publish/do.groovy | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/publish/do.groovy b/publish/do.groovy index 9073b85..80113f3 100644 --- a/publish/do.groovy +++ b/publish/do.groovy @@ -25,8 +25,12 @@ def resetfolders() { } } +def productuniquefolder(releasemeta) { + return "${releasemeta.productinfo.productname}_${releasemeta.productinfo.subcomponentname}" +} + def uniquereleasefolder(String softwarerelease, releasemeta) { - return "Software/${PRODUCT_NAME} ${softwarerelease}/${releasemeta.productinfo.productname}_${releasemeta.productinfo.subcomponentname}" + return "Software/${PRODUCT_NAME} ${softwarerelease}/${productuniquefolder(releasemeta)}" } def uniqueabsoluterreleasefolder(String releaserepofolder, String softwarerelease, releasemeta) { @@ -69,8 +73,9 @@ def getcomponentartifacts(releaseinfo, String repofolder, String tempfolder, ite def ArrayList publishablepaths = new ArrayList() if (publishableitems.size() > 0) { for (publishableitem in publishableitems) { - echo "publishableitem: ${publishableitem.filepath}" - if (itempathstopublish.size() == 0 || publishableitem.filepath in itempathstopublish) { + def String productuniquepublishableitem = "${productuniquefolder(releasemeta)}/${publishableitem.filepath}" + echo "publishableitem: ${productuniquepublishableitem}" + if (itempathstopublish.size() == 0 || productuniquepublishableitem in itempathstopublish) { publishablepaths.add(publishableitem.filepath) summaryappend("${publishableitem.filepath},") } From 5cac7a574bdba3dcf6dd31516ff249d7813eebb1 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Tue, 19 Mar 2019 15:53:27 +0000 Subject: [PATCH 42/42] Add filtered publishing - different approach for filtering --- publish/do.groovy | 1 + 1 file changed, 1 insertion(+) diff --git a/publish/do.groovy b/publish/do.groovy index 80113f3..1a54b23 100644 --- a/publish/do.groovy +++ b/publish/do.groovy @@ -184,6 +184,7 @@ def publishhierarchy(releasemeta, String itemstopublishstring, String customer, recallcomponent(releaseinfo, softwarerelease, itempathstopublish) } stripgithistory() + publish(customer) return [summarystring, markunstable, unstablereason] }