From 0c2b471c3cea162ff6169768e2c9da8eabc4498d Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Wed, 7 Nov 2018 22:36:03 +0000 Subject: [PATCH 001/237] Only build selected variants --- compile/eclipsebuild/eclipseds5build.gsh | 48 +++++++++++++++--------- 1 file changed, 30 insertions(+), 18 deletions(-) diff --git a/compile/eclipsebuild/eclipseds5build.gsh b/compile/eclipsebuild/eclipseds5build.gsh index 3061fea..078845e 100644 --- a/compile/eclipsebuild/eclipseds5build.gsh +++ b/compile/eclipsebuild/eclipseds5build.gsh @@ -117,7 +117,14 @@ def doImportProjects(ds5folder, toolchainfolder, ds5shellcommand, buildcommand, } // Build and export files -def doBuild(apps, ds5folder, toolchainfolder, ds5shellcommand, buildcommand, sourcefolder, exportfolder = "${WORKSPACE}/bin") { +def doBuild(apps, ds5folder, toolchainfolder, ds5shellcommand, buildcommand, sourcefolder, variantstobuild. exportfolder = "${WORKSPACE}/bin") { + toBuild = [] + if (variantstobuild) { + toBuildUntrimmed = variantstobuild.split(',') + toBuildUntrimmed.each { + toBuild.add(it.trim()) + } + } // The lock is being used because it was being found that the doKillLeftovers was affecting other builds lock(resource: "eclipsebuild_${env.NODE_NAME}") { try { @@ -137,26 +144,31 @@ def doBuild(apps, ds5folder, toolchainfolder, ds5shellcommand, buildcommand, sou for (build_variant in variants) { retry(maxprojectbuildretries) { // Eclipse occasionally raises exceptions (rather than the builds failing) try { - doDisplayLeftovers() - doRegisterToolchain(ds5folder, toolchainfolder) - echo "Build command: ${ds5shellcommand} \'${buildcommand} -no-indexer ${buildtype} \"${project}/${build_variant}\"\'" - timeout(time: 10, unit: 'MINUTES') { - if (isUnix()) { - sh """ - echo Start time: `date` - ${ds5shellcommand} \'${buildcommand} -no-indexer ${buildtype} \"${project}/${build_variant}\"\' - echo End time: `date` - """ + if (toBuild.contains(build_variant)) { + doDisplayLeftovers() + doRegisterToolchain(ds5folder, toolchainfolder) + echo "Build command: ${ds5shellcommand} \'${buildcommand} -no-indexer ${buildtype} \"${project}/${build_variant}\"\'" + timeout(time: 10, unit: 'MINUTES') { + if (isUnix()) { + sh """ + echo Start time: `date` + ${ds5shellcommand} \'${buildcommand} -no-indexer ${buildtype} \"${project}/${build_variant}\"\' + echo End time: `date` + """ + } + else { + bat """ + "%ds5shellcommand%" "%buildcommand%" -no-indexer ${buildtype} "${project}\\${build_variant}" + """ + } } - else { - bat """ - "%ds5shellcommand%" "%buildcommand%" -no-indexer ${buildtype} "${project}\\${build_variant}" - """ + result = doExport(exportfolder, exportpathlist, "", build_variant) + if (result != 0) { + error "Failed to copy...." } } - result = doExport(exportfolder, exportpathlist, "", build_variant) - if (result != 0) { - error "Failed to copy...." + else { + echo "Not building ${build_variant} variant of project: ${project}" } } catch (Exception e) { echo "Build failed - Waiting for a while" From 9f1d3ca026847e066d3fe9921aa68a2b99812a80 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Wed, 7 Nov 2018 22:39:15 +0000 Subject: [PATCH 002/237] Only build selected variants --- compile/eclipsebuild/eclipseds5build.gsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compile/eclipsebuild/eclipseds5build.gsh b/compile/eclipsebuild/eclipseds5build.gsh index 078845e..93a8064 100644 --- a/compile/eclipsebuild/eclipseds5build.gsh +++ b/compile/eclipsebuild/eclipseds5build.gsh @@ -117,7 +117,7 @@ def doImportProjects(ds5folder, toolchainfolder, ds5shellcommand, buildcommand, } // Build and export files -def doBuild(apps, ds5folder, toolchainfolder, ds5shellcommand, buildcommand, sourcefolder, variantstobuild. exportfolder = "${WORKSPACE}/bin") { +def doBuild(apps, ds5folder, toolchainfolder, ds5shellcommand, buildcommand, sourcefolder, variantstobuild, exportfolder = "${WORKSPACE}/bin") { toBuild = [] if (variantstobuild) { toBuildUntrimmed = variantstobuild.split(',') From 69de014d49076c0d25a24fe04600fedbc29e110f Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 10 Nov 2018 21:04:34 +0000 Subject: [PATCH 003/237] Condense autobuild startup boilerplate --- autobuilder.gsh | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 autobuilder.gsh diff --git a/autobuilder.gsh b/autobuilder.gsh new file mode 100644 index 0000000..06a5123 --- /dev/null +++ b/autobuilder.gsh @@ -0,0 +1,39 @@ +// Assume that WORKSPACE environment variable is set + +def autobuildroot = "${WORKSPACE}/autobuild" +def commonscriptsroot = "${autobuildroot}/Common_scripts" + +def conditionalclean(doclean = "${CLEAN_WORKSPACE}" == "true") { + if (doclean) { + echo "Cleaning workspace" + // Save any script files that were loaded into the workspace at first and are required after cleaning the workspace + stash allowEmpty: true, includes: 'autobuild/**/*', name: 'Clean workspace stash', useDefaultExcludes: false + cleanWs() + unstash name: 'Clean workspace stash' + } + else { + echo "Not cleaning workspace" + } +} + +// Start up boilderplate +def start(autobuildpath = "${WORKSPACE}/autobuild", commonscriptspath = "${autobuildroot}/Common_scripts") { + echo "Starting...." + + autobuildroot = autobuildpath + commonscriptsroot = commonscriptspath + + conditionalclean() + + configurationhelper = load("${commonscriptsroot}/configuration/configuration.gsh") + configurationhelper.registerPipelineScriptConfiguration() + +def commonscripts() + return commonscriptsroot +} + +def configurationhelper() { + return load("${commonscripts()}/configuration/configuration.gsh") +} + +return this; \ No newline at end of file From 3e7191297956761eead46374cc6cfd7348a97136 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 10 Nov 2018 21:08:35 +0000 Subject: [PATCH 004/237] Condense autobuild startup boilerplate --- autobuilder.gsh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/autobuilder.gsh b/autobuilder.gsh index 06a5123..7a7efa1 100644 --- a/autobuilder.gsh +++ b/autobuilder.gsh @@ -27,8 +27,9 @@ def start(autobuildpath = "${WORKSPACE}/autobuild", commonscriptspath = "${autob configurationhelper = load("${commonscriptsroot}/configuration/configuration.gsh") configurationhelper.registerPipelineScriptConfiguration() +} -def commonscripts() +def commonscripts() { return commonscriptsroot } From 12f680285f37934d9dc4ff56b7b961149febbc2f Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 10 Nov 2018 21:13:21 +0000 Subject: [PATCH 005/237] Condense autobuild startup boilerplate --- autobuilder.gsh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/autobuilder.gsh b/autobuilder.gsh index 7a7efa1..1657815 100644 --- a/autobuilder.gsh +++ b/autobuilder.gsh @@ -1,7 +1,7 @@ // Assume that WORKSPACE environment variable is set -def autobuildroot = "${WORKSPACE}/autobuild" -def commonscriptsroot = "${autobuildroot}/Common_scripts" +String autobuildroot = "${WORKSPACE}/autobuild" +String commonscriptsroot = "${autobuildroot}/Common_scripts" def conditionalclean(doclean = "${CLEAN_WORKSPACE}" == "true") { if (doclean) { From a870eb3e57496a1ff78e182fc9cb543d2f50bfd0 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 10 Nov 2018 21:23:19 +0000 Subject: [PATCH 006/237] Condense autobuild startup boilerplate --- autobuilder.gsh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/autobuilder.gsh b/autobuilder.gsh index 1657815..88b68a0 100644 --- a/autobuilder.gsh +++ b/autobuilder.gsh @@ -1,7 +1,10 @@ // Assume that WORKSPACE environment variable is set -String autobuildroot = "${WORKSPACE}/autobuild" -String commonscriptsroot = "${autobuildroot}/Common_scripts" +@Field +def autobuildroot = "${WORKSPACE}/autobuild" + +@Field +def commonscriptsroot = "${autobuildroot}/Common_scripts" def conditionalclean(doclean = "${CLEAN_WORKSPACE}" == "true") { if (doclean) { From 16c6e92ac9beaa917a8acde5802a491eba34b27e Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 10 Nov 2018 21:25:18 +0000 Subject: [PATCH 007/237] Condense autobuild startup boilerplate --- autobuilder.gsh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/autobuilder.gsh b/autobuilder.gsh index 88b68a0..bf42e4c 100644 --- a/autobuilder.gsh +++ b/autobuilder.gsh @@ -1,10 +1,8 @@ // Assume that WORKSPACE environment variable is set -@Field -def autobuildroot = "${WORKSPACE}/autobuild" +autobuildroot = "${WORKSPACE}/autobuild" -@Field -def commonscriptsroot = "${autobuildroot}/Common_scripts" +commonscriptsroot = "${autobuildroot}/Common_scripts" def conditionalclean(doclean = "${CLEAN_WORKSPACE}" == "true") { if (doclean) { From 9403f706aba7c1147d2ddce2a119edd6bae9b54b Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 10 Nov 2018 21:31:25 +0000 Subject: [PATCH 008/237] Condense autobuild startup boilerplate --- configuration/configuration.gsh | 2 +- versioncontrol/git.gsh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configuration/configuration.gsh b/configuration/configuration.gsh index 5688482..dbaf921 100644 --- a/configuration/configuration.gsh +++ b/configuration/configuration.gsh @@ -1,4 +1,4 @@ -gh = load("${COMMON_SCRIPTS}/versioncontrol/git.gsh") +gh = load("${autobuilder.commonscripts()}/versioncontrol/git.gsh") configurationCollection = [:] diff --git a/versioncontrol/git.gsh b/versioncontrol/git.gsh index 51dbd5d..1462a8e 100644 --- a/versioncontrol/git.gsh +++ b/versioncontrol/git.gsh @@ -1,4 +1,4 @@ -clh = load("${COMMON_SCRIPTS}/commandline/commandline.gsh") +clh = load("${autobuilder.commonscripts()}/commandline/commandline.gsh") String getGitInfo(String workingSetRootPath) { dir(workingSetRootPath) { From 3f3ee1c70997abd6693ea0c5224bbb8ec99f57bf Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 10 Nov 2018 21:37:04 +0000 Subject: [PATCH 009/237] Condense autobuild startup boilerplate --- autobuilder.gsh | 4 ++++ configuration/configuration.gsh | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/autobuilder.gsh b/autobuilder.gsh index bf42e4c..6ec0e38 100644 --- a/autobuilder.gsh +++ b/autobuilder.gsh @@ -34,6 +34,10 @@ def commonscripts() { return commonscriptsroot } +def getautobuildpath() { + return autobuildroot +} + def configurationhelper() { return load("${commonscripts()}/configuration/configuration.gsh") } diff --git a/configuration/configuration.gsh b/configuration/configuration.gsh index dbaf921..f131c98 100644 --- a/configuration/configuration.gsh +++ b/configuration/configuration.gsh @@ -8,7 +8,7 @@ def registerConfigurationInfo(String configurationName, String configurationURL, } def registerPipelineScriptConfiguration() { - registerConfigurationInfo('pipeline script', '-', '-', gh.getGitInfo("${AUTOBUILD_SCRIPTS}")) + registerConfigurationInfo('pipeline script', '-', '-', gh.getGitInfo("${autobuilder.getautobuildpath()}")) } def saveConfigurationInVersionInfo() { From 94941c199f983f328906b85c02394fc77fb42326 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 10 Nov 2018 21:46:24 +0000 Subject: [PATCH 010/237] Change .gsh suffix to .groovy --- artifacts/{metaexport.gsh => metaexport.groovy} | 0 autobuilder.gsh => autobuilder.groovy | 0 commandline/{commandline.gsh => commandline.groovy} | 0 .../{disableparallelbuilds.gsh => disableparallelbuilds.groovy} | 0 .../eclipsebuild/{eclipseds5build.gsh => eclipseds5build.groovy} | 0 configuration/{configuration.gsh => configuration.groovy} | 0 differences/{json.gsh => json.groovy} | 0 install/{installhelper.gsh => installhelper.groovy} | 0 versioncontrol/{git.gsh => git.groovy} | 0 versionnumbering/{metaversion.gsh => metaversion.groovy} | 0 10 files changed, 0 insertions(+), 0 deletions(-) rename artifacts/{metaexport.gsh => metaexport.groovy} (100%) rename autobuilder.gsh => autobuilder.groovy (100%) rename commandline/{commandline.gsh => commandline.groovy} (100%) rename compile/eclipsebuild/{disableparallelbuilds.gsh => disableparallelbuilds.groovy} (100%) rename compile/eclipsebuild/{eclipseds5build.gsh => eclipseds5build.groovy} (100%) rename configuration/{configuration.gsh => configuration.groovy} (100%) rename differences/{json.gsh => json.groovy} (100%) rename install/{installhelper.gsh => installhelper.groovy} (100%) rename versioncontrol/{git.gsh => git.groovy} (100%) rename versionnumbering/{metaversion.gsh => metaversion.groovy} (100%) diff --git a/artifacts/metaexport.gsh b/artifacts/metaexport.groovy similarity index 100% rename from artifacts/metaexport.gsh rename to artifacts/metaexport.groovy diff --git a/autobuilder.gsh b/autobuilder.groovy similarity index 100% rename from autobuilder.gsh rename to autobuilder.groovy diff --git a/commandline/commandline.gsh b/commandline/commandline.groovy similarity index 100% rename from commandline/commandline.gsh rename to commandline/commandline.groovy diff --git a/compile/eclipsebuild/disableparallelbuilds.gsh b/compile/eclipsebuild/disableparallelbuilds.groovy similarity index 100% rename from compile/eclipsebuild/disableparallelbuilds.gsh rename to compile/eclipsebuild/disableparallelbuilds.groovy diff --git a/compile/eclipsebuild/eclipseds5build.gsh b/compile/eclipsebuild/eclipseds5build.groovy similarity index 100% rename from compile/eclipsebuild/eclipseds5build.gsh rename to compile/eclipsebuild/eclipseds5build.groovy diff --git a/configuration/configuration.gsh b/configuration/configuration.groovy similarity index 100% rename from configuration/configuration.gsh rename to configuration/configuration.groovy diff --git a/differences/json.gsh b/differences/json.groovy similarity index 100% rename from differences/json.gsh rename to differences/json.groovy diff --git a/install/installhelper.gsh b/install/installhelper.groovy similarity index 100% rename from install/installhelper.gsh rename to install/installhelper.groovy diff --git a/versioncontrol/git.gsh b/versioncontrol/git.groovy similarity index 100% rename from versioncontrol/git.gsh rename to versioncontrol/git.groovy diff --git a/versionnumbering/metaversion.gsh b/versionnumbering/metaversion.groovy similarity index 100% rename from versionnumbering/metaversion.gsh rename to versionnumbering/metaversion.groovy From 76913ba017012d451f6681d6bf44704178515ae9 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 10 Nov 2018 21:54:02 +0000 Subject: [PATCH 011/237] Change .gsh suffix to .groovy --- autobuilder.groovy | 4 ++-- configuration/configuration.groovy | 2 +- versioncontrol/git.groovy | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/autobuilder.groovy b/autobuilder.groovy index 6ec0e38..54cfb12 100644 --- a/autobuilder.groovy +++ b/autobuilder.groovy @@ -26,7 +26,7 @@ def start(autobuildpath = "${WORKSPACE}/autobuild", commonscriptspath = "${autob conditionalclean() - configurationhelper = load("${commonscriptsroot}/configuration/configuration.gsh") + configurationhelper = load("${commonscriptsroot}/configuration/configuration.groovy") configurationhelper.registerPipelineScriptConfiguration() } @@ -39,7 +39,7 @@ def getautobuildpath() { } def configurationhelper() { - return load("${commonscripts()}/configuration/configuration.gsh") + return load("${commonscripts()}/configuration/configuration.groovy") } return this; \ No newline at end of file diff --git a/configuration/configuration.groovy b/configuration/configuration.groovy index f131c98..1f0c095 100644 --- a/configuration/configuration.groovy +++ b/configuration/configuration.groovy @@ -1,4 +1,4 @@ -gh = load("${autobuilder.commonscripts()}/versioncontrol/git.gsh") +gh = load("${autobuilder.commonscripts()}/versioncontrol/git.groovy") configurationCollection = [:] diff --git a/versioncontrol/git.groovy b/versioncontrol/git.groovy index 1462a8e..031094b 100644 --- a/versioncontrol/git.groovy +++ b/versioncontrol/git.groovy @@ -1,4 +1,4 @@ -clh = load("${autobuilder.commonscripts()}/commandline/commandline.gsh") +clh = load("${autobuilder.commonscripts()}/commandline/commandline.groovy") String getGitInfo(String workingSetRootPath) { dir(workingSetRootPath) { From ad68c4caf5f990cca4a774d46dac162666d1817d Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 10 Nov 2018 22:35:36 +0000 Subject: [PATCH 012/237] Remove clean boilerplate --- clean/clean.groovy | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 clean/clean.groovy diff --git a/clean/clean.groovy b/clean/clean.groovy new file mode 100644 index 0000000..4707ba0 --- /dev/null +++ b/clean/clean.groovy @@ -0,0 +1,10 @@ + +def clean(folderlist) { + for (folder in folderlist) { + dir(folder) { + deleteDir() + } + } +} + +return this; \ No newline at end of file From e3533bd5f140a1561520b416ef585f366ed9dca4 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 10 Nov 2018 23:29:30 +0000 Subject: [PATCH 013/237] Remove versionnumbering boilerplate --- versionnumbering/generate.groovy | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 versionnumbering/generate.groovy diff --git a/versionnumbering/generate.groovy b/versionnumbering/generate.groovy new file mode 100644 index 0000000..6e87392 --- /dev/null +++ b/versionnumbering/generate.groovy @@ -0,0 +1,20 @@ + +def generate(sourcerevision, sourcepath, basebuildnumber = "1000", releasejobname = "", versionfolder = "${WORKSPACE}/version", jobname = "${JOB_NAME}", buildid = "${BUILD_ID}") { + cs = autobuilder.commonscripts() + if (isUnix()) { + sh """ + "${PYTHON}" -u "${cs}/versionnumbering/versioninfo.py" -s "${sourcerevision}" -v "${versionfolder}" -g "${sourcepath}" -b "${basebuildnumber}" -j "${jobname}" -n "${buildid}" -r "${releasejobname}" + """ + } + else { + bat """ + "%${PYTHON}%" -u "%${cs}%\\versionnumbering\\versioninfo.py" -s "%${sourcerevision}%" -v "${versionfolder}" -g "${sourcepath}" -b %${basebuildnumber}% -j "%${jobname}%" -n "%${buildid}%" -r "%${releasejobname}%" + """ + } + env.BUILD_STAMP = readFile("${WORKSPACE}/version/buildstamp.txt").trim() + env.BUILD_STAMP_COMMA_SEP = readFile("${WORKSPACE}/version/buildstampcommasep.txt").trim() + env.SRC_REVISION = readFile("${WORKSPACE}/version/revision.txt").trim() + configurationhelper.saveConfigurationInVersionInfo(); +} + +return this; \ No newline at end of file From b0077bb1df56c27f18921cd7184d6e939fa43281 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 10 Nov 2018 23:49:04 +0000 Subject: [PATCH 014/237] Remove differences boilerplate --- differences/do.groovy | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 differences/do.groovy diff --git a/differences/do.groovy b/differences/do.groovy new file mode 100644 index 0000000..9dc1807 --- /dev/null +++ b/differences/do.groovy @@ -0,0 +1,17 @@ + +def differences(sourcerevision, previoussourcerevision, sourcepath, jirakey, versionfolder = "${WORKSPACE}/version") { + cs = autobuilder.commonscripts() + + if (isUnix()) { + sh """ + "${PYTHON}" -u "${cs}/differences/show_release_differences.py" -g "${sourcepath}" -s "${sourcerevision}" -p "${previoussourcerevision}" -j "${jirakey}" -o "opposite notcommon" -v "${versionfolder}" + """ + } + else { + bat """ + "%${PYTHON}%" -u "%${cs}%\\differences\\show_release_differences.py" -g "%${sourcepath}%" -s "%${sourcerevision}%" -p "%${previoussourcerevision}%" -j ${jirakey} -o "opposite notcommon" -v "%${versionfolder}%" + """ + } +} + +return this; From 1d7346e5a02c0018986e56a47987adf197874731 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sun, 11 Nov 2018 11:43:28 +0000 Subject: [PATCH 015/237] Remove boilerplate --- versionnumbering/do.groovy | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 versionnumbering/do.groovy diff --git a/versionnumbering/do.groovy b/versionnumbering/do.groovy new file mode 100644 index 0000000..9b4a42e --- /dev/null +++ b/versionnumbering/do.groovy @@ -0,0 +1,20 @@ + +def stamp(convertdetails) { + for (convertdetail in convertdetails) { + filetoconvert = convertdetail[0] + pattern = convertdetail[1] + replacement = convertdetail[2] + if (isUnix()) { + sh """ + "${PYTHON}" -u "${autobuilder.commonscripts()}/versionstamping/versionstamper.py" -f "${filetoconvert}" -p "${pattern}" -s "${replacement}" + """ + } + else { + bat """ + "%${PYTHON}%" -u "%${autobuilder.commonscripts()}%\\versionstamping\\versionstamper.py" -f "%${filetoconvert}%" -p "%${pattern}%" -s "%${replacement}%" + """ + } + } +} + +return this; From b92a8261897b30807c06198982d92a5db1cfd805 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Mon, 12 Nov 2018 10:50:37 +0000 Subject: [PATCH 016/237] Rename .gsh files to .groovy --- artifacts/{metaexport.gsh => metaexport.groovy} | 0 commandline/{commandline.gsh => commandline.groovy} | 0 .../{disableparallelbuilds.gsh => disableparallelbuilds.groovy} | 0 .../eclipsebuild/{eclipseds5build.gsh => eclipseds5build.groovy} | 0 configuration/{configuration.gsh => configuration.groovy} | 0 differences/{json.gsh => json.groovy} | 0 install/{installhelper.gsh => installhelper.groovy} | 0 versioncontrol/{git.gsh => git.groovy} | 0 versionnumbering/{metaversion.gsh => metaversion.groovy} | 0 9 files changed, 0 insertions(+), 0 deletions(-) rename artifacts/{metaexport.gsh => metaexport.groovy} (100%) rename commandline/{commandline.gsh => commandline.groovy} (100%) rename compile/eclipsebuild/{disableparallelbuilds.gsh => disableparallelbuilds.groovy} (100%) rename compile/eclipsebuild/{eclipseds5build.gsh => eclipseds5build.groovy} (100%) rename configuration/{configuration.gsh => configuration.groovy} (100%) rename differences/{json.gsh => json.groovy} (100%) rename install/{installhelper.gsh => installhelper.groovy} (100%) rename versioncontrol/{git.gsh => git.groovy} (100%) rename versionnumbering/{metaversion.gsh => metaversion.groovy} (100%) diff --git a/artifacts/metaexport.gsh b/artifacts/metaexport.groovy similarity index 100% rename from artifacts/metaexport.gsh rename to artifacts/metaexport.groovy diff --git a/commandline/commandline.gsh b/commandline/commandline.groovy similarity index 100% rename from commandline/commandline.gsh rename to commandline/commandline.groovy diff --git a/compile/eclipsebuild/disableparallelbuilds.gsh b/compile/eclipsebuild/disableparallelbuilds.groovy similarity index 100% rename from compile/eclipsebuild/disableparallelbuilds.gsh rename to compile/eclipsebuild/disableparallelbuilds.groovy diff --git a/compile/eclipsebuild/eclipseds5build.gsh b/compile/eclipsebuild/eclipseds5build.groovy similarity index 100% rename from compile/eclipsebuild/eclipseds5build.gsh rename to compile/eclipsebuild/eclipseds5build.groovy diff --git a/configuration/configuration.gsh b/configuration/configuration.groovy similarity index 100% rename from configuration/configuration.gsh rename to configuration/configuration.groovy diff --git a/differences/json.gsh b/differences/json.groovy similarity index 100% rename from differences/json.gsh rename to differences/json.groovy diff --git a/install/installhelper.gsh b/install/installhelper.groovy similarity index 100% rename from install/installhelper.gsh rename to install/installhelper.groovy diff --git a/versioncontrol/git.gsh b/versioncontrol/git.groovy similarity index 100% rename from versioncontrol/git.gsh rename to versioncontrol/git.groovy diff --git a/versionnumbering/metaversion.gsh b/versionnumbering/metaversion.groovy similarity index 100% rename from versionnumbering/metaversion.gsh rename to versionnumbering/metaversion.groovy From 4f62592e7f7bf0c91cb372f12d10c83fa208d4c8 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Tue, 13 Nov 2018 09:39:25 +0000 Subject: [PATCH 017/237] buildstamp.txt -> buildstamps.txt --- versionnumbering/metaversion.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versionnumbering/metaversion.groovy b/versionnumbering/metaversion.groovy index 9a50e2e..e566aa1 100644 --- a/versionnumbering/metaversion.groovy +++ b/versionnumbering/metaversion.groovy @@ -44,7 +44,7 @@ def appendcomponentinfo(versionFolder, outputFolder) { writeFile file: "${metadifferencesFile}", text: currentContents(metadifferencesFile) + "${differencesFile}:\n" + newContents } - buildStampFile = "${versionFolder}/buildstamp.txt" + buildStampFile = "${versionFolder}/buildstamps.txt" buildStampFileContents = readFile("${buildStampFile}").trim() remoteurlFile = "${versionFolder}/remoteurl.txt" From 2b616e5397f88d7acbbdca593db7a7ce9ecae45f Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Wed, 14 Nov 2018 12:21:52 +0000 Subject: [PATCH 018/237] Handle version numbering in windows --- versionnumbering/generate.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/versionnumbering/generate.groovy b/versionnumbering/generate.groovy index 6e87392..cf02860 100644 --- a/versionnumbering/generate.groovy +++ b/versionnumbering/generate.groovy @@ -8,7 +8,7 @@ def generate(sourcerevision, sourcepath, basebuildnumber = "1000", releasejobnam } else { bat """ - "%${PYTHON}%" -u "%${cs}%\\versionnumbering\\versioninfo.py" -s "%${sourcerevision}%" -v "${versionfolder}" -g "${sourcepath}" -b %${basebuildnumber}% -j "%${jobname}%" -n "%${buildid}%" -r "%${releasejobname}%" + \"${PYTHON}\" -u \"${cs}\\versionnumbering\\versioninfo.py\" -s \"${sourcerevision}\" -v \"${versionfolder}\" -g \"${sourcepath}\" -b ${basebuildnumber} -j \"${jobname}\" -n \"${buildid}\" -r \"${releasejobname}\" """ } env.BUILD_STAMP = readFile("${WORKSPACE}/version/buildstamp.txt").trim() @@ -17,4 +17,4 @@ def generate(sourcerevision, sourcepath, basebuildnumber = "1000", releasejobnam configurationhelper.saveConfigurationInVersionInfo(); } -return this; \ No newline at end of file +return this; From 8ce03b4e10a7016e46bfd9f1f91c30822fdc89ea Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Wed, 14 Nov 2018 12:28:10 +0000 Subject: [PATCH 019/237] Handle version numbering in windows --- differences/do.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/differences/do.groovy b/differences/do.groovy index 9dc1807..7279c0b 100644 --- a/differences/do.groovy +++ b/differences/do.groovy @@ -9,7 +9,7 @@ def differences(sourcerevision, previoussourcerevision, sourcepath, jirakey, ver } else { bat """ - "%${PYTHON}%" -u "%${cs}%\\differences\\show_release_differences.py" -g "%${sourcepath}%" -s "%${sourcerevision}%" -p "%${previoussourcerevision}%" -j ${jirakey} -o "opposite notcommon" -v "%${versionfolder}%" + \"${PYTHON}\" -u \"${cs}\\differences\\show_release_differences.py\" -g \"${sourcepath}\" -s \"${sourcerevision}\" -p \"${previoussourcerevision}\" -j ${jirakey} -o \"opposite notcommon\" -v \"${versionfolder}\" """ } } From 143670fbc6aba03871871b44aae0e7cd6d5b6ffe Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Wed, 14 Nov 2018 12:44:11 +0000 Subject: [PATCH 020/237] Handle version numbering in windows --- differences/do.groovy | 9 +++------ versionnumbering/generate.groovy | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/differences/do.groovy b/differences/do.groovy index 7279c0b..d0a489b 100644 --- a/differences/do.groovy +++ b/differences/do.groovy @@ -2,15 +2,12 @@ def differences(sourcerevision, previoussourcerevision, sourcepath, jirakey, versionfolder = "${WORKSPACE}/version") { cs = autobuilder.commonscripts() + diffcmd = '"${PYTHON}" -u "${cs}/differences/show_release_differences.py" -g "${sourcepath}" -s "${sourcerevision}" -p "${previoussourcerevision}" -j "${jirakey}" -o "opposite notcommon" -v "${versionfolder}"' if (isUnix()) { - sh """ - "${PYTHON}" -u "${cs}/differences/show_release_differences.py" -g "${sourcepath}" -s "${sourcerevision}" -p "${previoussourcerevision}" -j "${jirakey}" -o "opposite notcommon" -v "${versionfolder}" - """ + sh "${diffcmd}" } else { - bat """ - \"${PYTHON}\" -u \"${cs}\\differences\\show_release_differences.py\" -g \"${sourcepath}\" -s \"${sourcerevision}\" -p \"${previoussourcerevision}\" -j ${jirakey} -o \"opposite notcommon\" -v \"${versionfolder}\" - """ + bat "${diffcmd}" } } diff --git a/versionnumbering/generate.groovy b/versionnumbering/generate.groovy index cf02860..2776130 100644 --- a/versionnumbering/generate.groovy +++ b/versionnumbering/generate.groovy @@ -8,7 +8,7 @@ def generate(sourcerevision, sourcepath, basebuildnumber = "1000", releasejobnam } else { bat """ - \"${PYTHON}\" -u \"${cs}\\versionnumbering\\versioninfo.py\" -s \"${sourcerevision}\" -v \"${versionfolder}\" -g \"${sourcepath}\" -b ${basebuildnumber} -j \"${jobname}\" -n \"${buildid}\" -r \"${releasejobname}\" + "${PYTHON}" -u "${cs}\\versionnumbering\\versioninfo.py" -s "${sourcerevision}" -v "${versionfolder}" -g "${sourcepath}" -b "${basebuildnumber}" -j "${jobname}" -n "${buildid}" -r "${releasejobname}" """ } env.BUILD_STAMP = readFile("${WORKSPACE}/version/buildstamp.txt").trim() From 4c737131d55369f5deb9d2919c9632b401bea703 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Wed, 14 Nov 2018 12:45:05 +0000 Subject: [PATCH 021/237] Handle version numbering in windows --- differences/do.groovy | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/differences/do.groovy b/differences/do.groovy index d0a489b..b3039a9 100644 --- a/differences/do.groovy +++ b/differences/do.groovy @@ -2,12 +2,15 @@ def differences(sourcerevision, previoussourcerevision, sourcepath, jirakey, versionfolder = "${WORKSPACE}/version") { cs = autobuilder.commonscripts() - diffcmd = '"${PYTHON}" -u "${cs}/differences/show_release_differences.py" -g "${sourcepath}" -s "${sourcerevision}" -p "${previoussourcerevision}" -j "${jirakey}" -o "opposite notcommon" -v "${versionfolder}"' if (isUnix()) { - sh "${diffcmd}" + sh """ + "${PYTHON}" -u "${cs}/differences/show_release_differences.py" -g "${sourcepath}" -s "${sourcerevision}" -p "${previoussourcerevision}" -j "${jirakey}" -o "opposite notcommon" -v "${versionfolder}" + """ } else { - bat "${diffcmd}" + bat """ + "${PYTHON}" -u "${cs}\\differences\\show_release_differences.py" -g "${sourcepath}" -s "${sourcerevision}" -p "${previoussourcerevision}" -j "${jirakey}" -o "opposite notcommon" -v "${versionfolder}" + """ } } From bf1cba0f8baccaa4c5ea3bbe8ee60f870784a4ba Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Thu, 15 Nov 2018 23:53:08 +0000 Subject: [PATCH 022/237] Prefix each line of a metaversion file with path to relevant artifact --- versionnumbering/metaversion.groovy | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/versionnumbering/metaversion.groovy b/versionnumbering/metaversion.groovy index e566aa1..00256cc 100644 --- a/versionnumbering/metaversion.groovy +++ b/versionnumbering/metaversion.groovy @@ -9,7 +9,16 @@ def currentContents(file, newline = "\n", defaultContents = "") { return contents } -def mergemeta(versionFolder, outputFolder) { +def prefixline(rootpath, filepath) { + fileContents = readFile("${filepath}").trim() + newFileContents = "" + fileContents.eachline { + newFileContents += "${rootpath}" + "/" + it + } + return newFileContents +} + +def mergemeta(rootpath, versionFolder, outputFolder) { echo "Merging meta data from folder: ${versionFolder} to ${outputFolder}" differencesFile = "${versionFolder}/differences.txt" @@ -18,7 +27,7 @@ def mergemeta(versionFolder, outputFolder) { writeFile file: "${metadifferencesFile}", text: currentContents(metadifferencesFile) + newContents buildStampFile = "${versionFolder}/buildstamps.txt" - buildStampFileContents = readFile("${buildStampFile}").trim() + buildStampFileContents = prefixline(rootpath, "${buildStampFile}") metabuildStampFile = "${outputFolder}/buildstamps.txt" writeFile file: "${metabuildStampFile}", text: currentContents(metabuildStampFile) + buildStampFileContents @@ -34,7 +43,7 @@ def mergemeta(versionFolder, outputFolder) { return intrevision } -def appendcomponentinfo(versionFolder, outputFolder) { +def appendcomponentinfo(rootpath, versionFolder, outputFolder) { echo "Appending component version data from folder: ${versionFolder} to ${outputFolder}" differencesFile = "${versionFolder}/differences.txt" @@ -57,7 +66,7 @@ def appendcomponentinfo(versionFolder, outputFolder) { releaseJobNameContents = currentContents("${releaseJobNameFile}", "", "-").trim() metabuildStampFile = "${outputFolder}/buildstamps.txt" - writeFile file: "${metabuildStampFile}", text: currentContents(metabuildStampFile) + "${versionFolder}" + ":" + buildStampFileContents + "," + remoteurlFileContents + "," + gitRevisionFileContents + "," + releaseJobNameContents + writeFile file: "${metabuildStampFile}", text: currentContents(metabuildStampFile) + "${rootpath}" + ":" + buildStampFileContents + "," + remoteurlFileContents + "," + gitRevisionFileContents + "," + releaseJobNameContents revision = readFile("${versionFolder}/revision.txt").trim() intrevision = revision.toInteger() echo "Revision read in: ${intrevision}" @@ -67,20 +76,21 @@ def appendcomponentinfo(versionFolder, outputFolder) { // Each version folder should have been created using version creation scripts in this Common_scripts folder // as their are well-known files in each folder -def combineSubjobVersions(versionLabelPrefix, versionFolderList, outputFolder = "${WORKSPACE}/metaversion") { +def combineSubjobVersions(versionLabelPrefix, artifactList, outputFolder = "${WORKSPACE}/metaversion") { totalrevision = 0 dir("${outputFolder}") { deleteDir() } - for (versionFolder in versionFolderList) { + for (artifactItem in artifactList) { + (rootpath, versionFolder) = artifactItem echo "Inspecting folder: ${versionFolder}" metaversionsignaturefile = "${versionFolder}/metaversion.txt" // If the sub project is a meta job if (fileExists("${metaversionsignaturefile}")) { - intrevision = mergemeta("${versionFolder}", outputFolder) + intrevision = mergemeta(rootpath, versionFolder, outputFolder) } else { - intrevision = appendcomponentinfo("${versionFolder}", outputFolder) + intrevision = appendcomponentinfo(rootpath, versionFolder, outputFolder) } totalrevision += intrevision } From 7114a1bf1c98f95d8d51b3c76176585a21d594d6 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Fri, 16 Nov 2018 13:43:05 +0000 Subject: [PATCH 023/237] Remove some scope of variables being created --- autobuilder.groovy | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/autobuilder.groovy b/autobuilder.groovy index 54cfb12..eb32dfc 100644 --- a/autobuilder.groovy +++ b/autobuilder.groovy @@ -1,8 +1,8 @@ // Assume that WORKSPACE environment variable is set -autobuildroot = "${WORKSPACE}/autobuild" +def autobuildroot = "${WORKSPACE}/autobuild" -commonscriptsroot = "${autobuildroot}/Common_scripts" +def commonscriptsroot = "${autobuildroot}/Common_scripts" def conditionalclean(doclean = "${CLEAN_WORKSPACE}" == "true") { if (doclean) { @@ -26,8 +26,8 @@ def start(autobuildpath = "${WORKSPACE}/autobuild", commonscriptspath = "${autob conditionalclean() - configurationhelper = load("${commonscriptsroot}/configuration/configuration.groovy") - configurationhelper.registerPipelineScriptConfiguration() + def ch = load("${commonscriptsroot}/configuration/configuration.groovy") + ch.registerPipelineScriptConfiguration() } def commonscripts() { From 1552da9e07db5be1e461548d349d6844a81e92dd Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Fri, 16 Nov 2018 13:50:31 +0000 Subject: [PATCH 024/237] Remove some scope of variables being created --- autobuilder.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/autobuilder.groovy b/autobuilder.groovy index eb32dfc..f07e945 100644 --- a/autobuilder.groovy +++ b/autobuilder.groovy @@ -1,8 +1,8 @@ // Assume that WORKSPACE environment variable is set -def autobuildroot = "${WORKSPACE}/autobuild" +autobuildroot = "${WORKSPACE}/autobuild" -def commonscriptsroot = "${autobuildroot}/Common_scripts" +commonscriptsroot = "${autobuildroot}/Common_scripts" def conditionalclean(doclean = "${CLEAN_WORKSPACE}" == "true") { if (doclean) { From 09a1c4fa507de3b417a2612fe80d5ea9cedc94f8 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Fri, 16 Nov 2018 14:04:56 +0000 Subject: [PATCH 025/237] Locate required githelper script --- install/installhelper.groovy | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/install/installhelper.groovy b/install/installhelper.groovy index a55292d..f523799 100644 --- a/install/installhelper.groovy +++ b/install/installhelper.groovy @@ -15,7 +15,8 @@ def artifactsImporter(artifactDetails, installerDetails) { echo "Copying from: ${folderToCopy} to: ${componentVersionFolder}" fileOperations([folderCopyOperation(destinationFolderPath: componentVersionFolder, sourceFolderPath: folderToCopy)]) //fileOperations([fileCopyOperation(excludes: '', flattenFiles: false, includes: filesToCopy, targetLocation: componentVersionFolder )]) - artifactVersion = githelper.getSHAFromVersion("${destFolder}/version") + def gh = load("${autobuilder.commonscripts()}/versioncontrol/git.groovy") + artifactVersion = gh.getSHAFromVersion("${destFolder}/version") artifactFetched.put(artifactKey, artifactVersion) } } From fdff4d689313b5cf358ca33db588cb2fcbe316c6 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Fri, 16 Nov 2018 23:29:39 +0000 Subject: [PATCH 026/237] Correct file line handling --- versionnumbering/metaversion.groovy | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/versionnumbering/metaversion.groovy b/versionnumbering/metaversion.groovy index 00256cc..3b8d7c1 100644 --- a/versionnumbering/metaversion.groovy +++ b/versionnumbering/metaversion.groovy @@ -10,10 +10,13 @@ def currentContents(file, newline = "\n", defaultContents = "") { } def prefixline(rootpath, filepath) { - fileContents = readFile("${filepath}").trim() - newFileContents = "" - fileContents.eachline { - newFileContents += "${rootpath}" + "/" + it + def fileContents = readFile("${filepath}").trim() + def fileContentsNormalized = fileContents.normalize() + + def newFileContents = "" + def lines = fileContentsNormalized.readLines() + for (aline in lines) { + newFileContents += "${rootpath}" + "/" + aline } return newFileContents } From 5ee5219418ae4de60c76db138ac8b912365af0b9 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 17 Nov 2018 11:36:47 +0000 Subject: [PATCH 027/237] Add platform specific line endings definition --- autobuilder.groovy | 4 +++- platform/lineendings.groovy | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 platform/lineendings.groovy diff --git a/autobuilder.groovy b/autobuilder.groovy index 54cfb12..ef4f938 100644 --- a/autobuilder.groovy +++ b/autobuilder.groovy @@ -28,6 +28,8 @@ def start(autobuildpath = "${WORKSPACE}/autobuild", commonscriptspath = "${autob configurationhelper = load("${commonscriptsroot}/configuration/configuration.groovy") configurationhelper.registerPipelineScriptConfiguration() + + lineendings = load("${commonscriptsroot}/platform/lineendings.groovy") } def commonscripts() { @@ -42,4 +44,4 @@ def configurationhelper() { return load("${commonscripts()}/configuration/configuration.groovy") } -return this; \ No newline at end of file +return this; diff --git a/platform/lineendings.groovy b/platform/lineendings.groovy new file mode 100644 index 0000000..9657b0d --- /dev/null +++ b/platform/lineendings.groovy @@ -0,0 +1,5 @@ + +// Put ${nl} into strings when wanting a newline +nl = System.properties['line.separator'] + +return this; From ce133e9ba9ca4812c0afa08a6c5fb60aef42f3ea Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 17 Nov 2018 11:55:39 +0000 Subject: [PATCH 028/237] Put line endings on metaversion file --- versionnumbering/metaversion.groovy | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/versionnumbering/metaversion.groovy b/versionnumbering/metaversion.groovy index 3b8d7c1..1f6cff6 100644 --- a/versionnumbering/metaversion.groovy +++ b/versionnumbering/metaversion.groovy @@ -1,4 +1,6 @@ +def lineendings = load("${autobuilder.commonscripts()}/platform/lineendings.groovy") + def currentContents(file, newline = "\n", defaultContents = "") { if (fileExists("${file}")) { contents = readFile(file: "${file}").trim() + newline @@ -16,7 +18,7 @@ def prefixline(rootpath, filepath) { def newFileContents = "" def lines = fileContentsNormalized.readLines() for (aline in lines) { - newFileContents += "${rootpath}" + "/" + aline + newFileContents += "${rootpath}" + "/" + aline + "${nl}" } return newFileContents } From 18cc8e0609829df0468474e9c2e70285d6ec12d6 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 17 Nov 2018 20:25:15 +0000 Subject: [PATCH 029/237] Create a publishable artifact list; Create a checksum list --- checksum/utils.groovy | 31 ++++++++++++++++ file/utils.groovy | 16 ++++++++ publishing/utils.groovy | 25 +++++++++++++ versionnumbering/generate.groovy | 11 ++++-- versionnumbering/metaversion.groovy | 57 +++++++++++++++-------------- 5 files changed, 109 insertions(+), 31 deletions(-) create mode 100644 checksum/utils.groovy create mode 100644 file/utils.groovy create mode 100644 publishing/utils.groovy diff --git a/checksum/utils.groovy b/checksum/utils.groovy new file mode 100644 index 0000000..b1a714f --- /dev/null +++ b/checksum/utils.groovy @@ -0,0 +1,31 @@ + +env.CHECKSUMARTIFACTS = "checksums/**" +def CHECKSUMFOLDER = "${WORKSPACE}/checksums" + +// SHA256SUM environment variable must be set to sha256sum utility +// Generate a checksum file of from a list of files/directories relative to workspace +def generatelist(checksummable) { + if !fileExists("${SHA256SUM}") { + error "Please define the path to a sha256sum utility in the SHA256SUM environment variable" + } + sh """ + rm -rf "${CHECKSUMFOLDER}" + mkdir -p "${CHECKSUMFOLDER}" + """ + for (filepath in checksummable) { + def files = findFiles(glob: filepath) + for (file in files) { + if isUnix() { + sh """#!/bin/bash + "${SHA256SUM}" "${file}" >> "${CHECKSUMFOLDER}/sha256sum_list" + """ + } + else { + bat """ + "${SHA256SUM}" "${file}" >> "${CHECKSUMFOLDER}/sha256sum_list" + """ + } + } + } +} + diff --git a/file/utils.groovy b/file/utils.groovy new file mode 100644 index 0000000..0ffa47c --- /dev/null +++ b/file/utils.groovy @@ -0,0 +1,16 @@ + +def lineendings = load("${autobuilder.commonscripts()}/platform/lineendings.groovy") + +// Get current contents of given file and optionally add a newline string/character; If file doesn't exist, return default contents +def currentContents(file, newline = "${nl}", defaultContents = "") { + def contents = "" + if (fileExists("${file}")) { + contents = readFile(file: "${file}").trim() + newline + } + else { + contents = defaultContents + } + return contents +} + +return this; diff --git a/publishing/utils.groovy b/publishing/utils.groovy new file mode 100644 index 0000000..a10fd76 --- /dev/null +++ b/publishing/utils.groovy @@ -0,0 +1,25 @@ + +def fileutils = load("${autobuilder.commonscripts()}/file/utils.groovy") + +env.PUBLISHABLEARTIFACTS = "publishable/**" +def PUBLISHABLEFOLDER = "${WORKSPACE}/publishable" +def PUBLISHABLEFILE = "${WORKSPACE}/publishable/list.json" + +// Generate a list of artifact files that are publishable to outside parties +def generatelist(publishable) { + sh """ + rm -rf "${PUBLISHABLEFOLDER}" + mkdir -p "${PUBLISHABLEFOLDER}" + """ + filelist = [] + for (filepath in publishable) { + def files = findFiles(glob: filepath) + for (file in files) { + if (!file.directory) { + filelist.add(file.path) + } + } + } + def outJson = readJSON text: groovy.json.JsonOutput.toJson(filelist) + writeJSON(file: PUBLISHABLEFILE, json: outJson, pretty: 4) +} \ No newline at end of file diff --git a/versionnumbering/generate.groovy b/versionnumbering/generate.groovy index 2776130..6f9f803 100644 --- a/versionnumbering/generate.groovy +++ b/versionnumbering/generate.groovy @@ -1,5 +1,8 @@ -def generate(sourcerevision, sourcepath, basebuildnumber = "1000", releasejobname = "", versionfolder = "${WORKSPACE}/version", jobname = "${JOB_NAME}", buildid = "${BUILD_ID}") { +env.VERSIONARTIFACTS = "version/**" +def VERSIONFOLDER = "${WORKSPACE}/version" + +def generate(sourcerevision, sourcepath, basebuildnumber = "1000", releasejobname = "", versionfolder = "${VERSIONFOLDER}", jobname = "${JOB_NAME}", buildid = "${BUILD_ID}") { cs = autobuilder.commonscripts() if (isUnix()) { sh """ @@ -11,9 +14,9 @@ def generate(sourcerevision, sourcepath, basebuildnumber = "1000", releasejobnam "${PYTHON}" -u "${cs}\\versionnumbering\\versioninfo.py" -s "${sourcerevision}" -v "${versionfolder}" -g "${sourcepath}" -b "${basebuildnumber}" -j "${jobname}" -n "${buildid}" -r "${releasejobname}" """ } - env.BUILD_STAMP = readFile("${WORKSPACE}/version/buildstamp.txt").trim() - env.BUILD_STAMP_COMMA_SEP = readFile("${WORKSPACE}/version/buildstampcommasep.txt").trim() - env.SRC_REVISION = readFile("${WORKSPACE}/version/revision.txt").trim() + env.BUILD_STAMP = readFile("${VERSIONFOLDER}/buildstamp.txt").trim() + env.BUILD_STAMP_COMMA_SEP = readFile("${VERSIONFOLDER}/buildstampcommasep.txt").trim() + env.SRC_REVISION = readFile("${VERSIONFOLDER}/revision.txt").trim() configurationhelper.saveConfigurationInVersionInfo(); } diff --git a/versionnumbering/metaversion.groovy b/versionnumbering/metaversion.groovy index 1f6cff6..ff20a86 100644 --- a/versionnumbering/metaversion.groovy +++ b/versionnumbering/metaversion.groovy @@ -1,5 +1,6 @@ def lineendings = load("${autobuilder.commonscripts()}/platform/lineendings.groovy") +def fileutils = load("${autobuilder.commonscripts()}/file/utils.groovy") def currentContents(file, newline = "\n", defaultContents = "") { if (fileExists("${file}")) { @@ -26,18 +27,19 @@ def prefixline(rootpath, filepath) { def mergemeta(rootpath, versionFolder, outputFolder) { echo "Merging meta data from folder: ${versionFolder} to ${outputFolder}" - differencesFile = "${versionFolder}/differences.txt" - newContents = readFile file: "${differencesFile}" - metadifferencesFile = "${outputFolder}/differences.txt" - writeFile file: "${metadifferencesFile}", text: currentContents(metadifferencesFile) + newContents + def differencesFile = "${versionFolder}/differences.txt" + def newContents = readFile file: "${differencesFile}" + def metadifferencesFile = "${outputFolder}/differences.txt" + writeFile file: "${metadifferencesFile}", text: fileutils.currentContents(metadifferencesFile) + newContents - buildStampFile = "${versionFolder}/buildstamps.txt" - buildStampFileContents = prefixline(rootpath, "${buildStampFile}") - metabuildStampFile = "${outputFolder}/buildstamps.txt" - writeFile file: "${metabuildStampFile}", text: currentContents(metabuildStampFile) + buildStampFileContents + def buildStampFile = "${versionFolder}/buildstamps.txt" + def buildStampFileContents = prefixline(rootpath, "${buildStampFile}") + def metabuildStampFile = "${outputFolder}/buildstamps.txt" + writeFile file: "${metabuildStampFile}", text: fileutils.currentContents(metabuildStampFile) + buildStampFileContents + def intrevision = 0 if (fileExists("${versionFolder}/revision.txt")) { - revision = readFile("${versionFolder}/revision.txt").trim() + def revision = readFile("${versionFolder}/revision.txt").trim() intrevision = revision.toInteger() echo "Revision read in: ${intrevision}" } @@ -51,29 +53,29 @@ def mergemeta(rootpath, versionFolder, outputFolder) { def appendcomponentinfo(rootpath, versionFolder, outputFolder) { echo "Appending component version data from folder: ${versionFolder} to ${outputFolder}" - differencesFile = "${versionFolder}/differences.txt" + def differencesFile = "${versionFolder}/differences.txt" if (fileExists("${differencesFile}")) { - newContents = readFile file: "${differencesFile}" - metadifferencesFile = "${outputFolder}/differences.txt" - writeFile file: "${metadifferencesFile}", text: currentContents(metadifferencesFile) + "${differencesFile}:\n" + newContents + def newContents = readFile file: "${differencesFile}" + def metadifferencesFile = "${outputFolder}/differences.txt" + writeFile file: "${metadifferencesFile}", text: fileutils.currentContents(metadifferencesFile) + "${differencesFile}:\n" + newContents } - buildStampFile = "${versionFolder}/buildstamps.txt" - buildStampFileContents = readFile("${buildStampFile}").trim() + def buildStampFile = "${versionFolder}/buildstamps.txt" + def buildStampFileContents = readFile("${buildStampFile}").trim() - remoteurlFile = "${versionFolder}/remoteurl.txt" - remoteurlFileContents = currentContents(remoteurlFile, "", 'Unknown').trim() + def remoteurlFile = "${versionFolder}/remoteurl.txt" + def remoteurlFileContents = fileutils.currentContents(remoteurlFile, "", 'Unknown').trim() - gitRevisionFile = "${versionFolder}/gitrevision.txt" - gitRevisionFileContents = readFile("${gitRevisionFile}").trim() + def gitRevisionFile = "${versionFolder}/gitrevision.txt" + def gitRevisionFileContents = readFile("${gitRevisionFile}").trim() - releaseJobNameFile = "${versionFolder}/releasejobname.txt" - releaseJobNameContents = currentContents("${releaseJobNameFile}", "", "-").trim() + def releaseJobNameFile = "${versionFolder}/releasejobname.txt" + def releaseJobNameContents = fileutils.currentContents("${releaseJobNameFile}", "", "-").trim() - metabuildStampFile = "${outputFolder}/buildstamps.txt" - writeFile file: "${metabuildStampFile}", text: currentContents(metabuildStampFile) + "${rootpath}" + ":" + buildStampFileContents + "," + remoteurlFileContents + "," + gitRevisionFileContents + "," + releaseJobNameContents - revision = readFile("${versionFolder}/revision.txt").trim() - intrevision = revision.toInteger() + def metabuildStampFile = "${outputFolder}/buildstamps.txt" + writeFile file: "${metabuildStampFile}", text: fileutils.currentContents(metabuildStampFile) + "${rootpath}" + ":" + buildStampFileContents + "," + remoteurlFileContents + "," + gitRevisionFileContents + "," + releaseJobNameContents + def revision = readFile("${versionFolder}/revision.txt").trim() + def intrevision = revision.toInteger() echo "Revision read in: ${intrevision}" return intrevision @@ -82,15 +84,16 @@ def appendcomponentinfo(rootpath, versionFolder, outputFolder) { // Each version folder should have been created using version creation scripts in this Common_scripts folder // as their are well-known files in each folder def combineSubjobVersions(versionLabelPrefix, artifactList, outputFolder = "${WORKSPACE}/metaversion") { - totalrevision = 0 + def totalrevision = 0 dir("${outputFolder}") { deleteDir() } for (artifactItem in artifactList) { (rootpath, versionFolder) = artifactItem echo "Inspecting folder: ${versionFolder}" - metaversionsignaturefile = "${versionFolder}/metaversion.txt" + def metaversionsignaturefile = "${versionFolder}/metaversion.txt" // If the sub project is a meta job + def intrevision = 0 if (fileExists("${metaversionsignaturefile}")) { intrevision = mergemeta(rootpath, versionFolder, outputFolder) } From 583cffb0969e1b58848d252b55403b7a47e784d1 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 17 Nov 2018 20:35:46 +0000 Subject: [PATCH 030/237] Create a publishable artifact list; Create a checksum list --- checksum/utils.groovy | 2 +- publishing/utils.groovy | 6 ++---- versionnumbering/generate.groovy | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/checksum/utils.groovy b/checksum/utils.groovy index b1a714f..a961dc8 100644 --- a/checksum/utils.groovy +++ b/checksum/utils.groovy @@ -1,6 +1,5 @@ env.CHECKSUMARTIFACTS = "checksums/**" -def CHECKSUMFOLDER = "${WORKSPACE}/checksums" // SHA256SUM environment variable must be set to sha256sum utility // Generate a checksum file of from a list of files/directories relative to workspace @@ -8,6 +7,7 @@ def generatelist(checksummable) { if !fileExists("${SHA256SUM}") { error "Please define the path to a sha256sum utility in the SHA256SUM environment variable" } + def CHECKSUMFOLDER = "${WORKSPACE}/checksums" sh """ rm -rf "${CHECKSUMFOLDER}" mkdir -p "${CHECKSUMFOLDER}" diff --git a/publishing/utils.groovy b/publishing/utils.groovy index a10fd76..2fdbb73 100644 --- a/publishing/utils.groovy +++ b/publishing/utils.groovy @@ -1,12 +1,9 @@ -def fileutils = load("${autobuilder.commonscripts()}/file/utils.groovy") - env.PUBLISHABLEARTIFACTS = "publishable/**" -def PUBLISHABLEFOLDER = "${WORKSPACE}/publishable" -def PUBLISHABLEFILE = "${WORKSPACE}/publishable/list.json" // Generate a list of artifact files that are publishable to outside parties def generatelist(publishable) { + def PUBLISHABLEFOLDER = "${WORKSPACE}/publishable" sh """ rm -rf "${PUBLISHABLEFOLDER}" mkdir -p "${PUBLISHABLEFOLDER}" @@ -21,5 +18,6 @@ def generatelist(publishable) { } } def outJson = readJSON text: groovy.json.JsonOutput.toJson(filelist) + def PUBLISHABLEFILE = "${PUBLISHABLEFOLDER}/list.json" writeJSON(file: PUBLISHABLEFILE, json: outJson, pretty: 4) } \ No newline at end of file diff --git a/versionnumbering/generate.groovy b/versionnumbering/generate.groovy index 6f9f803..cb5e944 100644 --- a/versionnumbering/generate.groovy +++ b/versionnumbering/generate.groovy @@ -1,6 +1,6 @@ env.VERSIONARTIFACTS = "version/**" -def VERSIONFOLDER = "${WORKSPACE}/version" +VERSIONFOLDER = "${WORKSPACE}/version" def generate(sourcerevision, sourcepath, basebuildnumber = "1000", releasejobname = "", versionfolder = "${VERSIONFOLDER}", jobname = "${JOB_NAME}", buildid = "${BUILD_ID}") { cs = autobuilder.commonscripts() From b7433f290fa8a05272a6973fd53b97b5896c584f Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 17 Nov 2018 21:29:07 +0000 Subject: [PATCH 031/237] Create a publishable artifact list; Create a checksum list --- checksum/utils.groovy | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/checksum/utils.groovy b/checksum/utils.groovy index a961dc8..e4c37ca 100644 --- a/checksum/utils.groovy +++ b/checksum/utils.groovy @@ -4,8 +4,20 @@ env.CHECKSUMARTIFACTS = "checksums/**" // SHA256SUM environment variable must be set to sha256sum utility // Generate a checksum file of from a list of files/directories relative to workspace def generatelist(checksummable) { - if !fileExists("${SHA256SUM}") { - error "Please define the path to a sha256sum utility in the SHA256SUM environment variable" + def sha256sumfound = true + if (!fileExists("${SHA256SUM}")) { + def sha256sumfound = false + if (isUnix()) { + def sha256sumpath = sh(returnStdout: true, script: 'which sha256sum').trim() + if (sha256sumpath) { + echo "Found sha256sum executable here: + env.SHA256SUM = sha256sumpath + sha256sumfound = true + } + } + if (!sha256sumfound) { + error "Please define the path to a sha256sum utility in the SHA256SUM environment variable" + } } def CHECKSUMFOLDER = "${WORKSPACE}/checksums" sh """ From 660003f7b49f43fb3f26a53255aab1382b2cbf42 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 17 Nov 2018 21:50:35 +0000 Subject: [PATCH 032/237] Create a publishable artifact list; Create a checksum list --- checksum/utils.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checksum/utils.groovy b/checksum/utils.groovy index e4c37ca..63c96eb 100644 --- a/checksum/utils.groovy +++ b/checksum/utils.groovy @@ -10,7 +10,7 @@ def generatelist(checksummable) { if (isUnix()) { def sha256sumpath = sh(returnStdout: true, script: 'which sha256sum').trim() if (sha256sumpath) { - echo "Found sha256sum executable here: + echo "Found sha256sum executable here: ${sha256sumpath}" env.SHA256SUM = sha256sumpath sha256sumfound = true } From 53c2f1110619cf4d49ae0a65f91b4427744de9a0 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 17 Nov 2018 22:20:30 +0000 Subject: [PATCH 033/237] Create a publishable artifact list; Create a checksum list --- checksum/utils.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checksum/utils.groovy b/checksum/utils.groovy index 63c96eb..0d76756 100644 --- a/checksum/utils.groovy +++ b/checksum/utils.groovy @@ -27,7 +27,7 @@ def generatelist(checksummable) { for (filepath in checksummable) { def files = findFiles(glob: filepath) for (file in files) { - if isUnix() { + if (isUnix()) { sh """#!/bin/bash "${SHA256SUM}" "${file}" >> "${CHECKSUMFOLDER}/sha256sum_list" """ From 7c55b96a55782302e1fd92b3b10b0532a9d1b04b Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 17 Nov 2018 22:24:30 +0000 Subject: [PATCH 034/237] Create a publishable artifact list; Create a checksum list --- checksum/utils.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checksum/utils.groovy b/checksum/utils.groovy index 0d76756..e358b94 100644 --- a/checksum/utils.groovy +++ b/checksum/utils.groovy @@ -6,7 +6,7 @@ env.CHECKSUMARTIFACTS = "checksums/**" def generatelist(checksummable) { def sha256sumfound = true if (!fileExists("${SHA256SUM}")) { - def sha256sumfound = false + sha256sumfound = false if (isUnix()) { def sha256sumpath = sh(returnStdout: true, script: 'which sha256sum').trim() if (sha256sumpath) { From dcdf2c5fd171c8c697d06d9dfedc854b33107ad9 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 17 Nov 2018 22:39:48 +0000 Subject: [PATCH 035/237] Create a publishable artifact list; Create a checksum list --- checksum/utils.groovy | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/checksum/utils.groovy b/checksum/utils.groovy index e358b94..a46cd43 100644 --- a/checksum/utils.groovy +++ b/checksum/utils.groovy @@ -25,16 +25,18 @@ def generatelist(checksummable) { mkdir -p "${CHECKSUMFOLDER}" """ for (filepath in checksummable) { + echo "Checksumming ${filepath}" def files = findFiles(glob: filepath) for (file in files) { + echo "Checksumming ${file.path}" if (isUnix()) { sh """#!/bin/bash - "${SHA256SUM}" "${file}" >> "${CHECKSUMFOLDER}/sha256sum_list" + "${SHA256SUM}" "${file.path}" >> "${CHECKSUMFOLDER}/sha256sum_list" """ } else { bat """ - "${SHA256SUM}" "${file}" >> "${CHECKSUMFOLDER}/sha256sum_list" + "${SHA256SUM}" "${file.path}" >> "${CHECKSUMFOLDER}/sha256sum_list" """ } } From e1e5c40a5470b9be9ada0959699c9718f77ffeb7 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 17 Nov 2018 22:55:21 +0000 Subject: [PATCH 036/237] Create a publishable artifact list; Create a checksum list --- checksum/utils.groovy | 1 + 1 file changed, 1 insertion(+) diff --git a/checksum/utils.groovy b/checksum/utils.groovy index a46cd43..8829198 100644 --- a/checksum/utils.groovy +++ b/checksum/utils.groovy @@ -43,3 +43,4 @@ def generatelist(checksummable) { } } +return this; From 419d491da023651aaa654db6c9e9f0e9fec1a5db Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 17 Nov 2018 23:09:52 +0000 Subject: [PATCH 037/237] Create a publishable artifact list; Create a checksum list --- checksum/utils.groovy | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/checksum/utils.groovy b/checksum/utils.groovy index 8829198..ef80fdd 100644 --- a/checksum/utils.groovy +++ b/checksum/utils.groovy @@ -4,9 +4,14 @@ env.CHECKSUMARTIFACTS = "checksums/**" // SHA256SUM environment variable must be set to sha256sum utility // Generate a checksum file of from a list of files/directories relative to workspace def generatelist(checksummable) { - def sha256sumfound = true - if (!fileExists("${SHA256SUM}")) { - sha256sumfound = false + def sha256sumfound = false + if (env.SHA256SUM) { + if (fileExists("${SHA256SUM}")) { + sha256sumfound = true + } + } + if (!sha256sumfound) + { if (isUnix()) { def sha256sumpath = sh(returnStdout: true, script: 'which sha256sum').trim() if (sha256sumpath) { @@ -15,9 +20,9 @@ def generatelist(checksummable) { sha256sumfound = true } } - if (!sha256sumfound) { - error "Please define the path to a sha256sum utility in the SHA256SUM environment variable" - } + } + if (!sha256sumfound) { + error "Please define the path to a sha256sum utility in the SHA256SUM environment variable" } def CHECKSUMFOLDER = "${WORKSPACE}/checksums" sh """ From 29d30dcc7817b2961e4ed97abd67507d73ea97f0 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 17 Nov 2018 23:20:01 +0000 Subject: [PATCH 038/237] Create a publishable artifact list; Create a checksum list --- checksum/utils.groovy | 1 - publishing/utils.groovy | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/checksum/utils.groovy b/checksum/utils.groovy index ef80fdd..ccf74db 100644 --- a/checksum/utils.groovy +++ b/checksum/utils.groovy @@ -33,7 +33,6 @@ def generatelist(checksummable) { echo "Checksumming ${filepath}" def files = findFiles(glob: filepath) for (file in files) { - echo "Checksumming ${file.path}" if (isUnix()) { sh """#!/bin/bash "${SHA256SUM}" "${file.path}" >> "${CHECKSUMFOLDER}/sha256sum_list" diff --git a/publishing/utils.groovy b/publishing/utils.groovy index 2fdbb73..3fcb1f3 100644 --- a/publishing/utils.groovy +++ b/publishing/utils.groovy @@ -20,4 +20,6 @@ def generatelist(publishable) { def outJson = readJSON text: groovy.json.JsonOutput.toJson(filelist) def PUBLISHABLEFILE = "${PUBLISHABLEFOLDER}/list.json" writeJSON(file: PUBLISHABLEFILE, json: outJson, pretty: 4) -} \ No newline at end of file +} + +return this; From 86c18871e6641998816aecbf3cd3461059f970f7 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sun, 18 Nov 2018 09:48:30 +0000 Subject: [PATCH 039/237] Create a meta folder seperate from other artifacts --- checksum/utils.groovy | 3 ++- publishing/utils.groovy | 3 ++- versionnumbering/metaversion.groovy | 10 ---------- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/checksum/utils.groovy b/checksum/utils.groovy index ccf74db..88496b8 100644 --- a/checksum/utils.groovy +++ b/checksum/utils.groovy @@ -1,5 +1,6 @@ -env.CHECKSUMARTIFACTS = "checksums/**" +def metafolder = load("${autobuilder.commonscripts()}/meta/folder.groovy") +env.CHECKSUMARTIFACTS = "${metafolder.METAFOLDERNAME}/checksums/**" // SHA256SUM environment variable must be set to sha256sum utility // Generate a checksum file of from a list of files/directories relative to workspace diff --git a/publishing/utils.groovy b/publishing/utils.groovy index 3fcb1f3..42ebced 100644 --- a/publishing/utils.groovy +++ b/publishing/utils.groovy @@ -1,5 +1,6 @@ -env.PUBLISHABLEARTIFACTS = "publishable/**" +def metafolder = load("${autobuilder.commonscripts()}/meta/folder.groovy") +env.PUBLISHABLEARTIFACTS = "${metafolder.METAFOLDERNAME}/publishable/**" // Generate a list of artifact files that are publishable to outside parties def generatelist(publishable) { diff --git a/versionnumbering/metaversion.groovy b/versionnumbering/metaversion.groovy index ff20a86..44bfbde 100644 --- a/versionnumbering/metaversion.groovy +++ b/versionnumbering/metaversion.groovy @@ -2,16 +2,6 @@ def lineendings = load("${autobuilder.commonscripts()}/platform/lineendings.groovy") def fileutils = load("${autobuilder.commonscripts()}/file/utils.groovy") -def currentContents(file, newline = "\n", defaultContents = "") { - if (fileExists("${file}")) { - contents = readFile(file: "${file}").trim() + newline - } - else { - contents = defaultContents - } - return contents -} - def prefixline(rootpath, filepath) { def fileContents = readFile("${filepath}").trim() def fileContentsNormalized = fileContents.normalize() From 64023d515fc0460ba32cfa5cbb1fead0efa3015a Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sun, 18 Nov 2018 13:24:08 +0000 Subject: [PATCH 040/237] Create a meta folder seperate from other artifacts --- meta/folder.groovy | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 meta/folder.groovy diff --git a/meta/folder.groovy b/meta/folder.groovy new file mode 100644 index 0000000..d7c91ef --- /dev/null +++ b/meta/folder.groovy @@ -0,0 +1,10 @@ + +METAFOLDERNAME = "meta" + +def reset() { + dir("${WORKSPACE}/${METAFOLDERNAME}") { + deleteDir() + } +} + +return this; \ No newline at end of file From d835cd4a1b02c781eaeee3751c97fc66988f85c9 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sun, 18 Nov 2018 13:33:10 +0000 Subject: [PATCH 041/237] Create a meta folder seperate from other artifacts --- meta/folder.groovy | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/folder.groovy b/meta/folder.groovy index d7c91ef..2f4aaa3 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -2,6 +2,7 @@ METAFOLDERNAME = "meta" def reset() { + echo "Resetting meta folder" dir("${WORKSPACE}/${METAFOLDERNAME}") { deleteDir() } From 20697c05f1b45b686302ef82f2139d99dbe51d92 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sun, 18 Nov 2018 13:43:54 +0000 Subject: [PATCH 042/237] Create a meta folder seperate from other artifacts --- checksum/utils.groovy | 2 +- publishing/utils.groovy | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/checksum/utils.groovy b/checksum/utils.groovy index 88496b8..02a11e0 100644 --- a/checksum/utils.groovy +++ b/checksum/utils.groovy @@ -25,7 +25,7 @@ def generatelist(checksummable) { if (!sha256sumfound) { error "Please define the path to a sha256sum utility in the SHA256SUM environment variable" } - def CHECKSUMFOLDER = "${WORKSPACE}/checksums" + def CHECKSUMFOLDER = "${WORKSPACE}/${metafolder.METAFOLDERNAME}/checksums" sh """ rm -rf "${CHECKSUMFOLDER}" mkdir -p "${CHECKSUMFOLDER}" diff --git a/publishing/utils.groovy b/publishing/utils.groovy index 42ebced..df7697c 100644 --- a/publishing/utils.groovy +++ b/publishing/utils.groovy @@ -4,7 +4,7 @@ env.PUBLISHABLEARTIFACTS = "${metafolder.METAFOLDERNAME}/publishable/**" // Generate a list of artifact files that are publishable to outside parties def generatelist(publishable) { - def PUBLISHABLEFOLDER = "${WORKSPACE}/publishable" + def PUBLISHABLEFOLDER = "${WORKSPACE}/${metafolder.METAFOLDERNAME}/publishable" sh """ rm -rf "${PUBLISHABLEFOLDER}" mkdir -p "${PUBLISHABLEFOLDER}" From 430fb3349644468bfc03a755894f57556171f627 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sun, 18 Nov 2018 13:46:49 +0000 Subject: [PATCH 043/237] Create a meta folder seperate from other artifacts --- checksum/utils.groovy | 2 +- publishing/utils.groovy | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/checksum/utils.groovy b/checksum/utils.groovy index 02a11e0..5ec5ba9 100644 --- a/checksum/utils.groovy +++ b/checksum/utils.groovy @@ -1,5 +1,5 @@ -def metafolder = load("${autobuilder.commonscripts()}/meta/folder.groovy") +metafolder = load("${autobuilder.commonscripts()}/meta/folder.groovy") env.CHECKSUMARTIFACTS = "${metafolder.METAFOLDERNAME}/checksums/**" // SHA256SUM environment variable must be set to sha256sum utility diff --git a/publishing/utils.groovy b/publishing/utils.groovy index df7697c..72c6566 100644 --- a/publishing/utils.groovy +++ b/publishing/utils.groovy @@ -1,5 +1,5 @@ -def metafolder = load("${autobuilder.commonscripts()}/meta/folder.groovy") +metafolder = load("${autobuilder.commonscripts()}/meta/folder.groovy") env.PUBLISHABLEARTIFACTS = "${metafolder.METAFOLDERNAME}/publishable/**" // Generate a list of artifact files that are publishable to outside parties From a4d6817925d8094164e4c9f7eb53d5568c68a571 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sun, 18 Nov 2018 13:57:47 +0000 Subject: [PATCH 044/237] Create a meta folder seperate from other artifacts --- meta/folder.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/folder.groovy b/meta/folder.groovy index 2f4aaa3..ac82af4 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -1,7 +1,7 @@ METAFOLDERNAME = "meta" -def reset() { +def metareset() { echo "Resetting meta folder" dir("${WORKSPACE}/${METAFOLDERNAME}") { deleteDir() From 4d61150d49a920421d46aef3d661630eae2ddb47 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sun, 18 Nov 2018 14:09:47 +0000 Subject: [PATCH 045/237] Create a meta folder seperate from other artifacts --- autobuilder.groovy | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/autobuilder.groovy b/autobuilder.groovy index fd15492..89e2444 100644 --- a/autobuilder.groovy +++ b/autobuilder.groovy @@ -8,7 +8,7 @@ def conditionalclean(doclean = "${CLEAN_WORKSPACE}" == "true") { if (doclean) { echo "Cleaning workspace" // Save any script files that were loaded into the workspace at first and are required after cleaning the workspace - stash allowEmpty: true, includes: 'autobuild/**/*', name: 'Clean workspace stash', useDefaultExcludes: false + stash allowEmpty: true, includes: 'autobuild/**', name: 'Clean workspace stash', useDefaultExcludes: false cleanWs() unstash name: 'Clean workspace stash' } @@ -17,21 +17,6 @@ def conditionalclean(doclean = "${CLEAN_WORKSPACE}" == "true") { } } -// Start up boilderplate -def start(autobuildpath = "${WORKSPACE}/autobuild", commonscriptspath = "${autobuildroot}/Common_scripts") { - echo "Starting...." - - autobuildroot = autobuildpath - commonscriptsroot = commonscriptspath - - conditionalclean() - - lineendings = load("${commonscriptsroot}/platform/lineendings.groovy") - - def ch = load("${commonscriptsroot}/configuration/configuration.groovy") - ch.registerPipelineScriptConfiguration() -} - def commonscripts() { return commonscriptsroot } @@ -40,6 +25,24 @@ def getautobuildpath() { return autobuildroot } +// Start up boilderplate +def start(autobuildpath = autobuildroot, commonscriptspath = commonscriptsroot { + echo "Starting...." + + autobuildroot = autobuildpath + commonscriptsroot = commonscriptspath + + conditionalclean() + + def metafolder = load("${commonscripts()}/meta/folder.groovy") + metafolder.metareset() + + def lineendings = load("${commonscripts()}/platform/lineendings.groovy") + + def ch = load("${commonscripts()}/configuration/configuration.groovy") + ch.registerPipelineScriptConfiguration() +} + def configurationhelper() { return load("${commonscripts()}/configuration/configuration.groovy") } From ec457ffa08b034b2f6baa2db9a2661a57468574e Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sun, 18 Nov 2018 14:11:49 +0000 Subject: [PATCH 046/237] Create a meta folder seperate from other artifacts --- autobuilder.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autobuilder.groovy b/autobuilder.groovy index 89e2444..ef5ea7c 100644 --- a/autobuilder.groovy +++ b/autobuilder.groovy @@ -26,7 +26,7 @@ def getautobuildpath() { } // Start up boilderplate -def start(autobuildpath = autobuildroot, commonscriptspath = commonscriptsroot { +def start(autobuildpath = autobuildroot, commonscriptspath = commonscriptsroot) { echo "Starting...." autobuildroot = autobuildpath From de74aae7682505e2c6f1ecbcbb8da7b4c6138cd6 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sun, 18 Nov 2018 14:25:55 +0000 Subject: [PATCH 047/237] Create a meta folder seperate from other artifacts --- autobuilder.groovy | 2 -- versionnumbering/generate.groovy | 12 ++++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/autobuilder.groovy b/autobuilder.groovy index ef5ea7c..bff3738 100644 --- a/autobuilder.groovy +++ b/autobuilder.groovy @@ -37,8 +37,6 @@ def start(autobuildpath = autobuildroot, commonscriptspath = commonscriptsroot) def metafolder = load("${commonscripts()}/meta/folder.groovy") metafolder.metareset() - def lineendings = load("${commonscripts()}/platform/lineendings.groovy") - def ch = load("${commonscripts()}/configuration/configuration.groovy") ch.registerPipelineScriptConfiguration() } diff --git a/versionnumbering/generate.groovy b/versionnumbering/generate.groovy index cb5e944..935f026 100644 --- a/versionnumbering/generate.groovy +++ b/versionnumbering/generate.groovy @@ -1,9 +1,11 @@ -env.VERSIONARTIFACTS = "version/**" -VERSIONFOLDER = "${WORKSPACE}/version" +metafolder = load("${autobuilder.commonscripts()}/meta/folder.groovy") + +env.VERSIONARTIFACTS = "${metafolder.METAFOLDERNAME}/version/**" +VERSIONFOLDER = "${WORKSPACE}/${metafolder.METAFOLDERNAME}/version" def generate(sourcerevision, sourcepath, basebuildnumber = "1000", releasejobname = "", versionfolder = "${VERSIONFOLDER}", jobname = "${JOB_NAME}", buildid = "${BUILD_ID}") { - cs = autobuilder.commonscripts() + def cs = autobuilder.commonscripts() if (isUnix()) { sh """ "${PYTHON}" -u "${cs}/versionnumbering/versioninfo.py" -s "${sourcerevision}" -v "${versionfolder}" -g "${sourcepath}" -b "${basebuildnumber}" -j "${jobname}" -n "${buildid}" -r "${releasejobname}" @@ -17,7 +19,9 @@ def generate(sourcerevision, sourcepath, basebuildnumber = "1000", releasejobnam env.BUILD_STAMP = readFile("${VERSIONFOLDER}/buildstamp.txt").trim() env.BUILD_STAMP_COMMA_SEP = readFile("${VERSIONFOLDER}/buildstampcommasep.txt").trim() env.SRC_REVISION = readFile("${VERSIONFOLDER}/revision.txt").trim() - configurationhelper.saveConfigurationInVersionInfo(); + + def ch = load("${commonscripts()}/configuration/configuration.groovy") + ch.saveConfigurationInVersionInfo(); } return this; From a59b2c5a58fd6013aa50facb7551aa36cf88aab8 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sun, 18 Nov 2018 14:45:45 +0000 Subject: [PATCH 048/237] Create a meta folder seperate from other artifacts --- autobuilder.groovy | 3 +++ differences/do.groovy | 3 +++ 2 files changed, 6 insertions(+) diff --git a/autobuilder.groovy b/autobuilder.groovy index bff3738..090c0f4 100644 --- a/autobuilder.groovy +++ b/autobuilder.groovy @@ -45,4 +45,7 @@ def configurationhelper() { return load("${commonscripts()}/configuration/configuration.groovy") } +// Everyone wants to know this +autobuilder = this + return this; diff --git a/differences/do.groovy b/differences/do.groovy index b3039a9..7a550a9 100644 --- a/differences/do.groovy +++ b/differences/do.groovy @@ -1,4 +1,7 @@ +metafolder = load("${autobuilder.commonscripts()}/meta/folder.groovy") +env.DIFFERENCEARTIFACTS = "${metafolder.METAFOLDERNAME}/differences/**" + def differences(sourcerevision, previoussourcerevision, sourcepath, jirakey, versionfolder = "${WORKSPACE}/version") { cs = autobuilder.commonscripts() From 11d9fc7ee7386a495d88ac4f397967ed71dacb71 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sun, 18 Nov 2018 14:48:52 +0000 Subject: [PATCH 049/237] Create a meta folder seperate from other artifacts --- versionnumbering/generate.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versionnumbering/generate.groovy b/versionnumbering/generate.groovy index 935f026..f0f93be 100644 --- a/versionnumbering/generate.groovy +++ b/versionnumbering/generate.groovy @@ -20,7 +20,7 @@ def generate(sourcerevision, sourcepath, basebuildnumber = "1000", releasejobnam env.BUILD_STAMP_COMMA_SEP = readFile("${VERSIONFOLDER}/buildstampcommasep.txt").trim() env.SRC_REVISION = readFile("${VERSIONFOLDER}/revision.txt").trim() - def ch = load("${commonscripts()}/configuration/configuration.groovy") + def ch = load("${cs}/configuration/configuration.groovy") ch.saveConfigurationInVersionInfo(); } From 387b799b47c8af15f9c8308b37fe5dfe4b79a797 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sun, 18 Nov 2018 15:16:23 +0000 Subject: [PATCH 050/237] Create a meta folder seperate from other artifacts --- checksum/utils.groovy | 41 +++---------------------- differences/do.groovy | 6 ++-- differences/show_release_differences.py | 20 ++++++------ meta/folder.groovy | 1 + 4 files changed, 19 insertions(+), 49 deletions(-) diff --git a/checksum/utils.groovy b/checksum/utils.groovy index 5ec5ba9..add3a50 100644 --- a/checksum/utils.groovy +++ b/checksum/utils.groovy @@ -2,50 +2,19 @@ metafolder = load("${autobuilder.commonscripts()}/meta/folder.groovy") env.CHECKSUMARTIFACTS = "${metafolder.METAFOLDERNAME}/checksums/**" -// SHA256SUM environment variable must be set to sha256sum utility // Generate a checksum file of from a list of files/directories relative to workspace def generatelist(checksummable) { - def sha256sumfound = false - if (env.SHA256SUM) { - if (fileExists("${SHA256SUM}")) { - sha256sumfound = true - } - } - if (!sha256sumfound) - { - if (isUnix()) { - def sha256sumpath = sh(returnStdout: true, script: 'which sha256sum').trim() - if (sha256sumpath) { - echo "Found sha256sum executable here: ${sha256sumpath}" - env.SHA256SUM = sha256sumpath - sha256sumfound = true - } - } - } - if (!sha256sumfound) { - error "Please define the path to a sha256sum utility in the SHA256SUM environment variable" - } - def CHECKSUMFOLDER = "${WORKSPACE}/${metafolder.METAFOLDERNAME}/checksums" - sh """ - rm -rf "${CHECKSUMFOLDER}" - mkdir -p "${CHECKSUMFOLDER}" - """ + sums = "" for (filepath in checksummable) { echo "Checksumming ${filepath}" def files = findFiles(glob: filepath) for (file in files) { - if (isUnix()) { - sh """#!/bin/bash - "${SHA256SUM}" "${file.path}" >> "${CHECKSUMFOLDER}/sha256sum_list" - """ - } - else { - bat """ - "${SHA256SUM}" "${file.path}" >> "${CHECKSUMFOLDER}/sha256sum_list" - """ - } + def sum = sha1(file: file.path) + echo "Sum from file ${file.path} is ${sum}" + sums += "${sum}${nl}" } } + writeFile(file: "${CHECKSUMFOLDER}/sha1sumlist.txt", text: sums) } return this; diff --git a/differences/do.groovy b/differences/do.groovy index 7a550a9..8866400 100644 --- a/differences/do.groovy +++ b/differences/do.groovy @@ -2,17 +2,17 @@ metafolder = load("${autobuilder.commonscripts()}/meta/folder.groovy") env.DIFFERENCEARTIFACTS = "${metafolder.METAFOLDERNAME}/differences/**" -def differences(sourcerevision, previoussourcerevision, sourcepath, jirakey, versionfolder = "${WORKSPACE}/version") { +def differences(sourcerevision, previoussourcerevision, sourcepath, jirakey, difffolder = "${DIFFERENCEARTIFACTS}") { cs = autobuilder.commonscripts() if (isUnix()) { sh """ - "${PYTHON}" -u "${cs}/differences/show_release_differences.py" -g "${sourcepath}" -s "${sourcerevision}" -p "${previoussourcerevision}" -j "${jirakey}" -o "opposite notcommon" -v "${versionfolder}" + "${PYTHON}" -u "${cs}/differences/show_release_differences.py" -g "${sourcepath}" -s "${sourcerevision}" -p "${previoussourcerevision}" -j "${jirakey}" -o "opposite notcommon" -d "${difffolder}" """ } else { bat """ - "${PYTHON}" -u "${cs}\\differences\\show_release_differences.py" -g "${sourcepath}" -s "${sourcerevision}" -p "${previoussourcerevision}" -j "${jirakey}" -o "opposite notcommon" -v "${versionfolder}" + "${PYTHON}" -u "${cs}\\differences\\show_release_differences.py" -g "${sourcepath}" -s "${sourcerevision}" -p "${previoussourcerevision}" -j "${jirakey}" -o "opposite notcommon" -d "${difffolder}" """ } } diff --git a/differences/show_release_differences.py b/differences/show_release_differences.py index 2d3ee0d..0813356 100644 --- a/differences/show_release_differences.py +++ b/differences/show_release_differences.py @@ -29,9 +29,9 @@ class GitException(Exception): def __repr__(self): return self.message -def makeFolder(versionfolder): - print("Creating folder (if not already there): {0}".format(versionfolder)) - os.makedirs(versionfolder, exist_ok = True) +def makeFolder(difffolder): + print("Creating folder (if not already there): {0}".format(difffolder)) + os.makedirs(difffolder, exist_ok = True) def printDivider(outfh, times = 1, length = 100): for _ in range(times): @@ -172,7 +172,7 @@ USAGE parser.add_argument("-p", "--previousversion", dest="previousversion", action="store", default="origin/master", help="source branch or tag to compare with [default: %(default)s]") parser.add_argument("-j", "--jirakeyprefix", dest="jirakeyprefix", action="store", default="GIS", help="jira key prefix [default: %(default)s]") parser.add_argument("-o", "--outputoptions", dest="outputoptions", action="store", default="", help="output options: Can be: opposite notcommon [default: %(default)s]") - parser.add_argument("-v", "--versionfolder", dest="versionfolder", action="store", default="", help="version folder where differences file stored [default: %(default)s]") + parser.add_argument("-d", "--difffolder", dest="difffolder", action="store", default="", help="folder where differences file stored [default: %(default)s]") # Process arguments args = parser.parse_args() @@ -183,14 +183,14 @@ USAGE previousversion = args.previousversion jirakeyprefix = args.jirakeyprefix outputoptions = args.outputoptions - versionfolder = args.versionfolder + difffolder = args.difffolder print("Git root:", gitrootfolder, "Source version:", sourceversion, "Previous source version:", previousversion) - print("Jira key prefix:", jirakeyprefix, "Output options:", outputoptions, "Version folder:", versionfolder) + print("Jira key prefix:", jirakeyprefix, "Output options:", outputoptions, "Version folder:", difffolder) - if versionfolder: - makeFolder(versionfolder) - outfh = open(os.path.join(versionfolder, "differences.txt"), 'w') + if difffolder: + makeFolder(difffolder) + outfh = open(os.path.join(difffolder, "differences.txt"), 'w') else: outfh = sys.stdout @@ -209,7 +209,7 @@ USAGE gitlog = getGitLogDifferences(outfh, gitrootfolder, sourceversion, previousversion, tripledot = True) showDifferences(processLog(gitlog, jirakeyprefix), jirakeyprefix, outfh) - if versionfolder: + if difffolder: outfh.close() return 0 except Exception as e: diff --git a/meta/folder.groovy b/meta/folder.groovy index ac82af4..6b0b21c 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -1,5 +1,6 @@ METAFOLDERNAME = "meta" +env.METAARTIFACTS = "${METAFOLDERNAME}/**" def metareset() { echo "Resetting meta folder" From 552370f9c1126e45b772762b274462ad26bd412b Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sun, 18 Nov 2018 15:23:39 +0000 Subject: [PATCH 051/237] Create a meta folder seperate from other artifacts --- checksum/utils.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checksum/utils.groovy b/checksum/utils.groovy index add3a50..ec3b10a 100644 --- a/checksum/utils.groovy +++ b/checksum/utils.groovy @@ -4,14 +4,14 @@ env.CHECKSUMARTIFACTS = "${metafolder.METAFOLDERNAME}/checksums/**" // Generate a checksum file of from a list of files/directories relative to workspace def generatelist(checksummable) { + load("${autobuilder.commonscripts()}/platform/lineendings.groovy") sums = "" for (filepath in checksummable) { echo "Checksumming ${filepath}" def files = findFiles(glob: filepath) for (file in files) { def sum = sha1(file: file.path) - echo "Sum from file ${file.path} is ${sum}" - sums += "${sum}${nl}" + sums += "${sum} ${file.path}${nl}" // Format suitable for sha1sum utility } } writeFile(file: "${CHECKSUMFOLDER}/sha1sumlist.txt", text: sums) From 92e52dac5af83f9d04cec0f8abbe673cea445bf3 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sun, 18 Nov 2018 15:27:40 +0000 Subject: [PATCH 052/237] Create a meta folder seperate from other artifacts --- checksum/utils.groovy | 1 + versionnumbering/generate.groovy | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/checksum/utils.groovy b/checksum/utils.groovy index ec3b10a..748472f 100644 --- a/checksum/utils.groovy +++ b/checksum/utils.groovy @@ -1,6 +1,7 @@ metafolder = load("${autobuilder.commonscripts()}/meta/folder.groovy") env.CHECKSUMARTIFACTS = "${metafolder.METAFOLDERNAME}/checksums/**" +CHECKSUMFOLDER = "${metafolder.METAFOLDERNAME}/checksums" // Generate a checksum file of from a list of files/directories relative to workspace def generatelist(checksummable) { diff --git a/versionnumbering/generate.groovy b/versionnumbering/generate.groovy index f0f93be..cdcf1c2 100644 --- a/versionnumbering/generate.groovy +++ b/versionnumbering/generate.groovy @@ -1,6 +1,5 @@ metafolder = load("${autobuilder.commonscripts()}/meta/folder.groovy") - env.VERSIONARTIFACTS = "${metafolder.METAFOLDERNAME}/version/**" VERSIONFOLDER = "${WORKSPACE}/${metafolder.METAFOLDERNAME}/version" From 0ad7692aed22ea93a9bd3e9b956c96e23cffbd27 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sun, 18 Nov 2018 15:36:24 +0000 Subject: [PATCH 053/237] Create a meta folder seperate from other artifacts --- differences/do.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/differences/do.groovy b/differences/do.groovy index 8866400..9e572af 100644 --- a/differences/do.groovy +++ b/differences/do.groovy @@ -1,10 +1,10 @@ metafolder = load("${autobuilder.commonscripts()}/meta/folder.groovy") env.DIFFERENCEARTIFACTS = "${metafolder.METAFOLDERNAME}/differences/**" +DIFFERENCEFOLDER = "${WORKSPACE}/${metafolder.METAFOLDERNAME}/differences" -def differences(sourcerevision, previoussourcerevision, sourcepath, jirakey, difffolder = "${DIFFERENCEARTIFACTS}") { +def differences(sourcerevision, previoussourcerevision, sourcepath, jirakey, difffolder = "${DIFFERENCEFOLDER}") { cs = autobuilder.commonscripts() - if (isUnix()) { sh """ "${PYTHON}" -u "${cs}/differences/show_release_differences.py" -g "${sourcepath}" -s "${sourcerevision}" -p "${previoussourcerevision}" -j "${jirakey}" -o "opposite notcommon" -d "${difffolder}" From c04c82be175e05d9cbe7bc8f37f3d22538097a6b Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sun, 18 Nov 2018 21:23:41 +0000 Subject: [PATCH 054/237] Create a meta folder seperate from other artifacts --- autobuilder.groovy | 5 ++++- product/info.groovy | 16 ++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 product/info.groovy diff --git a/autobuilder.groovy b/autobuilder.groovy index 090c0f4..fc298ba 100644 --- a/autobuilder.groovy +++ b/autobuilder.groovy @@ -26,7 +26,7 @@ def getautobuildpath() { } // Start up boilderplate -def start(autobuildpath = autobuildroot, commonscriptspath = commonscriptsroot) { +def start(productname = "", jirakey = "", autobuildpath = autobuildroot, commonscriptspath = commonscriptsroot) { echo "Starting...." autobuildroot = autobuildpath @@ -37,6 +37,9 @@ def start(autobuildpath = autobuildroot, commonscriptspath = commonscriptsroot) def metafolder = load("${commonscripts()}/meta/folder.groovy") metafolder.metareset() + def productinfo = load("${commonscripts()}/product/info.groovy") + productinfo.setname(productname, jirakey) + def ch = load("${commonscripts()}/configuration/configuration.groovy") ch.registerPipelineScriptConfiguration() } diff --git a/product/info.groovy b/product/info.groovy new file mode 100644 index 0000000..c41fc80 --- /dev/null +++ b/product/info.groovy @@ -0,0 +1,16 @@ + +metafolder = load("${autobuilder.commonscripts()}/meta/folder.groovy") +PRODUCTFOLDER = "${metafolder.METAFOLDERNAME}/product" +env.PRODUCTARTIFACTS = "${PRODUCTFOLDER}/**" + +def setname(productname = "", jirakey = "") { + def productdata = [ + 'name' : productname.trim(), + 'jirakey' : jirakey.trim() + ] + def outJson = readJSON text: groovy.json.JsonOutput.toJson(productdata) + def PRODUCTFILE = "${PRODUCTFOLDER}/info.json" + writeJSON(file: PRODUCTFILE, json: outJson, pretty: 4) +} + +return this; \ No newline at end of file From 0b491063dcd3de67fbe2c5e3543314ceb0d3f818 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Mon, 19 Nov 2018 10:52:04 +0000 Subject: [PATCH 055/237] Create a meta folder seperate from other artifacts --- autobuilder.groovy | 4 ++-- product/info.groovy | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/autobuilder.groovy b/autobuilder.groovy index fc298ba..ae3af20 100644 --- a/autobuilder.groovy +++ b/autobuilder.groovy @@ -26,7 +26,7 @@ def getautobuildpath() { } // Start up boilderplate -def start(productname = "", jirakey = "", autobuildpath = autobuildroot, commonscriptspath = commonscriptsroot) { +def start(productname = PRODUCT_NAME, subcomponentname = SUBCOMPONENT_NAME, jirakey = JIRA_KEY, autobuildpath = autobuildroot, commonscriptspath = commonscriptsroot) { echo "Starting...." autobuildroot = autobuildpath @@ -38,7 +38,7 @@ def start(productname = "", jirakey = "", autobuildpath = autobuildroot, commons metafolder.metareset() def productinfo = load("${commonscripts()}/product/info.groovy") - productinfo.setname(productname, jirakey) + productinfo.setname(productname, subcomponentname, jirakey) def ch = load("${commonscripts()}/configuration/configuration.groovy") ch.registerPipelineScriptConfiguration() diff --git a/product/info.groovy b/product/info.groovy index c41fc80..05ed92a 100644 --- a/product/info.groovy +++ b/product/info.groovy @@ -3,9 +3,10 @@ metafolder = load("${autobuilder.commonscripts()}/meta/folder.groovy") PRODUCTFOLDER = "${metafolder.METAFOLDERNAME}/product" env.PRODUCTARTIFACTS = "${PRODUCTFOLDER}/**" -def setname(productname = "", jirakey = "") { +def setname(productname = PRODUCT_NAME, subcomponentname = SUBCOMPONENT_NAME, jirakey = JIRA_KEY) { def productdata = [ 'name' : productname.trim(), + 'subcomponent' : subcomponentname.trim() 'jirakey' : jirakey.trim() ] def outJson = readJSON text: groovy.json.JsonOutput.toJson(productdata) From f8bfaca3f08583a03dd077920637ef6b912b1a44 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Mon, 19 Nov 2018 10:53:23 +0000 Subject: [PATCH 056/237] Create a meta folder seperate from other artifacts --- product/info.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/product/info.groovy b/product/info.groovy index 05ed92a..a908e7e 100644 --- a/product/info.groovy +++ b/product/info.groovy @@ -6,8 +6,8 @@ env.PRODUCTARTIFACTS = "${PRODUCTFOLDER}/**" def setname(productname = PRODUCT_NAME, subcomponentname = SUBCOMPONENT_NAME, jirakey = JIRA_KEY) { def productdata = [ 'name' : productname.trim(), - 'subcomponent' : subcomponentname.trim() - 'jirakey' : jirakey.trim() + 'subcomponent' : subcomponentname.trim(), + 'jirakey' : jirakey.trim(), ] def outJson = readJSON text: groovy.json.JsonOutput.toJson(productdata) def PRODUCTFILE = "${PRODUCTFOLDER}/info.json" From d1b409b2d49953164cd5f30524832285c8dfd521 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Mon, 19 Nov 2018 14:32:14 +0000 Subject: [PATCH 057/237] Create a meta folder seperate from other artifacts --- product/info.groovy | 40 ++++++++++++--- versionnumbering/generate.groovy | 83 ++++++++++++++++++++++++++++++++ 2 files changed, 116 insertions(+), 7 deletions(-) diff --git a/product/info.groovy b/product/info.groovy index a908e7e..71cf6fa 100644 --- a/product/info.groovy +++ b/product/info.groovy @@ -1,17 +1,43 @@ +load("${autobuilder.commonscripts()}/json/interface.groovy") + metafolder = load("${autobuilder.commonscripts()}/meta/folder.groovy") PRODUCTFOLDER = "${metafolder.METAFOLDERNAME}/product" env.PRODUCTARTIFACTS = "${PRODUCTFOLDER}/**" +class ProductInfo extends JsonSerialised { + private String productname + private String subcomponentname + private String jirakey + + ProductInfo(productName = "", subcomponentName = "", jiraKey = "") { + productname = productName + subcomponentname = subcomponentName + jirakey = jiraKey + } + + def serialisationdata() { + def data = [ + 'productname' : productname, + 'subcomponentname' : subcomponentname, + 'jirakey' : jirakey, + ] + return data + } + + def saveJsonSerialised(String outputfile, int prettylevel = 4) { + def outJson = readJSON text: groovy.json.JsonOutput.toJson(serialisationdata()) + writeJSON(file: outputfile, json: outJson, pretty: prettylevel) + } +} + +theProductInfo = new ProductInfo() + def setname(productname = PRODUCT_NAME, subcomponentname = SUBCOMPONENT_NAME, jirakey = JIRA_KEY) { - def productdata = [ - 'name' : productname.trim(), - 'subcomponent' : subcomponentname.trim(), - 'jirakey' : jirakey.trim(), - ] - def outJson = readJSON text: groovy.json.JsonOutput.toJson(productdata) + theProductInfo = new ProductInfo(productname, subcomponentname, jirakey) + def PRODUCTFILE = "${PRODUCTFOLDER}/info.json" - writeJSON(file: PRODUCTFILE, json: outJson, pretty: 4) + theProductInfo.saveJsonSerialised(PRODUCTFILE) } return this; \ No newline at end of file diff --git a/versionnumbering/generate.groovy b/versionnumbering/generate.groovy index cdcf1c2..ad6214d 100644 --- a/versionnumbering/generate.groovy +++ b/versionnumbering/generate.groovy @@ -3,6 +3,89 @@ metafolder = load("${autobuilder.commonscripts()}/meta/folder.groovy") env.VERSIONARTIFACTS = "${metafolder.METAFOLDERNAME}/version/**" VERSIONFOLDER = "${WORKSPACE}/${metafolder.METAFOLDERNAME}/version" +class GitInfo { + private String sourcepath + private String sourcerevision + private String gitrevision + private String remoteurl + private String remoteinfo +} + +class JenkinsBuildInfo { + private String buildjobname + private int buildnumber + private String buildmachine + private String builddate +} + +class BuildStampInfo { + private String buildstampprefix + private int revision + private String buildstamp + private String buildstampcommasep +} + +class ReleaseInfo { + private String releasejobname +} + +class VersionInfo { + private ComponentInfo componentinfo + private GitInfo gitinfo + private JenkinsBuildInfo jenkinsbuildinfo + private BuildStampInfo buildstampinfo + private ReleaseInfo releaseinfo + + private VersionInfo[] associatedversions +} + + def generate(sourcerevision, sourcepath, basebuildnumber = "1000", releasejobname = "", versionfolder = "${VERSIONFOLDER}", jobname = "${JOB_NAME}", buildid = "${BUILD_ID}") { + + + version.generate("${SOURCE_REVISION}", "${SOURCE_PATH}", "${BASEBUILDNUMBER}", "${RELEASE_JOB_NAME}") + + VersionInfo() { + } + def writeversionfiles(versionfolder, buildjobname, versionprefix, gitrevisioncount, gitrevision, remoteinfo, remoteurl, buildnumber, buildstamp, releasejobname): + with open(os.path.join(versionfolder, "buildjobname.txt"), 'w') as f: + f.write(buildjobname) + + with open(os.path.join(versionfolder, "prefix.txt"), 'w') as f: + f.write(versionprefix) + + with open(os.path.join(versionfolder, "revision.txt"), 'w') as f: + f.write(str(gitrevisioncount)) + + with open(os.path.join(versionfolder, "gitrevision.txt"), 'w') as f: + f.write(gitrevision) + + with open(os.path.join(versionfolder, "remoteinfo.txt"), 'w') as f: + f.write(remoteinfo) + + with open(os.path.join(versionfolder, "remoteurl.txt"), 'w') as f: + f.write(remoteurl) + + with open(os.path.join(versionfolder, "buildnumber.txt"), 'w') as f: + f.write(buildnumber) + + with open(os.path.join(versionfolder, "buildstamp.txt"), 'w') as f: + f.write(buildstamp) + + buildstampcommasep = buildstamp.replace(".", ",") + with open(os.path.join(versionfolder, "buildstampcommasep.txt"), 'w') as f: + f.write(buildstampcommasep) + + with open(os.path.join(versionfolder, "buildmachine.txt"), 'w') as f: + f.write(slaveMachine) + + with open(os.path.join(versionfolder, "builddate.txt"), 'w') as f: + f.write(str(datetime.datetime.now())) + + with open(os.path.join(versionfolder, "releasejobname.txt"), 'w') as f: + f.write(releasejobname) + +} + def generate(sourcerevision, sourcepath, basebuildnumber = "1000", releasejobname = "", versionfolder = "${VERSIONFOLDER}", jobname = "${JOB_NAME}", buildid = "${BUILD_ID}") { def cs = autobuilder.commonscripts() if (isUnix()) { From ae3ad5f31d3b6a57c261b18345069a9f0fa17520 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Mon, 19 Nov 2018 14:34:36 +0000 Subject: [PATCH 058/237] Create a meta folder seperate from other artifacts --- json/interface.groovy | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 json/interface.groovy diff --git a/json/interface.groovy b/json/interface.groovy new file mode 100644 index 0000000..8962578 --- /dev/null +++ b/json/interface.groovy @@ -0,0 +1,7 @@ + +abstract class JsonSerialised { + def serialisationdata() + def saveJsonSerialised(String outputfile, int prettylevel = 4) +} + +return this; From bba686364164d7f8e781837ee06aa068e842d175 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Mon, 19 Nov 2018 14:39:03 +0000 Subject: [PATCH 059/237] Create a meta folder seperate from other artifacts --- product/info.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/product/info.groovy b/product/info.groovy index 71cf6fa..979d0b5 100644 --- a/product/info.groovy +++ b/product/info.groovy @@ -1,5 +1,5 @@ -load("${autobuilder.commonscripts()}/json/interface.groovy") +def ji = load("${autobuilder.commonscripts()}/json/interface.groovy") metafolder = load("${autobuilder.commonscripts()}/meta/folder.groovy") PRODUCTFOLDER = "${metafolder.METAFOLDERNAME}/product" From f8f739e6fdd7b6efad937cc7ea60121541c02fdc Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Mon, 19 Nov 2018 15:22:46 +0000 Subject: [PATCH 060/237] Create a meta folder seperate from other artifacts --- json/interface.groovy | 4 ++-- product/info.groovy | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/json/interface.groovy b/json/interface.groovy index 8962578..d238707 100644 --- a/json/interface.groovy +++ b/json/interface.groovy @@ -1,7 +1,7 @@ abstract class JsonSerialised { - def serialisationdata() - def saveJsonSerialised(String outputfile, int prettylevel = 4) + def serialisationdata(); + def saveJsonSerialised(String outputfile, int prettylevel = 4); } return this; diff --git a/product/info.groovy b/product/info.groovy index 979d0b5..9b2551c 100644 --- a/product/info.groovy +++ b/product/info.groovy @@ -11,6 +11,7 @@ class ProductInfo extends JsonSerialised { private String jirakey ProductInfo(productName = "", subcomponentName = "", jiraKey = "") { + super() productname = productName subcomponentname = subcomponentName jirakey = jiraKey From babca972e743871e9e1178aafc6d4380a2520691 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Mon, 19 Nov 2018 15:25:14 +0000 Subject: [PATCH 061/237] Create a meta folder seperate from other artifacts --- product/info.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/product/info.groovy b/product/info.groovy index 9b2551c..783b84c 100644 --- a/product/info.groovy +++ b/product/info.groovy @@ -5,7 +5,7 @@ metafolder = load("${autobuilder.commonscripts()}/meta/folder.groovy") PRODUCTFOLDER = "${metafolder.METAFOLDERNAME}/product" env.PRODUCTARTIFACTS = "${PRODUCTFOLDER}/**" -class ProductInfo extends JsonSerialised { +class ProductInfo extends ji.JsonSerialised { private String productname private String subcomponentname private String jirakey From 5d05f9baeab64949a471f92cfc315dc72ee7028d Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Mon, 19 Nov 2018 15:26:48 +0000 Subject: [PATCH 062/237] Create a meta folder seperate from other artifacts --- product/info.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/product/info.groovy b/product/info.groovy index 783b84c..8b8d3e2 100644 --- a/product/info.groovy +++ b/product/info.groovy @@ -5,7 +5,7 @@ metafolder = load("${autobuilder.commonscripts()}/meta/folder.groovy") PRODUCTFOLDER = "${metafolder.METAFOLDERNAME}/product" env.PRODUCTARTIFACTS = "${PRODUCTFOLDER}/**" -class ProductInfo extends ji.JsonSerialised { +class ProductInfo { private String productname private String subcomponentname private String jirakey From 210e17c2e88acc28edc3ec3c2fa63da4c8ce77d1 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Mon, 19 Nov 2018 15:29:20 +0000 Subject: [PATCH 063/237] Create a meta folder seperate from other artifacts --- json/interface.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/json/interface.groovy b/json/interface.groovy index d238707..4cd2628 100644 --- a/json/interface.groovy +++ b/json/interface.groovy @@ -1,7 +1,7 @@ abstract class JsonSerialised { - def serialisationdata(); - def saveJsonSerialised(String outputfile, int prettylevel = 4); + abstract void serialisationdata(); + abstract void saveJsonSerialised(String outputfile, int prettylevel = 4); } return this; From 6ed97583368d97dd9badd659c8429a86b94de1e7 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Mon, 19 Nov 2018 15:37:04 +0000 Subject: [PATCH 064/237] Create a meta folder seperate from other artifacts --- product/info.groovy | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/product/info.groovy b/product/info.groovy index 8b8d3e2..536d336 100644 --- a/product/info.groovy +++ b/product/info.groovy @@ -26,9 +26,9 @@ class ProductInfo { return data } - def saveJsonSerialised(String outputfile, int prettylevel = 4) { - def outJson = readJSON text: groovy.json.JsonOutput.toJson(serialisationdata()) - writeJSON(file: outputfile, json: outJson, pretty: prettylevel) + def saveJsonSerialised(script, String outputfile, int prettylevel = 4) { + def outJson = script.readJSON text: groovy.json.JsonOutput.toJson(serialisationdata()) + script.writeJSON(file: outputfile, json: outJson, pretty: prettylevel) } } @@ -38,7 +38,7 @@ def setname(productname = PRODUCT_NAME, subcomponentname = SUBCOMPONENT_NAME, ji theProductInfo = new ProductInfo(productname, subcomponentname, jirakey) def PRODUCTFILE = "${PRODUCTFOLDER}/info.json" - theProductInfo.saveJsonSerialised(PRODUCTFILE) + theProductInfo.saveJsonSerialised(this, PRODUCTFILE) } return this; \ No newline at end of file From bf13a8f5a3b35f461e2fca45c5232055154f1aa5 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Mon, 19 Nov 2018 16:03:24 +0000 Subject: [PATCH 065/237] Create a meta folder seperate from other artifacts --- json/interface.groovy | 26 +++++++++++ versionnumbering/generate.groovy | 75 +------------------------------- 2 files changed, 28 insertions(+), 73 deletions(-) diff --git a/json/interface.groovy b/json/interface.groovy index 4cd2628..fae1fe3 100644 --- a/json/interface.groovy +++ b/json/interface.groovy @@ -4,4 +4,30 @@ abstract class JsonSerialised { abstract void saveJsonSerialised(String outputfile, int prettylevel = 4); } +class GitInfo { + private String sourcepath + private String sourcerevision + private String gitrevision + private String remoteurl + private String remoteinfo +} + +class JenkinsBuildInfo { + private String buildjobname + private int buildnumber + private String buildmachine + private String builddate +} + +class BuildStampInfo { + private String buildstampprefix + private int revision + private String buildstamp + private String buildstampcommasep +} + +class ReleaseInfo { + private String releasejobname +} + return this; diff --git a/versionnumbering/generate.groovy b/versionnumbering/generate.groovy index ad6214d..3d498e9 100644 --- a/versionnumbering/generate.groovy +++ b/versionnumbering/generate.groovy @@ -1,34 +1,10 @@ +def ji = load("${autobuilder.commonscripts()}/json/interface.groovy") + metafolder = load("${autobuilder.commonscripts()}/meta/folder.groovy") env.VERSIONARTIFACTS = "${metafolder.METAFOLDERNAME}/version/**" VERSIONFOLDER = "${WORKSPACE}/${metafolder.METAFOLDERNAME}/version" -class GitInfo { - private String sourcepath - private String sourcerevision - private String gitrevision - private String remoteurl - private String remoteinfo -} - -class JenkinsBuildInfo { - private String buildjobname - private int buildnumber - private String buildmachine - private String builddate -} - -class BuildStampInfo { - private String buildstampprefix - private int revision - private String buildstamp - private String buildstampcommasep -} - -class ReleaseInfo { - private String releasejobname -} - class VersionInfo { private ComponentInfo componentinfo private GitInfo gitinfo @@ -37,53 +13,6 @@ class VersionInfo { private ReleaseInfo releaseinfo private VersionInfo[] associatedversions -} - - def generate(sourcerevision, sourcepath, basebuildnumber = "1000", releasejobname = "", versionfolder = "${VERSIONFOLDER}", jobname = "${JOB_NAME}", buildid = "${BUILD_ID}") { - - - version.generate("${SOURCE_REVISION}", "${SOURCE_PATH}", "${BASEBUILDNUMBER}", "${RELEASE_JOB_NAME}") - - VersionInfo() { - } - def writeversionfiles(versionfolder, buildjobname, versionprefix, gitrevisioncount, gitrevision, remoteinfo, remoteurl, buildnumber, buildstamp, releasejobname): - with open(os.path.join(versionfolder, "buildjobname.txt"), 'w') as f: - f.write(buildjobname) - - with open(os.path.join(versionfolder, "prefix.txt"), 'w') as f: - f.write(versionprefix) - - with open(os.path.join(versionfolder, "revision.txt"), 'w') as f: - f.write(str(gitrevisioncount)) - - with open(os.path.join(versionfolder, "gitrevision.txt"), 'w') as f: - f.write(gitrevision) - - with open(os.path.join(versionfolder, "remoteinfo.txt"), 'w') as f: - f.write(remoteinfo) - - with open(os.path.join(versionfolder, "remoteurl.txt"), 'w') as f: - f.write(remoteurl) - - with open(os.path.join(versionfolder, "buildnumber.txt"), 'w') as f: - f.write(buildnumber) - - with open(os.path.join(versionfolder, "buildstamp.txt"), 'w') as f: - f.write(buildstamp) - - buildstampcommasep = buildstamp.replace(".", ",") - with open(os.path.join(versionfolder, "buildstampcommasep.txt"), 'w') as f: - f.write(buildstampcommasep) - - with open(os.path.join(versionfolder, "buildmachine.txt"), 'w') as f: - f.write(slaveMachine) - - with open(os.path.join(versionfolder, "builddate.txt"), 'w') as f: - f.write(str(datetime.datetime.now())) - - with open(os.path.join(versionfolder, "releasejobname.txt"), 'w') as f: - f.write(releasejobname) - } def generate(sourcerevision, sourcepath, basebuildnumber = "1000", releasejobname = "", versionfolder = "${VERSIONFOLDER}", jobname = "${JOB_NAME}", buildid = "${BUILD_ID}") { From efdf4ae8b854e64b0109205347cb03779a1c3ba1 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Mon, 19 Nov 2018 16:17:20 +0000 Subject: [PATCH 066/237] Create a meta folder seperate from other artifacts --- json/interface.groovy | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/json/interface.groovy b/json/interface.groovy index fae1fe3..c9cd9f9 100644 --- a/json/interface.groovy +++ b/json/interface.groovy @@ -4,7 +4,7 @@ abstract class JsonSerialised { abstract void saveJsonSerialised(String outputfile, int prettylevel = 4); } -class GitInfo { +public class GitInfo { private String sourcepath private String sourcerevision private String gitrevision @@ -12,21 +12,21 @@ class GitInfo { private String remoteinfo } -class JenkinsBuildInfo { +public class JenkinsBuildInfo { private String buildjobname private int buildnumber private String buildmachine private String builddate } -class BuildStampInfo { +public class BuildStampInfo { private String buildstampprefix private int revision private String buildstamp private String buildstampcommasep } -class ReleaseInfo { +public class ReleaseInfo { private String releasejobname } From 7d0b8095a30fde7023129efd378b96a78957e83a Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Mon, 19 Nov 2018 17:30:30 +0000 Subject: [PATCH 067/237] Pass script object to custom objects --- autobuilder.groovy | 4 ++-- product/info.groovy | 14 ++++++++------ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/autobuilder.groovy b/autobuilder.groovy index ae3af20..ffaaf9f 100644 --- a/autobuilder.groovy +++ b/autobuilder.groovy @@ -26,7 +26,7 @@ def getautobuildpath() { } // Start up boilderplate -def start(productname = PRODUCT_NAME, subcomponentname = SUBCOMPONENT_NAME, jirakey = JIRA_KEY, autobuildpath = autobuildroot, commonscriptspath = commonscriptsroot) { +def start(script, productname = PRODUCT_NAME, subcomponentname = SUBCOMPONENT_NAME, jirakey = JIRA_KEY, autobuildpath = autobuildroot, commonscriptspath = commonscriptsroot) { echo "Starting...." autobuildroot = autobuildpath @@ -38,7 +38,7 @@ def start(productname = PRODUCT_NAME, subcomponentname = SUBCOMPONENT_NAME, jira metafolder.metareset() def productinfo = load("${commonscripts()}/product/info.groovy") - productinfo.setname(productname, subcomponentname, jirakey) + productinfo.setname(script, productname, subcomponentname, jirakey) def ch = load("${commonscripts()}/configuration/configuration.groovy") ch.registerPipelineScriptConfiguration() diff --git a/product/info.groovy b/product/info.groovy index 536d336..1e0af6d 100644 --- a/product/info.groovy +++ b/product/info.groovy @@ -5,12 +5,14 @@ metafolder = load("${autobuilder.commonscripts()}/meta/folder.groovy") PRODUCTFOLDER = "${metafolder.METAFOLDERNAME}/product" env.PRODUCTARTIFACTS = "${PRODUCTFOLDER}/**" -class ProductInfo { +class ProductInfo implements Serializable { + private script private String productname private String subcomponentname private String jirakey - ProductInfo(productName = "", subcomponentName = "", jiraKey = "") { + ProductInfo(script, productName = "", subcomponentName = "", jiraKey = "") { + this.script = script super() productname = productName subcomponentname = subcomponentName @@ -26,7 +28,7 @@ class ProductInfo { return data } - def saveJsonSerialised(script, String outputfile, int prettylevel = 4) { + def saveJsonSerialised(String outputfile, int prettylevel = 4) { def outJson = script.readJSON text: groovy.json.JsonOutput.toJson(serialisationdata()) script.writeJSON(file: outputfile, json: outJson, pretty: prettylevel) } @@ -34,11 +36,11 @@ class ProductInfo { theProductInfo = new ProductInfo() -def setname(productname = PRODUCT_NAME, subcomponentname = SUBCOMPONENT_NAME, jirakey = JIRA_KEY) { - theProductInfo = new ProductInfo(productname, subcomponentname, jirakey) +def setname(script, productname = PRODUCT_NAME, subcomponentname = SUBCOMPONENT_NAME, jirakey = JIRA_KEY) { + theProductInfo = new ProductInfo(script, productname, subcomponentname, jirakey) def PRODUCTFILE = "${PRODUCTFOLDER}/info.json" - theProductInfo.saveJsonSerialised(this, PRODUCTFILE) + theProductInfo.saveJsonSerialised(PRODUCTFILE) } return this; \ No newline at end of file From 518b60a5e8f83136d3168b84c2ec993c467fd1fe Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Mon, 19 Nov 2018 17:32:24 +0000 Subject: [PATCH 068/237] Pass script object to custom objects --- product/info.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/product/info.groovy b/product/info.groovy index 1e0af6d..19f5df0 100644 --- a/product/info.groovy +++ b/product/info.groovy @@ -12,8 +12,8 @@ class ProductInfo implements Serializable { private String jirakey ProductInfo(script, productName = "", subcomponentName = "", jiraKey = "") { - this.script = script super() + this.script = script productname = productName subcomponentname = subcomponentName jirakey = jiraKey From ce0643254bbbd99ef8bc4dbdca6eb34136a585c8 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Mon, 19 Nov 2018 17:34:40 +0000 Subject: [PATCH 069/237] Pass script object to custom objects --- product/info.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/product/info.groovy b/product/info.groovy index 19f5df0..78e281a 100644 --- a/product/info.groovy +++ b/product/info.groovy @@ -34,7 +34,7 @@ class ProductInfo implements Serializable { } } -theProductInfo = new ProductInfo() +theProductInfo = null def setname(script, productname = PRODUCT_NAME, subcomponentname = SUBCOMPONENT_NAME, jirakey = JIRA_KEY) { theProductInfo = new ProductInfo(script, productname, subcomponentname, jirakey) From 05284a7607fbf8f3ce9b3b0c560047d576af942d Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Mon, 19 Nov 2018 17:52:07 +0000 Subject: [PATCH 070/237] Pass script object to custom objects --- versionnumbering/generate.groovy | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/versionnumbering/generate.groovy b/versionnumbering/generate.groovy index 3d498e9..3d35e23 100644 --- a/versionnumbering/generate.groovy +++ b/versionnumbering/generate.groovy @@ -5,8 +5,10 @@ metafolder = load("${autobuilder.commonscripts()}/meta/folder.groovy") env.VERSIONARTIFACTS = "${metafolder.METAFOLDERNAME}/version/**" VERSIONFOLDER = "${WORKSPACE}/${metafolder.METAFOLDERNAME}/version" +def pi = load("${autobuilder.commonscripts()}/product/info.groovy") + class VersionInfo { - private ComponentInfo componentinfo + private ProductInfo productinfo private GitInfo gitinfo private JenkinsBuildInfo jenkinsbuildinfo private BuildStampInfo buildstampinfo From a1a36f47b7d91313a0d30a61aee7f98af34a1be8 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Mon, 19 Nov 2018 18:25:17 +0000 Subject: [PATCH 071/237] Pass script object to custom objects --- json/interface.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/json/interface.groovy b/json/interface.groovy index c9cd9f9..58f9eb7 100644 --- a/json/interface.groovy +++ b/json/interface.groovy @@ -1,5 +1,5 @@ -abstract class JsonSerialised { +abstract class GISJsonSerialised { abstract void serialisationdata(); abstract void saveJsonSerialised(String outputfile, int prettylevel = 4); } From f4753020d9c0e901b0343ac4d7ff195ffc4a40c2 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Tue, 20 Nov 2018 17:18:27 +0000 Subject: [PATCH 072/237] Move meta data to one groovy file because of the difficulty of including/importing groovy classes --- autobuilder.groovy | 6 +- json/interface.groovy | 33 ------ meta/folder.groovy | 180 ++++++++++++++++++++++++++++++- product/info.groovy | 46 -------- versionnumbering/generate.groovy | 13 --- 5 files changed, 181 insertions(+), 97 deletions(-) delete mode 100644 json/interface.groovy delete mode 100644 product/info.groovy diff --git a/autobuilder.groovy b/autobuilder.groovy index ffaaf9f..dfc470b 100644 --- a/autobuilder.groovy +++ b/autobuilder.groovy @@ -35,10 +35,8 @@ def start(script, productname = PRODUCT_NAME, subcomponentname = SUBCOMPONENT_NA conditionalclean() def metafolder = load("${commonscripts()}/meta/folder.groovy") - metafolder.metareset() - - def productinfo = load("${commonscripts()}/product/info.groovy") - productinfo.setname(script, productname, subcomponentname, jirakey) + metafolder.metareset(script) + metafolder.setproductinfo(productname, subcomponentname, jirakey) def ch = load("${commonscripts()}/configuration/configuration.groovy") ch.registerPipelineScriptConfiguration() diff --git a/json/interface.groovy b/json/interface.groovy deleted file mode 100644 index 58f9eb7..0000000 --- a/json/interface.groovy +++ /dev/null @@ -1,33 +0,0 @@ - -abstract class GISJsonSerialised { - abstract void serialisationdata(); - abstract void saveJsonSerialised(String outputfile, int prettylevel = 4); -} - -public class GitInfo { - private String sourcepath - private String sourcerevision - private String gitrevision - private String remoteurl - private String remoteinfo -} - -public class JenkinsBuildInfo { - private String buildjobname - private int buildnumber - private String buildmachine - private String builddate -} - -public class BuildStampInfo { - private String buildstampprefix - private int revision - private String buildstamp - private String buildstampcommasep -} - -public class ReleaseInfo { - private String releasejobname -} - -return this; diff --git a/meta/folder.groovy b/meta/folder.groovy index 6b0b21c..a8bc619 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -2,11 +2,189 @@ METAFOLDERNAME = "meta" env.METAARTIFACTS = "${METAFOLDERNAME}/**" -def metareset() { +class GISJsonSerialised implements Serializable { + protected script + + GISJsonSerialied(script) { + this.script = script + } + + abstract void serialisationdata(); + + def saveJsonSerialised(String outputfile, int prettylevel = 4) { + def outJson = script.readJSON text: groovy.json.JsonOutput.toJson(serialisationdata()) + script.writeJSON(file: outputfile, json: outJson, pretty: prettylevel) + } +} + +class ProductInfo extends GISJsonSerialised { + private String productname + private String subcomponentname + private String jirakey + + def set(script, productname, subcomponentname, jirakey) { + this.productname = productname + this.subcomponentname = subcomponentname + this.jirakey = jiraKey + } + + ProductInfo(script, productname = "", subcomponentname = "", jirakey = "") { + super(script) + set(productname, subcomponentname, jirakey) + } + + def serialisationdata() { + def data = [ + 'productname' : productname, + 'subcomponentname' : subcomponentname, + 'jirakey' : jirakey, + ] + return data + } +} + +class GitInfo extends GISJsonSerialised { + private String sourcepath + private String sourcerevision + private String gitrevision + private String remoteurl + private String remoteinfo + + GitInfo(script, sourcepath = "", sourcerevision = "", gitrevision = "", remoteurl = "", remoteinfo = "") { + super(script) + this.sourcepath = sourcepath + this.sourcerevision = sourcerevision + this.gitrevision = gitrevision + this.remoteurl = remoteurl + this.remoteinfo = remoteinfo + } + + def serialisationdata() { + def data = [ + 'sourcepath' : sourcepath, + 'sourcerevision' : sourcerevision, + 'gitrevision' : gitrevision, + 'remoteurl' : remoteurl, + 'remoteinfo' : remoteinfo, + ] + return data + } +} + +class JenkinsBuildInfo extends GISJsonSerialised { + private String buildjobname + private int buildnumber + private String buildmachine + private String builddate + + JenkinsBuildInfo(script, buildjobname = "", buildnumber = 0, buildmachine = "", builddate = "") { + super(script) + this.buildjobname = buildjobname + this.buildnumber = buildnumber + this.buildmachine = buildmachine + this.builddate = builddate + } + + def serialisationdata() { + def data = [ + 'buildjobname' : buildjobname, + 'buildnumber' : buildnumber, + 'buildmachine' : buildmachine, + 'builddate' : builddate, + ] + return data + } +} + +class BuildStampInfo extends GISJsonSerialised { + private String buildstampprefix + private int revision + private String buildstamp + private String buildstampcommasep + + BuildStampInfo(script, buildstampprefix = "", revision = 0, buildstamp = "", buildstampcommasep = "") { + super(script) + this.buildstampprefix = buildstampprefix + this.revision = revision + this.buildstamp = buildstamp + this.buildstampcommasep = buildstampcommasep + } + + def serialisationdata() { + def data = [ + 'buildstampprefix' : buildstampprefix, + 'revision' : revision, + 'buildstamp' : buildstamp, + 'buildstampcommasep' : buildstampcommasep, + ] + return data + } +} + +class ReleaseInfo extends GISJsonSerialised { + private String releasejobname + + BuildStampInfo(script, releasejobname = "") { + super(script) + this.releasejobname = releasejobname + } + + def serialisationdata() { + def data = [ + 'releasejobname' : releasejobname, + ] + return data + } +} + +class MetaInfo extends GISJsonSerialised { + private ProductInfo productinfo + private GitInfo gitinfo + private JenkinsBuildInfo jenkinsbuildinfo + private BuildStampInfo buildstampinfo + private ReleaseInfo releaseinfo + + private MetaInfo[] associatedmeta + + MetaInfo(script) { + super(script) + productinfo(script) + gitinfo(script) + jenkinsbuildinfo(script) + buildstampinfo(script) + releaseinfo(script) + } + + def serialisationdata() { + def data = [ + 'productinfo' : productinfo.serialisationdata(), + 'gitinfo' : gitinfo.serialisationdata(), + 'jenkinsbuildinfo' : jenkinsbuildinfo.serialisationdata(), + 'buildstampinfo' : buildstampinfo.serialisationdata(), + 'releaseinfo' : releaseinfo.serialisationdata(), + ] + return datasetProductInfo + } + + def setproductinfo(productname, subcomponentname, jirakey) { + productinfo.set(productname, subcomponentname, jirakey) + } + + +MetaInfo theMetaData = new MetaInfo(this) + +def metareset(script) { echo "Resetting meta folder" dir("${WORKSPACE}/${METAFOLDERNAME}") { deleteDir() } + theMetaData = new MetaInfo(this) } +def setproductinfo(productname = PRODUCT_NAME, subcomponentname = SUBCOMPONENT_NAME, jirakey = JIRA_KEY) { + theMetaData.setproductinfo(productname, subcomponentname, jirakey) +} + + + return this; \ No newline at end of file diff --git a/product/info.groovy b/product/info.groovy deleted file mode 100644 index 78e281a..0000000 --- a/product/info.groovy +++ /dev/null @@ -1,46 +0,0 @@ - -def ji = load("${autobuilder.commonscripts()}/json/interface.groovy") - -metafolder = load("${autobuilder.commonscripts()}/meta/folder.groovy") -PRODUCTFOLDER = "${metafolder.METAFOLDERNAME}/product" -env.PRODUCTARTIFACTS = "${PRODUCTFOLDER}/**" - -class ProductInfo implements Serializable { - private script - private String productname - private String subcomponentname - private String jirakey - - ProductInfo(script, productName = "", subcomponentName = "", jiraKey = "") { - super() - this.script = script - productname = productName - subcomponentname = subcomponentName - jirakey = jiraKey - } - - def serialisationdata() { - def data = [ - 'productname' : productname, - 'subcomponentname' : subcomponentname, - 'jirakey' : jirakey, - ] - return data - } - - def saveJsonSerialised(String outputfile, int prettylevel = 4) { - def outJson = script.readJSON text: groovy.json.JsonOutput.toJson(serialisationdata()) - script.writeJSON(file: outputfile, json: outJson, pretty: prettylevel) - } -} - -theProductInfo = null - -def setname(script, productname = PRODUCT_NAME, subcomponentname = SUBCOMPONENT_NAME, jirakey = JIRA_KEY) { - theProductInfo = new ProductInfo(script, productname, subcomponentname, jirakey) - - def PRODUCTFILE = "${PRODUCTFOLDER}/info.json" - theProductInfo.saveJsonSerialised(PRODUCTFILE) -} - -return this; \ No newline at end of file diff --git a/versionnumbering/generate.groovy b/versionnumbering/generate.groovy index 3d35e23..48f8bb6 100644 --- a/versionnumbering/generate.groovy +++ b/versionnumbering/generate.groovy @@ -1,22 +1,9 @@ -def ji = load("${autobuilder.commonscripts()}/json/interface.groovy") - metafolder = load("${autobuilder.commonscripts()}/meta/folder.groovy") -env.VERSIONARTIFACTS = "${metafolder.METAFOLDERNAME}/version/**" VERSIONFOLDER = "${WORKSPACE}/${metafolder.METAFOLDERNAME}/version" def pi = load("${autobuilder.commonscripts()}/product/info.groovy") -class VersionInfo { - private ProductInfo productinfo - private GitInfo gitinfo - private JenkinsBuildInfo jenkinsbuildinfo - private BuildStampInfo buildstampinfo - private ReleaseInfo releaseinfo - - private VersionInfo[] associatedversions -} - def generate(sourcerevision, sourcepath, basebuildnumber = "1000", releasejobname = "", versionfolder = "${VERSIONFOLDER}", jobname = "${JOB_NAME}", buildid = "${BUILD_ID}") { def cs = autobuilder.commonscripts() if (isUnix()) { From df5d11caa3f562bc5062d58aa50cf78b72a7784e Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Tue, 20 Nov 2018 17:37:27 +0000 Subject: [PATCH 073/237] Move meta data to one groovy file because of the difficulty of including/importing groovy classes --- versionnumbering/generate.groovy | 2 -- 1 file changed, 2 deletions(-) diff --git a/versionnumbering/generate.groovy b/versionnumbering/generate.groovy index 48f8bb6..b576201 100644 --- a/versionnumbering/generate.groovy +++ b/versionnumbering/generate.groovy @@ -2,8 +2,6 @@ metafolder = load("${autobuilder.commonscripts()}/meta/folder.groovy") VERSIONFOLDER = "${WORKSPACE}/${metafolder.METAFOLDERNAME}/version" -def pi = load("${autobuilder.commonscripts()}/product/info.groovy") - def generate(sourcerevision, sourcepath, basebuildnumber = "1000", releasejobname = "", versionfolder = "${VERSIONFOLDER}", jobname = "${JOB_NAME}", buildid = "${BUILD_ID}") { def cs = autobuilder.commonscripts() if (isUnix()) { From 6323d8f5ebd5d1775da703bd93aadb78a42e31ff Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Tue, 20 Nov 2018 17:45:39 +0000 Subject: [PATCH 074/237] Move meta data to one groovy file because of the difficulty of including/importing groovy classes --- meta/folder.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/folder.groovy b/meta/folder.groovy index a8bc619..0e800a4 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -3,7 +3,7 @@ METAFOLDERNAME = "meta" env.METAARTIFACTS = "${METAFOLDERNAME}/**" class GISJsonSerialised implements Serializable { - protected script + def script GISJsonSerialied(script) { this.script = script From 397727d4f1bec0be03c5d7feaac10cea5f5a116a Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Tue, 20 Nov 2018 17:47:17 +0000 Subject: [PATCH 075/237] Move meta data to one groovy file because of the difficulty of including/importing groovy classes --- meta/folder.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/folder.groovy b/meta/folder.groovy index 0e800a4..ca4680f 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -5,7 +5,7 @@ env.METAARTIFACTS = "${METAFOLDERNAME}/**" class GISJsonSerialised implements Serializable { def script - GISJsonSerialied(script) { + GISJsonSerialised(script) { this.script = script } From 746838240f0296d955740836debf602c820478a8 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Tue, 20 Nov 2018 17:49:13 +0000 Subject: [PATCH 076/237] Move meta data to one groovy file because of the difficulty of including/importing groovy classes --- meta/folder.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/folder.groovy b/meta/folder.groovy index ca4680f..65d4708 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -124,7 +124,7 @@ class BuildStampInfo extends GISJsonSerialised { class ReleaseInfo extends GISJsonSerialised { private String releasejobname - BuildStampInfo(script, releasejobname = "") { + ReleaseInfo(script, releasejobname = "") { super(script) this.releasejobname = releasejobname } From bba626b4175213c090a813b9560b12bce63630b6 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Tue, 20 Nov 2018 17:51:29 +0000 Subject: [PATCH 077/237] Move meta data to one groovy file because of the difficulty of including/importing groovy classes --- meta/folder.groovy | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/meta/folder.groovy b/meta/folder.groovy index 65d4708..46ae4f3 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -169,7 +169,7 @@ class MetaInfo extends GISJsonSerialised { def setproductinfo(productname, subcomponentname, jirakey) { productinfo.set(productname, subcomponentname, jirakey) } - +} MetaInfo theMetaData = new MetaInfo(this) @@ -185,6 +185,4 @@ def setproductinfo(productname = PRODUCT_NAME, subcomponentname = SUBCOMPONENT_N theMetaData.setproductinfo(productname, subcomponentname, jirakey) } - - return this; \ No newline at end of file From 326a38f0879ebbae0cd1e7743cabd659c8e5e09a Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Tue, 20 Nov 2018 18:03:51 +0000 Subject: [PATCH 078/237] Move meta data to one groovy file because of the difficulty of including/importing groovy classes --- meta/folder.groovy | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/meta/folder.groovy b/meta/folder.groovy index 46ae4f3..f13cdaa 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -2,14 +2,14 @@ METAFOLDERNAME = "meta" env.METAARTIFACTS = "${METAFOLDERNAME}/**" -class GISJsonSerialised implements Serializable { +abstract class GISJsonSerialised implements Serializable { def script GISJsonSerialised(script) { this.script = script } - abstract void serialisationdata(); + abstract Map serialisationdata(); def saveJsonSerialised(String outputfile, int prettylevel = 4) { def outJson = script.readJSON text: groovy.json.JsonOutput.toJson(serialisationdata()) @@ -33,7 +33,7 @@ class ProductInfo extends GISJsonSerialised { set(productname, subcomponentname, jirakey) } - def serialisationdata() { + Map serialisationdata() { def data = [ 'productname' : productname, 'subcomponentname' : subcomponentname, @@ -59,7 +59,7 @@ class GitInfo extends GISJsonSerialised { this.remoteinfo = remoteinfo } - def serialisationdata() { + Map serialisationdata() { def data = [ 'sourcepath' : sourcepath, 'sourcerevision' : sourcerevision, @@ -85,7 +85,7 @@ class JenkinsBuildInfo extends GISJsonSerialised { this.builddate = builddate } - def serialisationdata() { + Map serialisationdata() { def data = [ 'buildjobname' : buildjobname, 'buildnumber' : buildnumber, @@ -110,7 +110,7 @@ class BuildStampInfo extends GISJsonSerialised { this.buildstampcommasep = buildstampcommasep } - def serialisationdata() { + Map serialisationdata() { def data = [ 'buildstampprefix' : buildstampprefix, 'revision' : revision, @@ -129,7 +129,7 @@ class ReleaseInfo extends GISJsonSerialised { this.releasejobname = releasejobname } - def serialisationdata() { + Map serialisationdata() { def data = [ 'releasejobname' : releasejobname, ] @@ -153,15 +153,25 @@ class MetaInfo extends GISJsonSerialised { jenkinsbuildinfo(script) buildstampinfo(script) releaseinfo(script) + associatedmeta = [] } - def serialisationdata() { + List associatedmetaserialised() { + def associated = [] + for (metaitem in associatedmeta) { + associated.add(serialisationdata(metaitem)) + } + return associated + } + + Map serialisationdata() { def data = [ 'productinfo' : productinfo.serialisationdata(), 'gitinfo' : gitinfo.serialisationdata(), 'jenkinsbuildinfo' : jenkinsbuildinfo.serialisationdata(), 'buildstampinfo' : buildstampinfo.serialisationdata(), 'releaseinfo' : releaseinfo.serialisationdata(), + 'associatedmeta' : associatedmetaserialised(), ] return datasetProductInfo } From c48b95b3f692ceb39d81c2409ba39eedf19dff64 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Tue, 20 Nov 2018 18:38:55 +0000 Subject: [PATCH 079/237] Move meta data to one groovy file because of the difficulty of including/importing groovy classes --- meta/folder.groovy | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/meta/folder.groovy b/meta/folder.groovy index f13cdaa..afcd6f7 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -148,11 +148,11 @@ class MetaInfo extends GISJsonSerialised { MetaInfo(script) { super(script) - productinfo(script) - gitinfo(script) - jenkinsbuildinfo(script) - buildstampinfo(script) - releaseinfo(script) + productinfo = new ProductInfo(script) + gitinfo = new GitInfo(script) + jenkinsbuildinfoo = new JenkinsBuildInfo(script) + buildstampinfoo = new BuildStampInfo(script) + releaseinfoo = new ReleaseInfo(script) associatedmeta = [] } From b4dd72684c56a7f4d27d652f85e922c28a9b63ab Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Tue, 20 Nov 2018 18:41:46 +0000 Subject: [PATCH 080/237] Move meta data to one groovy file because of the difficulty of including/importing groovy classes --- meta/folder.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/folder.groovy b/meta/folder.groovy index afcd6f7..ad3636d 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -22,7 +22,7 @@ class ProductInfo extends GISJsonSerialised { private String subcomponentname private String jirakey - def set(script, productname, subcomponentname, jirakey) { + def set(productname, subcomponentname, jirakey) { this.productname = productname this.subcomponentname = subcomponentname this.jirakey = jiraKey From 98311b6e4f2640da54ff0c021867261564e05a94 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Tue, 20 Nov 2018 19:38:29 +0000 Subject: [PATCH 081/237] Move meta data to one groovy file because of the difficulty of including/importing groovy classes --- autobuilder.groovy | 2 +- meta/folder.groovy | 62 ++++++++++++++++++++++++---------------------- 2 files changed, 34 insertions(+), 30 deletions(-) diff --git a/autobuilder.groovy b/autobuilder.groovy index dfc470b..fab812a 100644 --- a/autobuilder.groovy +++ b/autobuilder.groovy @@ -36,7 +36,7 @@ def start(script, productname = PRODUCT_NAME, subcomponentname = SUBCOMPONENT_NA def metafolder = load("${commonscripts()}/meta/folder.groovy") metafolder.metareset(script) - metafolder.setproductinfo(productname, subcomponentname, jirakey) + metafolder.theMetaData.productinfo.set(productname, subcomponentname, jirakey) def ch = load("${commonscripts()}/configuration/configuration.groovy") ch.registerPipelineScriptConfiguration() diff --git a/meta/folder.groovy b/meta/folder.groovy index ad3636d..d4caa5d 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -9,7 +9,7 @@ abstract class GISJsonSerialised implements Serializable { this.script = script } - abstract Map serialisationdata(); + abstract LinkedHashMap serialisationdata(); def saveJsonSerialised(String outputfile, int prettylevel = 4) { def outJson = script.readJSON text: groovy.json.JsonOutput.toJson(serialisationdata()) @@ -22,18 +22,20 @@ class ProductInfo extends GISJsonSerialised { private String subcomponentname private String jirakey + ProductInfo(script, productname = "", subcomponentname = "", jirakey = "") { + super(script) + this.productname = productname + this.subcomponentname = subcomponentname + this.jirakey = jirakey + } + def set(productname, subcomponentname, jirakey) { this.productname = productname this.subcomponentname = subcomponentname - this.jirakey = jiraKey + this.jirakey = jirakey } - ProductInfo(script, productname = "", subcomponentname = "", jirakey = "") { - super(script) - set(productname, subcomponentname, jirakey) - } - - Map serialisationdata() { + LinkedHashMap serialisationdata() { def data = [ 'productname' : productname, 'subcomponentname' : subcomponentname, @@ -59,7 +61,7 @@ class GitInfo extends GISJsonSerialised { this.remoteinfo = remoteinfo } - Map serialisationdata() { + LinkedHashMap serialisationdata() { def data = [ 'sourcepath' : sourcepath, 'sourcerevision' : sourcerevision, @@ -85,7 +87,7 @@ class JenkinsBuildInfo extends GISJsonSerialised { this.builddate = builddate } - Map serialisationdata() { + LinkedHashMap serialisationdata() { def data = [ 'buildjobname' : buildjobname, 'buildnumber' : buildnumber, @@ -110,7 +112,7 @@ class BuildStampInfo extends GISJsonSerialised { this.buildstampcommasep = buildstampcommasep } - Map serialisationdata() { + LinkedHashMap serialisationdata() { def data = [ 'buildstampprefix' : buildstampprefix, 'revision' : revision, @@ -129,7 +131,7 @@ class ReleaseInfo extends GISJsonSerialised { this.releasejobname = releasejobname } - Map serialisationdata() { + LinkedHashMap serialisationdata() { def data = [ 'releasejobname' : releasejobname, ] @@ -138,34 +140,40 @@ class ReleaseInfo extends GISJsonSerialised { } class MetaInfo extends GISJsonSerialised { - private ProductInfo productinfo - private GitInfo gitinfo - private JenkinsBuildInfo jenkinsbuildinfo - private BuildStampInfo buildstampinfo - private ReleaseInfo releaseinfo + private String format = '0.1' + ProductInfo productinfo + GitInfo gitinfo + JenkinsBuildInfo jenkinsbuildinfo + BuildStampInfo buildstampinfo + ReleaseInfo releaseinfo - private MetaInfo[] associatedmeta + private ArrayList associatedmeta MetaInfo(script) { super(script) productinfo = new ProductInfo(script) gitinfo = new GitInfo(script) - jenkinsbuildinfoo = new JenkinsBuildInfo(script) - buildstampinfoo = new BuildStampInfo(script) - releaseinfoo = new ReleaseInfo(script) - associatedmeta = [] + jenkinsbuildinfo = new JenkinsBuildInfo(script) + buildstampinfo = new BuildStampInfo(script) + releaseinfo = new ReleaseInfo(script) + associatedmeta = new ArrayList() } List associatedmetaserialised() { def associated = [] for (metaitem in associatedmeta) { - associated.add(serialisationdata(metaitem)) + associated.add(metaitem.serialisationdata()) } return associated } - Map serialisationdata() { + void addAssociatedMetaInfo(mi) { + associatedmeta.add(mi) + } + + LinkedHashMap serialisationdata() { def data = [ + 'format' : format, 'productinfo' : productinfo.serialisationdata(), 'gitinfo' : gitinfo.serialisationdata(), 'jenkinsbuildinfo' : jenkinsbuildinfo.serialisationdata(), @@ -173,7 +181,7 @@ class MetaInfo extends GISJsonSerialised { 'releaseinfo' : releaseinfo.serialisationdata(), 'associatedmeta' : associatedmetaserialised(), ] - return datasetProductInfo + return data } def setproductinfo(productname, subcomponentname, jirakey) { @@ -191,8 +199,4 @@ def metareset(script) { theMetaData = new MetaInfo(this) } -def setproductinfo(productname = PRODUCT_NAME, subcomponentname = SUBCOMPONENT_NAME, jirakey = JIRA_KEY) { - theMetaData.setproductinfo(productname, subcomponentname, jirakey) -} - return this; \ No newline at end of file From 59d37c79a58e01bef069a8e8f395677395aa8105 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Tue, 20 Nov 2018 20:25:33 +0000 Subject: [PATCH 082/237] Start using meta info for storing configuration --- autobuilder.groovy | 13 ++++---- configuration/configuration.groovy | 33 ++++---------------- meta/folder.groovy | 48 ++++++++++++++++++++++++++---- versionnumbering/generate.groovy | 3 -- 4 files changed, 57 insertions(+), 40 deletions(-) diff --git a/autobuilder.groovy b/autobuilder.groovy index fab812a..a82e891 100644 --- a/autobuilder.groovy +++ b/autobuilder.groovy @@ -4,6 +4,8 @@ autobuildroot = "${WORKSPACE}/autobuild" commonscriptsroot = "${autobuildroot}/Common_scripts" +metafolder = load("${commonscripts()}/meta/folder.groovy") + def conditionalclean(doclean = "${CLEAN_WORKSPACE}" == "true") { if (doclean) { echo "Cleaning workspace" @@ -26,7 +28,7 @@ def getautobuildpath() { } // Start up boilderplate -def start(script, productname = PRODUCT_NAME, subcomponentname = SUBCOMPONENT_NAME, jirakey = JIRA_KEY, autobuildpath = autobuildroot, commonscriptspath = commonscriptsroot) { +MetaInfo start(script, productname = PRODUCT_NAME, subcomponentname = SUBCOMPONENT_NAME, jirakey = JIRA_KEY, autobuildpath = autobuildroot, commonscriptspath = commonscriptsroot) { echo "Starting...." autobuildroot = autobuildpath @@ -34,12 +36,13 @@ def start(script, productname = PRODUCT_NAME, subcomponentname = SUBCOMPONENT_NA conditionalclean() - def metafolder = load("${commonscripts()}/meta/folder.groovy") - metafolder.metareset(script) - metafolder.theMetaData.productinfo.set(productname, subcomponentname, jirakey) + def meta = metafolder.metareset(script) + meta.productinfo.set(productname, subcomponentname, jirakey) def ch = load("${commonscripts()}/configuration/configuration.groovy") - ch.registerPipelineScriptConfiguration() + ch.registerPipelineScriptConfiguration(meta) + + return meta } def configurationhelper() { diff --git a/configuration/configuration.groovy b/configuration/configuration.groovy index 1f0c095..30b7086 100644 --- a/configuration/configuration.groovy +++ b/configuration/configuration.groovy @@ -1,37 +1,16 @@ gh = load("${autobuilder.commonscripts()}/versioncontrol/git.groovy") -configurationCollection = [:] - -def registerConfigurationInfo(String configurationName, String configurationURL, String configurationVersion, String configurationSHA) { - def ConfigurationInfo = [configurationURL, configurationVersion, configurationSHA] - configurationCollection.put(configurationName, ConfigurationInfo) +def registerConfigurationInfo(meta, String configurationName, String configurationURL, String configurationVersion, String configurationSHA) { + meta.addConfigurationInfo(configurationName, configurationURL, configurationVersion, configurationSHA) } -def registerPipelineScriptConfiguration() { - registerConfigurationInfo('pipeline script', '-', '-', gh.getGitInfo("${autobuilder.getautobuildpath()}")) +def registerPipelineScriptConfiguration(meta) { + registerConfigurationInfo(meta, 'pipeline script', '-', '-', gh.getGitInfo("${autobuilder.getautobuildpath()}")) } -def saveConfigurationInVersionInfo() { - dir("${WORKSPACE}/version") { - echo "Writing configuration info to ${WORKSPACE}/version/configuration.txt" - writeFile file: 'configuration.txt', text: getFormattedConfiguration() - } -} - -String getFormattedConfiguration() { - String formattedInfo = "" - def keys = configurationCollection.keySet().sort() - for (key in keys) { - (configurationURL, configurationVersion, configurationSHA) = configurationCollection.get(key) - formattedLine = String.format("%s:%s,%s,%s%n", key, configurationURL, configurationVersion, configurationSHA) - formattedInfo += formattedLine - } - return formattedInfo -} - -def gitCheckoutAndRegister(String tool, String gitURL, String revision, String targetDir, String repoRoot = "", int cloneDepth = 1, boolean shallowClone = true) { +def gitCheckoutAndRegister(meta, String tool, String gitURL, String revision, String targetDir, String repoRoot = "", int cloneDepth = 1, boolean shallowClone = true) { gh.gitCheckout(gitURL, revision, targetDir, repoRoot, cloneDepth, shallowClone) - registerConfigurationInfo(tool, gitURL, revision, gh.getGitInfo(targetDir)) + registerConfigurationInfo(meta, tool, gitURL, revision, gh.getGitInfo(targetDir)) } return this diff --git a/meta/folder.groovy b/meta/folder.groovy index d4caa5d..2963e58 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -139,6 +139,31 @@ class ReleaseInfo extends GISJsonSerialised { } } +class ConfigurationInfo extends GISJsonSerialised { + private String configurationname + private String configurationURL + private String configurationversion + private String configurationSHA + + ConfigurationInfo(script, configurationname = "", configurationURL = "", configurationversion = "", configurationSHA = "") { + super(script) + this.configurationname = configurationname + this.configurationURL = configurationURL + this.configurationversion = configurationversion + this.configurationSHA = configurationSHA + } + + LinkedHashMap serialisationdata() { + def data = [ + 'configurationname' : configurationname, + 'configurationURL' : configurationURL, + 'configurationversion' : configurationversion, + 'configurationSHA' : configurationSHA, + ] + return data + } +} + class MetaInfo extends GISJsonSerialised { private String format = '0.1' ProductInfo productinfo @@ -146,7 +171,7 @@ class MetaInfo extends GISJsonSerialised { JenkinsBuildInfo jenkinsbuildinfo BuildStampInfo buildstampinfo ReleaseInfo releaseinfo - + private ArrayList configurationinfo private ArrayList associatedmeta MetaInfo(script) { @@ -156,9 +181,23 @@ class MetaInfo extends GISJsonSerialised { jenkinsbuildinfo = new JenkinsBuildInfo(script) buildstampinfo = new BuildStampInfo(script) releaseinfo = new ReleaseInfo(script) + configurationinfo = new ArrayList() associatedmeta = new ArrayList() } + List configurationinfoserialised() { + def configuration = [] + for (configurationitem in configurationinfo) { + configuration.add(configurationitem.serialisationdata()) + } + return associated + } + + void addConfigurationInfo(String configurationname, String configurationURL, String configurationversion, String configurationSHA) { + ConfigurationInfo ci = new ConfigurationInfo(script, configurationname, configurationURL, configurationversion, configurationSHA) + configurationinfo.add(ci) + } + List associatedmetaserialised() { def associated = [] for (metaitem in associatedmeta) { @@ -179,6 +218,7 @@ class MetaInfo extends GISJsonSerialised { 'jenkinsbuildinfo' : jenkinsbuildinfo.serialisationdata(), 'buildstampinfo' : buildstampinfo.serialisationdata(), 'releaseinfo' : releaseinfo.serialisationdata(), + 'configuration' : configurationinfoserialised(), 'associatedmeta' : associatedmetaserialised(), ] return data @@ -189,14 +229,12 @@ class MetaInfo extends GISJsonSerialised { } } -MetaInfo theMetaData = new MetaInfo(this) - -def metareset(script) { +MetaInfo metareset(script) { echo "Resetting meta folder" dir("${WORKSPACE}/${METAFOLDERNAME}") { deleteDir() } - theMetaData = new MetaInfo(this) + return new MetaInfo(script) } return this; \ No newline at end of file diff --git a/versionnumbering/generate.groovy b/versionnumbering/generate.groovy index b576201..b99467e 100644 --- a/versionnumbering/generate.groovy +++ b/versionnumbering/generate.groovy @@ -17,9 +17,6 @@ def generate(sourcerevision, sourcepath, basebuildnumber = "1000", releasejobnam env.BUILD_STAMP = readFile("${VERSIONFOLDER}/buildstamp.txt").trim() env.BUILD_STAMP_COMMA_SEP = readFile("${VERSIONFOLDER}/buildstampcommasep.txt").trim() env.SRC_REVISION = readFile("${VERSIONFOLDER}/revision.txt").trim() - - def ch = load("${cs}/configuration/configuration.groovy") - ch.saveConfigurationInVersionInfo(); } return this; From 35ae72bbdbbf7c34bdf47921be41b6b7522c7dd2 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Tue, 20 Nov 2018 20:29:56 +0000 Subject: [PATCH 083/237] Start using meta info for storing configuration --- autobuilder.groovy | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/autobuilder.groovy b/autobuilder.groovy index a82e891..e7943c6 100644 --- a/autobuilder.groovy +++ b/autobuilder.groovy @@ -4,8 +4,6 @@ autobuildroot = "${WORKSPACE}/autobuild" commonscriptsroot = "${autobuildroot}/Common_scripts" -metafolder = load("${commonscripts()}/meta/folder.groovy") - def conditionalclean(doclean = "${CLEAN_WORKSPACE}" == "true") { if (doclean) { echo "Cleaning workspace" @@ -28,7 +26,7 @@ def getautobuildpath() { } // Start up boilderplate -MetaInfo start(script, productname = PRODUCT_NAME, subcomponentname = SUBCOMPONENT_NAME, jirakey = JIRA_KEY, autobuildpath = autobuildroot, commonscriptspath = commonscriptsroot) { +def start(script, productname = PRODUCT_NAME, subcomponentname = SUBCOMPONENT_NAME, jirakey = JIRA_KEY, autobuildpath = autobuildroot, commonscriptspath = commonscriptsroot) { echo "Starting...." autobuildroot = autobuildpath @@ -36,6 +34,7 @@ MetaInfo start(script, productname = PRODUCT_NAME, subcomponentname = SUBCOMPONE conditionalclean() + def metafolder = load("${commonscripts()}/meta/folder.groovy") def meta = metafolder.metareset(script) meta.productinfo.set(productname, subcomponentname, jirakey) From d9b91dee691a29ae78466b8cbc2fd528d9d9a745 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Tue, 20 Nov 2018 22:52:20 +0000 Subject: [PATCH 084/237] Move functionality to meta --- autobuilder.groovy | 5 ++++- meta/folder.groovy | 13 ++++++++++++- versionnumbering/generate.groovy | 32 +++++++++++++++++++++++++++++--- versionnumbering/versioninfo.py | 25 +++---------------------- 4 files changed, 48 insertions(+), 27 deletions(-) diff --git a/autobuilder.groovy b/autobuilder.groovy index e7943c6..3a2a408 100644 --- a/autobuilder.groovy +++ b/autobuilder.groovy @@ -37,7 +37,10 @@ def start(script, productname = PRODUCT_NAME, subcomponentname = SUBCOMPONENT_NA def metafolder = load("${commonscripts()}/meta/folder.groovy") def meta = metafolder.metareset(script) meta.productinfo.set(productname, subcomponentname, jirakey) - + def now = new Date() + now.format("yyMMdd.HHmm", TimeZone.getTimeZone('UTC')) + meta.jenkinsbuildinfo.set(JOB_NAME, BUILD_ID, NODE_NAME, now) + def ch = load("${commonscripts()}/configuration/configuration.groovy") ch.registerPipelineScriptConfiguration(meta) diff --git a/meta/folder.groovy b/meta/folder.groovy index 2963e58..6ae3d3d 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -79,7 +79,7 @@ class JenkinsBuildInfo extends GISJsonSerialised { private String buildmachine private String builddate - JenkinsBuildInfo(script, buildjobname = "", buildnumber = 0, buildmachine = "", builddate = "") { + JenkinsBuildInfo(script, String buildjobname = "", int buildnumber = 0, String buildmachine = "", String builddate = "") { super(script) this.buildjobname = buildjobname this.buildnumber = buildnumber @@ -87,6 +87,13 @@ class JenkinsBuildInfo extends GISJsonSerialised { this.builddate = builddate } + def set(String buildjobname, int buildnumber, String buildmachine, String builddate) { + this.buildjobname = buildjobname + this.buildnumber = buildnumber + this.buildmachine = buildmachine + this.builddate = builddate + } + LinkedHashMap serialisationdata() { def data = [ 'buildjobname' : buildjobname, @@ -131,6 +138,10 @@ class ReleaseInfo extends GISJsonSerialised { this.releasejobname = releasejobname } + def set(releasejobname) { + this.releasejobname = releasejobname + } + LinkedHashMap serialisationdata() { def data = [ 'releasejobname' : releasejobname, diff --git a/versionnumbering/generate.groovy b/versionnumbering/generate.groovy index b99467e..0019b24 100644 --- a/versionnumbering/generate.groovy +++ b/versionnumbering/generate.groovy @@ -2,16 +2,16 @@ metafolder = load("${autobuilder.commonscripts()}/meta/folder.groovy") VERSIONFOLDER = "${WORKSPACE}/${metafolder.METAFOLDERNAME}/version" -def generate(sourcerevision, sourcepath, basebuildnumber = "1000", releasejobname = "", versionfolder = "${VERSIONFOLDER}", jobname = "${JOB_NAME}", buildid = "${BUILD_ID}") { +def generate(meta, sourcerevision, sourcepath, basebuildnumber = "1000", versionfolder = "${VERSIONFOLDER}") { def cs = autobuilder.commonscripts() if (isUnix()) { sh """ - "${PYTHON}" -u "${cs}/versionnumbering/versioninfo.py" -s "${sourcerevision}" -v "${versionfolder}" -g "${sourcepath}" -b "${basebuildnumber}" -j "${jobname}" -n "${buildid}" -r "${releasejobname}" + "${PYTHON}" -u "${cs}/versionnumbering/versioninfo.py" -s "${sourcerevision}" -v "${versionfolder}" -g "${sourcepath}" -b "${basebuildnumber}" """ } else { bat """ - "${PYTHON}" -u "${cs}\\versionnumbering\\versioninfo.py" -s "${sourcerevision}" -v "${versionfolder}" -g "${sourcepath}" -b "${basebuildnumber}" -j "${jobname}" -n "${buildid}" -r "${releasejobname}" + "${PYTHON}" -u "${cs}\\versionnumbering\\versioninfo.py" -s "${sourcerevision}" -v "${versionfolder}" -g "${sourcepath}" -b "${basebuildnumber}" """ } env.BUILD_STAMP = readFile("${VERSIONFOLDER}/buildstamp.txt").trim() @@ -20,3 +20,29 @@ def generate(sourcerevision, sourcepath, basebuildnumber = "1000", releasejobnam } return this; + + +/* + + with open(os.path.join(versionfolder, "prefix.txt"), 'w') as f: + f.write(versionprefix) + + with open(os.path.join(versionfolder, "revision.txt"), 'w') as f: + f.write(str(gitrevisioncount)) + + with open(os.path.join(versionfolder, "gitrevision.txt"), 'w') as f: + f.write(gitrevision) + + with open(os.path.join(versionfolder, "remoteinfo.txt"), 'w') as f: + f.write(remoteinfo) + + with open(os.path.join(versionfolder, "remoteurl.txt"), 'w') as f: + f.write(remoteurl) + + with open(os.path.join(versionfolder, "buildstamp.txt"), 'w') as f: + f.write(buildstamp) + + buildstampcommasep = buildstamp.replace(".", ",") + with open(os.path.join(versionfolder, "buildstampcommasep.txt"), 'w') as f: + f.write(buildstampcommasep) +*/ diff --git a/versionnumbering/versioninfo.py b/versionnumbering/versioninfo.py index 370d9fc..0fa097a 100644 --- a/versionnumbering/versioninfo.py +++ b/versionnumbering/versioninfo.py @@ -24,7 +24,6 @@ __date__ = '2017-11-29' __updated__ = '2017-11-29' gitExecutable = os.getenv("GIT_EXECUTABLE", default="git") -slaveMachine = os.getenv("NODE_NAME", default="-") MAXVERSIONNUMBER = 65535 def resetFolder(versionfolder): @@ -138,10 +137,7 @@ def getVersionPrefix(sourcebranch): print("Determined version prefix to be: {0}".format(versionprefix)) return versionprefix -def writeversionfiles(versionfolder, buildjobname, versionprefix, gitrevisioncount, gitrevision, remoteinfo, remoteurl, buildnumber, buildstamp, releasejobname): - with open(os.path.join(versionfolder, "buildjobname.txt"), 'w') as f: - f.write(buildjobname) - +def writeversionfiles(versionfolder, versionprefix, gitrevisioncount, gitrevision, remoteinfo, remoteurl, buildstamp): with open(os.path.join(versionfolder, "prefix.txt"), 'w') as f: f.write(versionprefix) @@ -157,9 +153,6 @@ def writeversionfiles(versionfolder, buildjobname, versionprefix, gitrevisioncou with open(os.path.join(versionfolder, "remoteurl.txt"), 'w') as f: f.write(remoteurl) - with open(os.path.join(versionfolder, "buildnumber.txt"), 'w') as f: - f.write(buildnumber) - with open(os.path.join(versionfolder, "buildstamp.txt"), 'w') as f: f.write(buildstamp) @@ -167,15 +160,9 @@ def writeversionfiles(versionfolder, buildjobname, versionprefix, gitrevisioncou with open(os.path.join(versionfolder, "buildstampcommasep.txt"), 'w') as f: f.write(buildstampcommasep) - with open(os.path.join(versionfolder, "buildmachine.txt"), 'w') as f: - f.write(slaveMachine) - with open(os.path.join(versionfolder, "builddate.txt"), 'w') as f: f.write(str(datetime.datetime.now())) - with open(os.path.join(versionfolder, "releasejobname.txt"), 'w') as f: - f.write(releasejobname) - def main(argv=None): # IGNORE:C0111 '''Command line options.''' @@ -207,9 +194,6 @@ USAGE parser.add_argument("-v", "--versionfolder", dest="versionfolder", action="store", default="version", help="version folder to be created [default: %(default)s]") parser.add_argument("-g", "--gitroot", dest="gitrootfolder", action="store", default="GitRepository", help="root path of source files [default: %(default)s]") parser.add_argument("-b", "--baseversionnumber", dest="baseversionnumber", action="store", default=int(1000), help="base git version number [default: %(default)s]") - parser.add_argument("-j", "--buildjobname", dest="buildjobname", action="store", default="-", help="build job name [default: %(default)s]") - parser.add_argument("-n", "--buildnumber", dest="buildnumber", action="store", default="1", help="build number [default: %(default)s]") - parser.add_argument("-r", "--releasejobname", dest="releasejobname", action="store", default="-", help="release-to-git build job name [default: %(default)s]") # Process arguments args = parser.parse_args() @@ -219,12 +203,9 @@ USAGE versionfolder = args.versionfolder gitrootfolder = args.gitrootfolder baseversionnumber = args.baseversionnumber - buildjobname = args.buildjobname - buildnumber = args.buildnumber - releasejobname = args.releasejobname print("Source branch:", sourcebranch, "version folder:", versionfolder, "Git root:", gitrootfolder) - print("Base version number:", baseversionnumber, "Build job name:", buildjobname, "Build number:", buildnumber, "Release job name:", releasejobname) + print("Base version number:", baseversionnumber) resetFolder(versionfolder) @@ -235,7 +216,7 @@ USAGE buildstamp = versionprefix + str(gitrevisioncount) print("Build stamp is: {0}".format(buildstamp)) - writeversionfiles(versionfolder, buildjobname, versionprefix, gitrevisioncount, gitrevision, remoteinfo, remoteurl, buildnumber, buildstamp, releasejobname) + writeversionfiles(versionfolder, versionprefix, gitrevisioncount, gitrevision, remoteinfo, remoteurl, buildstamp) return 0 except Exception as e: From 84c105946be4abdcb35ad85da8b847e81875a511 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Thu, 22 Nov 2018 10:08:11 +0000 Subject: [PATCH 085/237] Improve meta gathering --- meta/folder.groovy | 15 ++++ versionnumbering/generate.groovy | 134 +++++++++++++++++++++++-------- versionnumbering/versioninfo.py | 53 ------------ 3 files changed, 114 insertions(+), 88 deletions(-) diff --git a/meta/folder.groovy b/meta/folder.groovy index 6ae3d3d..8b638a9 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -61,6 +61,14 @@ class GitInfo extends GISJsonSerialised { this.remoteinfo = remoteinfo } + def set(sourcepath, sourcerevision, gitrevision, remoteurl, remoteinfo) { + this.sourcepath = sourcepath + this.sourcerevision = sourcerevision + this.gitrevision = gitrevision + this.remoteurl = remoteurl + this.remoteinfo = remoteinfo + } + LinkedHashMap serialisationdata() { def data = [ 'sourcepath' : sourcepath, @@ -119,6 +127,13 @@ class BuildStampInfo extends GISJsonSerialised { this.buildstampcommasep = buildstampcommasep } + def set(String buildstampprefix, int revision, String buildstamp, String buildstampcommasep) { + this.buildstampprefix = buildstampprefix + this.revision = revision + this.buildstamp = buildstamp + this.buildstampcommasep = buildstampcommasep + } + LinkedHashMap serialisationdata() { def data = [ 'buildstampprefix' : buildstampprefix, diff --git a/versionnumbering/generate.groovy b/versionnumbering/generate.groovy index 0019b24..f9683e6 100644 --- a/versionnumbering/generate.groovy +++ b/versionnumbering/generate.groovy @@ -1,48 +1,112 @@ -metafolder = load("${autobuilder.commonscripts()}/meta/folder.groovy") -VERSIONFOLDER = "${WORKSPACE}/${metafolder.METAFOLDERNAME}/version" +ddef getGitRevision(String gitrootpath, int basebuildnumber) { + dir( gitrootpath) { + def int MAXVERSIONNUMBER = 65535 -def generate(meta, sourcerevision, sourcepath, basebuildnumber = "1000", versionfolder = "${VERSIONFOLDER}") { - def cs = autobuilder.commonscripts() - if (isUnix()) { - sh """ - "${PYTHON}" -u "${cs}/versionnumbering/versioninfo.py" -s "${sourcerevision}" -v "${versionfolder}" -g "${sourcepath}" -b "${basebuildnumber}" - """ + def int changecount = sh(returnStdout: true, script: "${GIT_EXECUTABLE} rev-list HEAD --count") + echo "Change count: ${changecount}" + def int adjustedchangecount = (changecount + basebuildnumber) % (MAXVERSIONNUMBER + 1) + echo "Adjusted change count: ${adjustedchangecount}" + + def gitrevision = sh(returnStdout: true, script: "${GIT_EXECUTABLE} rev-parse HEAD") + echo "Revision: ${gitrevision}" + + def remoteinfo = sh(returnStdout: true, script: "${GIT_EXECUTABLE} remote show origin") + echo "Remote info: ${remoteinfo}" + + def remoteurl = sh(returnStdout: true, script: "${GIT_EXECUTABLE} remote get-url --push origin") + echo "Remote URL: ${remoteurl}" } - else { - bat """ - "${PYTHON}" -u "${cs}\\versionnumbering\\versioninfo.py" -s "${sourcerevision}" -v "${versionfolder}" -g "${sourcepath}" -b "${basebuildnumber}" - """ - } - env.BUILD_STAMP = readFile("${VERSIONFOLDER}/buildstamp.txt").trim() - env.BUILD_STAMP_COMMA_SEP = readFile("${VERSIONFOLDER}/buildstampcommasep.txt").trim() - env.SRC_REVISION = readFile("${VERSIONFOLDER}/revision.txt").trim() + return [adjustedchangecount, gitrevision, remoteinfo, remoteurl] } -return this; +// Handle: +// origin/master +// origin/2.0.x +def getVersionPrefix(String sourcebranch) { + echo "Determining version number prefix from source branch name: ${sourcebranch}" + sourcebranch = sourcebranch.toLowerCase() + def defaultversionprefix = "1.30000.0." + def splits = sourcebranch.split('/') + if (splits.size() < 1) { + echo "Source branch name is invalid. Defaulting to: ${defaultversionprefix}" + return defaultversionprefix + } -/* - - with open(os.path.join(versionfolder, "prefix.txt"), 'w') as f: - f.write(versionprefix) + def mastertypeversionprefix = "1.20000.0." + sourcebranch = splits.last() + if (sourcebranch.toLowerCase().find("master") != null) { + echo "Source branch name has 'master' in it. Defaulting to: ${mastertypeversionprefix}" + return mastertypeversionprefix + } - with open(os.path.join(versionfolder, "revision.txt"), 'w') as f: - f.write(str(gitrevisioncount)) + echo "sourcebranch is now: ${sourcebranch}" + def splits2 = sourcebranch.split('\\.') + echo "Splits2 is: ${splits2}" + if (splits2.size() < 1) { + def thirdpartyversionprefix = "1.25000.0." + echo "Source branch name has no dots in it (eg. 1.9.2). Defaulting to: ${thirdpartyversionprefix}" + return thirdpartyversionprefix + } + splits = [] + for (split in splits2) { + echo "Split is: ${split}" + if (split.isInteger()) { + splits.add(split) + } + else if (split == "x") { + return mastertypeversionprefix + } + } + echo "Splits is: ${splits}" - with open(os.path.join(versionfolder, "gitrevision.txt"), 'w') as f: - f.write(gitrevision) + def versionprefix = "" + if (splits.size() < 1) { + echo "This source branch name has no numbers in its name so defaulting to: ${defaultversionprefix}" + versionprefix = defaultversionprefix + } + else { + def int splitnumbercount = 0 + for (split in splits) { + echo "Split is ${split}" + if (split.isInteger()) { + versionprefix += split + "." + splitnumbercount += 1 + } + else if (splitnumbercount > 2) { + break + } + } + if (splitnumbercount == 0) { + echo "No leading numbers were found in source branch name so defaulting to: ${defaultversionprefix}" + versionprefix = defaultversionprefix + } + else { + if (splitnumbercount == 1) { + versionprefix += "0.0." + } + else if (splitnumbercount == 2) { + versionprefix += "0." + } + } + } + echo "Determined version prefix to be: ${versionprefix}" + return versionprefix +} - with open(os.path.join(versionfolder, "remoteinfo.txt"), 'w') as f: - f.write(remoteinfo) +String generate(meta, String sourcerevision, String sourcepath, int basebuildnumber = 1000) { + (gitrevisioncount, gitrevision, remoteinfo, remoteurl) = getGitRevision(sourcepath, basebuildnumber) - with open(os.path.join(versionfolder, "remoteurl.txt"), 'w') as f: - f.write(remoteurl) + def versionprefix = getVersionPrefix(sourcerevision) - with open(os.path.join(versionfolder, "buildstamp.txt"), 'w') as f: - f.write(buildstamp) + def buildstamp = versionprefix + gitrevisioncount.toString() + echo "Build stamp is: ${buildstamp}" - buildstampcommasep = buildstamp.replace(".", ",") - with open(os.path.join(versionfolder, "buildstampcommasep.txt"), 'w') as f: - f.write(buildstampcommasep) -*/ + meta.gitinfo.set(sourcepath, sourcerevision, gitrevision, remoteurl, remoteinfo) + meta.buildstampinfo.set(versionprefix, gitrevisioncount, buildstamp, buildstamp.replace(".", ",")) + + return buildstamp +} + +return this; \ No newline at end of file diff --git a/versionnumbering/versioninfo.py b/versionnumbering/versioninfo.py index 0fa097a..3d2a80d 100644 --- a/versionnumbering/versioninfo.py +++ b/versionnumbering/versioninfo.py @@ -23,57 +23,6 @@ __version__ = 0.1 __date__ = '2017-11-29' __updated__ = '2017-11-29' -gitExecutable = os.getenv("GIT_EXECUTABLE", default="git") -MAXVERSIONNUMBER = 65535 - -def resetFolder(versionfolder): - print("Removing folders and contents of: {0}".format(versionfolder)) - try: - shutil.rmtree(versionfolder) - except FileNotFoundError: - pass - - print("Creating folder: {0}".format(versionfolder)) - os.makedirs(versionfolder) - -def getGitRevision(gitrootpath, basenumber): - cwd = os.getcwd() - - path = os.path.expanduser(gitrootpath) - print("Changing current working directory to: {0}".format(path)) - os.chdir(path) - - print("Determining revision info using git command: {0}".format(gitExecutable)) - completed = subprocess.run([gitExecutable, "rev-list", "HEAD", "--count"], stdout=subprocess.PIPE) - print("Command {0} returned: {1}".format(completed.args, completed.returncode)) - changecount = completed.stdout.decode("utf-8").strip() - print("Change count: {0}".format(changecount)) - adjustedchangecount = int((int(changecount) + int(basenumber)) % (MAXVERSIONNUMBER + 1)) - print("Adjusted change count: {0}".format(adjustedchangecount)) - - print("Determining current revision info using git command: {0}".format(gitExecutable)) - completed = subprocess.run([gitExecutable, "rev-parse", "HEAD"], stdout=subprocess.PIPE) - print("Command {0} returned: {1}".format(completed.args, completed.returncode)) - revision = completed.stdout.decode("utf-8").strip() - print("Revision: {0}".format(revision)) - - print("Determining remote info using git command: {0}".format(gitExecutable)) - completed = subprocess.run([gitExecutable, "remote", "show", "origin"], stdout=subprocess.PIPE) - print("Command {0} returned: {1}".format(completed.args, completed.returncode)) - remoteinfo = completed.stdout.decode("utf-8") - print("Remote info: {0}".format(remoteinfo)) - - print("Determining remote url using git command: {0}".format(gitExecutable)) - completed = subprocess.run([gitExecutable, "remote", "get-url", "--push", "origin"], stdout=subprocess.PIPE) - print("Command {0} returned: {1}".format(completed.args, completed.returncode)) - remoteurl = completed.stdout.decode("utf-8") - print("Remote info: {0}".format(remoteurl)) - - os.chdir(cwd) - print("Restored current working directory to: {0}".format(cwd)) - - return (adjustedchangecount, revision, remoteinfo, remoteurl) - # Handle: # origin/master # origin/2.0.x @@ -207,8 +156,6 @@ USAGE print("Source branch:", sourcebranch, "version folder:", versionfolder, "Git root:", gitrootfolder) print("Base version number:", baseversionnumber) - resetFolder(versionfolder) - (gitrevisioncount, gitrevision, remoteinfo, remoteurl) = getGitRevision(gitrootfolder, baseversionnumber) versionprefix = getVersionPrefix(sourcebranch) From 654b4fa87be1ba9de08f3aefcd5793740f2391bd Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Thu, 22 Nov 2018 10:08:43 +0000 Subject: [PATCH 086/237] Improve meta gathering --- versionnumbering/generate.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versionnumbering/generate.groovy b/versionnumbering/generate.groovy index f9683e6..69bdd4d 100644 --- a/versionnumbering/generate.groovy +++ b/versionnumbering/generate.groovy @@ -1,5 +1,5 @@ -ddef getGitRevision(String gitrootpath, int basebuildnumber) { +def getGitRevision(String gitrootpath, int basebuildnumber) { dir( gitrootpath) { def int MAXVERSIONNUMBER = 65535 From 963dabcc6e61dd6a97e76f5243be4786789d1ca9 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Thu, 22 Nov 2018 10:13:47 +0000 Subject: [PATCH 087/237] Improve meta gathering --- meta/folder.groovy | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/meta/folder.groovy b/meta/folder.groovy index 8b638a9..690ffaa 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -29,7 +29,7 @@ class ProductInfo extends GISJsonSerialised { this.jirakey = jirakey } - def set(productname, subcomponentname, jirakey) { + void set(String productname, String subcomponentname, String jirakey) { this.productname = productname this.subcomponentname = subcomponentname this.jirakey = jirakey @@ -61,7 +61,7 @@ class GitInfo extends GISJsonSerialised { this.remoteinfo = remoteinfo } - def set(sourcepath, sourcerevision, gitrevision, remoteurl, remoteinfo) { + void set(String sourcepath, String sourcerevision, String gitrevision, String remoteurl, String remoteinfo) { this.sourcepath = sourcepath this.sourcerevision = sourcerevision this.gitrevision = gitrevision @@ -95,7 +95,7 @@ class JenkinsBuildInfo extends GISJsonSerialised { this.builddate = builddate } - def set(String buildjobname, int buildnumber, String buildmachine, String builddate) { + void set(String buildjobname, int buildnumber, String buildmachine, String builddate) { this.buildjobname = buildjobname this.buildnumber = buildnumber this.buildmachine = buildmachine @@ -127,7 +127,7 @@ class BuildStampInfo extends GISJsonSerialised { this.buildstampcommasep = buildstampcommasep } - def set(String buildstampprefix, int revision, String buildstamp, String buildstampcommasep) { + void set(String buildstampprefix, int revision, String buildstamp, String buildstampcommasep) { this.buildstampprefix = buildstampprefix this.revision = revision this.buildstamp = buildstamp @@ -153,7 +153,7 @@ class ReleaseInfo extends GISJsonSerialised { this.releasejobname = releasejobname } - def set(releasejobname) { + void set(String releasejobname) { this.releasejobname = releasejobname } @@ -220,7 +220,7 @@ class MetaInfo extends GISJsonSerialised { } void addConfigurationInfo(String configurationname, String configurationURL, String configurationversion, String configurationSHA) { - ConfigurationInfo ci = new ConfigurationInfo(script, configurationname, configurationURL, configurationversion, configurationSHA) + def ConfigurationInfo ci = new ConfigurationInfo(script, configurationname, configurationURL, configurationversion, configurationSHA) configurationinfo.add(ci) } @@ -263,4 +263,4 @@ MetaInfo metareset(script) { return new MetaInfo(script) } -return this; \ No newline at end of file +return this; From 0fe07ee41231719f3b8a42b7fd089ac590a09602 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Thu, 22 Nov 2018 10:22:00 +0000 Subject: [PATCH 088/237] Improve meta gathering --- meta/folder.groovy | 2 +- versionnumbering/generate.groovy | 24 ++++++++++++++---------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/meta/folder.groovy b/meta/folder.groovy index 690ffaa..045d67d 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -216,7 +216,7 @@ class MetaInfo extends GISJsonSerialised { for (configurationitem in configurationinfo) { configuration.add(configurationitem.serialisationdata()) } - return associated + return configuration } void addConfigurationInfo(String configurationname, String configurationURL, String configurationversion, String configurationSHA) { diff --git a/versionnumbering/generate.groovy b/versionnumbering/generate.groovy index 69bdd4d..3c475bc 100644 --- a/versionnumbering/generate.groovy +++ b/versionnumbering/generate.groovy @@ -1,20 +1,24 @@ def getGitRevision(String gitrootpath, int basebuildnumber) { + def int adjustedchangecount + def String gitrevision + def String remoteinfo + def String remoteurl dir( gitrootpath) { def int MAXVERSIONNUMBER = 65535 - def int changecount = sh(returnStdout: true, script: "${GIT_EXECUTABLE} rev-list HEAD --count") + def int changecount = sh(returnStdout: true, script: "${GIT_EXECUTABLE} rev-list HEAD --count").trim() echo "Change count: ${changecount}" - def int adjustedchangecount = (changecount + basebuildnumber) % (MAXVERSIONNUMBER + 1) + adjustedchangecount = (changecount + basebuildnumber) % (MAXVERSIONNUMBER + 1) echo "Adjusted change count: ${adjustedchangecount}" - def gitrevision = sh(returnStdout: true, script: "${GIT_EXECUTABLE} rev-parse HEAD") + gitrevision = sh(returnStdout: true, script: "${GIT_EXECUTABLE} rev-parse HEAD").trim() echo "Revision: ${gitrevision}" - def remoteinfo = sh(returnStdout: true, script: "${GIT_EXECUTABLE} remote show origin") + remoteinfo = sh(returnStdout: true, script: "${GIT_EXECUTABLE} remote show origin").trim() echo "Remote info: ${remoteinfo}" - def remoteurl = sh(returnStdout: true, script: "${GIT_EXECUTABLE} remote get-url --push origin") + remoteurl = sh(returnStdout: true, script: "${GIT_EXECUTABLE} remote get-url --push origin").trim() echo "Remote URL: ${remoteurl}" } return [adjustedchangecount, gitrevision, remoteinfo, remoteurl] @@ -41,9 +45,7 @@ def getVersionPrefix(String sourcebranch) { return mastertypeversionprefix } - echo "sourcebranch is now: ${sourcebranch}" def splits2 = sourcebranch.split('\\.') - echo "Splits2 is: ${splits2}" if (splits2.size() < 1) { def thirdpartyversionprefix = "1.25000.0." echo "Source branch name has no dots in it (eg. 1.9.2). Defaulting to: ${thirdpartyversionprefix}" @@ -51,7 +53,6 @@ def getVersionPrefix(String sourcebranch) { } splits = [] for (split in splits2) { - echo "Split is: ${split}" if (split.isInteger()) { splits.add(split) } @@ -59,7 +60,6 @@ def getVersionPrefix(String sourcebranch) { return mastertypeversionprefix } } - echo "Splits is: ${splits}" def versionprefix = "" if (splits.size() < 1) { @@ -69,7 +69,6 @@ def getVersionPrefix(String sourcebranch) { else { def int splitnumbercount = 0 for (split in splits) { - echo "Split is ${split}" if (split.isInteger()) { versionprefix += split + "." splitnumbercount += 1 @@ -96,6 +95,11 @@ def getVersionPrefix(String sourcebranch) { } String generate(meta, String sourcerevision, String sourcepath, int basebuildnumber = 1000) { + def int gitrevisioncount + def String gitrevision + def String remoteinfo + def String remoteurl + (gitrevisioncount, gitrevision, remoteinfo, remoteurl) = getGitRevision(sourcepath, basebuildnumber) def versionprefix = getVersionPrefix(sourcerevision) From fa26214f9e65cde90568843a5cf683cb935252d1 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Thu, 22 Nov 2018 10:26:40 +0000 Subject: [PATCH 089/237] Improve meta gathering --- autobuilder.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autobuilder.groovy b/autobuilder.groovy index 3a2a408..50a1655 100644 --- a/autobuilder.groovy +++ b/autobuilder.groovy @@ -39,7 +39,7 @@ def start(script, productname = PRODUCT_NAME, subcomponentname = SUBCOMPONENT_NA meta.productinfo.set(productname, subcomponentname, jirakey) def now = new Date() now.format("yyMMdd.HHmm", TimeZone.getTimeZone('UTC')) - meta.jenkinsbuildinfo.set(JOB_NAME, BUILD_ID, NODE_NAME, now) + meta.jenkinsbuildinfo.set(JOB_NAME, BUILD_ID, NODE_NAME, now.toString()) def ch = load("${commonscripts()}/configuration/configuration.groovy") ch.registerPipelineScriptConfiguration(meta) From 838460a826e7ad122a507e641260b736e7149b0b Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Thu, 22 Nov 2018 10:30:56 +0000 Subject: [PATCH 090/237] Improve meta gathering --- autobuilder.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autobuilder.groovy b/autobuilder.groovy index 50a1655..bbe7bb9 100644 --- a/autobuilder.groovy +++ b/autobuilder.groovy @@ -39,7 +39,7 @@ def start(script, productname = PRODUCT_NAME, subcomponentname = SUBCOMPONENT_NA meta.productinfo.set(productname, subcomponentname, jirakey) def now = new Date() now.format("yyMMdd.HHmm", TimeZone.getTimeZone('UTC')) - meta.jenkinsbuildinfo.set(JOB_NAME, BUILD_ID, NODE_NAME, now.toString()) + meta.jenkinsbuildinfo.set(JOB_NAME, BUILD_ID.toInteger(), NODE_NAME, now.toString()) def ch = load("${commonscripts()}/configuration/configuration.groovy") ch.registerPipelineScriptConfiguration(meta) From 6ece33765635a185bd017e2eb1e18797379bbe13 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Thu, 22 Nov 2018 10:40:37 +0000 Subject: [PATCH 091/237] Improve meta gathering --- versionnumbering/generate.groovy | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/versionnumbering/generate.groovy b/versionnumbering/generate.groovy index 3c475bc..16fb1a9 100644 --- a/versionnumbering/generate.groovy +++ b/versionnumbering/generate.groovy @@ -7,18 +7,18 @@ def getGitRevision(String gitrootpath, int basebuildnumber) { dir( gitrootpath) { def int MAXVERSIONNUMBER = 65535 - def int changecount = sh(returnStdout: true, script: "${GIT_EXECUTABLE} rev-list HEAD --count").trim() + def int changecount = sh(returnStdout: true, script: "git rev-list HEAD --count").trim() echo "Change count: ${changecount}" adjustedchangecount = (changecount + basebuildnumber) % (MAXVERSIONNUMBER + 1) echo "Adjusted change count: ${adjustedchangecount}" - gitrevision = sh(returnStdout: true, script: "${GIT_EXECUTABLE} rev-parse HEAD").trim() + gitrevision = sh(returnStdout: true, script: "git rev-parse HEAD").trim() echo "Revision: ${gitrevision}" - remoteinfo = sh(returnStdout: true, script: "${GIT_EXECUTABLE} remote show origin").trim() + remoteinfo = sh(returnStdout: true, script: "git remote show origin").trim() echo "Remote info: ${remoteinfo}" - remoteurl = sh(returnStdout: true, script: "${GIT_EXECUTABLE} remote get-url --push origin").trim() + remoteurl = sh(returnStdout: true, script: "git remote get-url --push origin").trim() echo "Remote URL: ${remoteurl}" } return [adjustedchangecount, gitrevision, remoteinfo, remoteurl] From 9e512c2774e23037348c63eca63122313409d110 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Thu, 22 Nov 2018 11:32:04 +0000 Subject: [PATCH 092/237] Improve meta gathering --- differences/do.groovy | 10 ++++------ meta/folder.groovy | 26 ++++++++++++++++++-------- 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/differences/do.groovy b/differences/do.groovy index 9e572af..35e0980 100644 --- a/differences/do.groovy +++ b/differences/do.groovy @@ -1,10 +1,8 @@ -metafolder = load("${autobuilder.commonscripts()}/meta/folder.groovy") -env.DIFFERENCEARTIFACTS = "${metafolder.METAFOLDERNAME}/differences/**" -DIFFERENCEFOLDER = "${WORKSPACE}/${metafolder.METAFOLDERNAME}/differences" - -def differences(sourcerevision, previoussourcerevision, sourcepath, jirakey, difffolder = "${DIFFERENCEFOLDER}") { - cs = autobuilder.commonscripts() +def differences(meta, String sourcerevision, String previoussourcerevision, String sourcepath) { + def String cs = autobuilder.commonscripts() + def String difffolder = meta.folder() + def String jirakey = meta.productinfo.jirakey if (isUnix()) { sh """ "${PYTHON}" -u "${cs}/differences/show_release_differences.py" -g "${sourcepath}" -s "${sourcerevision}" -p "${previoussourcerevision}" -j "${jirakey}" -o "opposite notcommon" -d "${difffolder}" diff --git a/meta/folder.groovy b/meta/folder.groovy index 045d67d..25d5f1f 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -1,7 +1,4 @@ -METAFOLDERNAME = "meta" -env.METAARTIFACTS = "${METAFOLDERNAME}/**" - abstract class GISJsonSerialised implements Serializable { def script @@ -20,7 +17,7 @@ abstract class GISJsonSerialised implements Serializable { class ProductInfo extends GISJsonSerialised { private String productname private String subcomponentname - private String jirakey + String jirakey ProductInfo(script, productname = "", subcomponentname = "", jirakey = "") { super(script) @@ -191,6 +188,10 @@ class ConfigurationInfo extends GISJsonSerialised { } class MetaInfo extends GISJsonSerialised { + private String METAFOLDERNAME = "meta" + private String METAFILENAME = "info.json" + private String METAARTIFACTS = "${METAFOLDERNAME}/**" + private String format = '0.1' ProductInfo productinfo GitInfo gitinfo @@ -250,17 +251,26 @@ class MetaInfo extends GISJsonSerialised { return data } - def setproductinfo(productname, subcomponentname, jirakey) { - productinfo.set(productname, subcomponentname, jirakey) + + String folder() { + return METAFOLDERNAME + } + + String generateartifacts() { + def String metafilepath = "${METAFOLDERNAME}/${METAFILENAME}" + saveJsonSerialised(metafilepath) + return METAARTIFACTS } } MetaInfo metareset(script) { echo "Resetting meta folder" - dir("${WORKSPACE}/${METAFOLDERNAME}") { + def mi = new MetaInfo(script) + + dir(mi.folder()) { deleteDir() } - return new MetaInfo(script) + return mi } return this; From bebea3f7f7fd9d520ba415cadb6422bee24d6f5a Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Thu, 22 Nov 2018 13:15:10 +0000 Subject: [PATCH 093/237] Add checksum info to meta --- checksum/utils.groovy | 15 +++----- meta/folder.groovy | 83 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 87 insertions(+), 11 deletions(-) diff --git a/checksum/utils.groovy b/checksum/utils.groovy index 748472f..c090bf3 100644 --- a/checksum/utils.groovy +++ b/checksum/utils.groovy @@ -1,21 +1,14 @@ -metafolder = load("${autobuilder.commonscripts()}/meta/folder.groovy") -env.CHECKSUMARTIFACTS = "${metafolder.METAFOLDERNAME}/checksums/**" -CHECKSUMFOLDER = "${metafolder.METAFOLDERNAME}/checksums" - // Generate a checksum file of from a list of files/directories relative to workspace -def generatelist(checksummable) { - load("${autobuilder.commonscripts()}/platform/lineendings.groovy") - sums = "" +def generatelist(meta, checksummable) { for (filepath in checksummable) { - echo "Checksumming ${filepath}" + def checksumset = meta.checksuminfo.addchecksumset(filepath) def files = findFiles(glob: filepath) for (file in files) { - def sum = sha1(file: file.path) - sums += "${sum} ${file.path}${nl}" // Format suitable for sha1sum utility + def sum = sha1(file: file.path).trim() + checksumset.addChecksumPair(file.path, sum) } } - writeFile(file: "${CHECKSUMFOLDER}/sha1sumlist.txt", text: sums) } return this; diff --git a/meta/folder.groovy b/meta/folder.groovy index 25d5f1f..152121c 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -187,6 +187,86 @@ class ConfigurationInfo extends GISJsonSerialised { } } +class ChecksumPair extends GISJsonSerialised { + private String filepath + private String sum + + ChecksumPair(script, String filepath, String sum) { + super(checksumset.script) + this.filepath = filepath + this.sum = sum + } + + LinkedHashMap serialisationdata() { + def data = [ + 'filepath' : filepath, + 'sum' : sum, + ] + return data + } +} + +class ChecksumSet extends GISJsonSerialised { + private String artifactpath + private ArrayList checksumpairs + + ChecksumInfo(script, artifactpath) { + super(script) + this.artifactpath = artifactpath + } + + ChecksumPair addChecksumPair(String filepath, String sum) { + def cp = new ChecksumPair(script, filepath, sum) + checksumpairs.add(cp) + return cp + } + + List checksumpairsserialised() { + def associated = [] + for (cp in checksumpairs) { + associated.add(cp.serialisationdata()) + } + return associated + } + + LinkedHashMap serialisationdata() { + def data = [ + 'artifactpath' : artifactpath, + 'checksumpairs' : checksumpairsserialised(), + ] + return data + } + + +class ChecksumInfo extends GISJsonSerialised { + private ArrayList checksumsets + + ChecksumInfo(script) { + super(script) + } + + ChecksumSet addChecksumSet(String artifactpath) { + def cs = new ChecksumSet(script, artifactpath) + checksumsets.add(cs) + return cs + } + + List checksumsetsserialised() { + def associated = [] + for (cs in checksumsets) { + associated.add(cs.serialisationdata()) + } + return associated + } + + LinkedHashMap serialisationdata() { + def data = [ + 'checksumsets' : checksumsetsserialised(), + ] + return data + } +} + class MetaInfo extends GISJsonSerialised { private String METAFOLDERNAME = "meta" private String METAFILENAME = "info.json" @@ -198,6 +278,7 @@ class MetaInfo extends GISJsonSerialised { JenkinsBuildInfo jenkinsbuildinfo BuildStampInfo buildstampinfo ReleaseInfo releaseinfo + ChecksumInfo checksuminfo private ArrayList configurationinfo private ArrayList associatedmeta @@ -208,6 +289,7 @@ class MetaInfo extends GISJsonSerialised { jenkinsbuildinfo = new JenkinsBuildInfo(script) buildstampinfo = new BuildStampInfo(script) releaseinfo = new ReleaseInfo(script) + checksuminfo = new ChecksumInfo(script) configurationinfo = new ArrayList() associatedmeta = new ArrayList() } @@ -246,6 +328,7 @@ class MetaInfo extends GISJsonSerialised { 'buildstampinfo' : buildstampinfo.serialisationdata(), 'releaseinfo' : releaseinfo.serialisationdata(), 'configuration' : configurationinfoserialised(), + 'checksuminfo' : checksuminfo.serialisationdata(), 'associatedmeta' : associatedmetaserialised(), ] return data From 2b6378e8e41fe7ea26ead77643be8db2b5e8a761 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Thu, 22 Nov 2018 18:33:55 +0000 Subject: [PATCH 094/237] Add checksum info to meta --- meta/folder.groovy | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/meta/folder.groovy b/meta/folder.groovy index 152121c..9a89b70 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -192,7 +192,7 @@ class ChecksumPair extends GISJsonSerialised { private String sum ChecksumPair(script, String filepath, String sum) { - super(checksumset.script) + super(script) this.filepath = filepath this.sum = sum } @@ -210,9 +210,10 @@ class ChecksumSet extends GISJsonSerialised { private String artifactpath private ArrayList checksumpairs - ChecksumInfo(script, artifactpath) { + ChecksumSet(script, artifactpath) { super(script) this.artifactpath = artifactpath + checksumpairs = new ArrayList() } ChecksumPair addChecksumPair(String filepath, String sum) { @@ -236,17 +237,20 @@ class ChecksumSet extends GISJsonSerialised { ] return data } - +} class ChecksumInfo extends GISJsonSerialised { private ArrayList checksumsets ChecksumInfo(script) { super(script) + checksumsets = new ArrayList() } ChecksumSet addChecksumSet(String artifactpath) { + script.echo "Entering addChecksumSet" def cs = new ChecksumSet(script, artifactpath) + script.echo "Created ChecksumSet" checksumsets.add(cs) return cs } @@ -339,8 +343,7 @@ class MetaInfo extends GISJsonSerialised { return METAFOLDERNAME } - String generateartifacts() { - def String metafilepath = "${METAFOLDERNAME}/${METAFILENAME}" + String generateartifacts(String metafilepath ="${METAFOLDERNAME}/${METAFILENAME}") { saveJsonSerialised(metafilepath) return METAARTIFACTS } From 084e8367d7b1907771e65a9f1689686ca605fdc5 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Thu, 22 Nov 2018 18:40:12 +0000 Subject: [PATCH 095/237] Add checksum info to meta --- checksum/utils.groovy | 4 ++-- meta/folder.groovy | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/checksum/utils.groovy b/checksum/utils.groovy index c090bf3..c2503cd 100644 --- a/checksum/utils.groovy +++ b/checksum/utils.groovy @@ -2,7 +2,7 @@ // Generate a checksum file of from a list of files/directories relative to workspace def generatelist(meta, checksummable) { for (filepath in checksummable) { - def checksumset = meta.checksuminfo.addchecksumset(filepath) + def checksumset = meta.checksuminfo.addChecksumSet(filepath) def files = findFiles(glob: filepath) for (file in files) { def sum = sha1(file: file.path).trim() @@ -11,4 +11,4 @@ def generatelist(meta, checksummable) { } } -return this; +return this; \ No newline at end of file diff --git a/meta/folder.groovy b/meta/folder.groovy index 9a89b70..421fec8 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -248,9 +248,7 @@ class ChecksumInfo extends GISJsonSerialised { } ChecksumSet addChecksumSet(String artifactpath) { - script.echo "Entering addChecksumSet" def cs = new ChecksumSet(script, artifactpath) - script.echo "Created ChecksumSet" checksumsets.add(cs) return cs } From 8d90a54ebd266a26ed229d56bd5c741e054ad55e Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Thu, 22 Nov 2018 20:19:08 +0000 Subject: [PATCH 096/237] Add publishable items to meta --- meta/folder.groovy | 32 ++++++++++++++++++++++++++++++++ publishing/utils.groovy | 20 ++------------------ 2 files changed, 34 insertions(+), 18 deletions(-) diff --git a/meta/folder.groovy b/meta/folder.groovy index 421fec8..7471f74 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -269,6 +269,22 @@ class ChecksumInfo extends GISJsonSerialised { } } +class PublishableInfo extends GISJsonSerialised { + private String filepath + + PublishableInfo(script, String filepath = "") { + super(script) + this.filepath = filepath + } + + LinkedHashMap serialisationdata() { + def data = [ + 'filepath' : filepath, + ] + return data + } +} + class MetaInfo extends GISJsonSerialised { private String METAFOLDERNAME = "meta" private String METAFILENAME = "info.json" @@ -282,6 +298,7 @@ class MetaInfo extends GISJsonSerialised { ReleaseInfo releaseinfo ChecksumInfo checksuminfo private ArrayList configurationinfo + private ArrayList publishableinfo private ArrayList associatedmeta MetaInfo(script) { @@ -293,6 +310,7 @@ class MetaInfo extends GISJsonSerialised { releaseinfo = new ReleaseInfo(script) checksuminfo = new ChecksumInfo(script) configurationinfo = new ArrayList() + publishableinfo = new ArrayList() associatedmeta = new ArrayList() } @@ -304,11 +322,24 @@ class MetaInfo extends GISJsonSerialised { return configuration } + void addPublishable(String filepath) { + def PublishableInfo pi = new PublishableInfo(script, filepath) + publishableinfo.add(pi) + } + void addConfigurationInfo(String configurationname, String configurationURL, String configurationversion, String configurationSHA) { def ConfigurationInfo ci = new ConfigurationInfo(script, configurationname, configurationURL, configurationversion, configurationSHA) configurationinfo.add(ci) } + List publishableinfoserialised() { + def publishable = [] + for (publishableitem in publishableinfo) { + publishable.add(publishableitem.serialisationdata()) + } + return publishable + } + List associatedmetaserialised() { def associated = [] for (metaitem in associatedmeta) { @@ -331,6 +362,7 @@ class MetaInfo extends GISJsonSerialised { 'releaseinfo' : releaseinfo.serialisationdata(), 'configuration' : configurationinfoserialised(), 'checksuminfo' : checksuminfo.serialisationdata(), + 'publishableinfo' : publishableinfoserialised(), 'associatedmeta' : associatedmetaserialised(), ] return data diff --git a/publishing/utils.groovy b/publishing/utils.groovy index 72c6566..145a7e9 100644 --- a/publishing/utils.groovy +++ b/publishing/utils.groovy @@ -1,26 +1,10 @@ -metafolder = load("${autobuilder.commonscripts()}/meta/folder.groovy") -env.PUBLISHABLEARTIFACTS = "${metafolder.METAFOLDERNAME}/publishable/**" - // Generate a list of artifact files that are publishable to outside parties -def generatelist(publishable) { - def PUBLISHABLEFOLDER = "${WORKSPACE}/${metafolder.METAFOLDERNAME}/publishable" - sh """ - rm -rf "${PUBLISHABLEFOLDER}" - mkdir -p "${PUBLISHABLEFOLDER}" - """ +def generatelist(meta, publishable) { filelist = [] for (filepath in publishable) { - def files = findFiles(glob: filepath) - for (file in files) { - if (!file.directory) { - filelist.add(file.path) - } - } + meta.addPublishable(filepath) } - def outJson = readJSON text: groovy.json.JsonOutput.toJson(filelist) - def PUBLISHABLEFILE = "${PUBLISHABLEFOLDER}/list.json" - writeJSON(file: PUBLISHABLEFILE, json: outJson, pretty: 4) } return this; From a06e33d10d6690247fa569a7331eb376ebfb4ab3 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Thu, 22 Nov 2018 22:17:38 +0000 Subject: [PATCH 097/237] Add release information items to meta --- meta/folder.groovy | 43 +++++++++++++++++++++++++++++++++++-------- 1 file changed, 35 insertions(+), 8 deletions(-) diff --git a/meta/folder.groovy b/meta/folder.groovy index 7471f74..b5cc379 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -143,20 +143,35 @@ class BuildStampInfo extends GISJsonSerialised { } class ReleaseInfo extends GISJsonSerialised { - private String releasejobname + private String releaserepoURL + private ArrayList releaseitems - ReleaseInfo(script, releasejobname = "") { + ReleaseInfo(script, releaserepoURL = "") { super(script) - this.releasejobname = releasejobname + this.releaserepoURL = releaserepoURL + this.releaseitems = new ArrayList() } - void set(String releasejobname) { - this.releasejobname = releasejobname + void set(String releaserepoURL = "") { + this.releaserepoURL = releaserepoURL + } + + void addReleaseItem(String releaseitem) { + releaseitems.add(releaseitem) + } + + List releaseitemssserialised() { + def items = [] + for (ri in releaseitems) { + items.add(ri) + } + return items } LinkedHashMap serialisationdata() { def data = [ - 'releasejobname' : releasejobname, + 'releaserepoURL' : releaserepoURL, + 'releaseitems' : releaseitemssserialised(), ] return data } @@ -373,9 +388,21 @@ class MetaInfo extends GISJsonSerialised { return METAFOLDERNAME } - String generateartifacts(String metafilepath ="${METAFOLDERNAME}/${METAFILENAME}") { + String generateartifacts(ArrayList releasedfromhere = new ArrayList(), + ArrayList releasedfromsubmeta = new ArrayList(), + String metafilepath ="${METAFOLDERNAME}/${METAFILENAME}" + ) { + def String artifactlist = METAARTIFACTS + releaseinfo.addReleaseItem(METAARTIFACTS) + for (releaseitem in releasedfromhere) { + artifactlist += "," + releaseitem + releaseinfo.addReleaseItem(releaseitem) + } + for (releaseitem in releasedfromsubmeta) { + artifactlist += "," + releaseitem + } saveJsonSerialised(metafilepath) - return METAARTIFACTS + return artifactlist } } From f14ce9fc0cf3d85cbc66a8f4155515c538dd603c Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Fri, 23 Nov 2018 17:23:17 +0000 Subject: [PATCH 098/237] Deserialise meta from file and associate with job meta --- import/importer.groovy | 14 ++++ meta/folder.groovy | 154 +++++++++++++++++++++++++++++++++++++++-- 2 files changed, 162 insertions(+), 6 deletions(-) create mode 100644 import/importer.groovy diff --git a/import/importer.groovy b/import/importer.groovy new file mode 100644 index 0000000..ba912f4 --- /dev/null +++ b/import/importer.groovy @@ -0,0 +1,14 @@ + +def artifactimport(meta, String jenkinsjob, String buildselector, String destpath, String filter = '**', boolean fingerprint = false) { + copyArtifacts( + filter: filter, + fingerprintArtifacts: fingerprint, + projectName: jenkinsjob.trim(), + selector: [ + $class: 'ParameterizedBuildSelector', + parameterName: buildselector + ], + target: destpath + ) + meta.importrelated(destpath) +} \ No newline at end of file diff --git a/meta/folder.groovy b/meta/folder.groovy index b5cc379..9d90cee 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -6,7 +6,9 @@ abstract class GISJsonSerialised implements Serializable { this.script = script } - abstract LinkedHashMap serialisationdata(); + abstract LinkedHashMap serialisationdata() + + abstract void deserialiseJson(rawmeta) def saveJsonSerialised(String outputfile, int prettylevel = 4) { def outJson = script.readJSON text: groovy.json.JsonOutput.toJson(serialisationdata()) @@ -32,6 +34,12 @@ class ProductInfo extends GISJsonSerialised { this.jirakey = jirakey } + void deserialiseJson(rawmeta) { + productname = rawmeta['productname'] + subcomponentname = rawmeta['subcomponentname'] + jirakey = rawmeta['jirakey'] + } + LinkedHashMap serialisationdata() { def data = [ 'productname' : productname, @@ -66,6 +74,14 @@ class GitInfo extends GISJsonSerialised { this.remoteinfo = remoteinfo } + void deserialiseJson(rawmeta) { + sourcepath = rawmeta['sourcepath'] + sourcerevision = rawmeta['sourcerevision'] + gitrevision = rawmeta['gitrevision'] + remoteurl = rawmeta['remoteurl'] + remoteinfo = rawmeta['remoteinfo'] + } + LinkedHashMap serialisationdata() { def data = [ 'sourcepath' : sourcepath, @@ -99,6 +115,13 @@ class JenkinsBuildInfo extends GISJsonSerialised { this.builddate = builddate } + void deserialiseJson(rawmeta) { + buildjobname = rawmeta['buildjobname'] + buildnumber = rawmeta['buildnumber'] + buildmachine = rawmeta['buildmachine'] + builddate = rawmeta['builddate'] + } + LinkedHashMap serialisationdata() { def data = [ 'buildjobname' : buildjobname, @@ -131,6 +154,13 @@ class BuildStampInfo extends GISJsonSerialised { this.buildstampcommasep = buildstampcommasep } + void deserialiseJson(rawmeta) { + buildstampprefix = rawmeta['buildstampprefix'] + revision = rawmeta['revision'] + buildstamp = rawmeta['buildstamp'] + buildstampcommasep = rawmeta['buildstampcommasep'] + } + LinkedHashMap serialisationdata() { def data = [ 'buildstampprefix' : buildstampprefix, @@ -168,6 +198,14 @@ class ReleaseInfo extends GISJsonSerialised { return items } + void deserialiseJson(rawmeta) { + releaserepoURL = rawmeta['releaserepoURL'] + releaseitems = new ArrayList() + for (rawreleaseitem in rawmeta['releaseitems']) { + releaseitems.add(rawreleaseitem) + } + } + LinkedHashMap serialisationdata() { def data = [ 'releaserepoURL' : releaserepoURL, @@ -191,6 +229,13 @@ class ConfigurationInfo extends GISJsonSerialised { this.configurationSHA = configurationSHA } + void deserialiseJson(rawmeta) { + configurationname = rawmeta['configurationname'] + configurationURL = rawmeta['configurationURL'] + configurationversion = rawmeta['configurationversion'] + configurationSHA = rawmeta['configurationSHA'] + } + LinkedHashMap serialisationdata() { def data = [ 'configurationname' : configurationname, @@ -212,6 +257,11 @@ class ChecksumPair extends GISJsonSerialised { this.sum = sum } + void deserialiseJson(rawmeta) { + filepath = rawmeta['filepath'] + sum = rawmeta['sum'] + } + LinkedHashMap serialisationdata() { def data = [ 'filepath' : filepath, @@ -245,6 +295,16 @@ class ChecksumSet extends GISJsonSerialised { return associated } + void deserialiseJson(rawmeta) { + artifactpath = rawmeta['artifactpath'] + checksumpairs = new ArrayList() + for (rawchecksumpair in rawmeta['checksumpairs']) { + def csp = new ChecksumPair(script) + csp.deserialiseJson(rawchecksumpair) + checksumpairs.add(csp) + } + } + LinkedHashMap serialisationdata() { def data = [ 'artifactpath' : artifactpath, @@ -276,6 +336,15 @@ class ChecksumInfo extends GISJsonSerialised { return associated } + void deserialiseJson(rawmeta) { + checksumsets = new ArrayList() + for (rawchecksumset in rawmeta['checksumsets']) { + def cs = new ChecksumSet(script) + cs.deserialiseJson(rawchecksumset) + checksumsets.add(cs) + } + } + LinkedHashMap serialisationdata() { def data = [ 'checksumsets' : checksumsetsserialised(), @@ -292,6 +361,10 @@ class PublishableInfo extends GISJsonSerialised { this.filepath = filepath } + void deserialiseJson(rawmeta) { + filepath = rawmeta['filepath'] + } + LinkedHashMap serialisationdata() { def data = [ 'filepath' : filepath, @@ -301,11 +374,37 @@ class PublishableInfo extends GISJsonSerialised { } class MetaInfo extends GISJsonSerialised { + private String FORMAT = "0.1" private String METAFOLDERNAME = "meta" private String METAFILENAME = "info.json" private String METAARTIFACTS = "${METAFOLDERNAME}/**" - private String format = '0.1' + class RelatedMetaInfo extends GISJsonSerialised { + String offsetpath + MetaInfo meta + + RelatedMetaInfo(script, offsetpath = "", MetaInfo meta = null) { + super(script) + this.offsetpath = offsetpath + this.meta = meta + } + + void deserialiseJson(rawmeta) { + offsetpath = rawmeta['offsetpath'] + meta = new MetaInfo(script) + meta.deserialiseJson(rawmeta['meta']) + } + + LinkedHashMap serialisationdata() { + def data = [ + 'offsetpath' : offsetpath, + 'meta' : meta.serialisationdata(), + ] + return data + } + } + + private String format = FORMAT ProductInfo productinfo GitInfo gitinfo JenkinsBuildInfo jenkinsbuildinfo @@ -314,7 +413,7 @@ class MetaInfo extends GISJsonSerialised { ChecksumInfo checksuminfo private ArrayList configurationinfo private ArrayList publishableinfo - private ArrayList associatedmeta + private ArrayList associatedmeta MetaInfo(script) { super(script) @@ -326,7 +425,7 @@ class MetaInfo extends GISJsonSerialised { checksuminfo = new ChecksumInfo(script) configurationinfo = new ArrayList() publishableinfo = new ArrayList() - associatedmeta = new ArrayList() + associatedmeta = new ArrayList() } List configurationinfoserialised() { @@ -363,8 +462,51 @@ class MetaInfo extends GISJsonSerialised { return associated } - void addAssociatedMetaInfo(mi) { - associatedmeta.add(mi) + void deserialiseJson(rawmeta) { + if (rawmeta['format'] != FORMAT) { + script.error("Unsupported meta format found at ${filepath}") + return + } + productinfo.deserialiseJson(rawmeta['productinfo']) + gitinfo.deserialiseJson(rawmeta['gitinfo']) + jenkinsbuildinfo.deserialiseJson(rawmeta['jenkinsbuildinfo']) + buildstampinfo.deserialiseJson(rawmeta['buildstampinfo']) + releaseinfo.deserialiseJson(rawmeta['releaseinfo']) + checksuminfo.deserialiseJson(rawmeta['checksuminfo']) + for (rawconfig in rawmeta['configuration']) { + def cf = new ConfigurationInfo(script) + cf.deserialiseJson(rawconfig) + configurationinfo.add(cf) + } + for (rawpublishable in rawmeta['publishableinfo']) { + def pb = new PublishableInfo(script) + pb.deserialiseJson(rawpublishable) + publishableinfo.add(pb) + } + for (rawrelatedmeta in rawmeta['associatedmeta']) { + def rm = new RelatedMetaInfo(script) + rm.deserialiseJson(rawrelatedmeta) + associatedmeta.add(rm) + } + } + + def deserialiseJson(String filepath) { + def rawmeta = script.readJSON(file: filepath) + deserialiseJson(rawmeta) + } + + MetaInfo importrelated(String destpath) { + MetaInfo mi = new MetaInfo(script) + + def importedmetafile = destpath + "/" + METAFOLDERNAME + "/" + METAFILENAME + if (script.fileExists(importedmetafile)) { + mi.deserialiseJson(importedmetafile) + } + + RelatedMetaInfo rmi = new RelatedMetaInfo(script, destpath, mi) + associatedmeta.add(rmi) + + return mi } LinkedHashMap serialisationdata() { From 53878daf609b8eacf1dd815b89cc4d1e8507d5a1 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Fri, 23 Nov 2018 18:51:51 +0000 Subject: [PATCH 099/237] Deserialise meta from file and associate with job meta --- import/importer.groovy | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/import/importer.groovy b/import/importer.groovy index ba912f4..d3c97e4 100644 --- a/import/importer.groovy +++ b/import/importer.groovy @@ -11,4 +11,6 @@ def artifactimport(meta, String jenkinsjob, String buildselector, String destpat target: destpath ) meta.importrelated(destpath) -} \ No newline at end of file +} + +return this; \ No newline at end of file From 929c18f5b690313da022d54bd815b8b0aab76dc8 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Fri, 23 Nov 2018 19:54:32 +0000 Subject: [PATCH 100/237] Store offset paths relative to WORKSPACE if given as absolute paths --- meta/folder.groovy | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/meta/folder.groovy b/meta/folder.groovy index 9d90cee..28fe85f 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -1,3 +1,5 @@ +import java.nio.file.Paths +import java.nio.file.Path abstract class GISJsonSerialised implements Serializable { def script @@ -494,16 +496,27 @@ class MetaInfo extends GISJsonSerialised { def rawmeta = script.readJSON(file: filepath) deserialiseJson(rawmeta) } + + String relativize(String path) { + def Path thispath = Paths.get(path) + if (thispath.startsWith(script.WORKSPACE)) { + def Path wspath = Paths.get(script.WORKSPACE) + def Path wsrelativePath = wspath.relativize(thispath) + return wsrelativePath.toString() + } + return path + } MetaInfo importrelated(String destpath) { MetaInfo mi = new MetaInfo(script) - def importedmetafile = destpath + "/" + METAFOLDERNAME + "/" + METAFILENAME + def String adjustedpath = relativize(destpath) + def importedmetafile = adjustedpath + "/" + METAFOLDERNAME + "/" + METAFILENAME if (script.fileExists(importedmetafile)) { mi.deserialiseJson(importedmetafile) } - RelatedMetaInfo rmi = new RelatedMetaInfo(script, destpath, mi) + RelatedMetaInfo rmi = new RelatedMetaInfo(script, adjustedpath, mi) associatedmeta.add(rmi) return mi From 8d119dcdbc340866d01f763a592649a445d4cd38 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Fri, 23 Nov 2018 20:06:10 +0000 Subject: [PATCH 101/237] Only show SHA code of configuration --- versioncontrol/git.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versioncontrol/git.groovy b/versioncontrol/git.groovy index 031094b..cb9354b 100644 --- a/versioncontrol/git.groovy +++ b/versioncontrol/git.groovy @@ -2,7 +2,7 @@ clh = load("${autobuilder.commonscripts()}/commandline/commandline.groovy") String getGitInfo(String workingSetRootPath) { dir(workingSetRootPath) { - return clh.getCommandOutput('git log -1 --format=oneline') + return clh.getCommandOutput('git rev-parse HEAD') } } From 9b51bd7cf89adcbd1de56613d51d22336bec760c Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Fri, 23 Nov 2018 21:05:06 +0000 Subject: [PATCH 102/237] Handle more version number strings --- versionnumbering/generate.groovy | 46 +++++++++++++++++--------------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/versionnumbering/generate.groovy b/versionnumbering/generate.groovy index 16fb1a9..59fe2a3 100644 --- a/versionnumbering/generate.groovy +++ b/versionnumbering/generate.groovy @@ -28,6 +28,8 @@ def getGitRevision(String gitrootpath, int basebuildnumber) { // origin/master // origin/2.0.x def getVersionPrefix(String sourcebranch) { + def int MAXVERSIONNUMBER = 65535 + echo "Determining version number prefix from source branch name: ${sourcebranch}" sourcebranch = sourcebranch.toLowerCase() @@ -51,43 +53,45 @@ def getVersionPrefix(String sourcebranch) { echo "Source branch name has no dots in it (eg. 1.9.2). Defaulting to: ${thirdpartyversionprefix}" return thirdpartyversionprefix } - splits = [] + for (split in splits2) { - if (split.isInteger()) { - splits.add(split) - } - else if (split == "x") { + if (split == "x") { + echo "Source branch name has '.x' or 'x.' in it. Defaulting to: ${mastertypeversionprefix}" return mastertypeversionprefix } } + def integerstrings = sourcebranch.findAll(/\d+/) + def integers = [] + for (integerstring in integerstrings) { + int integer = integerstring.toInteger() + integer = integer % (MAXVERSIONNUMBER + 1) + integers.add(integer) + } + def versionprefix = "" - if (splits.size() < 1) { + if (integers.size() < 1) { echo "This source branch name has no numbers in its name so defaulting to: ${defaultversionprefix}" versionprefix = defaultversionprefix } else { - def int splitnumbercount = 0 - for (split in splits) { - if (split.isInteger()) { - versionprefix += split + "." - splitnumbercount += 1 - } - else if (splitnumbercount > 2) { + def int integernumbercount = 0 + for (integer in integers) { + versionprefix += integer + "." + integernumbercount += 1 + if (integernumbercount > 2) { break } } - if (splitnumbercount == 0) { + if (integernumbercount == 0) { echo "No leading numbers were found in source branch name so defaulting to: ${defaultversionprefix}" versionprefix = defaultversionprefix } - else { - if (splitnumbercount == 1) { - versionprefix += "0.0." - } - else if (splitnumbercount == 2) { - versionprefix += "0." - } + else if (integernumbercount == 1) { + versionprefix += "0.0." + } + else if (integernumbercount == 2) { + versionprefix += "0." } } echo "Determined version prefix to be: ${versionprefix}" From 3bad7e2597a9242c529a66b3dbb2949de572ac79 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Fri, 23 Nov 2018 21:36:36 +0000 Subject: [PATCH 103/237] Parameterise the release repo --- autobuilder.groovy | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/autobuilder.groovy b/autobuilder.groovy index bbe7bb9..732e268 100644 --- a/autobuilder.groovy +++ b/autobuilder.groovy @@ -26,7 +26,7 @@ def getautobuildpath() { } // Start up boilderplate -def start(script, productname = PRODUCT_NAME, subcomponentname = SUBCOMPONENT_NAME, jirakey = JIRA_KEY, autobuildpath = autobuildroot, commonscriptspath = commonscriptsroot) { +def start(script, productname = PRODUCT_NAME, subcomponentname = SUBCOMPONENT_NAME, jirakey = JIRA_KEY, releaserepo = RELEASE_REPO, autobuildpath = autobuildroot, commonscriptspath = commonscriptsroot) { echo "Starting...." autobuildroot = autobuildpath @@ -40,7 +40,9 @@ def start(script, productname = PRODUCT_NAME, subcomponentname = SUBCOMPONENT_NA def now = new Date() now.format("yyMMdd.HHmm", TimeZone.getTimeZone('UTC')) meta.jenkinsbuildinfo.set(JOB_NAME, BUILD_ID.toInteger(), NODE_NAME, now.toString()) - + + meta.releaseinfo.set(releaserepo) + def ch = load("${commonscripts()}/configuration/configuration.groovy") ch.registerPipelineScriptConfiguration(meta) From 3eb169c9da50d78f63ac92c33a7a8fd585049ef0 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Fri, 23 Nov 2018 22:20:04 +0000 Subject: [PATCH 104/237] Check for existence of release repo by checking it out --- autobuilder.groovy | 3 ++- release/registerrepo.groovy | 12 ++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 release/registerrepo.groovy diff --git a/autobuilder.groovy b/autobuilder.groovy index 732e268..2a04925 100644 --- a/autobuilder.groovy +++ b/autobuilder.groovy @@ -41,7 +41,8 @@ def start(script, productname = PRODUCT_NAME, subcomponentname = SUBCOMPONENT_NA now.format("yyMMdd.HHmm", TimeZone.getTimeZone('UTC')) meta.jenkinsbuildinfo.set(JOB_NAME, BUILD_ID.toInteger(), NODE_NAME, now.toString()) - meta.releaseinfo.set(releaserepo) + def rr = load("${commonscripts()}/release/registerrepo.groovy") + rr.registerrepo(meta, releaserepo) def ch = load("${commonscripts()}/configuration/configuration.groovy") ch.registerPipelineScriptConfiguration(meta) diff --git a/release/registerrepo.groovy b/release/registerrepo.groovy new file mode 100644 index 0000000..1fc76ab --- /dev/null +++ b/release/registerrepo.groovy @@ -0,0 +1,12 @@ + +vc = load("${autobuilder.commonscripts()}/versioncontrol/git.groovy") + +// Prove the existence of the release repo - otherwise there is a large wait to cycle the build to correct the meta data +def registerrepo(meta, String releaserepo) { + if (releaserepo?.trim()) { + vc.gitCheckout(releaserepo, "origin/master", "meta/releaserepo") + } + meta.releaseinfo.set(releaserepo) +} + +return this; From d297db525283febc1e133fb294a0a66b94e1d372 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Fri, 23 Nov 2018 22:32:50 +0000 Subject: [PATCH 105/237] Save the temp repo load in a tmp folder --- release/registerrepo.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/registerrepo.groovy b/release/registerrepo.groovy index 1fc76ab..ff4d85d 100644 --- a/release/registerrepo.groovy +++ b/release/registerrepo.groovy @@ -4,7 +4,7 @@ vc = load("${autobuilder.commonscripts()}/versioncontrol/git.groovy") // Prove the existence of the release repo - otherwise there is a large wait to cycle the build to correct the meta data def registerrepo(meta, String releaserepo) { if (releaserepo?.trim()) { - vc.gitCheckout(releaserepo, "origin/master", "meta/releaserepo") + vc.gitCheckout(releaserepo, "origin/master", "tmp/releaserepo") } meta.releaseinfo.set(releaserepo) } From 0a7a6673bcb7f21a84fb37fb85f15aa846c2591e Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Fri, 23 Nov 2018 22:59:38 +0000 Subject: [PATCH 106/237] Make compile job use meta --- meta/folder.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/folder.groovy b/meta/folder.groovy index 28fe85f..0f9e0d5 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -138,8 +138,8 @@ class JenkinsBuildInfo extends GISJsonSerialised { class BuildStampInfo extends GISJsonSerialised { private String buildstampprefix private int revision - private String buildstamp - private String buildstampcommasep + String buildstamp + String buildstampcommasep BuildStampInfo(script, buildstampprefix = "", revision = 0, buildstamp = "", buildstampcommasep = "") { super(script) From c9a8032b36143cd19a38416561047a8948afbd6e Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 24 Nov 2018 11:24:37 +0000 Subject: [PATCH 107/237] Rename compile_init --- meta/folder.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/folder.groovy b/meta/folder.groovy index 0f9e0d5..189014c 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -162,7 +162,7 @@ class BuildStampInfo extends GISJsonSerialised { buildstamp = rawmeta['buildstamp'] buildstampcommasep = rawmeta['buildstampcommasep'] } - + LinkedHashMap serialisationdata() { def data = [ 'buildstampprefix' : buildstampprefix, From b5d80d67e8e3f561ca4e4c56db73cfc84fcce77d Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 24 Nov 2018 12:34:53 +0000 Subject: [PATCH 108/237] Correct checksumset deserialisation --- meta/folder.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/folder.groovy b/meta/folder.groovy index 189014c..e9491fe 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -253,7 +253,7 @@ class ChecksumPair extends GISJsonSerialised { private String filepath private String sum - ChecksumPair(script, String filepath, String sum) { + ChecksumPair(script, String filepath = "", String sum = "") { super(script) this.filepath = filepath this.sum = sum @@ -277,7 +277,7 @@ class ChecksumSet extends GISJsonSerialised { private String artifactpath private ArrayList checksumpairs - ChecksumSet(script, artifactpath) { + ChecksumSet(script, artifactpath = "") { super(script) this.artifactpath = artifactpath checksumpairs = new ArrayList() From 3752aa82ca371a5e4f278fb1821587265e580cf8 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 24 Nov 2018 13:18:35 +0000 Subject: [PATCH 109/237] Move image create job to use meta --- meta/folder.groovy | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meta/folder.groovy b/meta/folder.groovy index e9491fe..8f26265 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -507,11 +507,15 @@ class MetaInfo extends GISJsonSerialised { return path } + String metafilepath() { + return METAFOLDERNAME + "/" + METAFILENAME + } + MetaInfo importrelated(String destpath) { MetaInfo mi = new MetaInfo(script) def String adjustedpath = relativize(destpath) - def importedmetafile = adjustedpath + "/" + METAFOLDERNAME + "/" + METAFILENAME + def importedmetafile = adjustedpath + "/" + metafilepath() if (script.fileExists(importedmetafile)) { mi.deserialiseJson(importedmetafile) } From f50bbb36abbcc4e49af0c919afa51b706970e4dc Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 24 Nov 2018 14:14:13 +0000 Subject: [PATCH 110/237] Update build job to meta --- artifacts/metaexport.groovy | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/artifacts/metaexport.groovy b/artifacts/metaexport.groovy index 66a8153..0cfc773 100644 --- a/artifacts/metaexport.groovy +++ b/artifacts/metaexport.groovy @@ -1,21 +1,19 @@ // Take a list of Sub-job descriptors and output folder pairs, copy the artifacts, while filling in a string of artifact folders -def combineSubjobArtifacts(subJobs) { - artifactFolders = "" - for (subJob in subJobs) { - subJobObject = subJob[0] - artifactFolder = subJob[1] - if (subJobObject != null) { - subJobName = subJobObject.getProjectName() - subJobNumber = subJobObject.getNumber() - destFolder = "${artifactFolder}" +def combineSubjobArtifacts(meta, subJobs) { + def im = load("${commonscripts()}/import/importer.groovy") - dir("${destFolder}") { + def artifactFolders = "" + for (subJob in subJobs) { + def subJobObject = subJob[0] + if (subJobObject != null) { + def subJobName = subJobObject.getProjectName() + def subJobNumber = subJobObject.getNumber() + destFolder = subJob[1] + dir(destFolder) { deleteDir() } - - echo "Copying artifacts from: Job: ${subJobName} Number: ${subJobNumber} to folder: ${destFolder}" - copyArtifacts fingerprintArtifacts: true, projectName: "${subJobName}", selector: specific("${subJobNumber}"), target: "${destFolder}" + im.artifactimport(meta, subJobName, specific(subJobNumber), destFolder) artifactFolders += "${destFolder}/**," } } From ee97d816c8cbb5de9f4224a34c48a525ebb048ce Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sun, 25 Nov 2018 17:01:32 +0000 Subject: [PATCH 111/237] Update build job to meta --- artifacts/metaexport.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/artifacts/metaexport.groovy b/artifacts/metaexport.groovy index 0cfc773..016add9 100644 --- a/artifacts/metaexport.groovy +++ b/artifacts/metaexport.groovy @@ -1,7 +1,7 @@ // Take a list of Sub-job descriptors and output folder pairs, copy the artifacts, while filling in a string of artifact folders def combineSubjobArtifacts(meta, subJobs) { - def im = load("${commonscripts()}/import/importer.groovy") + def im = load("${autobuilder.commonscripts()}/import/importer.groovy") def artifactFolders = "" for (subJob in subJobs) { From 36b2d8bd90195a63d8864c1deba918e632fec38c Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sun, 25 Nov 2018 23:19:27 +0000 Subject: [PATCH 112/237] Make release job use meta --- artifacts/metaexport.groovy | 4 ++-- import/importer.groovy | 13 ++++++++++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/artifacts/metaexport.groovy b/artifacts/metaexport.groovy index 016add9..62a6ba4 100644 --- a/artifacts/metaexport.groovy +++ b/artifacts/metaexport.groovy @@ -1,7 +1,7 @@ // Take a list of Sub-job descriptors and output folder pairs, copy the artifacts, while filling in a string of artifact folders def combineSubjobArtifacts(meta, subJobs) { - def im = load("${autobuilder.commonscripts()}/import/importer.groovy") + def importer = load("${autobuilder.commonscripts()}/import/importer.groovy") def artifactFolders = "" for (subJob in subJobs) { @@ -13,7 +13,7 @@ def combineSubjobArtifacts(meta, subJobs) { dir(destFolder) { deleteDir() } - im.artifactimport(meta, subJobName, specific(subJobNumber), destFolder) + importer.artifactimport(meta, subJobName, subJobNumber, destFolder) artifactFolders += "${destFolder}/**," } } diff --git a/import/importer.groovy b/import/importer.groovy index d3c97e4..a9e28b2 100644 --- a/import/importer.groovy +++ b/import/importer.groovy @@ -1,4 +1,15 @@ +def artifactimport(meta, String jenkinsjob, int buildnumber, String destpath, String filter = '**', boolean fingerprint = false) { + copyArtifacts( + filter: filter, + fingerprintArtifacts: fingerprint, + projectName: jenkinsjob.trim(), + selector: specific(buildnumber.toString()), + target: destpath + ) + meta.importrelated(destpath) +} + def artifactimport(meta, String jenkinsjob, String buildselector, String destpath, String filter = '**', boolean fingerprint = false) { copyArtifacts( filter: filter, @@ -13,4 +24,4 @@ def artifactimport(meta, String jenkinsjob, String buildselector, String destpat meta.importrelated(destpath) } -return this; \ No newline at end of file +return this; From 9106a00c932747ee5fd0a6baf4cf95d811b60c71 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Mon, 26 Nov 2018 08:29:56 +0000 Subject: [PATCH 113/237] Build up list of artifacts --- artifacts/metaexport.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/artifacts/metaexport.groovy b/artifacts/metaexport.groovy index 62a6ba4..cf5e9b3 100644 --- a/artifacts/metaexport.groovy +++ b/artifacts/metaexport.groovy @@ -3,7 +3,7 @@ def combineSubjobArtifacts(meta, subJobs) { def importer = load("${autobuilder.commonscripts()}/import/importer.groovy") - def artifactFolders = "" + def artifactFolders = [] for (subJob in subJobs) { def subJobObject = subJob[0] if (subJobObject != null) { @@ -14,7 +14,7 @@ def combineSubjobArtifacts(meta, subJobs) { deleteDir() } importer.artifactimport(meta, subJobName, subJobNumber, destFolder) - artifactFolders += "${destFolder}/**," + artifactFolders.add("${destFolder}/**") } } return artifactFolders; From 0150bf139f8e29a8816c786a4ea01f8bce10ecf6 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Mon, 26 Nov 2018 11:16:53 +0000 Subject: [PATCH 114/237] Explicitly return artifact list as ArrayList --- artifacts/metaexport.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/artifacts/metaexport.groovy b/artifacts/metaexport.groovy index cf5e9b3..b6a832b 100644 --- a/artifacts/metaexport.groovy +++ b/artifacts/metaexport.groovy @@ -3,7 +3,7 @@ def combineSubjobArtifacts(meta, subJobs) { def importer = load("${autobuilder.commonscripts()}/import/importer.groovy") - def artifactFolders = [] + def ArrayList artifactFolders = new ArrayList() for (subJob in subJobs) { def subJobObject = subJob[0] if (subJobObject != null) { From 7e58b0b5a1babecf042aafc4e79651b8819658d1 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Mon, 26 Nov 2018 18:17:55 +0000 Subject: [PATCH 115/237] Walk meta data for release info --- import/importer.groovy | 4 ++-- meta/folder.groovy | 24 ++++++++++++++++++++++-- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/import/importer.groovy b/import/importer.groovy index a9e28b2..4d24d30 100644 --- a/import/importer.groovy +++ b/import/importer.groovy @@ -7,7 +7,7 @@ def artifactimport(meta, String jenkinsjob, int buildnumber, String destpath, St selector: specific(buildnumber.toString()), target: destpath ) - meta.importrelated(destpath) + return meta.importrelated(destpath) } def artifactimport(meta, String jenkinsjob, String buildselector, String destpath, String filter = '**', boolean fingerprint = false) { @@ -21,7 +21,7 @@ def artifactimport(meta, String jenkinsjob, String buildselector, String destpat ], target: destpath ) - meta.importrelated(destpath) + return meta.importrelated(destpath) } return this; diff --git a/meta/folder.groovy b/meta/folder.groovy index 8f26265..c2c30a4 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -175,8 +175,8 @@ class BuildStampInfo extends GISJsonSerialised { } class ReleaseInfo extends GISJsonSerialised { - private String releaserepoURL - private ArrayList releaseitems + String releaserepoURL + ArrayList releaseitems ReleaseInfo(script, releaserepoURL = "") { super(script) @@ -563,6 +563,26 @@ class MetaInfo extends GISJsonSerialised { saveJsonSerialised(metafilepath) return artifactlist } + + // Recurse tree of meta looking for release info and accumulate path + private ArrayList releasewalkerp(ArrayList releasemetacollection, String pathsofar) { + if (releaseinfo.releaserepoURL) { + ArrayList rmi(script, pathsofar, this) + releasemetacollection.add(rmi) + } + for (relatedmetainfo in associatedmeta) { + MetaInfo othermeta = relatedmetainfo.meta + String newpathsofar = pathsofar + "/" + relatedmetainfo.offsetpath + releasemetacollection = releasewalkerp(releasemetacollection, newpathsofar) + } + return releasemetacollection + } + + ArrayList releasewalker(String startpath = "") { + ArrayList releasemetacollection = new ArrayList() + releasemetacollection = releasewalkerp(releasemetacollection, startpath) + return releasemetacollection + } } MetaInfo metareset(script) { From 1dffa1ef60eb6f9b4da17597dfee0d6992e4b612 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Mon, 26 Nov 2018 18:37:54 +0000 Subject: [PATCH 116/237] Walk meta data for release info --- meta/folder.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/folder.groovy b/meta/folder.groovy index c2c30a4..361c120 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -567,7 +567,7 @@ class MetaInfo extends GISJsonSerialised { // Recurse tree of meta looking for release info and accumulate path private ArrayList releasewalkerp(ArrayList releasemetacollection, String pathsofar) { if (releaseinfo.releaserepoURL) { - ArrayList rmi(script, pathsofar, this) + RelatedMetaInfo rmi = new RelatedMetaInfo(script, pathsofar, this) releasemetacollection.add(rmi) } for (relatedmetainfo in associatedmeta) { From 68f24e6a30a3f8330a6e5914bb99bd69fc153fbf Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Mon, 26 Nov 2018 21:18:12 +0000 Subject: [PATCH 117/237] Walk meta data for release info --- meta/folder.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/folder.groovy b/meta/folder.groovy index 361c120..b204462 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -573,7 +573,7 @@ class MetaInfo extends GISJsonSerialised { for (relatedmetainfo in associatedmeta) { MetaInfo othermeta = relatedmetainfo.meta String newpathsofar = pathsofar + "/" + relatedmetainfo.offsetpath - releasemetacollection = releasewalkerp(releasemetacollection, newpathsofar) + releasemetacollection = othermeta.releasewalkerp(releasemetacollection, newpathsofar) } return releasemetacollection } From 84589b75474c3189c35c18320fc13da0aff4649f Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Tue, 27 Nov 2018 08:34:19 +0000 Subject: [PATCH 118/237] Correct release path --- meta/folder.groovy | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/folder.groovy b/meta/folder.groovy index b204462..88c5e17 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -572,7 +572,10 @@ class MetaInfo extends GISJsonSerialised { } for (relatedmetainfo in associatedmeta) { MetaInfo othermeta = relatedmetainfo.meta - String newpathsofar = pathsofar + "/" + relatedmetainfo.offsetpath + if (pathsofar) { + pathsofar += "/" + } + String newpathsofar = pathsofar + relatedmetainfo.offsetpath releasemetacollection = othermeta.releasewalkerp(releasemetacollection, newpathsofar) } return releasemetacollection From 6211375100f8e0f029d653d1e7d3851bbe19261f Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Tue, 27 Nov 2018 08:51:27 +0000 Subject: [PATCH 119/237] Correct release path --- meta/folder.groovy | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/folder.groovy b/meta/folder.groovy index 88c5e17..802443d 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -570,11 +570,11 @@ class MetaInfo extends GISJsonSerialised { RelatedMetaInfo rmi = new RelatedMetaInfo(script, pathsofar, this) releasemetacollection.add(rmi) } + if (pathsofar) { + pathsofar += "/" + } for (relatedmetainfo in associatedmeta) { MetaInfo othermeta = relatedmetainfo.meta - if (pathsofar) { - pathsofar += "/" - } String newpathsofar = pathsofar + relatedmetainfo.offsetpath releasemetacollection = othermeta.releasewalkerp(releasemetacollection, newpathsofar) } From da2e95a8705d2ead0a4e2c9b5f05dd592345226c Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Tue, 27 Nov 2018 16:52:38 +0000 Subject: [PATCH 120/237] Check out release repos --- meta/folder.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/folder.groovy b/meta/folder.groovy index 802443d..f5e7c93 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -564,7 +564,7 @@ class MetaInfo extends GISJsonSerialised { return artifactlist } - // Recurse tree of meta looking for release info and accumulate path + // Recurse tree of meta looking for release info and accumulate path - Pass by reference unavailable in Groovy/Java private ArrayList releasewalkerp(ArrayList releasemetacollection, String pathsofar) { if (releaseinfo.releaserepoURL) { RelatedMetaInfo rmi = new RelatedMetaInfo(script, pathsofar, this) From 976994accc03b3374a4de0efa06fa0b438ea5b3f Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Tue, 27 Nov 2018 18:09:27 +0000 Subject: [PATCH 121/237] Check out release repos --- meta/folder.groovy | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/meta/folder.groovy b/meta/folder.groovy index f5e7c93..1e45319 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -507,7 +507,7 @@ class MetaInfo extends GISJsonSerialised { return path } - String metafilepath() { + static String metafilepath() { return METAFOLDERNAME + "/" + METAFILENAME } @@ -598,4 +598,9 @@ MetaInfo metareset(script) { return mi } +MetaInfo metafromfolder(String folder = "") { + MetaInfo buildmeta = new MetaInfo(this) + buildmeta.deserialiseJson("${folder}/${MetaInfo.metafilepath()}") +} + return this; From 03921f73d4226056021efb821daaf18eec6445dc Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Tue, 27 Nov 2018 18:47:42 +0000 Subject: [PATCH 122/237] Check out release repos --- meta/folder.groovy | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/folder.groovy b/meta/folder.groovy index 1e45319..de445f1 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -376,10 +376,10 @@ class PublishableInfo extends GISJsonSerialised { } class MetaInfo extends GISJsonSerialised { - private String FORMAT = "0.1" - private String METAFOLDERNAME = "meta" - private String METAFILENAME = "info.json" - private String METAARTIFACTS = "${METAFOLDERNAME}/**" + private static String FORMAT = "0.1" + private static String METAFOLDERNAME = "meta" + private static String METAFILENAME = "info.json" + private static String METAARTIFACTS = "${METAFOLDERNAME}/**" class RelatedMetaInfo extends GISJsonSerialised { String offsetpath From 0ee39e5c95e1b9b2d1beba62b40548bb4258ea7e Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Tue, 27 Nov 2018 19:10:54 +0000 Subject: [PATCH 123/237] Check out release repos --- autobuilder.groovy | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/autobuilder.groovy b/autobuilder.groovy index 2a04925..9f0aece 100644 --- a/autobuilder.groovy +++ b/autobuilder.groovy @@ -4,6 +4,8 @@ autobuildroot = "${WORKSPACE}/autobuild" commonscriptsroot = "${autobuildroot}/Common_scripts" +metafolderscript = null + def conditionalclean(doclean = "${CLEAN_WORKSPACE}" == "true") { if (doclean) { echo "Cleaning workspace" @@ -25,17 +27,21 @@ def getautobuildpath() { return autobuildroot } +def getmetafolderscript() { + return metafolderscript +} + // Start up boilderplate def start(script, productname = PRODUCT_NAME, subcomponentname = SUBCOMPONENT_NAME, jirakey = JIRA_KEY, releaserepo = RELEASE_REPO, autobuildpath = autobuildroot, commonscriptspath = commonscriptsroot) { echo "Starting...." autobuildroot = autobuildpath commonscriptsroot = commonscriptspath + metafolderscript = load("${commonscripts()}/meta/folder.groovy") conditionalclean() - def metafolder = load("${commonscripts()}/meta/folder.groovy") - def meta = metafolder.metareset(script) + def meta = getmetafolderscript().metareset(script) meta.productinfo.set(productname, subcomponentname, jirakey) def now = new Date() now.format("yyMMdd.HHmm", TimeZone.getTimeZone('UTC')) From 6a08d9ef26061b9c6d97afa2a3597aa3acd69c89 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Tue, 27 Nov 2018 21:19:18 +0000 Subject: [PATCH 124/237] Check out release repos --- autobuilder.groovy | 1 + 1 file changed, 1 insertion(+) diff --git a/autobuilder.groovy b/autobuilder.groovy index 9f0aece..885d243 100644 --- a/autobuilder.groovy +++ b/autobuilder.groovy @@ -28,6 +28,7 @@ def getautobuildpath() { } def getmetafolderscript() { + echo "metafolderscript is type: ${metafolderscript.toClass()}" return metafolderscript } From 3c8510bb275a21aa1a883eca2dcc99c9c0b49f7c Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Tue, 27 Nov 2018 21:23:17 +0000 Subject: [PATCH 125/237] Check out release repos --- autobuilder.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autobuilder.groovy b/autobuilder.groovy index 885d243..e40a67e 100644 --- a/autobuilder.groovy +++ b/autobuilder.groovy @@ -28,7 +28,7 @@ def getautobuildpath() { } def getmetafolderscript() { - echo "metafolderscript is type: ${metafolderscript.toClass()}" + echo "metafolderscript is type: ${metafolderscript.getClass()}" return metafolderscript } From e7085c9e219608078132ee5b65423a2c0f0f401c Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Tue, 27 Nov 2018 21:41:01 +0000 Subject: [PATCH 126/237] Check out release repos --- meta/folder.groovy | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/folder.groovy b/meta/folder.groovy index de445f1..458156d 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -601,6 +601,7 @@ MetaInfo metareset(script) { MetaInfo metafromfolder(String folder = "") { MetaInfo buildmeta = new MetaInfo(this) buildmeta.deserialiseJson("${folder}/${MetaInfo.metafilepath()}") + return buildmeta } return this; From fca9f9f00d48ff56eb76fcbeeb27914af5fe1246 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Tue, 27 Nov 2018 22:35:37 +0000 Subject: [PATCH 127/237] Remove debug --- autobuilder.groovy | 1 - 1 file changed, 1 deletion(-) diff --git a/autobuilder.groovy b/autobuilder.groovy index e40a67e..9f0aece 100644 --- a/autobuilder.groovy +++ b/autobuilder.groovy @@ -28,7 +28,6 @@ def getautobuildpath() { } def getmetafolderscript() { - echo "metafolderscript is type: ${metafolderscript.getClass()}" return metafolderscript } From 3f8bb3f6f7c7de23558eaa4111dc8de2c1a33fcc Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Wed, 28 Nov 2018 09:07:06 +0000 Subject: [PATCH 128/237] Create a version number for the all build --- artifacts/metaexport.groovy | 8 ++++++-- meta/folder.groovy | 10 +++++++++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/artifacts/metaexport.groovy b/artifacts/metaexport.groovy index b6a832b..e87e3d9 100644 --- a/artifacts/metaexport.groovy +++ b/artifacts/metaexport.groovy @@ -4,6 +4,7 @@ def combineSubjobArtifacts(meta, subJobs) { def importer = load("${autobuilder.commonscripts()}/import/importer.groovy") def ArrayList artifactFolders = new ArrayList() + int revisiontotal = 0 for (subJob in subJobs) { def subJobObject = subJob[0] if (subJobObject != null) { @@ -13,11 +14,14 @@ def combineSubjobArtifacts(meta, subJobs) { dir(destFolder) { deleteDir() } - importer.artifactimport(meta, subJobName, subJobNumber, destFolder) + importedmeta = importer.artifactimport(meta, subJobName, subJobNumber, destFolder) + revisiontotal += importedmeta.buildstampinfo.revision artifactFolders.add("${destFolder}/**") } } - return artifactFolders; + def versiongenerator = load("${autobuilder.commonscripts()}/versionnumbering/generate.groovy") + revisiontotal = revisiontotal % (versiongenerator.MAXVERSIONNUMBER + 1) + return [artifactFolders, revisiontotal] } return this; diff --git a/meta/folder.groovy b/meta/folder.groovy index 458156d..74ac7c4 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -137,7 +137,7 @@ class JenkinsBuildInfo extends GISJsonSerialised { class BuildStampInfo extends GISJsonSerialised { private String buildstampprefix - private int revision + int revision String buildstamp String buildstampcommasep @@ -156,6 +156,14 @@ class BuildStampInfo extends GISJsonSerialised { this.buildstampcommasep = buildstampcommasep } + void changerevision(int newrevision) { + revision = newrevision + buildstampsplit = buildstamp.split('.') + buildstampsplit[3] = newrevision.toString() + buildstamp = buildstampsplit.join('.') + buildstampcommasep = buildstampsplit.join(',') + } + void deserialiseJson(rawmeta) { buildstampprefix = rawmeta['buildstampprefix'] revision = rawmeta['revision'] From 1a4666fdcce33377839c1992fb2f6410a2cd877a Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Wed, 28 Nov 2018 11:37:10 +0000 Subject: [PATCH 129/237] Correct scope of MAXVERSIONNUMBER --- versionnumbering/generate.groovy | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/versionnumbering/generate.groovy b/versionnumbering/generate.groovy index 59fe2a3..cf21fd0 100644 --- a/versionnumbering/generate.groovy +++ b/versionnumbering/generate.groovy @@ -1,3 +1,4 @@ +int MAXVERSIONNUMBER = 65535 def getGitRevision(String gitrootpath, int basebuildnumber) { def int adjustedchangecount @@ -5,8 +6,6 @@ def getGitRevision(String gitrootpath, int basebuildnumber) { def String remoteinfo def String remoteurl dir( gitrootpath) { - def int MAXVERSIONNUMBER = 65535 - def int changecount = sh(returnStdout: true, script: "git rev-list HEAD --count").trim() echo "Change count: ${changecount}" adjustedchangecount = (changecount + basebuildnumber) % (MAXVERSIONNUMBER + 1) @@ -28,8 +27,6 @@ def getGitRevision(String gitrootpath, int basebuildnumber) { // origin/master // origin/2.0.x def getVersionPrefix(String sourcebranch) { - def int MAXVERSIONNUMBER = 65535 - echo "Determining version number prefix from source branch name: ${sourcebranch}" sourcebranch = sourcebranch.toLowerCase() From 46ddde1b777ab67847f7ad5de4cab37ca6488143 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Wed, 28 Nov 2018 13:10:26 +0000 Subject: [PATCH 130/237] Correct scope of MAXVERSIONNUMBER --- artifacts/metaexport.groovy | 2 +- versionnumbering/generate.groovy | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/artifacts/metaexport.groovy b/artifacts/metaexport.groovy index e87e3d9..b4d4a6d 100644 --- a/artifacts/metaexport.groovy +++ b/artifacts/metaexport.groovy @@ -20,7 +20,7 @@ def combineSubjobArtifacts(meta, subJobs) { } } def versiongenerator = load("${autobuilder.commonscripts()}/versionnumbering/generate.groovy") - revisiontotal = revisiontotal % (versiongenerator.MAXVERSIONNUMBER + 1) + revisiontotal = revisiontotal % (versiongenerator.maxversionnumber() + 1) return [artifactFolders, revisiontotal] } diff --git a/versionnumbering/generate.groovy b/versionnumbering/generate.groovy index cf21fd0..9df06d8 100644 --- a/versionnumbering/generate.groovy +++ b/versionnumbering/generate.groovy @@ -1,4 +1,8 @@ -int MAXVERSIONNUMBER = 65535 + +def int maxversionnumber() { + def int MAXVERSIONNUMBER = 65535 + return MAXVERSIONNUMBER +} def getGitRevision(String gitrootpath, int basebuildnumber) { def int adjustedchangecount @@ -8,7 +12,7 @@ def getGitRevision(String gitrootpath, int basebuildnumber) { dir( gitrootpath) { def int changecount = sh(returnStdout: true, script: "git rev-list HEAD --count").trim() echo "Change count: ${changecount}" - adjustedchangecount = (changecount + basebuildnumber) % (MAXVERSIONNUMBER + 1) + adjustedchangecount = (changecount + basebuildnumber) % (maxversionnumber() + 1) echo "Adjusted change count: ${adjustedchangecount}" gitrevision = sh(returnStdout: true, script: "git rev-parse HEAD").trim() @@ -62,7 +66,7 @@ def getVersionPrefix(String sourcebranch) { def integers = [] for (integerstring in integerstrings) { int integer = integerstring.toInteger() - integer = integer % (MAXVERSIONNUMBER + 1) + integer = integer % (maxversionnumber() + 1) integers.add(integer) } From 58b6100215be6ed6ddbe3eb7abacaacac88fff50 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Wed, 28 Nov 2018 17:11:08 +0000 Subject: [PATCH 131/237] Load in artifacts for release --- meta/folder.groovy | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/meta/folder.groovy b/meta/folder.groovy index 74ac7c4..822472d 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -594,6 +594,17 @@ class MetaInfo extends GISJsonSerialised { releasemetacollection = releasewalkerp(releasemetacollection, startpath) return releasemetacollection } + + Map releasewalkerunique(String startpath = "") { + Map releasemetauniquecollection = new Map() + ArrayList releasemetacollection = new ArrayList() + releasemetacollection = releasewalkerp(releasemetacollection, startpath) + for (relatedmetainfo in releasemetacollection) { + String uniquestring = relatedmetainfo.meta.productinfo.productname + "_" + relatedmetainfo.meta.productinfo.subcomponentname + releasemetauniquecollection.put(uniquestring, relatedmetainfo) + } + return releasemetauniquecollection + } } MetaInfo metareset(script) { From c095a2c19ef6afcb69febebfb1a5b5e20392a9d3 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Wed, 28 Nov 2018 17:17:09 +0000 Subject: [PATCH 132/237] Load in artifacts for release --- meta/folder.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/folder.groovy b/meta/folder.groovy index 822472d..8f8ea0a 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -596,7 +596,7 @@ class MetaInfo extends GISJsonSerialised { } Map releasewalkerunique(String startpath = "") { - Map releasemetauniquecollection = new Map() + Map releasemetauniquecollection = new LinkedHashMap() ArrayList releasemetacollection = new ArrayList() releasemetacollection = releasewalkerp(releasemetacollection, startpath) for (relatedmetainfo in releasemetacollection) { From 911d147f81b3c3a3712490e8aca945e96b6c2118 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Wed, 28 Nov 2018 17:40:47 +0000 Subject: [PATCH 133/237] Load in artifacts for release --- meta/folder.groovy | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/meta/folder.groovy b/meta/folder.groovy index 8f8ea0a..24bcbf5 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -573,32 +573,34 @@ class MetaInfo extends GISJsonSerialised { } // Recurse tree of meta looking for release info and accumulate path - Pass by reference unavailable in Groovy/Java - private ArrayList releasewalkerp(ArrayList releasemetacollection, String pathsofar) { - if (releaseinfo.releaserepoURL) { - RelatedMetaInfo rmi = new RelatedMetaInfo(script, pathsofar, this) - releasemetacollection.add(rmi) - } - if (pathsofar) { - pathsofar += "/" - } - for (relatedmetainfo in associatedmeta) { - MetaInfo othermeta = relatedmetainfo.meta - String newpathsofar = pathsofar + relatedmetainfo.offsetpath - releasemetacollection = othermeta.releasewalkerp(releasemetacollection, newpathsofar) + private ArrayList releasewalkerp(int maxdepth, ArrayList releasemetacollection, String pathsofar) { + if (maxdepth > 0) { + if (releaseinfo.releaserepoURL) { + RelatedMetaInfo rmi = new RelatedMetaInfo(script, pathsofar, this) + releasemetacollection.add(rmi) + } + if (pathsofar) { + pathsofar += "/" + } + for (relatedmetainfo in associatedmeta) { + MetaInfo othermeta = relatedmetainfo.meta + String newpathsofar = pathsofar + relatedmetainfo.offsetpath + releasemetacollection = othermeta.releasewalkerp(maxdepth - 1, releasemetacollection, newpathsofar) + } } return releasemetacollection } - ArrayList releasewalker(String startpath = "") { + ArrayList releasewalker(int maxdepth, String startpath = "") { ArrayList releasemetacollection = new ArrayList() - releasemetacollection = releasewalkerp(releasemetacollection, startpath) + releasemetacollection = releasewalkerp(maxdepth, releasemetacollection, startpath) return releasemetacollection } - Map releasewalkerunique(String startpath = "") { + Map releasewalkerunique(int maxdepth, String startpath = "") { Map releasemetauniquecollection = new LinkedHashMap() ArrayList releasemetacollection = new ArrayList() - releasemetacollection = releasewalkerp(releasemetacollection, startpath) + releasemetacollection = releasewalkerp(maxdepth, releasemetacollection, startpath) for (relatedmetainfo in releasemetacollection) { String uniquestring = relatedmetainfo.meta.productinfo.productname + "_" + relatedmetainfo.meta.productinfo.subcomponentname releasemetauniquecollection.put(uniquestring, relatedmetainfo) From 1acfec14d58fccd275ea435ef4bae6423aa5dde1 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Wed, 28 Nov 2018 19:24:10 +0000 Subject: [PATCH 134/237] Perform git push operations --- meta/folder.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/folder.groovy b/meta/folder.groovy index 24bcbf5..b8120a6 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -158,7 +158,7 @@ class BuildStampInfo extends GISJsonSerialised { void changerevision(int newrevision) { revision = newrevision - buildstampsplit = buildstamp.split('.') + def List buildstampsplit = buildstamp.split('.') buildstampsplit[3] = newrevision.toString() buildstamp = buildstampsplit.join('.') buildstampcommasep = buildstampsplit.join(',') From a43f93cc15a854ff0425b36a355d6acaa5b614e7 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Wed, 28 Nov 2018 19:44:11 +0000 Subject: [PATCH 135/237] Perform git push operations --- meta/folder.groovy | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/folder.groovy b/meta/folder.groovy index b8120a6..cfa0a6e 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -157,11 +157,13 @@ class BuildStampInfo extends GISJsonSerialised { } void changerevision(int newrevision) { + script.echo("Build stamp currently ${buildstamp}") revision = newrevision def List buildstampsplit = buildstamp.split('.') buildstampsplit[3] = newrevision.toString() buildstamp = buildstampsplit.join('.') buildstampcommasep = buildstampsplit.join(',') + script.echo("Build stamp now ${buildstamp}") } void deserialiseJson(rawmeta) { From 95b1a75e0c8c32161cac0ff241e32f0d9aedf5c7 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Thu, 29 Nov 2018 00:33:39 +0000 Subject: [PATCH 136/237] Calculate version number earlier --- meta/folder.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/folder.groovy b/meta/folder.groovy index cfa0a6e..ed17a91 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -159,7 +159,7 @@ class BuildStampInfo extends GISJsonSerialised { void changerevision(int newrevision) { script.echo("Build stamp currently ${buildstamp}") revision = newrevision - def List buildstampsplit = buildstamp.split('.') + def List buildstampsplit = buildstamp.split('\\.') buildstampsplit[3] = newrevision.toString() buildstamp = buildstampsplit.join('.') buildstampcommasep = buildstampsplit.join(',') From 24b138ac8ffa91bc3bfee0403212417f8cb0b1de Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Thu, 29 Nov 2018 08:06:46 +0000 Subject: [PATCH 137/237] Remote URL fetch was not working --- meta/folder.groovy | 2 +- versionnumbering/generate.groovy | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/folder.groovy b/meta/folder.groovy index ed17a91..2640567 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -1,4 +1,4 @@ -import java.nio.file.Paths +urimport java.nio.file.Paths import java.nio.file.Path abstract class GISJsonSerialised implements Serializable { diff --git a/versionnumbering/generate.groovy b/versionnumbering/generate.groovy index 9df06d8..f185c40 100644 --- a/versionnumbering/generate.groovy +++ b/versionnumbering/generate.groovy @@ -21,7 +21,7 @@ def getGitRevision(String gitrootpath, int basebuildnumber) { remoteinfo = sh(returnStdout: true, script: "git remote show origin").trim() echo "Remote info: ${remoteinfo}" - remoteurl = sh(returnStdout: true, script: "git remote get-url --push origin").trim() + remoteurl = sh(returnStdout: true, script: "git config --get remote.origin.url").trim() echo "Remote URL: ${remoteurl}" } return [adjustedchangecount, gitrevision, remoteinfo, remoteurl] From 3fceb3282905b6cef5137eacf9cb0a17774e1d47 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Thu, 29 Nov 2018 08:10:04 +0000 Subject: [PATCH 138/237] Remote URL fetch was not working --- meta/folder.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/folder.groovy b/meta/folder.groovy index 2640567..ed17a91 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -1,4 +1,4 @@ -urimport java.nio.file.Paths +import java.nio.file.Paths import java.nio.file.Path abstract class GISJsonSerialised implements Serializable { From 347e544b459cb5206c0145bc3007288412a062f3 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Thu, 29 Nov 2018 08:36:20 +0000 Subject: [PATCH 139/237] Remove comma separated buildstamp store --- meta/folder.groovy | 17 ++++++++--------- versionnumbering/generate.groovy | 2 +- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/meta/folder.groovy b/meta/folder.groovy index ed17a91..76fbe43 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -139,30 +139,31 @@ class BuildStampInfo extends GISJsonSerialised { private String buildstampprefix int revision String buildstamp - String buildstampcommasep - BuildStampInfo(script, buildstampprefix = "", revision = 0, buildstamp = "", buildstampcommasep = "") { + BuildStampInfo(script, buildstampprefix = "", revision = 0, buildstamp = "") { super(script) this.buildstampprefix = buildstampprefix this.revision = revision this.buildstamp = buildstamp - this.buildstampcommasep = buildstampcommasep } - void set(String buildstampprefix, int revision, String buildstamp, String buildstampcommasep) { + void set(String buildstampprefix, int revision, String buildstamp) { this.buildstampprefix = buildstampprefix this.revision = revision this.buildstamp = buildstamp - this.buildstampcommasep = buildstampcommasep } + String buildstampcommasep() { + buildstampcommasep = buildstamp.replace(".", ",") + return buildstampcommasep + } + void changerevision(int newrevision) { script.echo("Build stamp currently ${buildstamp}") revision = newrevision def List buildstampsplit = buildstamp.split('\\.') - buildstampsplit[3] = newrevision.toString() + buildstampsplit[-1] = newrevision.toString() buildstamp = buildstampsplit.join('.') - buildstampcommasep = buildstampsplit.join(',') script.echo("Build stamp now ${buildstamp}") } @@ -170,7 +171,6 @@ class BuildStampInfo extends GISJsonSerialised { buildstampprefix = rawmeta['buildstampprefix'] revision = rawmeta['revision'] buildstamp = rawmeta['buildstamp'] - buildstampcommasep = rawmeta['buildstampcommasep'] } LinkedHashMap serialisationdata() { @@ -178,7 +178,6 @@ class BuildStampInfo extends GISJsonSerialised { 'buildstampprefix' : buildstampprefix, 'revision' : revision, 'buildstamp' : buildstamp, - 'buildstampcommasep' : buildstampcommasep, ] return data } diff --git a/versionnumbering/generate.groovy b/versionnumbering/generate.groovy index f185c40..a7b583a 100644 --- a/versionnumbering/generate.groovy +++ b/versionnumbering/generate.groovy @@ -113,7 +113,7 @@ String generate(meta, String sourcerevision, String sourcepath, int basebuildnum echo "Build stamp is: ${buildstamp}" meta.gitinfo.set(sourcepath, sourcerevision, gitrevision, remoteurl, remoteinfo) - meta.buildstampinfo.set(versionprefix, gitrevisioncount, buildstamp, buildstamp.replace(".", ",")) + meta.buildstampinfo.set(versionprefix, gitrevisioncount, buildstamp) return buildstamp } From 574c2155a776b67f164ab426da7fcbe606a333f8 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Thu, 29 Nov 2018 12:48:41 +0000 Subject: [PATCH 140/237] Correct buildstamp comma sep generation --- meta/folder.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/folder.groovy b/meta/folder.groovy index 76fbe43..570a3ea 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -154,7 +154,7 @@ class BuildStampInfo extends GISJsonSerialised { } String buildstampcommasep() { - buildstampcommasep = buildstamp.replace(".", ",") + def String buildstampcommasep = buildstamp.replace(".", ",") return buildstampcommasep } From d33e50f3cc7779f41f6703b52ef97c8e73e62b78 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Thu, 29 Nov 2018 13:23:40 +0000 Subject: [PATCH 141/237] Remove redundant script; Correct artifact export of release job --- versionnumbering/metaversion.groovy | 100 ---------------------------- 1 file changed, 100 deletions(-) delete mode 100644 versionnumbering/metaversion.groovy diff --git a/versionnumbering/metaversion.groovy b/versionnumbering/metaversion.groovy deleted file mode 100644 index 44bfbde..0000000 --- a/versionnumbering/metaversion.groovy +++ /dev/null @@ -1,100 +0,0 @@ - -def lineendings = load("${autobuilder.commonscripts()}/platform/lineendings.groovy") -def fileutils = load("${autobuilder.commonscripts()}/file/utils.groovy") - -def prefixline(rootpath, filepath) { - def fileContents = readFile("${filepath}").trim() - def fileContentsNormalized = fileContents.normalize() - - def newFileContents = "" - def lines = fileContentsNormalized.readLines() - for (aline in lines) { - newFileContents += "${rootpath}" + "/" + aline + "${nl}" - } - return newFileContents -} - -def mergemeta(rootpath, versionFolder, outputFolder) { - echo "Merging meta data from folder: ${versionFolder} to ${outputFolder}" - - def differencesFile = "${versionFolder}/differences.txt" - def newContents = readFile file: "${differencesFile}" - def metadifferencesFile = "${outputFolder}/differences.txt" - writeFile file: "${metadifferencesFile}", text: fileutils.currentContents(metadifferencesFile) + newContents - - def buildStampFile = "${versionFolder}/buildstamps.txt" - def buildStampFileContents = prefixline(rootpath, "${buildStampFile}") - def metabuildStampFile = "${outputFolder}/buildstamps.txt" - writeFile file: "${metabuildStampFile}", text: fileutils.currentContents(metabuildStampFile) + buildStampFileContents - - def intrevision = 0 - if (fileExists("${versionFolder}/revision.txt")) { - def revision = readFile("${versionFolder}/revision.txt").trim() - intrevision = revision.toInteger() - echo "Revision read in: ${intrevision}" - } - else { - intrevision = 1 - } - - return intrevision -} - -def appendcomponentinfo(rootpath, versionFolder, outputFolder) { - echo "Appending component version data from folder: ${versionFolder} to ${outputFolder}" - - def differencesFile = "${versionFolder}/differences.txt" - if (fileExists("${differencesFile}")) { - def newContents = readFile file: "${differencesFile}" - def metadifferencesFile = "${outputFolder}/differences.txt" - writeFile file: "${metadifferencesFile}", text: fileutils.currentContents(metadifferencesFile) + "${differencesFile}:\n" + newContents - } - - def buildStampFile = "${versionFolder}/buildstamps.txt" - def buildStampFileContents = readFile("${buildStampFile}").trim() - - def remoteurlFile = "${versionFolder}/remoteurl.txt" - def remoteurlFileContents = fileutils.currentContents(remoteurlFile, "", 'Unknown').trim() - - def gitRevisionFile = "${versionFolder}/gitrevision.txt" - def gitRevisionFileContents = readFile("${gitRevisionFile}").trim() - - def releaseJobNameFile = "${versionFolder}/releasejobname.txt" - def releaseJobNameContents = fileutils.currentContents("${releaseJobNameFile}", "", "-").trim() - - def metabuildStampFile = "${outputFolder}/buildstamps.txt" - writeFile file: "${metabuildStampFile}", text: fileutils.currentContents(metabuildStampFile) + "${rootpath}" + ":" + buildStampFileContents + "," + remoteurlFileContents + "," + gitRevisionFileContents + "," + releaseJobNameContents - def revision = readFile("${versionFolder}/revision.txt").trim() - def intrevision = revision.toInteger() - echo "Revision read in: ${intrevision}" - - return intrevision -} - -// Each version folder should have been created using version creation scripts in this Common_scripts folder -// as their are well-known files in each folder -def combineSubjobVersions(versionLabelPrefix, artifactList, outputFolder = "${WORKSPACE}/metaversion") { - def totalrevision = 0 - dir("${outputFolder}") { - deleteDir() - } - for (artifactItem in artifactList) { - (rootpath, versionFolder) = artifactItem - echo "Inspecting folder: ${versionFolder}" - def metaversionsignaturefile = "${versionFolder}/metaversion.txt" - // If the sub project is a meta job - def intrevision = 0 - if (fileExists("${metaversionsignaturefile}")) { - intrevision = mergemeta(rootpath, versionFolder, outputFolder) - } - else { - intrevision = appendcomponentinfo(rootpath, versionFolder, outputFolder) - } - totalrevision += intrevision - } - echo "Accumulated revision is: ${totalrevision}" - writeFile file: "${outputFolder}/metaversion.txt", text: versionLabelPrefix + ((versionLabelPrefix.endsWith(".")) ? "" : ".") + totalrevision.toString() - writeFile(file: "${outputFolder}/revision.txt", text: totalrevision.toString()) -} - -return this; \ No newline at end of file From cc99fcf2a17aff04d651b5a24338cb8240476c9c Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Thu, 29 Nov 2018 14:03:12 +0000 Subject: [PATCH 142/237] Alter differences file generation; Merge differences when importing --- differences/do.groovy | 6 +++--- differences/show_release_differences.py | 11 +++++------ meta/folder.groovy | 22 +++++++++++++++++++--- 3 files changed, 27 insertions(+), 12 deletions(-) diff --git a/differences/do.groovy b/differences/do.groovy index 35e0980..32f18b5 100644 --- a/differences/do.groovy +++ b/differences/do.groovy @@ -1,16 +1,16 @@ def differences(meta, String sourcerevision, String previoussourcerevision, String sourcepath) { def String cs = autobuilder.commonscripts() - def String difffolder = meta.folder() + def String difffile = meta.difffilepath() def String jirakey = meta.productinfo.jirakey if (isUnix()) { sh """ - "${PYTHON}" -u "${cs}/differences/show_release_differences.py" -g "${sourcepath}" -s "${sourcerevision}" -p "${previoussourcerevision}" -j "${jirakey}" -o "opposite notcommon" -d "${difffolder}" + "${PYTHON}" -u "${cs}/differences/show_release_differences.py" -g "${sourcepath}" -s "${sourcerevision}" -p "${previoussourcerevision}" -j "${jirakey}" -o "opposite notcommon" -f "${difffile}" """ } else { bat """ - "${PYTHON}" -u "${cs}\\differences\\show_release_differences.py" -g "${sourcepath}" -s "${sourcerevision}" -p "${previoussourcerevision}" -j "${jirakey}" -o "opposite notcommon" -d "${difffolder}" + "${PYTHON}" -u "${cs}\\differences\\show_release_differences.py" -g "${sourcepath}" -s "${sourcerevision}" -p "${previoussourcerevision}" -j "${jirakey}" -o "opposite notcommon" -f "${difffile}" """ } } diff --git a/differences/show_release_differences.py b/differences/show_release_differences.py index 0813356..fee6f7b 100644 --- a/differences/show_release_differences.py +++ b/differences/show_release_differences.py @@ -172,7 +172,7 @@ USAGE parser.add_argument("-p", "--previousversion", dest="previousversion", action="store", default="origin/master", help="source branch or tag to compare with [default: %(default)s]") parser.add_argument("-j", "--jirakeyprefix", dest="jirakeyprefix", action="store", default="GIS", help="jira key prefix [default: %(default)s]") parser.add_argument("-o", "--outputoptions", dest="outputoptions", action="store", default="", help="output options: Can be: opposite notcommon [default: %(default)s]") - parser.add_argument("-d", "--difffolder", dest="difffolder", action="store", default="", help="folder where differences file stored [default: %(default)s]") + parser.add_argument("-f", "--difffile", dest="difffile", action="store", default="", help="file where differences file stored [default: %(default)s]") # Process arguments args = parser.parse_args() @@ -183,14 +183,13 @@ USAGE previousversion = args.previousversion jirakeyprefix = args.jirakeyprefix outputoptions = args.outputoptions - difffolder = args.difffolder + difffile = args.difffile print("Git root:", gitrootfolder, "Source version:", sourceversion, "Previous source version:", previousversion) - print("Jira key prefix:", jirakeyprefix, "Output options:", outputoptions, "Version folder:", difffolder) + print("Jira key prefix:", jirakeyprefix, "Output options:", outputoptions, "Diff file:", difffile) - if difffolder: - makeFolder(difffolder) - outfh = open(os.path.join(difffolder, "differences.txt"), 'w') + if difffile: + outfh = open(difffile), 'w') else: outfh = sys.stdout diff --git a/meta/folder.groovy b/meta/folder.groovy index 570a3ea..8bd80d3 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -19,8 +19,8 @@ abstract class GISJsonSerialised implements Serializable { } class ProductInfo extends GISJsonSerialised { - private String productname - private String subcomponentname + String productname + String subcomponentname String jirakey ProductInfo(script, productname = "", subcomponentname = "", jirakey = "") { @@ -388,6 +388,7 @@ class MetaInfo extends GISJsonSerialised { private static String FORMAT = "0.1" private static String METAFOLDERNAME = "meta" private static String METAFILENAME = "info.json" + private static String METADIFFFILENAME = "differences.txt" private static String METAARTIFACTS = "${METAFOLDERNAME}/**" class RelatedMetaInfo extends GISJsonSerialised { @@ -519,7 +520,11 @@ class MetaInfo extends GISJsonSerialised { static String metafilepath() { return METAFOLDERNAME + "/" + METAFILENAME } - + + static String difffilepath() { + return METAFOLDERNAME + "/" + METADIFFFILENAME + } + MetaInfo importrelated(String destpath) { MetaInfo mi = new MetaInfo(script) @@ -532,6 +537,17 @@ class MetaInfo extends GISJsonSerialised { RelatedMetaInfo rmi = new RelatedMetaInfo(script, adjustedpath, mi) associatedmeta.add(rmi) + def importedmetadifffile = adjustedpath + "/" + difffilepath() + if (script.fileExists(importedmetadifffile)) { + def String newcontents = script.readFile(file: importedmetadifffile) + def String currentcontents = "" + if (script.fileExists(difffilepath())) { + currentcontents = script.readFile(file: difffilepath()) + } + + script.writeFile(file: difffilepath(), currentcontents + "\n" + mi.productinfo.productname + " " mi.productinfo.componentname + ":\n" + newcontents) + } + return mi } From e452d7823e3bb03a2c30157175514cdfb5c9a389 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Thu, 29 Nov 2018 14:05:23 +0000 Subject: [PATCH 143/237] Alter differences file generation; Merge differences when importing --- meta/folder.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/folder.groovy b/meta/folder.groovy index 8bd80d3..2269a77 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -545,7 +545,7 @@ class MetaInfo extends GISJsonSerialised { currentcontents = script.readFile(file: difffilepath()) } - script.writeFile(file: difffilepath(), currentcontents + "\n" + mi.productinfo.productname + " " mi.productinfo.componentname + ":\n" + newcontents) + script.writeFile(file: difffilepath(), currentcontents + "\n" + mi.productinfo.productname + " " + mi.productinfo.componentname + ":\n" + newcontents) } return mi From c98a09f5250d499c22f3c0b426213151cee2ce44 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Thu, 29 Nov 2018 14:31:21 +0000 Subject: [PATCH 144/237] Alter differences file generation; Merge differences when importing --- meta/folder.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/folder.groovy b/meta/folder.groovy index 2269a77..ac2ab9a 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -545,7 +545,7 @@ class MetaInfo extends GISJsonSerialised { currentcontents = script.readFile(file: difffilepath()) } - script.writeFile(file: difffilepath(), currentcontents + "\n" + mi.productinfo.productname + " " + mi.productinfo.componentname + ":\n" + newcontents) + script.writeFile(file: difffilepath(), currentcontents + "\n" + mi.productinfo.productname + " " + mi.productinfo.subcomponentname + ":\n" + newcontents) } return mi From 0f2ae8596496efab7e0bf0448bac9ec93e494346 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Thu, 29 Nov 2018 14:36:42 +0000 Subject: [PATCH 145/237] Alter differences file generation; Merge differences when importing --- meta/folder.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/folder.groovy b/meta/folder.groovy index ac2ab9a..9c5367e 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -545,7 +545,7 @@ class MetaInfo extends GISJsonSerialised { currentcontents = script.readFile(file: difffilepath()) } - script.writeFile(file: difffilepath(), currentcontents + "\n" + mi.productinfo.productname + " " + mi.productinfo.subcomponentname + ":\n" + newcontents) + script.writeFile(file: difffilepath(), text: currentcontents + "\n" + mi.productinfo.productname + " " + mi.productinfo.subcomponentname + ":\n" + newcontents) } return mi From 94ef8956ba6bdd56bd225850ae290e2c0771dfde Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Thu, 29 Nov 2018 14:41:49 +0000 Subject: [PATCH 146/237] Alter differences file generation; Merge differences when importing --- differences/show_release_differences.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/differences/show_release_differences.py b/differences/show_release_differences.py index fee6f7b..0600753 100644 --- a/differences/show_release_differences.py +++ b/differences/show_release_differences.py @@ -189,7 +189,7 @@ USAGE print("Jira key prefix:", jirakeyprefix, "Output options:", outputoptions, "Diff file:", difffile) if difffile: - outfh = open(difffile), 'w') + outfh = open(difffile, 'w') else: outfh = sys.stdout From 5491405110db56d84eedeb45368523c1d2793721 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Thu, 29 Nov 2018 14:51:43 +0000 Subject: [PATCH 147/237] Alter differences file generation; Merge differences when importing --- differences/show_release_differences.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/differences/show_release_differences.py b/differences/show_release_differences.py index 0600753..ddf8c0d 100644 --- a/differences/show_release_differences.py +++ b/differences/show_release_differences.py @@ -29,10 +29,6 @@ class GitException(Exception): def __repr__(self): return self.message -def makeFolder(difffolder): - print("Creating folder (if not already there): {0}".format(difffolder)) - os.makedirs(difffolder, exist_ok = True) - def printDivider(outfh, times = 1, length = 100): for _ in range(times): outfh.write("{0}\n".format("*" * length)) @@ -208,7 +204,7 @@ USAGE gitlog = getGitLogDifferences(outfh, gitrootfolder, sourceversion, previousversion, tripledot = True) showDifferences(processLog(gitlog, jirakeyprefix), jirakeyprefix, outfh) - if difffolder: + if difffile: outfh.close() return 0 except Exception as e: From 5bb08476af818e51c87b40798049bf249bc2b6a4 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Thu, 29 Nov 2018 15:05:23 +0000 Subject: [PATCH 148/237] Add HMBFDGMA jira comment regular expression --- differences/show_release_differences.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/differences/show_release_differences.py b/differences/show_release_differences.py index ddf8c0d..80b636e 100644 --- a/differences/show_release_differences.py +++ b/differences/show_release_differences.py @@ -80,6 +80,9 @@ jiraprojectpattern = { 'HMBFDHV': ( re.compile("^.* +(?:[Hh][Mm][Bb][Ff][Dd][Hh][Vv][ _-]*|\#\s*)(\d+):*(.*)$"), re.compile('^(\S*) Revert " *HMBFDHV-(\d+):* (.*)"$'), ), + 'HMBFDGMA': ( re.compile("^.* +(?:[Hh][Mm][Bb][Ff][Dd][Gg][Mm][Aa][ _-]*|\#\s*)(\d+):*(.*)$"), + re.compile('^(\S*) Revert " *HMBFDGMA-(\d+):* (.*)"$'), + ), } mergepattern = re.compile("^(.*)((?:Merge branch '.*'|Merge remote-tracking branch '.*'|Merge commit '.*'|Add '.*' from commit).*)$") From aa497116fd9078857227afef34bf88c184030998 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Thu, 29 Nov 2018 15:19:55 +0000 Subject: [PATCH 149/237] Alter differences file generation; Merge differences when importing --- differences/show_release_differences.py | 1 + 1 file changed, 1 insertion(+) diff --git a/differences/show_release_differences.py b/differences/show_release_differences.py index 80b636e..5c0f15d 100644 --- a/differences/show_release_differences.py +++ b/differences/show_release_differences.py @@ -188,6 +188,7 @@ USAGE print("Jira key prefix:", jirakeyprefix, "Output options:", outputoptions, "Diff file:", difffile) if difffile: + os.makedirs(os.path.dirname(difffile), exist_ok=True) outfh = open(difffile, 'w') else: outfh = sys.stdout From db54da7b0577f004033c5104c5f22fc10f090fdc Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Thu, 29 Nov 2018 17:48:05 +0000 Subject: [PATCH 150/237] Move release functionality into Common_scripts --- release/do.groovy | 131 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 131 insertions(+) create mode 100644 release/do.groovy diff --git a/release/do.groovy b/release/do.groovy new file mode 100644 index 0000000..72c2f9f --- /dev/null +++ b/release/do.groovy @@ -0,0 +1,131 @@ +boolean markunstable = false +String unstablereason = "" + +String summaryfolder = "${WORKSPACE}/summary" +String summaryfile = "${summaryfolder}/summary.txt" +String releaserepofolder = "${WORKSPACE}/releaserepos" +String tempfolder = "${WORKSPACE}/temp" + +def resetfolders() { + dir(summaryfolder) { + deleteDir() + } + dir(releaserepofolder) { + deleteDir() + } + dir(tempfolder) { + deleteDir() + } +} + +def start() { + markunstable = false + unstablereason = "" + writeFile(file: summaryfile, text: "Release summary: \n") +} + +def setunstable(String reason) { + markunstable = true + unstablereason = reason +} + +def summaryappend(String summary) { + def String currentsummarycontents = readFile(file: summaryfile) + writeFile(file: summaryfile, text: currentsummarycontents + summary + "\n") +} + +def checkoutreleaserepo(info, String checkoutfolder) { + def String releaserepo = info.meta.releaseinfo.releaserepoURL + // Get the latest head revision of the release repo without checking out working copy; Check out to a folder unique to component + dir(releaserepofolder) { + sh("git clone -n --depth 1 ${releaserepo} ${checkoutfolder}") + } +} + +def getcomponentartifacts(info, String repofolder, String tempfolder) { + // Copy relevant artifacts to temp folder + summaryappend("Artifacts: ") + for (artifactfilter in info.meta.releaseinfo.releaseitems) { + def filterpath = artifactfilter + if (info.offsetpath) { + filterpath = info.offsetpath + '/' + artifactfilter + } + // Copy relevant artifacts to temp folder + echo "Copying artifacts: ${filterpath} to ${tempfolder}" + copyArtifacts( + filter: filterpath, + projectName: BUILD_JOB, + selector: [ + $class: 'ParameterizedBuildSelector', + parameterName: BUILD_JOB_SELECTOR + ], + target: tempfolder + ) + // Move relevant artifacts from temp folder to release position + def originalrootdir = tempfolder + "/" + info.offsetpath + dir(originalrootdir) { + sh("mv * ${repofolder}") + } + summaryappend("${artifactfilter},") + } +} + +def gitrelease(String releaserepo, String buildstamp) { + summaryappend(" Git operations: ") + dir(releaserepo) { + // Add anything new + sh("git add .") + summaryappend("Add,") + // Perform git commit (if necessary) + def changesoccurred = sh(script: "git status --porcelain", returnStdout: true) + if (changesoccurred) { + sh("git commit -a -m ${buildstamp}") + summaryappend("Commit,") + } + else { + summaryappend("No-commit,") + } + // Tag with buildstamp + sh("git tag ${buildstamp}") + summaryappend("Tag (${buildstamp}),") + if (DRY_RUN_PUSH == "true") { + sh("git push -n --tags origin master") + summaryappend("Dry-Run-Push,") + setunstable("The artifact(s) have not been pushed/saved (\"Dry run push\" parameter/option is selected)") + } + else { + sh("git push --tags origin master") + summaryappend("Push") + } + } +} + +def releasecomponent(info) { + def String uniquefolder = "${info.meta.productinfo.productname}_${info.meta.productinfo.subcomponentname}" + def String uniquefolderforrepo = "${releaserepofolder}/${uniquefolder}" + def String uniquefoldertemp = "${tempfolder}/${uniquefolder}" + + summaryappend("${info.meta.productinfo.productname} ${info.meta.productinfo.subcomponentname}: ") + checkoutreleaserepo(info, uniquefolderforrepo) + + getcomponentartifacts(info, uniquefolderforrepo, uniquefoldertemp) + + def String buildstamp = info.meta.buildstampinfo.buildstamp + gitrelease(uniquefolderforrepo, buildstamp) +} + +def releasehierarchy(buildmeta, int maxdepth = MAX_META_DEPTH) { + start() + + // Walk the meta information to a max depth, looking for artifacts to import for release + componentReleaseInfo = buildmeta.releasewalkerunique(maxdepth.toInteger()) + + // For each component + for (key in componentReleaseInfo.keySet()) { + def info = componentReleaseInfo[key] + releasecomponent(info) + } + return [markunstable, unstablereason] +} + +return this; \ No newline at end of file From 66973f0034206d128ecdbd661410425d0bd4c999 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Thu, 29 Nov 2018 17:56:08 +0000 Subject: [PATCH 151/237] Move release functionality into Common_scripts --- release/do.groovy | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/release/do.groovy b/release/do.groovy index 72c2f9f..239cc17 100644 --- a/release/do.groovy +++ b/release/do.groovy @@ -114,11 +114,12 @@ def releasecomponent(info) { gitrelease(uniquefolderforrepo, buildstamp) } -def releasehierarchy(buildmeta, int maxdepth = MAX_META_DEPTH) { +def releasehierarchy(buildmeta, String maxdepth) { + int md = maxdepth.toInteger() start() // Walk the meta information to a max depth, looking for artifacts to import for release - componentReleaseInfo = buildmeta.releasewalkerunique(maxdepth.toInteger()) + componentReleaseInfo = buildmeta.releasewalkerunique(md) // For each component for (key in componentReleaseInfo.keySet()) { From f724c2115209e3d049b3e7bc381cbf5ba5609e34 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Thu, 29 Nov 2018 18:09:13 +0000 Subject: [PATCH 152/237] Move release functionality into Common_scripts --- release/do.groovy | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/release/do.groovy b/release/do.groovy index 239cc17..17090fe 100644 --- a/release/do.groovy +++ b/release/do.groovy @@ -1,10 +1,10 @@ -boolean markunstable = false -String unstablereason = "" +markunstable = false +unstablereason = "" -String summaryfolder = "${WORKSPACE}/summary" -String summaryfile = "${summaryfolder}/summary.txt" -String releaserepofolder = "${WORKSPACE}/releaserepos" -String tempfolder = "${WORKSPACE}/temp" +summaryfolder = "${WORKSPACE}/summary" +summaryfile = "${summaryfolder}/summary.txt" +releaserepofolder = "${WORKSPACE}/releaserepos" +tempfolder = "${WORKSPACE}/temp" def resetfolders() { dir(summaryfolder) { From e17df02c5cb1017411d435c7b061365ea7fd287f Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Thu, 29 Nov 2018 18:11:37 +0000 Subject: [PATCH 153/237] Move release functionality into Common_scripts --- release/do.groovy | 1 + 1 file changed, 1 insertion(+) diff --git a/release/do.groovy b/release/do.groovy index 17090fe..177593d 100644 --- a/release/do.groovy +++ b/release/do.groovy @@ -118,6 +118,7 @@ def releasehierarchy(buildmeta, String maxdepth) { int md = maxdepth.toInteger() start() + resetfolders() // Walk the meta information to a max depth, looking for artifacts to import for release componentReleaseInfo = buildmeta.releasewalkerunique(md) From 5d53126d199b99a070b4ebbf7c58b7623ea5535a Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Thu, 29 Nov 2018 18:15:32 +0000 Subject: [PATCH 154/237] Move release functionality into Common_scripts --- release/do.groovy | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/release/do.groovy b/release/do.groovy index 177593d..1eaf2b8 100644 --- a/release/do.groovy +++ b/release/do.groovy @@ -18,7 +18,7 @@ def resetfolders() { } } -def start() { +def preconditions() { markunstable = false unstablereason = "" writeFile(file: summaryfile, text: "Release summary: \n") @@ -116,9 +116,9 @@ def releasecomponent(info) { def releasehierarchy(buildmeta, String maxdepth) { int md = maxdepth.toInteger() - start() - resetfolders() + preconditions() + // Walk the meta information to a max depth, looking for artifacts to import for release componentReleaseInfo = buildmeta.releasewalkerunique(md) From 8316cf4cf71f0dba161436441509e0cd168235c3 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Thu, 29 Nov 2018 18:19:59 +0000 Subject: [PATCH 155/237] Move release functionality into Common_scripts --- release/do.groovy | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/release/do.groovy b/release/do.groovy index 1eaf2b8..264bd53 100644 --- a/release/do.groovy +++ b/release/do.groovy @@ -70,7 +70,7 @@ def getcomponentartifacts(info, String repofolder, String tempfolder) { } } -def gitrelease(String releaserepo, String buildstamp) { +def gitrelease(String releaserepo, String buildstamp, String dryrunpush) { summaryappend(" Git operations: ") dir(releaserepo) { // Add anything new @@ -88,7 +88,7 @@ def gitrelease(String releaserepo, String buildstamp) { // Tag with buildstamp sh("git tag ${buildstamp}") summaryappend("Tag (${buildstamp}),") - if (DRY_RUN_PUSH == "true") { + if (dryrunpush == "true") { sh("git push -n --tags origin master") summaryappend("Dry-Run-Push,") setunstable("The artifact(s) have not been pushed/saved (\"Dry run push\" parameter/option is selected)") @@ -100,7 +100,7 @@ def gitrelease(String releaserepo, String buildstamp) { } } -def releasecomponent(info) { +def releasecomponent(info, String dryrunpush) { def String uniquefolder = "${info.meta.productinfo.productname}_${info.meta.productinfo.subcomponentname}" def String uniquefolderforrepo = "${releaserepofolder}/${uniquefolder}" def String uniquefoldertemp = "${tempfolder}/${uniquefolder}" @@ -111,10 +111,10 @@ def releasecomponent(info) { getcomponentartifacts(info, uniquefolderforrepo, uniquefoldertemp) def String buildstamp = info.meta.buildstampinfo.buildstamp - gitrelease(uniquefolderforrepo, buildstamp) + gitrelease(uniquefolderforrepo, buildstamp, dryrunpush) } -def releasehierarchy(buildmeta, String maxdepth) { +def releasehierarchy(buildmeta, String maxdepth, dryrunpush) { int md = maxdepth.toInteger() resetfolders() preconditions() @@ -125,7 +125,7 @@ def releasehierarchy(buildmeta, String maxdepth) { // For each component for (key in componentReleaseInfo.keySet()) { def info = componentReleaseInfo[key] - releasecomponent(info) + releasecomponent(info, dryrunpush) } return [markunstable, unstablereason] } From e4f8dab2bbee21d2504f8466f2f60cd9eb00717b Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Thu, 29 Nov 2018 18:39:53 +0000 Subject: [PATCH 156/237] Move release functionality into Common_scripts --- release/do.groovy | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/release/do.groovy b/release/do.groovy index 264bd53..6db301c 100644 --- a/release/do.groovy +++ b/release/do.groovy @@ -31,7 +31,7 @@ def setunstable(String reason) { def summaryappend(String summary) { def String currentsummarycontents = readFile(file: summaryfile) - writeFile(file: summaryfile, text: currentsummarycontents + summary + "\n") + writeFile(file: summaryfile, text: currentsummarycontents + summary) } def checkoutreleaserepo(info, String checkoutfolder) { @@ -112,6 +112,8 @@ def releasecomponent(info, String dryrunpush) { def String buildstamp = info.meta.buildstampinfo.buildstamp gitrelease(uniquefolderforrepo, buildstamp, dryrunpush) + + summaryappend("\n") } def releasehierarchy(buildmeta, String maxdepth, dryrunpush) { From 4e140fe10a98a0b28c82bfc39c86442dc5f22a64 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Fri, 30 Nov 2018 11:07:08 +0000 Subject: [PATCH 157/237] Check for changes occurring --- release/do.groovy | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/release/do.groovy b/release/do.groovy index 6db301c..0d8e0de 100644 --- a/release/do.groovy +++ b/release/do.groovy @@ -73,11 +73,14 @@ def getcomponentartifacts(info, String repofolder, String tempfolder) { def gitrelease(String releaserepo, String buildstamp, String dryrunpush) { summaryappend(" Git operations: ") dir(releaserepo) { + def String precommitshacode = sh("git rev-parse --verify HEAD", returnStdout: true).trim() + echo "Pre commit sha code: ${precommitshacode}" // Add anything new sh("git add .") summaryappend("Add,") // Perform git commit (if necessary) - def changesoccurred = sh(script: "git status --porcelain", returnStdout: true) + def changes = sh(script: "git status --porcelain", returnStdout: true) + boolean changesoccurred = changes?.trim() if (changesoccurred) { sh("git commit -a -m ${buildstamp}") summaryappend("Commit,") @@ -85,6 +88,8 @@ def gitrelease(String releaserepo, String buildstamp, String dryrunpush) { else { summaryappend("No-commit,") } + def String postcommitshacode = sh("git rev-parse --verify HEAD", returnStdout: true).trim() + echo "Post commit sha code: ${precommitshacode}" // Tag with buildstamp sh("git tag ${buildstamp}") summaryappend("Tag (${buildstamp}),") From 2a7e51f64d6c2915e65cebe714611f771637519c Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Fri, 30 Nov 2018 11:09:48 +0000 Subject: [PATCH 158/237] Check for changes occurring --- release/do.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release/do.groovy b/release/do.groovy index 0d8e0de..cd49d41 100644 --- a/release/do.groovy +++ b/release/do.groovy @@ -73,7 +73,7 @@ def getcomponentartifacts(info, String repofolder, String tempfolder) { def gitrelease(String releaserepo, String buildstamp, String dryrunpush) { summaryappend(" Git operations: ") dir(releaserepo) { - def String precommitshacode = sh("git rev-parse --verify HEAD", returnStdout: true).trim() + def String precommitshacode = sh(script: "git rev-parse --verify HEAD", returnStdout: true).trim() echo "Pre commit sha code: ${precommitshacode}" // Add anything new sh("git add .") @@ -88,7 +88,7 @@ def gitrelease(String releaserepo, String buildstamp, String dryrunpush) { else { summaryappend("No-commit,") } - def String postcommitshacode = sh("git rev-parse --verify HEAD", returnStdout: true).trim() + def String postcommitshacode = sh(script: "git rev-parse --verify HEAD", returnStdout: true).trim() echo "Post commit sha code: ${precommitshacode}" // Tag with buildstamp sh("git tag ${buildstamp}") From 0489ee2d82472b3b65410f91e7e199ff41e1b9f0 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Fri, 30 Nov 2018 11:28:15 +0000 Subject: [PATCH 159/237] Check for changes occurring --- release/do.groovy | 1 + 1 file changed, 1 insertion(+) diff --git a/release/do.groovy b/release/do.groovy index cd49d41..e72d6f2 100644 --- a/release/do.groovy +++ b/release/do.groovy @@ -81,6 +81,7 @@ def gitrelease(String releaserepo, String buildstamp, String dryrunpush) { // Perform git commit (if necessary) def changes = sh(script: "git status --porcelain", returnStdout: true) boolean changesoccurred = changes?.trim() + echo "changesoccurred: ${changesoccurred}" if (changesoccurred) { sh("git commit -a -m ${buildstamp}") summaryappend("Commit,") From ae1dcc41bf920341c60f6c12743b2e96102a928e Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Fri, 30 Nov 2018 11:32:17 +0000 Subject: [PATCH 160/237] Update --- release/do.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release/do.groovy b/release/do.groovy index e72d6f2..11eb648 100644 --- a/release/do.groovy +++ b/release/do.groovy @@ -81,11 +81,11 @@ def gitrelease(String releaserepo, String buildstamp, String dryrunpush) { // Perform git commit (if necessary) def changes = sh(script: "git status --porcelain", returnStdout: true) boolean changesoccurred = changes?.trim() - echo "changesoccurred: ${changesoccurred}" + echo "changes: ${changes}\nchangesoccurred: ${changesoccurred}" if (changesoccurred) { sh("git commit -a -m ${buildstamp}") summaryappend("Commit,") - } + else { summaryappend("No-commit,") } From eb42ae659889748fac6e9150450cf6cbdd0e30b4 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Fri, 30 Nov 2018 11:34:57 +0000 Subject: [PATCH 161/237] Check for changes occurring --- release/do.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/do.groovy b/release/do.groovy index 11eb648..d7f05f7 100644 --- a/release/do.groovy +++ b/release/do.groovy @@ -85,7 +85,7 @@ def gitrelease(String releaserepo, String buildstamp, String dryrunpush) { if (changesoccurred) { sh("git commit -a -m ${buildstamp}") summaryappend("Commit,") - + } else { summaryappend("No-commit,") } From 68cf41bc6f2f7994d4daaf261f584278317783cf Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Fri, 30 Nov 2018 15:06:40 +0000 Subject: [PATCH 162/237] Check for changes occurring --- meta/folder.groovy | 2 +- release/do.groovy | 167 +++++++++++++++++++++++++++++++++------------ 2 files changed, 125 insertions(+), 44 deletions(-) diff --git a/meta/folder.groovy b/meta/folder.groovy index 9c5367e..cfce68f 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -568,7 +568,7 @@ class MetaInfo extends GISJsonSerialised { } - String folder() { + static String folder() { return METAFOLDERNAME } diff --git a/release/do.groovy b/release/do.groovy index d7f05f7..80e10de 100644 --- a/release/do.groovy +++ b/release/do.groovy @@ -6,6 +6,8 @@ summaryfile = "${summaryfolder}/summary.txt" releaserepofolder = "${WORKSPACE}/releaserepos" tempfolder = "${WORKSPACE}/temp" +metascript = autobuilder.getmetafolderscript() + def resetfolders() { dir(summaryfolder) { deleteDir() @@ -34,21 +36,36 @@ def summaryappend(String summary) { writeFile(file: summaryfile, text: currentsummarycontents + summary) } -def checkoutreleaserepo(info, String checkoutfolder) { - def String releaserepo = info.meta.releaseinfo.releaserepoURL - // Get the latest head revision of the release repo without checking out working copy; Check out to a folder unique to component - dir(releaserepofolder) { - sh("git clone -n --depth 1 ${releaserepo} ${checkoutfolder}") +def getpreviousreleasemeta(buildmeta, String checkoutfolder) { + def previousreleasemeta = new metascript.MetaInfo(this) + // See if there is meta data file from the current release + def String releasemetafolderpath = "${checkoutfolder}/${buildmeta.folder()}" + if (fileExists(releasemetafolderpath)) { + previousreleasemeta = metascript.metafromfolder(releasemetafolderpath) } + return previousreleasemeta } -def getcomponentartifacts(info, String repofolder, String tempfolder) { +def checkoutreleaserepo(buildmeta, String checkoutfolder) { + def String releaserepo = buildmeta.releaseinfo.releaserepoURL + // Get the latest head revision of the release repo without checking out working copy; Check out to a folder unique to component; Extract any meta + def previousreleasemeta = new metascript.MetaInfo(this) + dir(releaserepofolder) { + sh("git clone --depth 1 ${releaserepo} ${checkoutfolder}") + previousreleasemeta = getpreviousreleasemeta(buildmeta, checkoutfolder) + // Clear all existing files + sh("git rm *") + } + return previousreleasemeta +} + +def getcomponentartifacts(buildinfo, String repofolder, String tempfolder) { // Copy relevant artifacts to temp folder summaryappend("Artifacts: ") - for (artifactfilter in info.meta.releaseinfo.releaseitems) { + for (artifactfilter in buildinfo.meta.releaseinfo.releaseitems) { def filterpath = artifactfilter - if (info.offsetpath) { - filterpath = info.offsetpath + '/' + artifactfilter + if (buildinfo.offsetpath) { + filterpath = buildinfo.offsetpath + '/' + artifactfilter } // Copy relevant artifacts to temp folder echo "Copying artifacts: ${filterpath} to ${tempfolder}" @@ -62,7 +79,7 @@ def getcomponentartifacts(info, String repofolder, String tempfolder) { target: tempfolder ) // Move relevant artifacts from temp folder to release position - def originalrootdir = tempfolder + "/" + info.offsetpath + def originalrootdir = tempfolder + "/" + buildinfo.offsetpath dir(originalrootdir) { sh("mv * ${repofolder}") } @@ -70,59 +87,123 @@ def getcomponentartifacts(info, String repofolder, String tempfolder) { } } -def gitrelease(String releaserepo, String buildstamp, String dryrunpush) { +def releasegitadd() { + // Add anything new + sh("git add .") + summaryappend("Add,") +} + +def releasegitreset() { + // Add anything new + sh("git reset --hard") + sh("git clean -fdx") + summaryappend("Reset,") +} + +def releasegitcommit(String buildstamp) { + sh("git commit -a -m ${buildstamp}") + summaryappend("Commit,") +} + +// Determine if there has been a change by comparing the sha code in previous release meta and the build meta +def boolean checkforchange(buildmeta, previousreleasemeta) { + String buildsha = buildmeta.gitinfo.gitrevision + String previoussha = previousreleasemeta.gitinfo.gitrevision + + def boolean changed = (buildsha != previoussha) + echo "buildsha: ${buildsha} previoussha: ${previoussha} changed: ${changed}" + return changed +} + +def ArrayList maketaglist(String buildstamp, String otherreleasetags) { + ArrayList taglist = new ArrayList() + taglist.add(buildstamp) + + ArrayList othertaglist = otherreleasetags.split(',') + for (othertagitem in othertaglist) { + taglist.add(othertagitem.trim()) + } + return taglist +} + +def boolean releasegittag(String postcommitshacode, String tag) { + // Tag + sh("git tag ${tag}") + summaryappend("(${tag}),") +} + +def boolean releasegittags(String postcommitshacode, ArrayList taglist) { + boolean tagadded = false + + summaryappend("Rel Tag ") + for (tag in taglist) { + if (releasegittag(postcommitshacode, tag)) { + tagadded = true + } + } + return tagadded +} + +def releasegitpush(String dryrunpush ) { + if (dryrunpush == "true") { + sh("git push -n --tags origin master") + summaryappend("Dry-Run-Push") + setunstable("The artifact(s) have not been pushed/saved (\"Dry run push\" parameter/option is selected)") + } + else { + sh("git push --tags origin master") + summaryappend("Push") + } +} + +def gitrelease(buildmeta, previousreleasemeta, String releaserepo, String otherreleasetags, String dryrunpush) { summaryappend(" Git operations: ") + def String buildstamp = buildinfo.meta.buildstampinfo.buildstamp dir(releaserepo) { def String precommitshacode = sh(script: "git rev-parse --verify HEAD", returnStdout: true).trim() echo "Pre commit sha code: ${precommitshacode}" - // Add anything new - sh("git add .") - summaryappend("Add,") - // Perform git commit (if necessary) - def changes = sh(script: "git status --porcelain", returnStdout: true) - boolean changesoccurred = changes?.trim() - echo "changes: ${changes}\nchangesoccurred: ${changesoccurred}" - if (changesoccurred) { - sh("git commit -a -m ${buildstamp}") - summaryappend("Commit,") + + releasegitadd() + + def boolean changed = checkforchange(buildmeta, previousreleasemeta) + if (changed) { + releasegitcommit(buildstamp) } else { + releasegitreset() summaryappend("No-commit,") } + def String postcommitshacode = sh(script: "git rev-parse --verify HEAD", returnStdout: true).trim() - echo "Post commit sha code: ${precommitshacode}" - // Tag with buildstamp - sh("git tag ${buildstamp}") - summaryappend("Tag (${buildstamp}),") - if (dryrunpush == "true") { - sh("git push -n --tags origin master") - summaryappend("Dry-Run-Push,") - setunstable("The artifact(s) have not been pushed/saved (\"Dry run push\" parameter/option is selected)") - } - else { - sh("git push --tags origin master") - summaryappend("Push") + echo "Post commit sha code: ${postcommitshacode}" + + ArrayList taglist = maketaglist(buildstamp, otherreleasetags) + + def boolean tagadded = releasegittags(postcommitshacode, taglist) + + if (changed || tagadded) { + releasegitpush(dryrunpush) } } } -def releasecomponent(info, String dryrunpush) { - def String uniquefolder = "${info.meta.productinfo.productname}_${info.meta.productinfo.subcomponentname}" +def releasecomponent(buildinfo, String otherreleasetags, String dryrunpush) { + def buildmeta = buildinfo.meta + def String uniquefolder = "${buildmeta.productinfo.productname}_${buildmeta.productinfo.subcomponentname}" def String uniquefolderforrepo = "${releaserepofolder}/${uniquefolder}" def String uniquefoldertemp = "${tempfolder}/${uniquefolder}" - summaryappend("${info.meta.productinfo.productname} ${info.meta.productinfo.subcomponentname}: ") - checkoutreleaserepo(info, uniquefolderforrepo) + summaryappend("${buildmeta.productinfo.productname} ${buildmeta.productinfo.subcomponentname}: ") + def previousreleasemeta = checkoutreleaserepo(buildmeta, uniquefolderforrepo) - getcomponentartifacts(info, uniquefolderforrepo, uniquefoldertemp) + getcomponentartifacts(buildinfo, uniquefolderforrepo, uniquefoldertemp) - def String buildstamp = info.meta.buildstampinfo.buildstamp - gitrelease(uniquefolderforrepo, buildstamp, dryrunpush) + gitrelease(buildmeta, previousreleasemeta, uniquefolderforrepo, otherreleasetags, dryrunpush) summaryappend("\n") } -def releasehierarchy(buildmeta, String maxdepth, dryrunpush) { +def releasehierarchy(buildmeta, String maxdepth, String otherreleasetags, String dryrunpush) { int md = maxdepth.toInteger() resetfolders() preconditions() @@ -132,8 +213,8 @@ def releasehierarchy(buildmeta, String maxdepth, dryrunpush) { // For each component for (key in componentReleaseInfo.keySet()) { - def info = componentReleaseInfo[key] - releasecomponent(info, dryrunpush) + def buildinfo = componentReleaseInfo[key] + releasecomponent(buildinfo, otherreleasetags, dryrunpush) } return [markunstable, unstablereason] } From 01b5194cabc2f4023c011b8f1f128b77c6358ee2 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Fri, 30 Nov 2018 15:16:10 +0000 Subject: [PATCH 163/237] Check for changes occurring --- meta/folder.groovy | 4 ++++ release/do.groovy | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/meta/folder.groovy b/meta/folder.groovy index cfce68f..13b1fe5 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -624,6 +624,10 @@ class MetaInfo extends GISJsonSerialised { } return releasemetauniquecollection } + + MetaInfo getNewMetaObject(script) { + return new MetaInfo(script) + } } MetaInfo metareset(script) { diff --git a/release/do.groovy b/release/do.groovy index 80e10de..9d3e09a 100644 --- a/release/do.groovy +++ b/release/do.groovy @@ -37,7 +37,7 @@ def summaryappend(String summary) { } def getpreviousreleasemeta(buildmeta, String checkoutfolder) { - def previousreleasemeta = new metascript.MetaInfo(this) + def previousreleasemeta = buildmeta.getNewMetaObject(this) // See if there is meta data file from the current release def String releasemetafolderpath = "${checkoutfolder}/${buildmeta.folder()}" if (fileExists(releasemetafolderpath)) { @@ -49,7 +49,7 @@ def getpreviousreleasemeta(buildmeta, String checkoutfolder) { def checkoutreleaserepo(buildmeta, String checkoutfolder) { def String releaserepo = buildmeta.releaseinfo.releaserepoURL // Get the latest head revision of the release repo without checking out working copy; Check out to a folder unique to component; Extract any meta - def previousreleasemeta = new metascript.MetaInfo(this) + def previousreleasemeta = buildmeta.getNewMetaObject(this) dir(releaserepofolder) { sh("git clone --depth 1 ${releaserepo} ${checkoutfolder}") previousreleasemeta = getpreviousreleasemeta(buildmeta, checkoutfolder) From d532ddbdb5c7a0966becac910025ec9a82f502bb Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Fri, 30 Nov 2018 15:21:49 +0000 Subject: [PATCH 164/237] Check for changes occurring --- release/do.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/do.groovy b/release/do.groovy index 9d3e09a..576a188 100644 --- a/release/do.groovy +++ b/release/do.groovy @@ -41,7 +41,7 @@ def getpreviousreleasemeta(buildmeta, String checkoutfolder) { // See if there is meta data file from the current release def String releasemetafolderpath = "${checkoutfolder}/${buildmeta.folder()}" if (fileExists(releasemetafolderpath)) { - previousreleasemeta = metascript.metafromfolder(releasemetafolderpath) + previousreleasemeta = metascript.metafromfolder(checkoutfolder) } return previousreleasemeta } From 42d175974e6ea34722219476a44c9813378f4d0d Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Fri, 30 Nov 2018 15:27:03 +0000 Subject: [PATCH 165/237] Check for changes occurring --- release/do.groovy | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/release/do.groovy b/release/do.groovy index 576a188..644b995 100644 --- a/release/do.groovy +++ b/release/do.groovy @@ -52,7 +52,9 @@ def checkoutreleaserepo(buildmeta, String checkoutfolder) { def previousreleasemeta = buildmeta.getNewMetaObject(this) dir(releaserepofolder) { sh("git clone --depth 1 ${releaserepo} ${checkoutfolder}") - previousreleasemeta = getpreviousreleasemeta(buildmeta, checkoutfolder) + } + previousreleasemeta = getpreviousreleasemeta(buildmeta, checkoutfolder) + dir(checkoutfolder) { // Clear all existing files sh("git rm *") } From 47545c5206c4a466f0eeac1357e85859040786b9 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Fri, 30 Nov 2018 15:29:48 +0000 Subject: [PATCH 166/237] Check for changes occurring --- release/do.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/do.groovy b/release/do.groovy index 644b995..6cf55e2 100644 --- a/release/do.groovy +++ b/release/do.groovy @@ -56,7 +56,7 @@ def checkoutreleaserepo(buildmeta, String checkoutfolder) { previousreleasemeta = getpreviousreleasemeta(buildmeta, checkoutfolder) dir(checkoutfolder) { // Clear all existing files - sh("git rm *") + sh("git rm -r *") } return previousreleasemeta } From 75855fd9fb152e51978f5b9f785dd3cc5920a04e Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Fri, 30 Nov 2018 15:32:39 +0000 Subject: [PATCH 167/237] Check for changes occurring --- release/do.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/do.groovy b/release/do.groovy index 6cf55e2..bcdc419 100644 --- a/release/do.groovy +++ b/release/do.groovy @@ -160,7 +160,7 @@ def releasegitpush(String dryrunpush ) { def gitrelease(buildmeta, previousreleasemeta, String releaserepo, String otherreleasetags, String dryrunpush) { summaryappend(" Git operations: ") - def String buildstamp = buildinfo.meta.buildstampinfo.buildstamp + def String buildstamp = buildmeta.buildstampinfo.buildstamp dir(releaserepo) { def String precommitshacode = sh(script: "git rev-parse --verify HEAD", returnStdout: true).trim() echo "Pre commit sha code: ${precommitshacode}" From 5926f63c7bdd534b5b4c9de784d15ad6dc9e6ee9 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Fri, 30 Nov 2018 16:15:58 +0000 Subject: [PATCH 168/237] Check for changes occurring --- release/do.groovy | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/release/do.groovy b/release/do.groovy index bcdc419..a86bf04 100644 --- a/release/do.groovy +++ b/release/do.groovy @@ -129,6 +129,11 @@ def ArrayList maketaglist(String buildstamp, String otherreleasetags) { } def boolean releasegittag(String postcommitshacode, String tag) { + // Check if tag exists already + def retvalue = sh(script: "git rev-parse ${tag} >2 /dev/null", returnStdout: true, returnStatus: true) + echo "retvalue: ${retvalue} class: ${retvalue.getClass()}" + + // Tag sh("git tag ${tag}") summaryappend("(${tag}),") From 476c771144c259f23222061fcd8490615ab99ecb Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Fri, 30 Nov 2018 16:38:43 +0000 Subject: [PATCH 169/237] Check for changes occurring --- release/do.groovy | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/release/do.groovy b/release/do.groovy index a86bf04..2438b54 100644 --- a/release/do.groovy +++ b/release/do.groovy @@ -129,14 +129,26 @@ def ArrayList maketaglist(String buildstamp, String otherreleasetags) { } def boolean releasegittag(String postcommitshacode, String tag) { + def boolean tagadded = false // Check if tag exists already - def retvalue = sh(script: "git rev-parse ${tag} >2 /dev/null", returnStdout: true, returnStatus: true) - echo "retvalue: ${retvalue} class: ${retvalue.getClass()}" - - - // Tag - sh("git tag ${tag}") - summaryappend("(${tag}),") + def existingshacode = sh(script: "git rev-parse ${tag}", returnStdout: true).trim() + if (existingshacode?.trim()) { // If tag/sha code does exist + if (existingshacode != postcommitshacode) { // If the existing tag is not associated with HEAD + // This is a problem - The tag is already at another position in git repo + setunstable("The tag ${tag} has been used at another commit other than HEAD - You must decide what to do with it - Not good practice to delete it or move it") + summaryappend("(${tag} - Could not add!),") + } + else { + summaryappend("(${tag} - Already added),") + } + } + else { // If sha code does not exist already + // Tag + sh("git tag ${tag}") + summaryappend("(${tag}),") + tagadded = true + } + return tagadded } def boolean releasegittags(String postcommitshacode, ArrayList taglist) { From 6494069af5d92a59fe9c552c77a3938eb1756023 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Fri, 30 Nov 2018 16:48:17 +0000 Subject: [PATCH 170/237] Check for changes occurring --- release/do.groovy | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/release/do.groovy b/release/do.groovy index 2438b54..e69f09b 100644 --- a/release/do.groovy +++ b/release/do.groovy @@ -125,6 +125,7 @@ def ArrayList maketaglist(String buildstamp, String otherreleasetags) { for (othertagitem in othertaglist) { taglist.add(othertagitem.trim()) } + echo "Taglist: ${taglist}" return taglist } @@ -136,16 +137,16 @@ def boolean releasegittag(String postcommitshacode, String tag) { if (existingshacode != postcommitshacode) { // If the existing tag is not associated with HEAD // This is a problem - The tag is already at another position in git repo setunstable("The tag ${tag} has been used at another commit other than HEAD - You must decide what to do with it - Not good practice to delete it or move it") - summaryappend("(${tag} - Could not add!),") + summaryappend("(${tag} - Could not add!)") } else { - summaryappend("(${tag} - Already added),") + summaryappend("(${tag} - Already added)") } } else { // If sha code does not exist already // Tag sh("git tag ${tag}") - summaryappend("(${tag}),") + summaryappend("(${tag})") tagadded = true } return tagadded From 9c12e97ea42a82e7a92d6843d941a684815e04e3 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Fri, 30 Nov 2018 17:16:45 +0000 Subject: [PATCH 171/237] Check for changes occurring --- release/do.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/do.groovy b/release/do.groovy index e69f09b..1fe7cd4 100644 --- a/release/do.groovy +++ b/release/do.groovy @@ -125,7 +125,7 @@ def ArrayList maketaglist(String buildstamp, String otherreleasetags) { for (othertagitem in othertaglist) { taglist.add(othertagitem.trim()) } - echo "Taglist: ${taglist}" + echo "Taglist: ${taglist} size: ${taglist.size()}" return taglist } From 192678568584e1e2e0052b2db99560c478d4e81d Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Fri, 30 Nov 2018 17:20:36 +0000 Subject: [PATCH 172/237] Check for changes occurring --- release/do.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/do.groovy b/release/do.groovy index 1fe7cd4..788838b 100644 --- a/release/do.groovy +++ b/release/do.groovy @@ -121,7 +121,7 @@ def ArrayList maketaglist(String buildstamp, String otherreleasetags) { ArrayList taglist = new ArrayList() taglist.add(buildstamp) - ArrayList othertaglist = otherreleasetags.split(',') + ArrayList othertaglist = otherreleasetags.trim().split(',') for (othertagitem in othertaglist) { taglist.add(othertagitem.trim()) } From e1671aba544d1021fa2939b094219df6defe5e0d Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Fri, 30 Nov 2018 17:36:43 +0000 Subject: [PATCH 173/237] Check for changes occurring --- release/do.groovy | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/release/do.groovy b/release/do.groovy index 788838b..5d4f2e9 100644 --- a/release/do.groovy +++ b/release/do.groovy @@ -119,9 +119,12 @@ def boolean checkforchange(buildmeta, previousreleasemeta) { def ArrayList maketaglist(String buildstamp, String otherreleasetags) { ArrayList taglist = new ArrayList() - taglist.add(buildstamp) + taglist.add(buildstamp.trim()) + echo "Taglist: ${taglist} size: ${taglist.size()}" + ArrayList othertaglist = otherreleasetags.trim().split(',') + echo "othertaglist: ${othertaglist} size: ${othertaglist.size()}" for (othertagitem in othertaglist) { taglist.add(othertagitem.trim()) } @@ -178,7 +181,7 @@ def releasegitpush(String dryrunpush ) { def gitrelease(buildmeta, previousreleasemeta, String releaserepo, String otherreleasetags, String dryrunpush) { summaryappend(" Git operations: ") - def String buildstamp = buildmeta.buildstampinfo.buildstamp + def String buildstamp = buildmeta.buildstampinfo.buildstamp.trim() dir(releaserepo) { def String precommitshacode = sh(script: "git rev-parse --verify HEAD", returnStdout: true).trim() echo "Pre commit sha code: ${precommitshacode}" From 1500adb084374cf918b98b67b81272ae1c7172df Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Fri, 30 Nov 2018 17:41:40 +0000 Subject: [PATCH 174/237] Check for changes occurring --- release/do.groovy | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/release/do.groovy b/release/do.groovy index 5d4f2e9..7b7c07c 100644 --- a/release/do.groovy +++ b/release/do.groovy @@ -118,15 +118,14 @@ def boolean checkforchange(buildmeta, previousreleasemeta) { } def ArrayList maketaglist(String buildstamp, String otherreleasetags) { - ArrayList taglist = new ArrayList() - taglist.add(buildstamp.trim()) + def ArrayList taglist = new ArrayList() + taglist.add(buildstamp) - echo "Taglist: ${taglist} size: ${taglist.size()}" - - ArrayList othertaglist = otherreleasetags.trim().split(',') - echo "othertaglist: ${othertaglist} size: ${othertaglist.size()}" + def ArrayList othertaglist = otherreleasetags.split(',') for (othertagitem in othertaglist) { - taglist.add(othertagitem.trim()) + if (othertagitem?.trim()) { + taglist.add(othertagitem.trim()) + } } echo "Taglist: ${taglist} size: ${taglist.size()}" return taglist @@ -181,7 +180,7 @@ def releasegitpush(String dryrunpush ) { def gitrelease(buildmeta, previousreleasemeta, String releaserepo, String otherreleasetags, String dryrunpush) { summaryappend(" Git operations: ") - def String buildstamp = buildmeta.buildstampinfo.buildstamp.trim() + def String buildstamp = buildmeta.buildstampinfo.buildstamp dir(releaserepo) { def String precommitshacode = sh(script: "git rev-parse --verify HEAD", returnStdout: true).trim() echo "Pre commit sha code: ${precommitshacode}" From b380eef774e2a3d8c79f64bbc7767fe00983c788 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Fri, 30 Nov 2018 18:20:30 +0000 Subject: [PATCH 175/237] Restoration of subtree contents --- versionnumbering/generate.groovy | 39 ++++++++++++++++++++++++++------ 1 file changed, 32 insertions(+), 7 deletions(-) diff --git a/versionnumbering/generate.groovy b/versionnumbering/generate.groovy index a7b583a..925ed65 100644 --- a/versionnumbering/generate.groovy +++ b/versionnumbering/generate.groovy @@ -10,18 +10,43 @@ def getGitRevision(String gitrootpath, int basebuildnumber) { def String remoteinfo def String remoteurl dir( gitrootpath) { - def int changecount = sh(returnStdout: true, script: "git rev-list HEAD --count").trim() + def int changecount + if (isUnix()) { + changecount = sh(returnStdout: true, script: "git rev-list HEAD --count").trim() + } + else { + def stdout = bat(returnStdout:true , script: "git rev-list HEAD --count").trim() + changecount = stdout.readLines()[1] as int + } echo "Change count: ${changecount}" adjustedchangecount = (changecount + basebuildnumber) % (maxversionnumber() + 1) echo "Adjusted change count: ${adjustedchangecount}" - - gitrevision = sh(returnStdout: true, script: "git rev-parse HEAD").trim() + + if (isUnix()) { + gitrevision = sh(returnStdout: true, script: "git rev-parse HEAD").trim() + } + else { + def stdout = bat(returnStdout:true , script: "git rev-parse HEAD").trim() + gitrevision = stdout.readLines()[1] + } echo "Revision: ${gitrevision}" - - remoteinfo = sh(returnStdout: true, script: "git remote show origin").trim() + + if (isUnix()) { + remoteinfo = sh(returnStdout: true, script: "git remote show origin").trim() + } + else { + def stdout = bat(returnStdout:true , script: "git remote show origin").trim() + remoteinfo = stdout.readLines()[1..-1] + } echo "Remote info: ${remoteinfo}" - - remoteurl = sh(returnStdout: true, script: "git config --get remote.origin.url").trim() + + if (isUnix()) { + remoteurl = sh(returnStdout: true, script: "git config --get remote.origin.url").trim() + } + else { + def stdout = bat(returnStdout:true , script: "git config --get remote.origin.url").trim() + remoteurl = stdout.readLines()[1] + } echo "Remote URL: ${remoteurl}" } return [adjustedchangecount, gitrevision, remoteinfo, remoteurl] From 10e2a571787bae9dedf1a5d2267d85df0dfd20e8 Mon Sep 17 00:00:00 2001 From: Damian Smith Date: Fri, 30 Nov 2018 18:26:07 +0000 Subject: [PATCH 176/237] Merge commit 'b380eef774e2a3d8c79f64bbc7767fe00983c788' into 1.10003.j20-comscr --- release/do.groovy | 135 ---------------------------------------------- 1 file changed, 135 deletions(-) delete mode 100644 release/do.groovy diff --git a/release/do.groovy b/release/do.groovy deleted file mode 100644 index 6db301c..0000000 --- a/release/do.groovy +++ /dev/null @@ -1,135 +0,0 @@ -markunstable = false -unstablereason = "" - -summaryfolder = "${WORKSPACE}/summary" -summaryfile = "${summaryfolder}/summary.txt" -releaserepofolder = "${WORKSPACE}/releaserepos" -tempfolder = "${WORKSPACE}/temp" - -def resetfolders() { - dir(summaryfolder) { - deleteDir() - } - dir(releaserepofolder) { - deleteDir() - } - dir(tempfolder) { - deleteDir() - } -} - -def preconditions() { - markunstable = false - unstablereason = "" - writeFile(file: summaryfile, text: "Release summary: \n") -} - -def setunstable(String reason) { - markunstable = true - unstablereason = reason -} - -def summaryappend(String summary) { - def String currentsummarycontents = readFile(file: summaryfile) - writeFile(file: summaryfile, text: currentsummarycontents + summary) -} - -def checkoutreleaserepo(info, String checkoutfolder) { - def String releaserepo = info.meta.releaseinfo.releaserepoURL - // Get the latest head revision of the release repo without checking out working copy; Check out to a folder unique to component - dir(releaserepofolder) { - sh("git clone -n --depth 1 ${releaserepo} ${checkoutfolder}") - } -} - -def getcomponentartifacts(info, String repofolder, String tempfolder) { - // Copy relevant artifacts to temp folder - summaryappend("Artifacts: ") - for (artifactfilter in info.meta.releaseinfo.releaseitems) { - def filterpath = artifactfilter - if (info.offsetpath) { - filterpath = info.offsetpath + '/' + artifactfilter - } - // Copy relevant artifacts to temp folder - echo "Copying artifacts: ${filterpath} to ${tempfolder}" - copyArtifacts( - filter: filterpath, - projectName: BUILD_JOB, - selector: [ - $class: 'ParameterizedBuildSelector', - parameterName: BUILD_JOB_SELECTOR - ], - target: tempfolder - ) - // Move relevant artifacts from temp folder to release position - def originalrootdir = tempfolder + "/" + info.offsetpath - dir(originalrootdir) { - sh("mv * ${repofolder}") - } - summaryappend("${artifactfilter},") - } -} - -def gitrelease(String releaserepo, String buildstamp, String dryrunpush) { - summaryappend(" Git operations: ") - dir(releaserepo) { - // Add anything new - sh("git add .") - summaryappend("Add,") - // Perform git commit (if necessary) - def changesoccurred = sh(script: "git status --porcelain", returnStdout: true) - if (changesoccurred) { - sh("git commit -a -m ${buildstamp}") - summaryappend("Commit,") - } - else { - summaryappend("No-commit,") - } - // Tag with buildstamp - sh("git tag ${buildstamp}") - summaryappend("Tag (${buildstamp}),") - if (dryrunpush == "true") { - sh("git push -n --tags origin master") - summaryappend("Dry-Run-Push,") - setunstable("The artifact(s) have not been pushed/saved (\"Dry run push\" parameter/option is selected)") - } - else { - sh("git push --tags origin master") - summaryappend("Push") - } - } -} - -def releasecomponent(info, String dryrunpush) { - def String uniquefolder = "${info.meta.productinfo.productname}_${info.meta.productinfo.subcomponentname}" - def String uniquefolderforrepo = "${releaserepofolder}/${uniquefolder}" - def String uniquefoldertemp = "${tempfolder}/${uniquefolder}" - - summaryappend("${info.meta.productinfo.productname} ${info.meta.productinfo.subcomponentname}: ") - checkoutreleaserepo(info, uniquefolderforrepo) - - getcomponentartifacts(info, uniquefolderforrepo, uniquefoldertemp) - - def String buildstamp = info.meta.buildstampinfo.buildstamp - gitrelease(uniquefolderforrepo, buildstamp, dryrunpush) - - summaryappend("\n") -} - -def releasehierarchy(buildmeta, String maxdepth, dryrunpush) { - int md = maxdepth.toInteger() - resetfolders() - preconditions() - - // Walk the meta information to a max depth, looking for artifacts to import for release - componentReleaseInfo = buildmeta.releasewalkerunique(md) - - // For each component - for (key in componentReleaseInfo.keySet()) { - def info = componentReleaseInfo[key] - releasecomponent(info, dryrunpush) - } - return [markunstable, unstablereason] -} - -return this; \ No newline at end of file From 2c15e3fb45bc603d41b1381d1f44e75cca1fc0dc Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Fri, 30 Nov 2018 18:46:33 +0000 Subject: [PATCH 177/237] Check for changes occurring --- release/do.groovy | 1 - 1 file changed, 1 deletion(-) diff --git a/release/do.groovy b/release/do.groovy index 7b7c07c..b2f09bd 100644 --- a/release/do.groovy +++ b/release/do.groovy @@ -127,7 +127,6 @@ def ArrayList maketaglist(String buildstamp, String otherreleasetags) { taglist.add(othertagitem.trim()) } } - echo "Taglist: ${taglist} size: ${taglist.size()}" return taglist } From 75708e8b1ded943eaa76016cf0d342341c68b9c0 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 1 Dec 2018 08:25:26 +0000 Subject: [PATCH 178/237] Make sure changecount is an integer --- versionnumbering/generate.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versionnumbering/generate.groovy b/versionnumbering/generate.groovy index 925ed65..f80d021 100644 --- a/versionnumbering/generate.groovy +++ b/versionnumbering/generate.groovy @@ -12,7 +12,7 @@ def getGitRevision(String gitrootpath, int basebuildnumber) { dir( gitrootpath) { def int changecount if (isUnix()) { - changecount = sh(returnStdout: true, script: "git rev-list HEAD --count").trim() + changecount = sh(returnStdout: true, script: "git rev-list HEAD --count").trim().toInteger() } else { def stdout = bat(returnStdout:true , script: "git rev-list HEAD --count").trim() From 7b4ccb95da39981937b3fe4376e821ea46a30378 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 1 Dec 2018 09:32:23 +0000 Subject: [PATCH 179/237] Add a summary on the console --- release/do.groovy | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/release/do.groovy b/release/do.groovy index b2f09bd..2866793 100644 --- a/release/do.groovy +++ b/release/do.groovy @@ -5,6 +5,7 @@ summaryfolder = "${WORKSPACE}/summary" summaryfile = "${summaryfolder}/summary.txt" releaserepofolder = "${WORKSPACE}/releaserepos" tempfolder = "${WORKSPACE}/temp" +summarystring = "" metascript = autobuilder.getmetafolderscript() @@ -23,6 +24,7 @@ def resetfolders() { def preconditions() { markunstable = false unstablereason = "" + summarystring = "" writeFile(file: summaryfile, text: "Release summary: \n") } @@ -34,6 +36,7 @@ def setunstable(String reason) { def summaryappend(String summary) { def String currentsummarycontents = readFile(file: summaryfile) writeFile(file: summaryfile, text: currentsummarycontents + summary) + summarystring += summary } def getpreviousreleasemeta(buildmeta, String checkoutfolder) { @@ -237,7 +240,7 @@ def releasehierarchy(buildmeta, String maxdepth, String otherreleasetags, String def buildinfo = componentReleaseInfo[key] releasecomponent(buildinfo, otherreleasetags, dryrunpush) } - return [markunstable, unstablereason] + return [summarystring, markunstable, unstablereason] } return this; \ No newline at end of file From 77c0c47b5c09944bb6f7963e46d31207da96da99 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 1 Dec 2018 10:19:27 +0000 Subject: [PATCH 180/237] Handle case of tag not already existing in release repo correctly --- release/do.groovy | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/release/do.groovy b/release/do.groovy index 2866793..187fb01 100644 --- a/release/do.groovy +++ b/release/do.groovy @@ -3,9 +3,10 @@ unstablereason = "" summaryfolder = "${WORKSPACE}/summary" summaryfile = "${summaryfolder}/summary.txt" +summarystring = "" releaserepofolder = "${WORKSPACE}/releaserepos" tempfolder = "${WORKSPACE}/temp" -summarystring = "" +gitrevparseoutputfile = "${tempfolder}/gitrevparse.out" metascript = autobuilder.getmetafolderscript() @@ -136,8 +137,9 @@ def ArrayList maketaglist(String buildstamp, String otherreleasetags) { def boolean releasegittag(String postcommitshacode, String tag) { def boolean tagadded = false // Check if tag exists already - def existingshacode = sh(script: "git rev-parse ${tag}", returnStdout: true).trim() - if (existingshacode?.trim()) { // If tag/sha code does exist + def int gitrevparsestatus = sh(script: "git rev-parse \"${tag}\" > \"${gitrevparseoutputfile}\"", returnStatus: true).trim() + if (gitrevparsestatus == 0) { // Tag exists + def existingshacode = readFile(file: gitrevparseoutputfile).trim() if (existingshacode != postcommitshacode) { // If the existing tag is not associated with HEAD // This is a problem - The tag is already at another position in git repo setunstable("The tag ${tag} has been used at another commit other than HEAD - You must decide what to do with it - Not good practice to delete it or move it") @@ -147,9 +149,9 @@ def boolean releasegittag(String postcommitshacode, String tag) { summaryappend("(${tag} - Already added)") } } - else { // If sha code does not exist already + else { // If tag does not exist already // Tag - sh("git tag ${tag}") + sh("git tag \"${tag}\"") summaryappend("(${tag})") tagadded = true } @@ -243,4 +245,4 @@ def releasehierarchy(buildmeta, String maxdepth, String otherreleasetags, String return [summarystring, markunstable, unstablereason] } -return this; \ No newline at end of file +return this; From 483c6ee6306aa1bfa7073d339a9b1b05abb1ffeb Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 1 Dec 2018 10:25:10 +0000 Subject: [PATCH 181/237] Handle case of tag not already existing in release repo correctly --- release/do.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/do.groovy b/release/do.groovy index 187fb01..a43beda 100644 --- a/release/do.groovy +++ b/release/do.groovy @@ -137,7 +137,7 @@ def ArrayList maketaglist(String buildstamp, String otherreleasetags) { def boolean releasegittag(String postcommitshacode, String tag) { def boolean tagadded = false // Check if tag exists already - def int gitrevparsestatus = sh(script: "git rev-parse \"${tag}\" > \"${gitrevparseoutputfile}\"", returnStatus: true).trim() + def int gitrevparsestatus = sh(script: "git rev-parse \"${tag}\" > \"${gitrevparseoutputfile}\"", returnStatus: true) if (gitrevparsestatus == 0) { // Tag exists def existingshacode = readFile(file: gitrevparseoutputfile).trim() if (existingshacode != postcommitshacode) { // If the existing tag is not associated with HEAD From 72072efecbb7796042d100c3a37068a6402f1395 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 1 Dec 2018 10:43:26 +0000 Subject: [PATCH 182/237] Handle case of tag not already existing in release repo correctly --- release/do.groovy | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/release/do.groovy b/release/do.groovy index a43beda..dc834ea 100644 --- a/release/do.groovy +++ b/release/do.groovy @@ -137,7 +137,7 @@ def ArrayList maketaglist(String buildstamp, String otherreleasetags) { def boolean releasegittag(String postcommitshacode, String tag) { def boolean tagadded = false // Check if tag exists already - def int gitrevparsestatus = sh(script: "git rev-parse \"${tag}\" > \"${gitrevparseoutputfile}\"", returnStatus: true) + def int gitrevparsestatus = sh(script: "git rev-parse \"${tag}\" > \"${gitrevparseoutputfile}\" 2> /dev/null", returnStatus: true) if (gitrevparsestatus == 0) { // Tag exists def existingshacode = readFile(file: gitrevparseoutputfile).trim() if (existingshacode != postcommitshacode) { // If the existing tag is not associated with HEAD @@ -173,12 +173,12 @@ def boolean releasegittags(String postcommitshacode, ArrayList taglist) def releasegitpush(String dryrunpush ) { if (dryrunpush == "true") { sh("git push -n --tags origin master") - summaryappend("Dry-Run-Push") + summaryappend(",Dry-Run-Push") setunstable("The artifact(s) have not been pushed/saved (\"Dry run push\" parameter/option is selected)") } else { sh("git push --tags origin master") - summaryappend("Push") + summaryappend(",Push") } } From 467ffd7ac0b4385506665742d5a607125d7916d7 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 1 Dec 2018 10:47:30 +0000 Subject: [PATCH 183/237] Handle case of tag not already existing in release repo correctly --- release/do.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/do.groovy b/release/do.groovy index dc834ea..f71c3df 100644 --- a/release/do.groovy +++ b/release/do.groovy @@ -137,7 +137,7 @@ def ArrayList maketaglist(String buildstamp, String otherreleasetags) { def boolean releasegittag(String postcommitshacode, String tag) { def boolean tagadded = false // Check if tag exists already - def int gitrevparsestatus = sh(script: "git rev-parse \"${tag}\" > \"${gitrevparseoutputfile}\" 2> /dev/null", returnStatus: true) + def int gitrevparsestatus = sh(script: "git rev-parse \"${tag}\" >\"${gitrevparseoutputfile}\" 2>/dev/null", returnStatus: true) if (gitrevparsestatus == 0) { // Tag exists def existingshacode = readFile(file: gitrevparseoutputfile).trim() if (existingshacode != postcommitshacode) { // If the existing tag is not associated with HEAD From df484224e7911770599998344c7a9416a342792e Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 1 Dec 2018 12:27:00 +0000 Subject: [PATCH 184/237] Tag associated source repos --- release/do.groovy | 86 ++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 78 insertions(+), 8 deletions(-) diff --git a/release/do.groovy b/release/do.groovy index f71c3df..a320775 100644 --- a/release/do.groovy +++ b/release/do.groovy @@ -5,6 +5,7 @@ summaryfolder = "${WORKSPACE}/summary" summaryfile = "${summaryfolder}/summary.txt" summarystring = "" releaserepofolder = "${WORKSPACE}/releaserepos" +sourcerepofolder = "${WORKSPACE}/sourcerepos" tempfolder = "${WORKSPACE}/temp" gitrevparseoutputfile = "${tempfolder}/gitrevparse.out" @@ -65,6 +66,14 @@ def checkoutreleaserepo(buildmeta, String checkoutfolder) { return previousreleasemeta } +def checkoutsourcerepo(buildmeta, String checkoutfolder) { + def String sourcerepo = buildmeta.gitinfo.remoteurl + // Get the latest revision of the source repo without checking out working copy; Check out to a folder unique to component + dir(sourcerepofolder) { + sh("git clone --depth 1 ${sourcerepo} ${checkoutfolder}") + } +} + def getcomponentartifacts(buildinfo, String repofolder, String tempfolder) { // Copy relevant artifacts to temp folder summaryappend("Artifacts: ") @@ -112,13 +121,13 @@ def releasegitcommit(String buildstamp) { } // Determine if there has been a change by comparing the sha code in previous release meta and the build meta -def boolean checkforchange(buildmeta, previousreleasemeta) { +def checkforchange(buildmeta, previousreleasemeta) { String buildsha = buildmeta.gitinfo.gitrevision String previoussha = previousreleasemeta.gitinfo.gitrevision def boolean changed = (buildsha != previoussha) echo "buildsha: ${buildsha} previoussha: ${previoussha} changed: ${changed}" - return changed + return [changed, buildsha] } def ArrayList maketaglist(String buildstamp, String otherreleasetags) { @@ -170,6 +179,42 @@ def boolean releasegittags(String postcommitshacode, ArrayList taglist) return tagadded } +def boolean sourcegittag(String shacode, String tag) { + def boolean tagadded = false + // Check if tag exists already + def int gitrevparsestatus = sh(script: "git rev-parse \"${tag}\" >\"${gitrevparseoutputfile}\" 2>/dev/null", returnStatus: true) + if (gitrevparsestatus == 0) { // Tag exists + def existingshacode = readFile(file: gitrevparseoutputfile).trim() + if (existingshacode != shacode) { // If the existing tag is not associated with HEAD + // This is a problem - The tag is already at another position in git repo + setunstable("The source tag ${tag} has been used at another commit (${existingshacode}) - You must decide what to do with it - Not good practice to delete it or move it") + summaryappend("(${tag} - Could not add!)") + } + else { + summaryappend("(${tag} - Already added)") + } + } + else { // If tag does not exist already + // Tag + sh("git tag \"${tag}\"") + summaryappend("(${tag})") + tagadded = true + } + return tagadded +} + +def sourcegittags(buildsha, taglist) { + boolean tagadded = false + + summaryappend("Src Tag ") + for (tag in taglist) { + if (sourcegittag(buildsha, tag)) { + tagadded = true + } + } + return tagadded +} + def releasegitpush(String dryrunpush ) { if (dryrunpush == "true") { sh("git push -n --tags origin master") @@ -182,16 +227,34 @@ def releasegitpush(String dryrunpush ) { } } -def gitrelease(buildmeta, previousreleasemeta, String releaserepo, String otherreleasetags, String dryrunpush) { +def sourcegitpush(String dryrunpush ) { + if (dryrunpush == "true") { + sh("git push -n --tags") + summaryappend(",Dry-Run-Push") + setunstable("The source tag(s) have not been pushed/saved (\"Dry run push\" parameter/option is selected)") + } + else { + sh("git push --tags") + summaryappend(",Push") + } +} + +def gitrelease(buildmeta, previousreleasemeta, String releaserepo, String sourcerepo, String otherreleasetags, String dryrunpush) { summaryappend(" Git operations: ") def String buildstamp = buildmeta.buildstampinfo.buildstamp + + ArrayList taglist = maketaglist(buildstamp, otherreleasetags) + + def boolean changed = false + def String buildsha = "" + def boolean tagadded = false dir(releaserepo) { def String precommitshacode = sh(script: "git rev-parse --verify HEAD", returnStdout: true).trim() echo "Pre commit sha code: ${precommitshacode}" releasegitadd() - def boolean changed = checkforchange(buildmeta, previousreleasemeta) + (changed, buildsha)= checkforchange(buildmeta, previousreleasemeta) if (changed) { releasegitcommit(buildstamp) } @@ -203,14 +266,18 @@ def gitrelease(buildmeta, previousreleasemeta, String releaserepo, String otherr def String postcommitshacode = sh(script: "git rev-parse --verify HEAD", returnStdout: true).trim() echo "Post commit sha code: ${postcommitshacode}" - ArrayList taglist = maketaglist(buildstamp, otherreleasetags) - - def boolean tagadded = releasegittags(postcommitshacode, taglist) + tagadded = releasegittags(postcommitshacode, taglist) if (changed || tagadded) { releasegitpush(dryrunpush) } } + dir(sourcerepo) { + tagadded = sourcegittags(buildsha, taglist) + if (tagadded) { + sourcegitpush(dryrunpush) + } + } } def releasecomponent(buildinfo, String otherreleasetags, String dryrunpush) { @@ -218,13 +285,16 @@ def releasecomponent(buildinfo, String otherreleasetags, String dryrunpush) { def String uniquefolder = "${buildmeta.productinfo.productname}_${buildmeta.productinfo.subcomponentname}" def String uniquefolderforrepo = "${releaserepofolder}/${uniquefolder}" def String uniquefoldertemp = "${tempfolder}/${uniquefolder}" + def String uniquefolderforsourcerepo = "${sourcerepofolder}/${uniquefolder}" summaryappend("${buildmeta.productinfo.productname} ${buildmeta.productinfo.subcomponentname}: ") def previousreleasemeta = checkoutreleaserepo(buildmeta, uniquefolderforrepo) + checkoutsourcerepo(buildmeta, uniquefolderforsourcerepo) + getcomponentartifacts(buildinfo, uniquefolderforrepo, uniquefoldertemp) - gitrelease(buildmeta, previousreleasemeta, uniquefolderforrepo, otherreleasetags, dryrunpush) + gitrelease(buildmeta, previousreleasemeta, uniquefolderforrepo, uniquefolderforsourcerepo, otherreleasetags, dryrunpush) summaryappend("\n") } From 995062473d2f0c27ca143832626f1cb08f796fb3 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 1 Dec 2018 13:25:00 +0000 Subject: [PATCH 185/237] Tag associated source repos --- release/do.groovy | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/release/do.groovy b/release/do.groovy index a320775..6992f81 100644 --- a/release/do.groovy +++ b/release/do.groovy @@ -121,13 +121,13 @@ def releasegitcommit(String buildstamp) { } // Determine if there has been a change by comparing the sha code in previous release meta and the build meta -def checkforchange(buildmeta, previousreleasemeta) { +def boolean checkforchange(buildmeta, previousreleasemeta) { String buildsha = buildmeta.gitinfo.gitrevision String previoussha = previousreleasemeta.gitinfo.gitrevision def boolean changed = (buildsha != previoussha) echo "buildsha: ${buildsha} previoussha: ${previoussha} changed: ${changed}" - return [changed, buildsha] + return changed } def ArrayList maketaglist(String buildstamp, String otherreleasetags) { @@ -196,17 +196,17 @@ def boolean sourcegittag(String shacode, String tag) { } else { // If tag does not exist already // Tag - sh("git tag \"${tag}\"") + sh("git tag \"${tag}\" ${shacode}") summaryappend("(${tag})") tagadded = true } return tagadded } -def sourcegittags(buildsha, taglist) { +def sourcegittags(String buildsha, List taglist) { boolean tagadded = false - summaryappend("Src Tag ") + summaryappend(",Src Tag ") for (tag in taglist) { if (sourcegittag(buildsha, tag)) { tagadded = true @@ -243,18 +243,14 @@ def gitrelease(buildmeta, previousreleasemeta, String releaserepo, String source summaryappend(" Git operations: ") def String buildstamp = buildmeta.buildstampinfo.buildstamp - ArrayList taglist = maketaglist(buildstamp, otherreleasetags) - - def boolean changed = false def String buildsha = "" - def boolean tagadded = false dir(releaserepo) { def String precommitshacode = sh(script: "git rev-parse --verify HEAD", returnStdout: true).trim() echo "Pre commit sha code: ${precommitshacode}" releasegitadd() - (changed, buildsha)= checkforchange(buildmeta, previousreleasemeta) + def boolean changed = checkforchange(buildmeta, previousreleasemeta) if (changed) { releasegitcommit(buildstamp) } @@ -266,14 +262,19 @@ def gitrelease(buildmeta, previousreleasemeta, String releaserepo, String source def String postcommitshacode = sh(script: "git rev-parse --verify HEAD", returnStdout: true).trim() echo "Post commit sha code: ${postcommitshacode}" - tagadded = releasegittags(postcommitshacode, taglist) + ArrayList taglist = maketaglist(buildstamp, otherreleasetags) + def tagadded = releasegittags(postcommitshacode, taglist) if (changed || tagadded) { releasegitpush(dryrunpush) } } dir(sourcerepo) { - tagadded = sourcegittags(buildsha, taglist) + def String srcbuildstamp = "${buildmeta.productinfo.productname}_${buildmeta.buildstampinfo.buildstamp}" + def String buildsha = buildmeta.gitinfo.gitrevision + + def ArrayList srctaglist = maketaglist(srcbuildstamp, otherreleasetags) + def tagadded = sourcegittags(buildsha, srctaglist) if (tagadded) { sourcegitpush(dryrunpush) } @@ -306,7 +307,7 @@ def releasehierarchy(buildmeta, String maxdepth, String otherreleasetags, String // Walk the meta information to a max depth, looking for artifacts to import for release componentReleaseInfo = buildmeta.releasewalkerunique(md) - + // For each component for (key in componentReleaseInfo.keySet()) { def buildinfo = componentReleaseInfo[key] From 8a08eefc068043ff5e775162760f94709bf1a21f Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 1 Dec 2018 13:27:12 +0000 Subject: [PATCH 186/237] Tag associated source repos --- release/do.groovy | 1 - 1 file changed, 1 deletion(-) diff --git a/release/do.groovy b/release/do.groovy index 6992f81..ce2aef0 100644 --- a/release/do.groovy +++ b/release/do.groovy @@ -243,7 +243,6 @@ def gitrelease(buildmeta, previousreleasemeta, String releaserepo, String source summaryappend(" Git operations: ") def String buildstamp = buildmeta.buildstampinfo.buildstamp - def String buildsha = "" dir(releaserepo) { def String precommitshacode = sh(script: "git rev-parse --verify HEAD", returnStdout: true).trim() echo "Pre commit sha code: ${precommitshacode}" From 70473b38d8f4a5a5d01a010be067363778d18ce9 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 1 Dec 2018 14:19:59 +0000 Subject: [PATCH 187/237] Tag associated source repos --- release/do.groovy | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/release/do.groovy b/release/do.groovy index ce2aef0..4a00491 100644 --- a/release/do.groovy +++ b/release/do.groovy @@ -69,8 +69,20 @@ def checkoutreleaserepo(buildmeta, String checkoutfolder) { def checkoutsourcerepo(buildmeta, String checkoutfolder) { def String sourcerepo = buildmeta.gitinfo.remoteurl // Get the latest revision of the source repo without checking out working copy; Check out to a folder unique to component - dir(sourcerepofolder) { - sh("git clone --depth 1 ${sourcerepo} ${checkoutfolder}") + if (fileExists(checkoutfolder)) { + dir(checkoutfolder) { + sh(""" + git reset --hard" + git clean -fdx + git pull + """ + ) + } + } + else { + dir(sourcerepofolder) { + sh("git clone ${sourcerepo} ${checkoutfolder}") + } } } @@ -269,7 +281,7 @@ def gitrelease(buildmeta, previousreleasemeta, String releaserepo, String source } } dir(sourcerepo) { - def String srcbuildstamp = "${buildmeta.productinfo.productname}_${buildmeta.buildstampinfo.buildstamp}" + def String srcbuildstamp = "${buildmeta.productinfo.productname}_${buildmeta.productinfo.subcomponentname}_${buildmeta.buildstampinfo.buildstamp}" def String buildsha = buildmeta.gitinfo.gitrevision def ArrayList srctaglist = maketaglist(srcbuildstamp, otherreleasetags) From f08e4ba3aab0c53ed2740f8b517e54c7316e0eae Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 1 Dec 2018 14:22:22 +0000 Subject: [PATCH 188/237] Tag associated source repos --- release/do.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/do.groovy b/release/do.groovy index 4a00491..f0c6c8b 100644 --- a/release/do.groovy +++ b/release/do.groovy @@ -72,7 +72,7 @@ def checkoutsourcerepo(buildmeta, String checkoutfolder) { if (fileExists(checkoutfolder)) { dir(checkoutfolder) { sh(""" - git reset --hard" + git reset --hard git clean -fdx git pull """ From e02d609283aa6f14a0b1498f18b6cc45ca021a14 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 1 Dec 2018 14:52:01 +0000 Subject: [PATCH 189/237] Make sure product name and sub component names can be used in tags --- meta/folder.groovy | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/meta/folder.groovy b/meta/folder.groovy index 13b1fe5..7ab5744 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -31,6 +31,15 @@ class ProductInfo extends GISJsonSerialised { } void set(String productname, String subcomponentname, String jirakey) { + // Make sure the fields can be used in git tags + def int pstatus = script.sh(script: "git check-ref-format --normalize \"refs/tags/${productname}\"", , returnStatus: true) + if (pstatus > 0) { + script.error("The product name: ${productname} needs to be renamed as it cannot be used in a git tag name") + } + def int sstatus = script.sh(script: "git check-ref-format --normalize \"refs/tags/${subcomponentname}\"", , returnStatus: true) + if (sstatus > 0) { + script.error("The subcomponent name: ${subcomponentname} needs to be renamed as it cannot be used in a git tag name") + } this.productname = productname this.subcomponentname = subcomponentname this.jirakey = jirakey From 9044b468b62882c353351d94b5c604629a8dd3fe Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 1 Dec 2018 15:00:02 +0000 Subject: [PATCH 190/237] Make sure product name and sub component names can be used in tags --- meta/folder.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/folder.groovy b/meta/folder.groovy index 7ab5744..e1e38aa 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -32,11 +32,11 @@ class ProductInfo extends GISJsonSerialised { void set(String productname, String subcomponentname, String jirakey) { // Make sure the fields can be used in git tags - def int pstatus = script.sh(script: "git check-ref-format --normalize \"refs/tags/${productname}\"", , returnStatus: true) + def int pstatus = script.sh(script: "git check-ref-format --normalize \"refs/tags/${productname}\" >/dev/null 2>/dev/null", , returnStatus: true) if (pstatus > 0) { script.error("The product name: ${productname} needs to be renamed as it cannot be used in a git tag name") } - def int sstatus = script.sh(script: "git check-ref-format --normalize \"refs/tags/${subcomponentname}\"", , returnStatus: true) + def int sstatus = script.sh(script: "git check-ref-format --normalize \"refs/tags/${subcomponentname}\" >/dev/null 2>/dev/null", , returnStatus: true) if (sstatus > 0) { script.error("The subcomponent name: ${subcomponentname} needs to be renamed as it cannot be used in a git tag name") } From 391001aa3bd2a805da83cdc29f951873c9cc0b76 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 1 Dec 2018 23:27:47 +0000 Subject: [PATCH 191/237] Make sure all excess local tags are removed from the source repo at the start --- release/do.groovy | 2 ++ 1 file changed, 2 insertions(+) diff --git a/release/do.groovy b/release/do.groovy index f0c6c8b..ecdd4eb 100644 --- a/release/do.groovy +++ b/release/do.groovy @@ -75,6 +75,8 @@ def checkoutsourcerepo(buildmeta, String checkoutfolder) { git reset --hard git clean -fdx git pull + # Remove all tags that are not already on the remote + git fetch --tags --prune """ ) } From e419aac74f0ed95134730adb0154e6f7f1830052 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 1 Dec 2018 23:53:17 +0000 Subject: [PATCH 192/237] Make sure all excess local tags are removed from the source repo at the start --- release/do.groovy | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/release/do.groovy b/release/do.groovy index ecdd4eb..c8e1ce6 100644 --- a/release/do.groovy +++ b/release/do.groovy @@ -76,7 +76,8 @@ def checkoutsourcerepo(buildmeta, String checkoutfolder) { git clean -fdx git pull # Remove all tags that are not already on the remote - git fetch --tags --prune + git tag -l | xargs git tag -d >/dev/null + git fetch -t >/dev/null """ ) } From 9abb04a84816cde72ddde80e15ac4b4b78b423bc Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sun, 2 Dec 2018 17:04:33 +0000 Subject: [PATCH 193/237] Distinguish src and release repo pushes --- release/do.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release/do.groovy b/release/do.groovy index c8e1ce6..169c292 100644 --- a/release/do.groovy +++ b/release/do.groovy @@ -245,12 +245,12 @@ def releasegitpush(String dryrunpush ) { def sourcegitpush(String dryrunpush ) { if (dryrunpush == "true") { sh("git push -n --tags") - summaryappend(",Dry-Run-Push") + summaryappend(",Src-Dry-Run-Push") setunstable("The source tag(s) have not been pushed/saved (\"Dry run push\" parameter/option is selected)") } else { sh("git push --tags") - summaryappend(",Push") + summaryappend(",Src Push") } } From 9cb07c5f1617d0b59d47d0ac486f1d8650827bf3 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sun, 2 Dec 2018 18:08:43 +0000 Subject: [PATCH 194/237] Make sure product name and sub component names can be used in tags --- meta/folder.groovy | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/meta/folder.groovy b/meta/folder.groovy index e1e38aa..1edd45c 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -434,6 +434,7 @@ class MetaInfo extends GISJsonSerialised { ChecksumInfo checksuminfo private ArrayList configurationinfo private ArrayList publishableinfo + private LinkedHashMap custominfo private ArrayList associatedmeta MetaInfo(script) { @@ -446,6 +447,7 @@ class MetaInfo extends GISJsonSerialised { checksuminfo = new ChecksumInfo(script) configurationinfo = new ArrayList() publishableinfo = new ArrayList() + custominfo = new LinkedHashMap() associatedmeta = new ArrayList() } @@ -467,6 +469,14 @@ class MetaInfo extends GISJsonSerialised { configurationinfo.add(ci) } + void addCustomInfo(String customId, String customValue) { + custominfo.put(customId.trim(), customValue) + } + + String getCustomInfo(String customId) { + return custominfo.getAt(customId.trim()) + } + List publishableinfoserialised() { def publishable = [] for (publishableitem in publishableinfo) { @@ -504,6 +514,7 @@ class MetaInfo extends GISJsonSerialised { pb.deserialiseJson(rawpublishable) publishableinfo.add(pb) } + custominfo = rawmeta['custominfo'] for (rawrelatedmeta in rawmeta['associatedmeta']) { def rm = new RelatedMetaInfo(script) rm.deserialiseJson(rawrelatedmeta) @@ -571,6 +582,7 @@ class MetaInfo extends GISJsonSerialised { 'configuration' : configurationinfoserialised(), 'checksuminfo' : checksuminfo.serialisationdata(), 'publishableinfo' : publishableinfoserialised(), + 'custominfo' : custominfo, 'associatedmeta' : associatedmetaserialised(), ] return data From bf616a38a1e9ef837be0ca6e94d9b9cfb9c4bb56 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Mon, 3 Dec 2018 08:37:23 +0000 Subject: [PATCH 195/237] Add bat variant of git commands --- meta/folder.groovy | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/meta/folder.groovy b/meta/folder.groovy index 1edd45c..643e203 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -32,11 +32,23 @@ class ProductInfo extends GISJsonSerialised { void set(String productname, String subcomponentname, String jirakey) { // Make sure the fields can be used in git tags - def int pstatus = script.sh(script: "git check-ref-format --normalize \"refs/tags/${productname}\" >/dev/null 2>/dev/null", , returnStatus: true) + def int pstatus = 0 + if (script.isUnix()) { + pstatus = script.sh(script: "git check-ref-format --normalize \"refs/tags/${productname}\" >/dev/null 2>/dev/null", , returnStatus: true) + } + else { + pstatus = script.bat(script: "@git check-ref-format --normalize \"refs/tags/${productname}\" > NUL 2> NUL", , returnStatus: true) + } if (pstatus > 0) { script.error("The product name: ${productname} needs to be renamed as it cannot be used in a git tag name") } - def int sstatus = script.sh(script: "git check-ref-format --normalize \"refs/tags/${subcomponentname}\" >/dev/null 2>/dev/null", , returnStatus: true) + def int sstatus = 0 + if (script.isUnix()) { + sstatus = script.sh(script: "git check-ref-format --normalize \"refs/tags/${subcomponentname}\" >/dev/null 2>/dev/null", , returnStatus: true) + } + else { + sstatus = script.bat(script: "@git check-ref-format --normalize \"refs/tags/${subcomponentname}\" > NUL 2> NUL", , returnStatus: true) + } if (sstatus > 0) { script.error("The subcomponent name: ${subcomponentname} needs to be renamed as it cannot be used in a git tag name") } From 66082496ba822a5d2883823f745b97cc4e54a89b Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Mon, 3 Dec 2018 08:48:11 +0000 Subject: [PATCH 196/237] Add bat variant of git commands --- versionnumbering/generate.groovy | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/versionnumbering/generate.groovy b/versionnumbering/generate.groovy index f80d021..ae7e5f4 100644 --- a/versionnumbering/generate.groovy +++ b/versionnumbering/generate.groovy @@ -10,42 +10,35 @@ def getGitRevision(String gitrootpath, int basebuildnumber) { def String remoteinfo def String remoteurl dir( gitrootpath) { - def int changecount + def int changecount = 0 if (isUnix()) { changecount = sh(returnStdout: true, script: "git rev-list HEAD --count").trim().toInteger() } else { - def stdout = bat(returnStdout:true , script: "git rev-list HEAD --count").trim() - changecount = stdout.readLines()[1] as int - } + changecount = bat(returnStdout: true, script: "@git rev-list HEAD --count").trim().toInteger() + } echo "Change count: ${changecount}" adjustedchangecount = (changecount + basebuildnumber) % (maxversionnumber() + 1) echo "Adjusted change count: ${adjustedchangecount}" - if (isUnix()) { gitrevision = sh(returnStdout: true, script: "git rev-parse HEAD").trim() } else { - def stdout = bat(returnStdout:true , script: "git rev-parse HEAD").trim() - gitrevision = stdout.readLines()[1] + gitrevision = bat(returnStdout: true, script: "@git rev-parse HEAD").trim() } echo "Revision: ${gitrevision}" - if (isUnix()) { remoteinfo = sh(returnStdout: true, script: "git remote show origin").trim() } else { - def stdout = bat(returnStdout:true , script: "git remote show origin").trim() - remoteinfo = stdout.readLines()[1..-1] + remoteinfo = bat(returnStdout: true, script: "@git remote show origin").trim() } echo "Remote info: ${remoteinfo}" - if (isUnix()) { remoteurl = sh(returnStdout: true, script: "git config --get remote.origin.url").trim() } else { - def stdout = bat(returnStdout:true , script: "git config --get remote.origin.url").trim() - remoteurl = stdout.readLines()[1] + remoteurl = bat(returnStdout: true, script: "@git config --get remote.origin.url").trim() } echo "Remote URL: ${remoteurl}" } From 95caf56875baa6ed8b58fd36c7e9cf9855a3ea81 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Mon, 3 Dec 2018 13:28:28 +0000 Subject: [PATCH 197/237] Make installer build use meta --- meta/folder.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/folder.groovy b/meta/folder.groovy index 643e203..15f77d0 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -605,8 +605,8 @@ class MetaInfo extends GISJsonSerialised { return METAFOLDERNAME } - String generateartifacts(ArrayList releasedfromhere = new ArrayList(), - ArrayList releasedfromsubmeta = new ArrayList(), + String generateartifacts(ArrayList releasedfromhere = new ArrayList(), // These items are recorded in meta as released from here + ArrayList releasedfromsubmeta = new ArrayList(), // These items are not recorded in meta as released from here String metafilepath ="${METAFOLDERNAME}/${METAFILENAME}" ) { def String artifactlist = METAARTIFACTS From a5cd7e43acf791622620f270e12decfe2953ff3f Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Mon, 3 Dec 2018 14:47:13 +0000 Subject: [PATCH 198/237] Import specific job binaries; Add imported meta to this jobs meta --- import/importer.groovy | 6 ++++-- install/installhelper.groovy | 19 +++++-------------- 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/import/importer.groovy b/import/importer.groovy index 4d24d30..bf040ce 100644 --- a/import/importer.groovy +++ b/import/importer.groovy @@ -1,7 +1,8 @@ -def artifactimport(meta, String jenkinsjob, int buildnumber, String destpath, String filter = '**', boolean fingerprint = false) { +def artifactimport(meta, String jenkinsjob, int buildnumber, String destpath, String filter = '**', String excludes = '', boolean fingerprint = false) { copyArtifacts( filter: filter, + excludes: excludes, fingerprintArtifacts: fingerprint, projectName: jenkinsjob.trim(), selector: specific(buildnumber.toString()), @@ -10,9 +11,10 @@ def artifactimport(meta, String jenkinsjob, int buildnumber, String destpath, St return meta.importrelated(destpath) } -def artifactimport(meta, String jenkinsjob, String buildselector, String destpath, String filter = '**', boolean fingerprint = false) { +def artifactimport(meta, String jenkinsjob, String buildselector, String destpath, String filter = '**', String excludes = '', boolean fingerprint = false) { copyArtifacts( filter: filter, + excludes: excludes, fingerprintArtifacts: fingerprint, projectName: jenkinsjob.trim(), selector: [ diff --git a/install/installhelper.groovy b/install/installhelper.groovy index f523799..fdd6016 100644 --- a/install/installhelper.groovy +++ b/install/installhelper.groovy @@ -1,30 +1,21 @@ // Given details about artifacts to import and details of installers to build, import artifacts that are required -def artifactsImporter(artifactDetails, installerDetails) { +def artifactsImporter(meta, artifactDetails, installerDetails) { artifactFetched = [:] + def importer = load("${autobuilder.commonscripts()}/import/importer.groovy") for (installer in toBuild) { def artifactKey = installerDetails.get(installer)[0] - //echo "To build: ${installer} use artifactKey: ${artifactKey}" - (sourceProject, destFolder, toCopy, notToCopy, binariesFolders) = artifactDetails.get(artifactKey) + (sourceProject, sourceselector, destFolder, toCopy, notToCopy, binariesFolders) = artifactDetails.get(artifactKey) env.importDest = destFolder if (artifactFetched.get(artifactKey) == null) { - //echo "Artifact info: ${artifactInfo}" - copyArtifacts excludes: notToCopy, filter: toCopy, fingerprintArtifacts: true, projectName: "${sourceProject}", selector: lastSuccessful(), target: "${destFolder}" - def componentVersionFolder = "${WORKSPACE}\\version\\version_${artifactKey}" - def folderToCopy = "${destFolder}\\version" - echo "Copying from: ${folderToCopy} to: ${componentVersionFolder}" - fileOperations([folderCopyOperation(destinationFolderPath: componentVersionFolder, sourceFolderPath: folderToCopy)]) - //fileOperations([fileCopyOperation(excludes: '', flattenFiles: false, includes: filesToCopy, targetLocation: componentVersionFolder )]) - def gh = load("${autobuilder.commonscripts()}/versioncontrol/git.groovy") - artifactVersion = gh.getSHAFromVersion("${destFolder}/version") - artifactFetched.put(artifactKey, artifactVersion) + def importmeta = importer.artifactimport(meta, sourceProject, sourceselector, destpath, toCopy, notToCopy, true) } } return artifactFetched } // Export any required binaries to the /bin folder -def exportBinaries(artifactDetails, installerDetails) { +def placeBinaries(artifactDetails, installerDetails) { for (installer in toBuild) { (artifactSet, targetFolder, executionPath, ISMprojectFile, installerVariant, exportBinaries) = installerDetails.get(installer) if (exportBinaries) { From 5aae28adceb6c3d13281be015d9f9519b3e34262 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Mon, 3 Dec 2018 15:06:26 +0000 Subject: [PATCH 199/237] Import specific job binaries; Add imported meta to this jobs meta --- install/installhelper.groovy | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/installhelper.groovy b/install/installhelper.groovy index fdd6016..206a6c1 100644 --- a/install/installhelper.groovy +++ b/install/installhelper.groovy @@ -6,9 +6,8 @@ def artifactsImporter(meta, artifactDetails, installerDetails) { for (installer in toBuild) { def artifactKey = installerDetails.get(installer)[0] (sourceProject, sourceselector, destFolder, toCopy, notToCopy, binariesFolders) = artifactDetails.get(artifactKey) - env.importDest = destFolder if (artifactFetched.get(artifactKey) == null) { - def importmeta = importer.artifactimport(meta, sourceProject, sourceselector, destpath, toCopy, notToCopy, true) + def importmeta = importer.artifactimport(meta, sourceProject, sourceselector, destFolder, toCopy, notToCopy, true) } } return artifactFetched From 2d679105c8c4f23cf7e46940d8547c36d9e99351 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Mon, 3 Dec 2018 15:36:06 +0000 Subject: [PATCH 200/237] Import specific job binaries; Add imported meta to this jobs meta --- install/installhelper.groovy | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/install/installhelper.groovy b/install/installhelper.groovy index 206a6c1..0155c7f 100644 --- a/install/installhelper.groovy +++ b/install/installhelper.groovy @@ -1,5 +1,5 @@ // Given details about artifacts to import and details of installers to build, import artifacts that are required -def artifactsImporter(meta, artifactDetails, installerDetails) { +def Map artifactsImporter(meta, artifactDetails, installerDetails) { artifactFetched = [:] def importer = load("${autobuilder.commonscripts()}/import/importer.groovy") @@ -8,6 +8,7 @@ def artifactsImporter(meta, artifactDetails, installerDetails) { (sourceProject, sourceselector, destFolder, toCopy, notToCopy, binariesFolders) = artifactDetails.get(artifactKey) if (artifactFetched.get(artifactKey) == null) { def importmeta = importer.artifactimport(meta, sourceProject, sourceselector, destFolder, toCopy, notToCopy, true) + artifactFetched.put(artifactKey, importmeta) } } return artifactFetched From db6163fff766bbaecc039aa3ccafa9df7b2b0aee Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Mon, 10 Dec 2018 18:30:15 +0000 Subject: [PATCH 201/237] Add publishing script --- publish/do.groovy | 313 ++++++++++++++++++++++++++++++++++++++ versioncontrol/git.groovy | 18 ++- 2 files changed, 329 insertions(+), 2 deletions(-) create mode 100644 publish/do.groovy diff --git a/publish/do.groovy b/publish/do.groovy new file mode 100644 index 0000000..2c5a018 --- /dev/null +++ b/publish/do.groovy @@ -0,0 +1,313 @@ +markunstable = false +unstablereason = "" + +FTP_CLIENT_LOCATION='ftp' +FTP_URL='ie1.hostedftp.com' +FTP_USER='ftp@globalinkjetsystems.com' +FTP_CUSTOMER_ROOT='/Customers/' +FTP_PASSWORD='ramshorn42' +summaryfolder = "${WORKSPACE}/summary" +summaryfile = "${summaryfolder}/summary.txt" +summarystring = "" +releaserepofolder = "${WORKSPACE}/releaserepos" +sourcerepofolder = "${WORKSPACE}/sourcerepos" +tempfolder = "${WORKSPACE}/temp" +gitrevparseoutputfile = "${tempfolder}/gitrevparse.out" + +metascript = autobuilder.getmetafolderscript() +gh = load("${autobuilder.commonscripts()}/versioncontrol/git.groovy") + +def resetfolders() { + dir(summaryfolder) { + deleteDir() + } + dir(releaserepofolder) { + deleteDir() + } + dir(tempfolder) { + deleteDir() + } +} + +def preconditions() { + markunstable = false + unstablereason = "" + summarystring = "" + writeFile(file: summaryfile, text: "Publish summary: \n") +} + +def setunstable(String reason) { + markunstable = true + unstablereason = reason +} + +def summaryappend(String summary) { + def String currentsummarycontents = readFile(file: summaryfile) + writeFile(file: summaryfile, text: currentsummarycontents + summary) + summarystring += summary +} + +def getpreviousreleasemeta(buildmeta, String checkoutfolder) { + def previousreleasemeta = buildmeta.getNewMetaObject(this) + // See if there is meta data file from the current release + def String releasemetafolderpath = "${checkoutfolder}/${buildmeta.folder()}" + if (fileExists(releasemetafolderpath)) { + previousreleasemeta = metascript.metafromfolder(checkoutfolder) + } + return previousreleasemeta +} + +def checkoutreleaserepo(buildmeta, String checkoutfolder) { + def String releaserepo = buildmeta.releaseinfo.releaserepoURL + // Get the latest head revision of the release repo without checking out working copy; Check out to a folder unique to component; Extract any meta + def previousreleasemeta = buildmeta.getNewMetaObject(this) + dir(releaserepofolder) { + sh("git clone --depth 1 ${releaserepo} ${checkoutfolder}") + } + previousreleasemeta = getpreviousreleasemeta(buildmeta, checkoutfolder) + dir(checkoutfolder) { + // Clear all existing files + sh("git rm -r *") + } + return previousreleasemeta +} + +def checkoutsourcerepo(buildmeta, String checkoutfolder) { + def String sourcerepo = buildmeta.gitinfo.remoteurl + // Get the latest revision of the source repo without checking out working copy; Check out to a folder unique to component + if (fileExists(checkoutfolder)) { + dir(checkoutfolder) { + sh(""" + git reset --hard + git clean -fdx + git pull + # Remove all tags that are not already on the remote + git tag -l | xargs git tag -d >/dev/null + git fetch -t >/dev/null + """ + ) + } + } + else { + dir(sourcerepofolder) { + sh("git clone ${sourcerepo} ${checkoutfolder}") + } + } +} + +def getcomponentartifacts(releaseinfo, String repofolder, String tempfolder) { + // Copy relevant artifacts to temp folder + summaryappend("Artifacts: ") + + def releasemeta = releaseinfo.meta + def String componentURL = releasemeta.releaseinfo.releaserepoURL + def String revision = "refs/tags/${releasemeta.buildstampinfo.buildstamp}" + def publishableitems = releasemeta.publishableinfo + def ArrayList publishablePaths = new ArrayList() + for (publishableitem in publishableitems) { + publishablePaths.add(publishableitem.filepath) + summaryappend("${publishableitem.filepath},") + } + gh.gitCheckout(componentURL, revision, repofolder, "", 1, true, publishablePaths) // Shallow clone +} + +def releasegitadd() { + // Add anything new + sh("git add .") + summaryappend("Add,") +} + +def releasegitreset() { + // Add anything new + sh("git reset --hard") + sh("git clean -fdx") + summaryappend("Reset,") +} + +def releasegitcommit(String buildstamp) { + sh("git commit -a -m ${buildstamp}") + summaryappend("Commit,") +} + +// Determine if there has been a change by comparing the sha code in previous release meta and the build meta +def boolean checkforchange(buildmeta, previousreleasemeta) { + String buildsha = buildmeta.gitinfo.gitrevision + String previoussha = previousreleasemeta.gitinfo.gitrevision + + def boolean changed = (buildsha != previoussha) + echo "buildsha: ${buildsha} previoussha: ${previoussha} changed: ${changed}" + return changed +} + +def ArrayList maketaglist(String buildstamp, String otherreleasetags) { + def ArrayList taglist = new ArrayList() + taglist.add(buildstamp) + + def ArrayList othertaglist = otherreleasetags.split(',') + for (othertagitem in othertaglist) { + if (othertagitem?.trim()) { + taglist.add(othertagitem.trim()) + } + } + return taglist +} + +def boolean releasegittag(String postcommitshacode, String tag) { + def boolean tagadded = false + // Check if tag exists already + def int gitrevparsestatus = sh(script: "git rev-parse \"${tag}\" >\"${gitrevparseoutputfile}\" 2>/dev/null", returnStatus: true) + if (gitrevparsestatus == 0) { // Tag exists + def existingshacode = readFile(file: gitrevparseoutputfile).trim() + if (existingshacode != postcommitshacode) { // If the existing tag is not associated with HEAD + // This is a problem - The tag is already at another position in git repo + setunstable("The tag ${tag} has been used at another commit other than HEAD - You must decide what to do with it - Not good practice to delete it or move it") + summaryappend("(${tag} - Could not add!)") + } + else { + summaryappend("(${tag} - Already added)") + } + } + else { // If tag does not exist already + // Tag + sh("git tag \"${tag}\"") + summaryappend("(${tag})") + tagadded = true + } + return tagadded +} + +def boolean releasegittags(String postcommitshacode, ArrayList taglist) { + boolean tagadded = false + + summaryappend("Rel Tag ") + for (tag in taglist) { + if (releasegittag(postcommitshacode, tag)) { + tagadded = true + } + } + return tagadded +} + +def boolean sourcegittag(String shacode, String tag) { + def boolean tagadded = false + // Check if tag exists already + def int gitrevparsestatus = sh(script: "git rev-parse \"${tag}\" >\"${gitrevparseoutputfile}\" 2>/dev/null", returnStatus: true) + if (gitrevparsestatus == 0) { // Tag exists + def existingshacode = readFile(file: gitrevparseoutputfile).trim() + if (existingshacode != shacode) { // If the existing tag is not associated with HEAD + // This is a problem - The tag is already at another position in git repo + setunstable("The source tag ${tag} has been used at another commit (${existingshacode}) - You must decide what to do with it - Not good practice to delete it or move it") + summaryappend("(${tag} - Could not add!)") + } + else { + summaryappend("(${tag} - Already added)") + } + } + else { // If tag does not exist already + // Tag + sh("git tag \"${tag}\" ${shacode}") + summaryappend("(${tag})") + tagadded = true + } + return tagadded +} + +def sourcegittags(String buildsha, List taglist) { + boolean tagadded = false + + summaryappend(",Src Tag ") + for (tag in taglist) { + if (sourcegittag(buildsha, tag)) { + tagadded = true + } + } + return tagadded +} + +def releasegitpush(String dryrunpush ) { + if (dryrunpush == "true") { + sh("git push -n --tags origin master") + summaryappend(",Dry-Run-Push") + setunstable("The artifact(s) have not been pushed/saved (\"Dry run push\" parameter/option is selected)") + } + else { + sh("git push --tags origin master") + summaryappend(",Push") + } +} + +def sourcegitpush(String dryrunpush ) { + if (dryrunpush == "true") { + sh("git push -n --tags") + summaryappend(",Src-Dry-Run-Push") + setunstable("The source tag(s) have not been pushed/saved (\"Dry run push\" parameter/option is selected)") + } + else { + sh("git push --tags") + summaryappend(",Src Push") + } +} + +def publish(releasemeta, String uniquefolderforrepo) { + summaryappend(" Git operations: ") + def String buildstamp = releasemeta.buildstampinfo.buildstamp + + dir(uniquefolderforrepo) { + def String precommitshacode = sh(script: "git rev-parse --verify HEAD", returnStdout: true).trim() + echo "Pre commit sha code: ${precommitshacode}" + + releasegitadd() + + def boolean changed = checkforchange(buildmeta, previousreleasemeta) + if (changed) { + releasegitcommit(buildstamp) + } + else { + releasegitreset() + summaryappend("No-commit,") + } + + def String postcommitshacode = sh(script: "git rev-parse --verify HEAD", returnStdout: true).trim() + echo "Post commit sha code: ${postcommitshacode}" + + ArrayList taglist = maketaglist(buildstamp, otherreleasetags) + def tagadded = releasegittags(postcommitshacode, taglist) + + if (changed || tagadded) { + releasegitpush(dryrunpush) + } + } +} + +def recallcomponent(releaseinfo) { + def releasemeta = releaseinfo.meta + def String uniquefolder = "${releasemeta.productinfo.productname}_${releasemeta.productinfo.subcomponentname}" + def String uniquefolderforrepo = "${releaserepofolder}/${uniquefolder}" + def String uniquefoldertemp = "${tempfolder}/${uniquefolder}" + + summaryappend("${releasemeta.productinfo.productname} ${releasemeta.productinfo.subcomponentname}: ") + + getcomponentartifacts(releaseinfo, uniquefolderforrepo, uniquefoldertemp) + + summaryappend("\n") +} + +def publishhierarchy(releasemeta, String customer, String softwarerelease, String maxdepth) { + int md = maxdepth.toInteger() + resetfolders() + preconditions() + + // Walk the meta information to a max depth, looking for artifacts to import for release + componentReleaseInfo = releasemeta.releasewalkerunique(md) + + // For each component + for (key in componentReleaseInfo.keySet()) { + def releaseinfo = componentReleaseInfo[key] + recallcomponent(releaseinfo) + } + // publish(releasemeta, uniquefolderforrepo) + + return [summarystring, markunstable, unstablereason] +} + +return this; diff --git a/versioncontrol/git.groovy b/versioncontrol/git.groovy index cb9354b..8bd7968 100644 --- a/versioncontrol/git.groovy +++ b/versioncontrol/git.groovy @@ -1,3 +1,7 @@ +import hudson.plugins.git.* +import hudson.plugins.git.extensions.* +import hudson.plugins.git.extensions.impl.* + clh = load("${autobuilder.commonscripts()}/commandline/commandline.groovy") String getGitInfo(String workingSetRootPath) { @@ -6,7 +10,16 @@ String getGitInfo(String workingSetRootPath) { } } -def gitCheckout(String gitURL, String revision, String targetDir, String repoRoot = "", int cloneDepth = 1, boolean shallowClone = true) { +@NonCPS +def SparseCheckoutPaths sparsecheckoutconfig(ArrayList paths) { + ArrayList sparsecheckoutpaths = new ArrayList() + for (path in paths) { + sparsecheckoutpaths.add(new SparseCheckoutPath(path)) + } + return new SparseCheckoutPaths(sparsecheckoutpaths) +} + +def gitCheckout(String gitURL, String revision, String targetDir, String repoRoot = "", int cloneDepth = 1, boolean shallowClone = true, ArrayList sparseitemlist = new ArrayList()) { reporootenv = env.REPO_ROOT if (reporootenv != null && repoRoot != "") { reporootpath = "${reporootenv.trim()}/${repoRoot}" @@ -28,7 +41,8 @@ def gitCheckout(String gitURL, String revision, String targetDir, String repoRoo [$class: 'CleanBeforeCheckout'], [$class: 'CloneOption', depth: cloneDepth, noTags: false, reference: reporootpath, shallow: shallowClone, timeout: 120], [$class: 'CheckoutOption', timeout: 120], - [$class: 'RelativeTargetDirectory', relativeTargetDir: targetDir] + [$class: 'RelativeTargetDirectory', relativeTargetDir: targetDir], + sparsecheckoutconfig(sparseitemlist) ], submoduleCfg: [], ]) From 9ea146b13318e6f5beedd7dd917d6cda79ac60b5 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Tue, 11 Dec 2018 11:22:13 +0000 Subject: [PATCH 202/237] Only checkout repositories that have publishable items --- publish/do.groovy | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/publish/do.groovy b/publish/do.groovy index 2c5a018..c7084d0 100644 --- a/publish/do.groovy +++ b/publish/do.groovy @@ -104,11 +104,13 @@ def getcomponentartifacts(releaseinfo, String repofolder, String tempfolder) { def String revision = "refs/tags/${releasemeta.buildstampinfo.buildstamp}" def publishableitems = releasemeta.publishableinfo def ArrayList publishablePaths = new ArrayList() - for (publishableitem in publishableitems) { - publishablePaths.add(publishableitem.filepath) - summaryappend("${publishableitem.filepath},") + if (publishableitems.size() > 0) { + for (publishableitem in publishableitems) { + publishablePaths.add(publishableitem.filepath) + summaryappend("${publishableitem.filepath},") + } + gh.gitCheckout(componentURL, revision, repofolder, "", 1, true, publishablePaths) // Shallow clone } - gh.gitCheckout(componentURL, revision, repofolder, "", 1, true, publishablePaths) // Shallow clone } def releasegitadd() { From a7f6f97d7720cebc81be274449a9634d3569cfbc Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Tue, 11 Dec 2018 13:15:10 +0000 Subject: [PATCH 203/237] Build up folder structure for FTP --- publish/do.groovy | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/publish/do.groovy b/publish/do.groovy index c7084d0..4d02b4f 100644 --- a/publish/do.groovy +++ b/publish/do.groovy @@ -281,9 +281,9 @@ def publish(releasemeta, String uniquefolderforrepo) { } } -def recallcomponent(releaseinfo) { +def recallcomponent(releaseinfo, String customer, String softwarerelease) { def releasemeta = releaseinfo.meta - def String uniquefolder = "${releasemeta.productinfo.productname}_${releasemeta.productinfo.subcomponentname}" + def String uniquefolder = "${customer}/${PRODUCT_NAME}/${software_release}/${releasemeta.productinfo.productname}_${releasemeta.productinfo.subcomponentname}" def String uniquefolderforrepo = "${releaserepofolder}/${uniquefolder}" def String uniquefoldertemp = "${tempfolder}/${uniquefolder}" @@ -305,7 +305,7 @@ def publishhierarchy(releasemeta, String customer, String softwarerelease, Strin // For each component for (key in componentReleaseInfo.keySet()) { def releaseinfo = componentReleaseInfo[key] - recallcomponent(releaseinfo) + recallcomponent(releaseinfo, customer, softwarerelease) } // publish(releasemeta, uniquefolderforrepo) From 67ca5024c206ccfd03e322717df27ae1458332f9 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Tue, 11 Dec 2018 13:59:24 +0000 Subject: [PATCH 204/237] Change root path for transfer; Add an example FTP operation --- publish/do.groovy | 53 ++++++++++++++++++----------------------------- 1 file changed, 20 insertions(+), 33 deletions(-) diff --git a/publish/do.groovy b/publish/do.groovy index 4d02b4f..b953f4c 100644 --- a/publish/do.groovy +++ b/publish/do.groovy @@ -1,11 +1,6 @@ markunstable = false unstablereason = "" -FTP_CLIENT_LOCATION='ftp' -FTP_URL='ie1.hostedftp.com' -FTP_USER='ftp@globalinkjetsystems.com' -FTP_CUSTOMER_ROOT='/Customers/' -FTP_PASSWORD='ramshorn42' summaryfolder = "${WORKSPACE}/summary" summaryfile = "${summaryfolder}/summary.txt" summarystring = "" @@ -250,40 +245,32 @@ def sourcegitpush(String dryrunpush ) { } } -def publish(releasemeta, String uniquefolderforrepo) { - summaryappend(" Git operations: ") - def String buildstamp = releasemeta.buildstampinfo.buildstamp +def String FTP_CLIENT_LOCATION='ftp' +def String FTP_URL='ie1.hostedftp.com' +def String FTP_USER='ftp@globalinkjetsystems.com' +def String FTP_CUSTOMER_ROOT='/Customers/' +def String FTP_PASSWORD='ramshorn42' - dir(uniquefolderforrepo) { - def String precommitshacode = sh(script: "git rev-parse --verify HEAD", returnStdout: true).trim() - echo "Pre commit sha code: ${precommitshacode}" - - releasegitadd() +def publish() { + summaryappend(" FTP operations: ") - def boolean changed = checkforchange(buildmeta, previousreleasemeta) - if (changed) { - releasegitcommit(buildstamp) - } - else { - releasegitreset() - summaryappend("No-commit,") - } - - def String postcommitshacode = sh(script: "git rev-parse --verify HEAD", returnStdout: true).trim() - echo "Post commit sha code: ${postcommitshacode}" - - ArrayList taglist = maketaglist(buildstamp, otherreleasetags) - def tagadded = releasegittags(postcommitshacode, taglist) - - if (changed || tagadded) { - releasegitpush(dryrunpush) - } + dir(releaserepofolder) { + sh """#!/bin/bash + ftp -n -v ${FTP_URL} << EOT + ascii + user ${FTP_USER} ${FTP_PASSWORD} + prompt + cd ${FTP_CUSTOMER_ROOT} + ls -la + bye + EOT + """ } } def recallcomponent(releaseinfo, String customer, String softwarerelease) { def releasemeta = releaseinfo.meta - def String uniquefolder = "${customer}/${PRODUCT_NAME}/${software_release}/${releasemeta.productinfo.productname}_${releasemeta.productinfo.subcomponentname}" + def String uniquefolder = "${customer}/Software/${PRODUCT_NAME} ${software_release}/${releasemeta.productinfo.productname}_${releasemeta.productinfo.subcomponentname}" def String uniquefolderforrepo = "${releaserepofolder}/${uniquefolder}" def String uniquefoldertemp = "${tempfolder}/${uniquefolder}" @@ -307,7 +294,7 @@ def publishhierarchy(releasemeta, String customer, String softwarerelease, Strin def releaseinfo = componentReleaseInfo[key] recallcomponent(releaseinfo, customer, softwarerelease) } - // publish(releasemeta, uniquefolderforrepo) + publish() return [summarystring, markunstable, unstablereason] } From b178b86f6ee9199bdc418f5cf79d28b6505b7a00 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Tue, 11 Dec 2018 14:26:20 +0000 Subject: [PATCH 205/237] Build up folder structure for FTP --- publish/do.groovy | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/publish/do.groovy b/publish/do.groovy index b953f4c..46b3fdd 100644 --- a/publish/do.groovy +++ b/publish/do.groovy @@ -245,15 +245,15 @@ def sourcegitpush(String dryrunpush ) { } } -def String FTP_CLIENT_LOCATION='ftp' -def String FTP_URL='ie1.hostedftp.com' -def String FTP_USER='ftp@globalinkjetsystems.com' -def String FTP_CUSTOMER_ROOT='/Customers/' -def String FTP_PASSWORD='ramshorn42' def publish() { summaryappend(" FTP operations: ") + def String FTP_CLIENT_LOCATION='ftp' + def String FTP_URL='ie1.hostedftp.com' + def String FTP_USER='ftp@globalinkjetsystems.com' + def String FTP_CUSTOMER_ROOT='/Customers/' + def String FTP_PASSWORD='ramshorn42' dir(releaserepofolder) { sh """#!/bin/bash ftp -n -v ${FTP_URL} << EOT From 4230e4dcd33918892e2f4ac90fafb688dad4ba87 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Tue, 11 Dec 2018 15:14:29 +0000 Subject: [PATCH 206/237] Use ncftpput to transfer --- publish/do.groovy | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/publish/do.groovy b/publish/do.groovy index 46b3fdd..13a280a 100644 --- a/publish/do.groovy +++ b/publish/do.groovy @@ -106,6 +106,9 @@ def getcomponentartifacts(releaseinfo, String repofolder, String tempfolder) { } gh.gitCheckout(componentURL, revision, repofolder, "", 1, true, publishablePaths) // Shallow clone } + else { + summaryappend("None ") + } } def releasegitadd() { @@ -245,32 +248,26 @@ def sourcegitpush(String dryrunpush ) { } } - -def publish() { +def publish(String customer) { summaryappend(" FTP operations: ") def String FTP_CLIENT_LOCATION='ftp' def String FTP_URL='ie1.hostedftp.com' def String FTP_USER='ftp@globalinkjetsystems.com' - def String FTP_CUSTOMER_ROOT='/Customers/' + def String FTP_CUSTOMER_ROOT="/Customers/${customer}" def String FTP_PASSWORD='ramshorn42' dir(releaserepofolder) { + summaryappend(" FTP operations: Transferring to ${FTP_CUSTOMER_ROOT} ") sh """#!/bin/bash - ftp -n -v ${FTP_URL} << EOT - ascii - user ${FTP_USER} ${FTP_PASSWORD} - prompt - cd ${FTP_CUSTOMER_ROOT} - ls -la - bye - EOT + ncftpput -u ${FTP_USER} -p ${FTP_PASSWORD} -R ${FTP_URL} "${FTP_CUSTOMER_ROOT}" . """ + summaryappend(", Transferred ") } } -def recallcomponent(releaseinfo, String customer, String softwarerelease) { +def recallcomponent(releaseinfo, String softwarerelease) { def releasemeta = releaseinfo.meta - def String uniquefolder = "${customer}/Software/${PRODUCT_NAME} ${software_release}/${releasemeta.productinfo.productname}_${releasemeta.productinfo.subcomponentname}" + def String uniquefolder = "Software/${PRODUCT_NAME} ${software_release}/${releasemeta.productinfo.productname}_${releasemeta.productinfo.subcomponentname}" def String uniquefolderforrepo = "${releaserepofolder}/${uniquefolder}" def String uniquefoldertemp = "${tempfolder}/${uniquefolder}" @@ -292,9 +289,9 @@ def publishhierarchy(releasemeta, String customer, String softwarerelease, Strin // For each component for (key in componentReleaseInfo.keySet()) { def releaseinfo = componentReleaseInfo[key] - recallcomponent(releaseinfo, customer, softwarerelease) + recallcomponent(releaseinfo, softwarerelease) } - publish() + publish(customer) return [summarystring, markunstable, unstablereason] } From e06d3705497981903880f07cb750004a800e5669 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Tue, 11 Dec 2018 15:59:04 +0000 Subject: [PATCH 207/237] Use ncftpput to transfer --- publish/do.groovy | 200 +++------------------------------------------- 1 file changed, 10 insertions(+), 190 deletions(-) diff --git a/publish/do.groovy b/publish/do.groovy index 13a280a..8cdf9a3 100644 --- a/publish/do.groovy +++ b/publish/do.groovy @@ -5,12 +5,7 @@ summaryfolder = "${WORKSPACE}/summary" summaryfile = "${summaryfolder}/summary.txt" summarystring = "" releaserepofolder = "${WORKSPACE}/releaserepos" -sourcerepofolder = "${WORKSPACE}/sourcerepos" tempfolder = "${WORKSPACE}/temp" -gitrevparseoutputfile = "${tempfolder}/gitrevparse.out" - -metascript = autobuilder.getmetafolderscript() -gh = load("${autobuilder.commonscripts()}/versioncontrol/git.groovy") def resetfolders() { dir(summaryfolder) { @@ -42,54 +37,7 @@ def summaryappend(String summary) { summarystring += summary } -def getpreviousreleasemeta(buildmeta, String checkoutfolder) { - def previousreleasemeta = buildmeta.getNewMetaObject(this) - // See if there is meta data file from the current release - def String releasemetafolderpath = "${checkoutfolder}/${buildmeta.folder()}" - if (fileExists(releasemetafolderpath)) { - previousreleasemeta = metascript.metafromfolder(checkoutfolder) - } - return previousreleasemeta -} - -def checkoutreleaserepo(buildmeta, String checkoutfolder) { - def String releaserepo = buildmeta.releaseinfo.releaserepoURL - // Get the latest head revision of the release repo without checking out working copy; Check out to a folder unique to component; Extract any meta - def previousreleasemeta = buildmeta.getNewMetaObject(this) - dir(releaserepofolder) { - sh("git clone --depth 1 ${releaserepo} ${checkoutfolder}") - } - previousreleasemeta = getpreviousreleasemeta(buildmeta, checkoutfolder) - dir(checkoutfolder) { - // Clear all existing files - sh("git rm -r *") - } - return previousreleasemeta -} - -def checkoutsourcerepo(buildmeta, String checkoutfolder) { - def String sourcerepo = buildmeta.gitinfo.remoteurl - // Get the latest revision of the source repo without checking out working copy; Check out to a folder unique to component - if (fileExists(checkoutfolder)) { - dir(checkoutfolder) { - sh(""" - git reset --hard - git clean -fdx - git pull - # Remove all tags that are not already on the remote - git tag -l | xargs git tag -d >/dev/null - git fetch -t >/dev/null - """ - ) - } - } - else { - dir(sourcerepofolder) { - sh("git clone ${sourcerepo} ${checkoutfolder}") - } - } -} - +gh = load("${autobuilder.commonscripts()}/versioncontrol/git.groovy") def getcomponentartifacts(releaseinfo, String repofolder, String tempfolder) { // Copy relevant artifacts to temp folder summaryappend("Artifacts: ") @@ -111,143 +59,6 @@ def getcomponentartifacts(releaseinfo, String repofolder, String tempfolder) { } } -def releasegitadd() { - // Add anything new - sh("git add .") - summaryappend("Add,") -} - -def releasegitreset() { - // Add anything new - sh("git reset --hard") - sh("git clean -fdx") - summaryappend("Reset,") -} - -def releasegitcommit(String buildstamp) { - sh("git commit -a -m ${buildstamp}") - summaryappend("Commit,") -} - -// Determine if there has been a change by comparing the sha code in previous release meta and the build meta -def boolean checkforchange(buildmeta, previousreleasemeta) { - String buildsha = buildmeta.gitinfo.gitrevision - String previoussha = previousreleasemeta.gitinfo.gitrevision - - def boolean changed = (buildsha != previoussha) - echo "buildsha: ${buildsha} previoussha: ${previoussha} changed: ${changed}" - return changed -} - -def ArrayList maketaglist(String buildstamp, String otherreleasetags) { - def ArrayList taglist = new ArrayList() - taglist.add(buildstamp) - - def ArrayList othertaglist = otherreleasetags.split(',') - for (othertagitem in othertaglist) { - if (othertagitem?.trim()) { - taglist.add(othertagitem.trim()) - } - } - return taglist -} - -def boolean releasegittag(String postcommitshacode, String tag) { - def boolean tagadded = false - // Check if tag exists already - def int gitrevparsestatus = sh(script: "git rev-parse \"${tag}\" >\"${gitrevparseoutputfile}\" 2>/dev/null", returnStatus: true) - if (gitrevparsestatus == 0) { // Tag exists - def existingshacode = readFile(file: gitrevparseoutputfile).trim() - if (existingshacode != postcommitshacode) { // If the existing tag is not associated with HEAD - // This is a problem - The tag is already at another position in git repo - setunstable("The tag ${tag} has been used at another commit other than HEAD - You must decide what to do with it - Not good practice to delete it or move it") - summaryappend("(${tag} - Could not add!)") - } - else { - summaryappend("(${tag} - Already added)") - } - } - else { // If tag does not exist already - // Tag - sh("git tag \"${tag}\"") - summaryappend("(${tag})") - tagadded = true - } - return tagadded -} - -def boolean releasegittags(String postcommitshacode, ArrayList taglist) { - boolean tagadded = false - - summaryappend("Rel Tag ") - for (tag in taglist) { - if (releasegittag(postcommitshacode, tag)) { - tagadded = true - } - } - return tagadded -} - -def boolean sourcegittag(String shacode, String tag) { - def boolean tagadded = false - // Check if tag exists already - def int gitrevparsestatus = sh(script: "git rev-parse \"${tag}\" >\"${gitrevparseoutputfile}\" 2>/dev/null", returnStatus: true) - if (gitrevparsestatus == 0) { // Tag exists - def existingshacode = readFile(file: gitrevparseoutputfile).trim() - if (existingshacode != shacode) { // If the existing tag is not associated with HEAD - // This is a problem - The tag is already at another position in git repo - setunstable("The source tag ${tag} has been used at another commit (${existingshacode}) - You must decide what to do with it - Not good practice to delete it or move it") - summaryappend("(${tag} - Could not add!)") - } - else { - summaryappend("(${tag} - Already added)") - } - } - else { // If tag does not exist already - // Tag - sh("git tag \"${tag}\" ${shacode}") - summaryappend("(${tag})") - tagadded = true - } - return tagadded -} - -def sourcegittags(String buildsha, List taglist) { - boolean tagadded = false - - summaryappend(",Src Tag ") - for (tag in taglist) { - if (sourcegittag(buildsha, tag)) { - tagadded = true - } - } - return tagadded -} - -def releasegitpush(String dryrunpush ) { - if (dryrunpush == "true") { - sh("git push -n --tags origin master") - summaryappend(",Dry-Run-Push") - setunstable("The artifact(s) have not been pushed/saved (\"Dry run push\" parameter/option is selected)") - } - else { - sh("git push --tags origin master") - summaryappend(",Push") - } -} - -def sourcegitpush(String dryrunpush ) { - if (dryrunpush == "true") { - sh("git push -n --tags") - summaryappend(",Src-Dry-Run-Push") - setunstable("The source tag(s) have not been pushed/saved (\"Dry run push\" parameter/option is selected)") - } - else { - sh("git push --tags") - summaryappend(",Src Push") - } -} - def publish(String customer) { summaryappend(" FTP operations: ") @@ -278,6 +89,14 @@ def recallcomponent(releaseinfo, String softwarerelease) { summaryappend("\n") } +def stripgithistory() { + dir(releaserepofolder) { + sh """#!/bin/bash + ( find . -type d -name ".git" && find . -name ".gitignore" && find . -name ".gitmodules" ) | xargs rm -rf + """ + } +} + def publishhierarchy(releasemeta, String customer, String softwarerelease, String maxdepth) { int md = maxdepth.toInteger() resetfolders() @@ -291,6 +110,7 @@ def publishhierarchy(releasemeta, String customer, String softwarerelease, Strin def releaseinfo = componentReleaseInfo[key] recallcomponent(releaseinfo, softwarerelease) } + stripgithistory() publish(customer) return [summarystring, markunstable, unstablereason] From 8ba5a2c59a7407c8d993bd343793818953edbc7c Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Tue, 11 Dec 2018 16:01:13 +0000 Subject: [PATCH 208/237] Use ncftpput to transfer --- publish/do.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/publish/do.groovy b/publish/do.groovy index 8cdf9a3..34d0e42 100644 --- a/publish/do.groovy +++ b/publish/do.groovy @@ -68,7 +68,7 @@ def publish(String customer) { def String FTP_CUSTOMER_ROOT="/Customers/${customer}" def String FTP_PASSWORD='ramshorn42' dir(releaserepofolder) { - summaryappend(" FTP operations: Transferring to ${FTP_CUSTOMER_ROOT} ") + summaryappend("FTP operations: Transferring to ${FTP_CUSTOMER_ROOT}") sh """#!/bin/bash ncftpput -u ${FTP_USER} -p ${FTP_PASSWORD} -R ${FTP_URL} "${FTP_CUSTOMER_ROOT}" . """ From 08e458d9d633bfca42d0dd39bb5e549066a6b277 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Tue, 11 Dec 2018 18:12:45 +0000 Subject: [PATCH 209/237] Use ncftpput to transfer --- publish/do.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/publish/do.groovy b/publish/do.groovy index 34d0e42..a30bfc9 100644 --- a/publish/do.groovy +++ b/publish/do.groovy @@ -92,7 +92,7 @@ def recallcomponent(releaseinfo, String softwarerelease) { def stripgithistory() { dir(releaserepofolder) { sh """#!/bin/bash - ( find . -type d -name ".git" && find . -name ".gitignore" && find . -name ".gitmodules" ) | xargs rm -rf + ( find . -type d -name ".git" && find . -name ".gitignore" && find . -name ".gitmodules" && find . -iname ".gitattributes") | xargs rm -rvf """ } } From 64a6b177de8bce34c2a37982ec5305bd62be2d96 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Tue, 11 Dec 2018 18:53:08 +0000 Subject: [PATCH 210/237] Revision number needs to be altered if a job imports a dependent component; Make sure imports happen after the initial revision number is calculated --- artifacts/metaexport.groovy | 8 ++------ import/importer.groovy | 10 ++++++++-- versionnumbering/generate.groovy | 5 +++++ 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/artifacts/metaexport.groovy b/artifacts/metaexport.groovy index b4d4a6d..0ca5da7 100644 --- a/artifacts/metaexport.groovy +++ b/artifacts/metaexport.groovy @@ -4,7 +4,6 @@ def combineSubjobArtifacts(meta, subJobs) { def importer = load("${autobuilder.commonscripts()}/import/importer.groovy") def ArrayList artifactFolders = new ArrayList() - int revisiontotal = 0 for (subJob in subJobs) { def subJobObject = subJob[0] if (subJobObject != null) { @@ -14,14 +13,11 @@ def combineSubjobArtifacts(meta, subJobs) { dir(destFolder) { deleteDir() } - importedmeta = importer.artifactimport(meta, subJobName, subJobNumber, destFolder) - revisiontotal += importedmeta.buildstampinfo.revision + importer.artifactimport(meta, subJobName, subJobNumber, destFolder) artifactFolders.add("${destFolder}/**") } } - def versiongenerator = load("${autobuilder.commonscripts()}/versionnumbering/generate.groovy") - revisiontotal = revisiontotal % (versiongenerator.maxversionnumber() + 1) - return [artifactFolders, revisiontotal] + return artifactFolders } return this; diff --git a/import/importer.groovy b/import/importer.groovy index 4d24d30..081226a 100644 --- a/import/importer.groovy +++ b/import/importer.groovy @@ -1,4 +1,6 @@ +versiongenerator = load("${autobuilder.commonscripts()}/versionnumbering/generate.groovy") + def artifactimport(meta, String jenkinsjob, int buildnumber, String destpath, String filter = '**', boolean fingerprint = false) { copyArtifacts( filter: filter, @@ -7,7 +9,9 @@ def artifactimport(meta, String jenkinsjob, int buildnumber, String destpath, St selector: specific(buildnumber.toString()), target: destpath ) - return meta.importrelated(destpath) + def importedmeta = meta.importrelated(destpath) + meta.buildstampinfo.changerevision(versiongenerator.incrementrevision(meta.buildstampinfo.revision, importedmeta.buildstampinfo.revision)) + return importedmeta } def artifactimport(meta, String jenkinsjob, String buildselector, String destpath, String filter = '**', boolean fingerprint = false) { @@ -21,7 +25,9 @@ def artifactimport(meta, String jenkinsjob, String buildselector, String destpat ], target: destpath ) - return meta.importrelated(destpath) + def importedmeta = meta.importrelated(destpath) + meta.buildstampinfo.changerevision(versiongenerator.incrementrevision(meta.buildstampinfo.revision, importedmeta.buildstampinfo.revision)) + return importedmeta } return this; diff --git a/versionnumbering/generate.groovy b/versionnumbering/generate.groovy index ae7e5f4..e73782f 100644 --- a/versionnumbering/generate.groovy +++ b/versionnumbering/generate.groovy @@ -136,4 +136,9 @@ String generate(meta, String sourcerevision, String sourcepath, int basebuildnum return buildstamp } +int incrementrevision(int current, int increment) { + def int newrevision = (current + increment) % (maxversionnumber() + 1) + return newrevision +} + return this; \ No newline at end of file From e3bf9774ede490241fd0840e834e5230e4c9dc4d Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Tue, 11 Dec 2018 21:25:38 +0000 Subject: [PATCH 211/237] Revision number needs to be altered if a job imports a dependent component; Make sure imports happen after the initial revision number is calculated --- versionnumbering/generate.groovy | 1 + 1 file changed, 1 insertion(+) diff --git a/versionnumbering/generate.groovy b/versionnumbering/generate.groovy index e73782f..7e5568a 100644 --- a/versionnumbering/generate.groovy +++ b/versionnumbering/generate.groovy @@ -138,6 +138,7 @@ String generate(meta, String sourcerevision, String sourcepath, int basebuildnum int incrementrevision(int current, int increment) { def int newrevision = (current + increment) % (maxversionnumber() + 1) + echo "Current revision: ${current} Increment: ${increment} New revision: ${newrevision}" return newrevision } From 2dbfbdab472fc59f27e233fb3f9fdf5759a99278 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Wed, 12 Dec 2018 11:14:13 +0000 Subject: [PATCH 212/237] Remove .git files/folders before publishing --- publish/do.groovy | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/publish/do.groovy b/publish/do.groovy index a30bfc9..91f3b3e 100644 --- a/publish/do.groovy +++ b/publish/do.groovy @@ -90,9 +90,14 @@ def recallcomponent(releaseinfo, String softwarerelease) { } def stripgithistory() { + echo "Stripping git history out of ${releaserepo}" dir(releaserepofolder) { sh """#!/bin/bash - ( find . -type d -name ".git" && find . -name ".gitignore" && find . -name ".gitmodules" && find . -iname ".gitattributes") | xargs rm -rvf + pwd + find . -type d -name ".git" | xargs rm -rvf + find . -name ".gitignore" | xargs rm -rvf + find . -name ".gitmodules" | xargs rm -rvf + find . -iname ".gitattributes" | xargs rm -rvf """ } } From 6ac6396c6f7ffeac25f73b7c8344d561b81e859d Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Wed, 12 Dec 2018 11:29:40 +0000 Subject: [PATCH 213/237] Remove .git files/folders before publishing --- publish/do.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/publish/do.groovy b/publish/do.groovy index 91f3b3e..ec9b53f 100644 --- a/publish/do.groovy +++ b/publish/do.groovy @@ -90,7 +90,7 @@ def recallcomponent(releaseinfo, String softwarerelease) { } def stripgithistory() { - echo "Stripping git history out of ${releaserepo}" + echo "Stripping git history out of ${releaserepofolder}" dir(releaserepofolder) { sh """#!/bin/bash pwd From 7a4c46d342ac3671f42d2077be48d0bbf21176ce Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Wed, 12 Dec 2018 14:01:09 +0000 Subject: [PATCH 214/237] Releasing to git was relying on the source code sha changing only; However it needs to take into account that a dependent component revision number changed too --- release/do.groovy | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/release/do.groovy b/release/do.groovy index 169c292..85753e6 100644 --- a/release/do.groovy +++ b/release/do.groovy @@ -140,8 +140,18 @@ def boolean checkforchange(buildmeta, previousreleasemeta) { String buildsha = buildmeta.gitinfo.gitrevision String previoussha = previousreleasemeta.gitinfo.gitrevision - def boolean changed = (buildsha != previoussha) - echo "buildsha: ${buildsha} previoussha: ${previoussha} changed: ${changed}" + def boolean shachanged = (buildsha != previoussha) + echo "buildsha: ${buildsha} previoussha: ${previoussha} changed: ${shachanged}" + + String buildstamp = buildmeta.buildstampinfo.buildstamp + String previousbuildstamp = previousreleasemeta.buildstampinfo.buildstamp + + def boolean buildstampchanged = (buildstamp != previousbuildstamp) + echo "buildstamp: ${buildstamp} previousbuildstamp: ${previousbuildstamp} changed: ${buildstampchanged}" + + def boolean changed = (shachanged | buildstampchanged) + echo "changed: ${changed}" + return changed } From ca914eebd209abcefaca8ffbbd1f21847e9de156 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Wed, 12 Dec 2018 15:20:25 +0000 Subject: [PATCH 215/237] Remove .git detritus from published folders --- publish/do.groovy | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/publish/do.groovy b/publish/do.groovy index ec9b53f..e280c0c 100644 --- a/publish/do.groovy +++ b/publish/do.groovy @@ -94,10 +94,10 @@ def stripgithistory() { dir(releaserepofolder) { sh """#!/bin/bash pwd - find . -type d -name ".git" | xargs rm -rvf - find . -name ".gitignore" | xargs rm -rvf - find . -name ".gitmodules" | xargs rm -rvf - find . -iname ".gitattributes" | xargs rm -rvf + find . -type d -name ".git" | xargs -iXX rm -rvf XX + find . -name ".gitignore" | xargs -iXX rm -rvf XX + find . -name ".gitmodules" | xargs -iXX rm -rvf XX + find . -iname ".gitattributes" | xargs -iXX rm -rvf XX """ } } From 5a1a55aa35a0b9d2a4fae58c9c3143947aa65e68 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Wed, 12 Dec 2018 15:22:15 +0000 Subject: [PATCH 216/237] Move product agnostic scripts into common subtree area --- publish/publish.groovy | 90 ++++++++++++++++++++++++++++++++++++++++++ release/release.groovy | 87 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 177 insertions(+) create mode 100644 publish/publish.groovy create mode 100644 release/release.groovy diff --git a/publish/publish.groovy b/publish/publish.groovy new file mode 100644 index 0000000..8ed7aa8 --- /dev/null +++ b/publish/publish.groovy @@ -0,0 +1,90 @@ +pipeline { + agent { label "${AGENT_LABEL}" } + stages { + stage('Initial setup') { + steps { + script { + autobuilderscript = load("${WORKSPACE}/autobuild/Common_scripts/autobuilder.groovy") + meta = autobuilderscript.start(this, PRODUCT_NAME, SUBCOMPONENT_NAME, JIRA_KEY, RELEASE_REPO) + } + } + } + stage('Clean folders') { + steps { + script { + cleanfolders = [ + ] + cleaner = load("${autobuilder.commonscripts()}/clean/clean.groovy") + cleaner.clean(cleanfolders) + } + } + } + stage('Checkout release repo') { + steps { + script { + configurationhelper = autobuilder.configurationhelper() + + SOURCEURL = RELEASE_REPO + SOURCEREVISION = "refs/tags/${SOFTWARE_RELEASE}" + SOURCEDIR = "${WORKSPACE}/whole" + SOURCEROOTDIR = 'whole' + configurationhelper.gitCheckoutAndRegister(meta, 'whole', SOURCEURL, SOURCEREVISION, SOURCEDIR, SOURCEROOTDIR, 0, false) + } + } + } + stage('Get release artifact meta') { + steps { + script { + def mfs = autobuilderscript.getmetafolderscript() + releasemeta = mfs.metafromfolder(SOURCEDIR) + } + } + } + stage('Publish components') { + steps { + script { + def publisher = load("${autobuilder.commonscripts()}/publish/do.groovy") + MAX_META_DEPTH='2' + (summarystring, markunstable, unstablereason) = publisher.publishhierarchy(releasemeta, CUSTOMER, SOFTWARE_RELEASE, MAX_META_DEPTH) + if (markunstable) { + env.unstablereason = unstablereason + currentBuild.result = 'UNSTABLE' + } + } + } + } + stage('Archiving artifacts') { + steps { + script { + def artifactlist = meta.generateartifacts() + archiveArtifacts "summary/**,${artifactlist}" + } + } + } + stage('Summarise') { + steps { + script { + echo "Summary:\n${summarystring}\n" + if (env.unstablereason) { + echo "Instability reason: ${env.unstablereason}" + } + } + } + } + } + post { + always { + echo 'Post-build' + } + failure { + echo 'Failed build' + } + unstable { + echo 'Unstable build' + } + success { + echo 'Succeeded build' + } + } +} + diff --git a/release/release.groovy b/release/release.groovy new file mode 100644 index 0000000..828f1ff --- /dev/null +++ b/release/release.groovy @@ -0,0 +1,87 @@ +pipeline { + agent { label "${AGENT_LABEL}" } + stages { + stage('Initial setup') { + steps { + script { + autobuilderscript = load("${WORKSPACE}/autobuild/Common_scripts/autobuilder.groovy") + meta = autobuilderscript.start(this, PRODUCT_NAME, SUBCOMPONENT_NAME, JIRA_KEY, RELEASE_REPO) + } + } + } + stage('Clean exports') { + steps { + script { + cleanfolders = [ + "${WORKSPACE}/build_artifacts", + ] + cleaner = load("${autobuilder.commonscripts()}/clean/clean.groovy") + cleaner.clean(cleanfolders) + } + } + } + stage('Get build artifact meta') { + steps { + script { + BUILD_ARTIFACTS = "${WORKSPACE}/build_artifacts" + copyArtifacts( + filter: 'meta/**', + projectName: BUILD_JOB, + selector: [ + $class: 'ParameterizedBuildSelector', + parameterName: BUILD_JOB_SELECTOR + ], + target: BUILD_ARTIFACTS + ) + def mfs = autobuilderscript.getmetafolderscript() + buildmeta = mfs.metafromfolder(BUILD_ARTIFACTS) + } + } + } + stage('Release components') { + steps { + script { + def releaser = load("${autobuilder.commonscripts()}/release/do.groovy") + (summarystring, markunstable, unstablereason) = releaser.releasehierarchy(buildmeta, MAX_META_DEPTH, OTHER_RELEASE_TAGS, DRY_RUN_PUSH) + if (markunstable) { + env.unstablereason = unstablereason + currentBuild.result = 'UNSTABLE' + } + } + } + } + stage('Archiving artifacts') { + steps { + script { + def artifactlist = meta.generateartifacts() + archiveArtifacts "summary/**,${artifactlist}" + } + } + } + stage('Summarise') { + steps { + script { + echo "Summary:\n${summarystring}\n" + if (env.unstablereason) { + echo "Instability reason: ${env.unstablereason}" + } + } + } + } + } + post { + always { + echo 'Post-build' + } + failure { + echo 'Failed build' + } + unstable { + echo 'Unstable build' + } + success { + echo 'Succeeded build' + } + } +} + From fa3cc37a4d9ec6c79c55aaa09e2772aea9065977 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Wed, 12 Dec 2018 16:47:07 +0000 Subject: [PATCH 217/237] Post subtree pull corrections --- publish/do.groovy | 7 +++- publish/publish.groovy | 90 ++++++++++++++++++++++++++++++++++++++++++ release/do.groovy | 14 ++++++- release/release.groovy | 87 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 195 insertions(+), 3 deletions(-) create mode 100644 publish/publish.groovy create mode 100644 release/release.groovy diff --git a/publish/do.groovy b/publish/do.groovy index a30bfc9..e280c0c 100644 --- a/publish/do.groovy +++ b/publish/do.groovy @@ -90,9 +90,14 @@ def recallcomponent(releaseinfo, String softwarerelease) { } def stripgithistory() { + echo "Stripping git history out of ${releaserepofolder}" dir(releaserepofolder) { sh """#!/bin/bash - ( find . -type d -name ".git" && find . -name ".gitignore" && find . -name ".gitmodules" && find . -iname ".gitattributes") | xargs rm -rvf + pwd + find . -type d -name ".git" | xargs -iXX rm -rvf XX + find . -name ".gitignore" | xargs -iXX rm -rvf XX + find . -name ".gitmodules" | xargs -iXX rm -rvf XX + find . -iname ".gitattributes" | xargs -iXX rm -rvf XX """ } } diff --git a/publish/publish.groovy b/publish/publish.groovy new file mode 100644 index 0000000..8ed7aa8 --- /dev/null +++ b/publish/publish.groovy @@ -0,0 +1,90 @@ +pipeline { + agent { label "${AGENT_LABEL}" } + stages { + stage('Initial setup') { + steps { + script { + autobuilderscript = load("${WORKSPACE}/autobuild/Common_scripts/autobuilder.groovy") + meta = autobuilderscript.start(this, PRODUCT_NAME, SUBCOMPONENT_NAME, JIRA_KEY, RELEASE_REPO) + } + } + } + stage('Clean folders') { + steps { + script { + cleanfolders = [ + ] + cleaner = load("${autobuilder.commonscripts()}/clean/clean.groovy") + cleaner.clean(cleanfolders) + } + } + } + stage('Checkout release repo') { + steps { + script { + configurationhelper = autobuilder.configurationhelper() + + SOURCEURL = RELEASE_REPO + SOURCEREVISION = "refs/tags/${SOFTWARE_RELEASE}" + SOURCEDIR = "${WORKSPACE}/whole" + SOURCEROOTDIR = 'whole' + configurationhelper.gitCheckoutAndRegister(meta, 'whole', SOURCEURL, SOURCEREVISION, SOURCEDIR, SOURCEROOTDIR, 0, false) + } + } + } + stage('Get release artifact meta') { + steps { + script { + def mfs = autobuilderscript.getmetafolderscript() + releasemeta = mfs.metafromfolder(SOURCEDIR) + } + } + } + stage('Publish components') { + steps { + script { + def publisher = load("${autobuilder.commonscripts()}/publish/do.groovy") + MAX_META_DEPTH='2' + (summarystring, markunstable, unstablereason) = publisher.publishhierarchy(releasemeta, CUSTOMER, SOFTWARE_RELEASE, MAX_META_DEPTH) + if (markunstable) { + env.unstablereason = unstablereason + currentBuild.result = 'UNSTABLE' + } + } + } + } + stage('Archiving artifacts') { + steps { + script { + def artifactlist = meta.generateartifacts() + archiveArtifacts "summary/**,${artifactlist}" + } + } + } + stage('Summarise') { + steps { + script { + echo "Summary:\n${summarystring}\n" + if (env.unstablereason) { + echo "Instability reason: ${env.unstablereason}" + } + } + } + } + } + post { + always { + echo 'Post-build' + } + failure { + echo 'Failed build' + } + unstable { + echo 'Unstable build' + } + success { + echo 'Succeeded build' + } + } +} + diff --git a/release/do.groovy b/release/do.groovy index 169c292..85753e6 100644 --- a/release/do.groovy +++ b/release/do.groovy @@ -140,8 +140,18 @@ def boolean checkforchange(buildmeta, previousreleasemeta) { String buildsha = buildmeta.gitinfo.gitrevision String previoussha = previousreleasemeta.gitinfo.gitrevision - def boolean changed = (buildsha != previoussha) - echo "buildsha: ${buildsha} previoussha: ${previoussha} changed: ${changed}" + def boolean shachanged = (buildsha != previoussha) + echo "buildsha: ${buildsha} previoussha: ${previoussha} changed: ${shachanged}" + + String buildstamp = buildmeta.buildstampinfo.buildstamp + String previousbuildstamp = previousreleasemeta.buildstampinfo.buildstamp + + def boolean buildstampchanged = (buildstamp != previousbuildstamp) + echo "buildstamp: ${buildstamp} previousbuildstamp: ${previousbuildstamp} changed: ${buildstampchanged}" + + def boolean changed = (shachanged | buildstampchanged) + echo "changed: ${changed}" + return changed } diff --git a/release/release.groovy b/release/release.groovy new file mode 100644 index 0000000..828f1ff --- /dev/null +++ b/release/release.groovy @@ -0,0 +1,87 @@ +pipeline { + agent { label "${AGENT_LABEL}" } + stages { + stage('Initial setup') { + steps { + script { + autobuilderscript = load("${WORKSPACE}/autobuild/Common_scripts/autobuilder.groovy") + meta = autobuilderscript.start(this, PRODUCT_NAME, SUBCOMPONENT_NAME, JIRA_KEY, RELEASE_REPO) + } + } + } + stage('Clean exports') { + steps { + script { + cleanfolders = [ + "${WORKSPACE}/build_artifacts", + ] + cleaner = load("${autobuilder.commonscripts()}/clean/clean.groovy") + cleaner.clean(cleanfolders) + } + } + } + stage('Get build artifact meta') { + steps { + script { + BUILD_ARTIFACTS = "${WORKSPACE}/build_artifacts" + copyArtifacts( + filter: 'meta/**', + projectName: BUILD_JOB, + selector: [ + $class: 'ParameterizedBuildSelector', + parameterName: BUILD_JOB_SELECTOR + ], + target: BUILD_ARTIFACTS + ) + def mfs = autobuilderscript.getmetafolderscript() + buildmeta = mfs.metafromfolder(BUILD_ARTIFACTS) + } + } + } + stage('Release components') { + steps { + script { + def releaser = load("${autobuilder.commonscripts()}/release/do.groovy") + (summarystring, markunstable, unstablereason) = releaser.releasehierarchy(buildmeta, MAX_META_DEPTH, OTHER_RELEASE_TAGS, DRY_RUN_PUSH) + if (markunstable) { + env.unstablereason = unstablereason + currentBuild.result = 'UNSTABLE' + } + } + } + } + stage('Archiving artifacts') { + steps { + script { + def artifactlist = meta.generateartifacts() + archiveArtifacts "summary/**,${artifactlist}" + } + } + } + stage('Summarise') { + steps { + script { + echo "Summary:\n${summarystring}\n" + if (env.unstablereason) { + echo "Instability reason: ${env.unstablereason}" + } + } + } + } + } + post { + always { + echo 'Post-build' + } + failure { + echo 'Failed build' + } + unstable { + echo 'Unstable build' + } + success { + echo 'Succeeded build' + } + } +} + From e00d396c2b5dab238d2b0bff57abf0a1d0a0c082 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 15 Dec 2018 17:49:02 +0000 Subject: [PATCH 218/237] Remove redundant common_scripts --- file/utils.groovy | 16 --- versionnumbering/versioninfo.py | 180 -------------------------------- 2 files changed, 196 deletions(-) delete mode 100644 file/utils.groovy delete mode 100644 versionnumbering/versioninfo.py diff --git a/file/utils.groovy b/file/utils.groovy deleted file mode 100644 index 0ffa47c..0000000 --- a/file/utils.groovy +++ /dev/null @@ -1,16 +0,0 @@ - -def lineendings = load("${autobuilder.commonscripts()}/platform/lineendings.groovy") - -// Get current contents of given file and optionally add a newline string/character; If file doesn't exist, return default contents -def currentContents(file, newline = "${nl}", defaultContents = "") { - def contents = "" - if (fileExists("${file}")) { - contents = readFile(file: "${file}").trim() + newline - } - else { - contents = defaultContents - } - return contents -} - -return this; diff --git a/versionnumbering/versioninfo.py b/versionnumbering/versioninfo.py deleted file mode 100644 index 3d2a80d..0000000 --- a/versionnumbering/versioninfo.py +++ /dev/null @@ -1,180 +0,0 @@ -# encoding: utf-8 -''' -versionnumbering -- shortdesc - -versionnumbering generates a version folder with a common set of version information files in it - -@author: dan - -@copyright: 2017 Global Inkjet Systems Ltd. All rights reserved. -''' -import os -import sys -import shutil -import subprocess -import re -import datetime - -from argparse import ArgumentParser -from argparse import RawDescriptionHelpFormatter - -__all__ = [] -__version__ = 0.1 -__date__ = '2017-11-29' -__updated__ = '2017-11-29' - -# Handle: -# origin/master -# origin/2.0.x -def getVersionPrefix(sourcebranch): - print("Determining version number prefix from source branch name: {0}".format(sourcebranch)) - - defaultversionprefix = "1.30000.0." - mastertypeversionprefix = "1.20000.0." - thirdpartyversionprefix = "1.25000.0." - splits = sourcebranch.split('/') - if len(splits) < 1: - print("Source branch name is invalid. Defaulting to: {0}".format(defaultversionprefix)) - return defaultversionprefix - - sourcebranch = splits[-1] - - if sourcebranch.lower().find("master") != -1: # Special case - return mastertypeversionprefix - - splits2 = re.split(r'(\d+)', sourcebranch) - splits = [] - hasdot = False - for split in splits2: - if split.isdigit(): - splits.append(split) - if split == ".": - hasdot = True - - if not hasdot: - print("Source branch name has not dots in it (eg. 1.9.2). Defaulting to: {0}".format(thirdpartyversionprefix)) - return thirdpartyversionprefix - - versionprefix = "" - if len(splits) < 1: - print("This source branch name has no numbers in its name so defaulting to: {0}".format(defaultversionprefix)) - versionprefix = defaultversionprefix - else: - splitnumbercount = 0 - isIntermediateReleaseBranch = False - for split in splits: - if split.isdigit(): - versionprefix += split + "." - splitnumbercount += 1 - else: - if split == "x": - isIntermediateReleaseBranch = True - break - if splitnumbercount > 2: - break - if splitnumbercount == 0: - print("No leading numbers were found in source branch name so defaulting to: {0}".format(defaultversionprefix)) - versionprefix = defaultversionprefix - else: - if isIntermediateReleaseBranch: - versionprefix = mastertypeversionprefix - elif splitnumbercount == 1: - versionprefix += "0.0." - elif splitnumbercount == 2: - versionprefix += "0." - - print("Determined version prefix to be: {0}".format(versionprefix)) - return versionprefix - -def writeversionfiles(versionfolder, versionprefix, gitrevisioncount, gitrevision, remoteinfo, remoteurl, buildstamp): - with open(os.path.join(versionfolder, "prefix.txt"), 'w') as f: - f.write(versionprefix) - - with open(os.path.join(versionfolder, "revision.txt"), 'w') as f: - f.write(str(gitrevisioncount)) - - with open(os.path.join(versionfolder, "gitrevision.txt"), 'w') as f: - f.write(gitrevision) - - with open(os.path.join(versionfolder, "remoteinfo.txt"), 'w') as f: - f.write(remoteinfo) - - with open(os.path.join(versionfolder, "remoteurl.txt"), 'w') as f: - f.write(remoteurl) - - with open(os.path.join(versionfolder, "buildstamp.txt"), 'w') as f: - f.write(buildstamp) - - buildstampcommasep = buildstamp.replace(".", ",") - with open(os.path.join(versionfolder, "buildstampcommasep.txt"), 'w') as f: - f.write(buildstampcommasep) - - with open(os.path.join(versionfolder, "builddate.txt"), 'w') as f: - f.write(str(datetime.datetime.now())) - -def main(argv=None): # IGNORE:C0111 - '''Command line options.''' - - if argv is None: - argv = sys.argv - else: - sys.argv.extend(argv) - - program_name = os.path.basename(sys.argv[0]) - program_version = "v%s" % __version__ - program_build_date = str(__updated__) - program_version_message = '%%(prog)s %s (%s)' % (program_version, program_build_date) - program_shortdesc = __import__('__main__').__doc__.split("\n")[1] - program_license = '''%s - - Created by dan on %s. - Copyright 2017 Global Inkjet Systems Ltd. All rights reserved. - - Distributed on an "AS IS" basis without warranties - or conditions of any kind, either express or implied. - -USAGE -''' % (program_shortdesc, str(__date__)) - - try: - # Setup argument parser - parser = ArgumentParser(description=program_license, formatter_class=RawDescriptionHelpFormatter) - parser.add_argument("-s", "--sourcebranch", dest="sourcebranch", action="store", default="origin/master", help="source branch name to discover version number [default: %(default)s]") - parser.add_argument("-v", "--versionfolder", dest="versionfolder", action="store", default="version", help="version folder to be created [default: %(default)s]") - parser.add_argument("-g", "--gitroot", dest="gitrootfolder", action="store", default="GitRepository", help="root path of source files [default: %(default)s]") - parser.add_argument("-b", "--baseversionnumber", dest="baseversionnumber", action="store", default=int(1000), help="base git version number [default: %(default)s]") - - # Process arguments - args = parser.parse_args() - - try: - sourcebranch = args.sourcebranch - versionfolder = args.versionfolder - gitrootfolder = args.gitrootfolder - baseversionnumber = args.baseversionnumber - - print("Source branch:", sourcebranch, "version folder:", versionfolder, "Git root:", gitrootfolder) - print("Base version number:", baseversionnumber) - - (gitrevisioncount, gitrevision, remoteinfo, remoteurl) = getGitRevision(gitrootfolder, baseversionnumber) - - versionprefix = getVersionPrefix(sourcebranch) - - buildstamp = versionprefix + str(gitrevisioncount) - print("Build stamp is: {0}".format(buildstamp)) - - writeversionfiles(versionfolder, versionprefix, gitrevisioncount, gitrevision, remoteinfo, remoteurl, buildstamp) - - return 0 - except Exception as e: - print("Error while creating version info:", e.__repr__()) - return 1 - - except Exception as e: - indent = len(program_name) * " " - print(program_name + ": " + repr(e) + "\n") - print(indent + " for help use --help") - return 2 - -if __name__ == "__main__": - sys.exit(main()) From 1eba3bf0162fead6284b53e63647c2f2456326d1 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 15 Dec 2018 18:00:34 +0000 Subject: [PATCH 219/237] Remove compile retries --- compile/eclipsebuild/eclipseds5build.groovy | 52 ++++++++++----------- 1 file changed, 24 insertions(+), 28 deletions(-) diff --git a/compile/eclipsebuild/eclipseds5build.groovy b/compile/eclipsebuild/eclipseds5build.groovy index 93a8064..cf382b1 100644 --- a/compile/eclipsebuild/eclipseds5build.groovy +++ b/compile/eclipsebuild/eclipseds5build.groovy @@ -142,39 +142,35 @@ def doBuild(apps, ds5folder, toolchainfolder, ds5shellcommand, buildcommand, sou buildtype = "-build" } for (build_variant in variants) { - retry(maxprojectbuildretries) { // Eclipse occasionally raises exceptions (rather than the builds failing) - try { - if (toBuild.contains(build_variant)) { - doDisplayLeftovers() - doRegisterToolchain(ds5folder, toolchainfolder) - echo "Build command: ${ds5shellcommand} \'${buildcommand} -no-indexer ${buildtype} \"${project}/${build_variant}\"\'" - timeout(time: 10, unit: 'MINUTES') { - if (isUnix()) { - sh """ - echo Start time: `date` - ${ds5shellcommand} \'${buildcommand} -no-indexer ${buildtype} \"${project}/${build_variant}\"\' - echo End time: `date` - """ - } - else { - bat """ - "%ds5shellcommand%" "%buildcommand%" -no-indexer ${buildtype} "${project}\\${build_variant}" - """ - } + try { + if (toBuild.contains(build_variant)) { + doDisplayLeftovers() + doRegisterToolchain(ds5folder, toolchainfolder) + echo "Build command: ${ds5shellcommand} \'${buildcommand} -no-indexer ${buildtype} \"${project}/${build_variant}\"\'" + timeout(time: 10, unit: 'MINUTES') { + if (isUnix()) { + sh """ + echo Start time: `date` + ${ds5shellcommand} \'${buildcommand} -no-indexer ${buildtype} \"${project}/${build_variant}\"\' + echo End time: `date` + """ } - result = doExport(exportfolder, exportpathlist, "", build_variant) - if (result != 0) { - error "Failed to copy...." + else { + bat """ + "%ds5shellcommand%" "%buildcommand%" -no-indexer ${buildtype} "${project}\\${build_variant}" + """ } } - else { - echo "Not building ${build_variant} variant of project: ${project}" + result = doExport(exportfolder, exportpathlist, "", build_variant) + if (result != 0) { + error "Failed to copy...." } - } catch (Exception e) { - echo "Build failed - Waiting for a while" - sleep(time: 4, unit: 'SECONDS') - error "Build failed..." } + else { + echo "Not building ${build_variant} variant of project: ${project}" + } + } catch (Exception e) { + error "Build failed..." } } } From 8ae90886986d45e2261d7a1674737241b85298a5 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sun, 16 Dec 2018 11:38:54 +0000 Subject: [PATCH 220/237] Fixing version stamping in windows --- versionnumbering/do.groovy | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/versionnumbering/do.groovy b/versionnumbering/do.groovy index 9b4a42e..0c53ce9 100644 --- a/versionnumbering/do.groovy +++ b/versionnumbering/do.groovy @@ -1,17 +1,20 @@ def stamp(convertdetails) { for (convertdetail in convertdetails) { - filetoconvert = convertdetail[0] - pattern = convertdetail[1] - replacement = convertdetail[2] + def filetoconvert = convertdetail[0] + def pattern = convertdetail[1] + def replacement = convertdetail[2] + echo "Converting any instances of pattern: ${pattern} with replacement: ${replacement} in file: ${filetoconvert}" + def stampscript = "${autobuilder.commonscripts()}/versionstamping/versionstamper.py" + echo "Using python: ${PYTHON} and script: ${stampscript}" if (isUnix()) { sh """ - "${PYTHON}" -u "${autobuilder.commonscripts()}/versionstamping/versionstamper.py" -f "${filetoconvert}" -p "${pattern}" -s "${replacement}" + "${PYTHON}" -u "${stampscript}" -f "${filetoconvert}" -p "${pattern}" -s "${replacement}" """ } else { bat """ - "%${PYTHON}%" -u "%${autobuilder.commonscripts()}%\\versionstamping\\versionstamper.py" -f "%${filetoconvert}%" -p "%${pattern}%" -s "%${replacement}%" + "%${PYTHON}%" -u "%${stampscript}%" -f "%${filetoconvert}%" -p "%${pattern}%" -s "%${replacement}%" """ } } From fc461ba62b9caf0e2f7d1c8215f7aa309ee45a4f Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sun, 16 Dec 2018 11:46:44 +0000 Subject: [PATCH 221/237] Fixing version stamping in windows --- versionnumbering/do.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versionnumbering/do.groovy b/versionnumbering/do.groovy index 0c53ce9..9f45f70 100644 --- a/versionnumbering/do.groovy +++ b/versionnumbering/do.groovy @@ -14,7 +14,7 @@ def stamp(convertdetails) { } else { bat """ - "%${PYTHON}%" -u "%${stampscript}%" -f "%${filetoconvert}%" -p "%${pattern}%" -s "%${replacement}%" + "${PYTHON}" -u "${stampscript}" -f "${filetoconvert}" -p "${pattern}" -s "${replacement}" """ } } From 7bd8655a9224716056a3ec25beed4d4ba97ad6b3 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sun, 16 Dec 2018 11:59:26 +0000 Subject: [PATCH 222/237] Fixing version stamping in windows --- versionnumbering/do.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/versionnumbering/do.groovy b/versionnumbering/do.groovy index 9f45f70..666aee3 100644 --- a/versionnumbering/do.groovy +++ b/versionnumbering/do.groovy @@ -4,9 +4,9 @@ def stamp(convertdetails) { def filetoconvert = convertdetail[0] def pattern = convertdetail[1] def replacement = convertdetail[2] - echo "Converting any instances of pattern: ${pattern} with replacement: ${replacement} in file: ${filetoconvert}" + //echo "Converting any instances of pattern: ${pattern} with replacement: ${replacement} in file: ${filetoconvert}" def stampscript = "${autobuilder.commonscripts()}/versionstamping/versionstamper.py" - echo "Using python: ${PYTHON} and script: ${stampscript}" + //echo "Using python: ${PYTHON} and script: ${stampscript}" if (isUnix()) { sh """ "${PYTHON}" -u "${stampscript}" -f "${filetoconvert}" -p "${pattern}" -s "${replacement}" From 93ef7dfcf78b80b3eb033320caa9494a0052cb33 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sun, 16 Dec 2018 12:05:47 +0000 Subject: [PATCH 223/237] Revert "Remove compile retries" This reverts commit 90ee2b5c1c5c2bcf13af8d3c501114f41b3d8181. --- compile/eclipsebuild/eclipseds5build.groovy | 52 +++++++++++---------- 1 file changed, 28 insertions(+), 24 deletions(-) diff --git a/compile/eclipsebuild/eclipseds5build.groovy b/compile/eclipsebuild/eclipseds5build.groovy index cf382b1..93a8064 100644 --- a/compile/eclipsebuild/eclipseds5build.groovy +++ b/compile/eclipsebuild/eclipseds5build.groovy @@ -142,35 +142,39 @@ def doBuild(apps, ds5folder, toolchainfolder, ds5shellcommand, buildcommand, sou buildtype = "-build" } for (build_variant in variants) { - try { - if (toBuild.contains(build_variant)) { - doDisplayLeftovers() - doRegisterToolchain(ds5folder, toolchainfolder) - echo "Build command: ${ds5shellcommand} \'${buildcommand} -no-indexer ${buildtype} \"${project}/${build_variant}\"\'" - timeout(time: 10, unit: 'MINUTES') { - if (isUnix()) { - sh """ - echo Start time: `date` - ${ds5shellcommand} \'${buildcommand} -no-indexer ${buildtype} \"${project}/${build_variant}\"\' - echo End time: `date` - """ + retry(maxprojectbuildretries) { // Eclipse occasionally raises exceptions (rather than the builds failing) + try { + if (toBuild.contains(build_variant)) { + doDisplayLeftovers() + doRegisterToolchain(ds5folder, toolchainfolder) + echo "Build command: ${ds5shellcommand} \'${buildcommand} -no-indexer ${buildtype} \"${project}/${build_variant}\"\'" + timeout(time: 10, unit: 'MINUTES') { + if (isUnix()) { + sh """ + echo Start time: `date` + ${ds5shellcommand} \'${buildcommand} -no-indexer ${buildtype} \"${project}/${build_variant}\"\' + echo End time: `date` + """ + } + else { + bat """ + "%ds5shellcommand%" "%buildcommand%" -no-indexer ${buildtype} "${project}\\${build_variant}" + """ + } } - else { - bat """ - "%ds5shellcommand%" "%buildcommand%" -no-indexer ${buildtype} "${project}\\${build_variant}" - """ + result = doExport(exportfolder, exportpathlist, "", build_variant) + if (result != 0) { + error "Failed to copy...." } } - result = doExport(exportfolder, exportpathlist, "", build_variant) - if (result != 0) { - error "Failed to copy...." + else { + echo "Not building ${build_variant} variant of project: ${project}" } + } catch (Exception e) { + echo "Build failed - Waiting for a while" + sleep(time: 4, unit: 'SECONDS') + error "Build failed..." } - else { - echo "Not building ${build_variant} variant of project: ${project}" - } - } catch (Exception e) { - error "Build failed..." } } } From 2371eff2e841e448c32bf7c2e84f5023a0b44e19 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sun, 16 Dec 2018 17:24:46 +0000 Subject: [PATCH 224/237] Move eclipse nios operation into common area --- compile/eclipsebuild/eclipseniosbuild.groovy | 103 +++++++++++++++++++ 1 file changed, 103 insertions(+) create mode 100644 compile/eclipsebuild/eclipseniosbuild.groovy diff --git a/compile/eclipsebuild/eclipseniosbuild.groovy b/compile/eclipsebuild/eclipseniosbuild.groovy new file mode 100644 index 0000000..18c31d1 --- /dev/null +++ b/compile/eclipsebuild/eclipseniosbuild.groovy @@ -0,0 +1,103 @@ +// Gets the debug and optimization flags. +// Arg1 is "app" or "lib". Returns flags. +// Restore the debug and optimization levels, in case this is a dev machine. +// Arg1 is "app" or "lib". Arg2-3 is flags from getFlags. Returns nothing. +def setFlagsToRelease(NIOSEDS, project, wdir) { + if ( project == "app" ) { + if (isUnix()) { + sh """#!/bin/bash + set -x + cd "${wdir}" + + "${NIOSEDS}/nios2_command_shell.sh" nios2-app-update-makefile --app-dir=. --set-optimization=-O2 --set-debug-level= + """ + } + } + else if ( project == "lib" ) { + if (isUnix()) { + sh """#!/bin/bash + set -x + cd "${wdir}" + + "${NIOSEDS}/nios2_command_shell.sh" nios2-lib-update-makefile --lib-dir=. --set-optimization=-O2 --set-debug-level= + """ + } + } +} + +def remake_and_check(NIOSEDS, wdir) { + if (isUnix()) { + sh """#!/bin/bash + set -x + cd "${wdir}" + + # Use the makefile to clean and build + "${NIOSEDS}/nios2_command_shell.sh" make clean + if [ \$? -ne 0 ]; then exit 1; fi + + # Set the debug and optimization levels to production values + "${NIOSEDS}/nios2_command_shell.sh" make -j12 all + if [ \$? -ne 0 ]; then exit 1; fi + """ + } +} + +def generate_bsp(NIOSEDS, bspfolder) { + if (isUnix()) { + sh """#!/bin/bash + set -x + + "${NIOSEDS}/nios2_command_shell.sh" nios2-bsp-generate-files --bsp-dir "${bspfolder}" --log "${bspfolder}/bsp.log" --settings "${bspfolder}/settings.bsp" + """ + } +} + +def modifylib(NIOSEDS, bspfolder, buildconfig, wdir) { + if (isUnix()) { + sh """#!/bin/bash + set -x + + cd "${wdir}" + + "${NIOSEDS}/nios2_command_shell.sh" nios2-lib-update-makefile --lib-dir=. --set-bsp-dir "${bspfolder}" --set-active-build-config "${buildconfig}" + """ + } +} + +def modifyapp(NIOSEDS, bspfolder, wdir) { + if (isUnix()) { + sh """#!/bin/bash + set -x + + cd "${wdir}" + + "${NIOSEDS}/nios2_command_shell.sh" nios2-app-update-makefile --app-dir=. --set-bsp-dir "${bspfolder}" + """ + } +} + +def dump_elf_info(NIOSEDS, elffile, outputdir) { + sh """#!/bin/bash + set -x + + mkdir -p "${outputdir}" + if [ \$? -ne 0 ]; then exit 1; fi + + "${NIOSEDS}/nios2_command_shell.sh" nios2-elf-query "${elffile}" --cpu_name > "${outputdir}/lower_cpu_name.txt" + if [ \$? -ne 0 ]; then exit 1; fi + + "${NIOSEDS}/nios2_command_shell.sh" nios2-elf-query "${elffile}" --sidp > "${outputdir}/lower_sidp.txt" + if [ \$? -ne 0 ]; then exit 1; fi + + "${NIOSEDS}/nios2_command_shell.sh" nios2-elf-query "${elffile}" --id > "${outputdir}/lower_id.txt" + if [ \$? -ne 0 ]; then exit 1; fi + + "${NIOSEDS}/nios2_command_shell.sh" nios2-elf-query "${elffile}" --timestamp > "${outputdir}/lower_timestamp.txt" + if [ \$? -ne 0 ]; then exit 1; fi + + "${NIOSEDS}/nios2_command_shell.sh" nios2-elf-query "${elffile}" --sopcinfo > "${outputdir}/lower_sopcinfo.txt" + if [ \$? -ne 0 ]; then exit 1; fi + """ +} + +return this; \ No newline at end of file From 5127186c4f974c68c635d82a28ef6d7a80be1ee9 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sun, 16 Dec 2018 18:26:50 +0000 Subject: [PATCH 225/237] Output version information to meta --- compile/eclipsebuild/eclipseniosbuild.groovy | 55 ++++++++++++-------- 1 file changed, 33 insertions(+), 22 deletions(-) diff --git a/compile/eclipsebuild/eclipseniosbuild.groovy b/compile/eclipsebuild/eclipseniosbuild.groovy index 18c31d1..a3bb4b9 100644 --- a/compile/eclipsebuild/eclipseniosbuild.groovy +++ b/compile/eclipsebuild/eclipseniosbuild.groovy @@ -76,28 +76,39 @@ def modifyapp(NIOSEDS, bspfolder, wdir) { } } -def dump_elf_info(NIOSEDS, elffile, outputdir) { - sh """#!/bin/bash - set -x - - mkdir -p "${outputdir}" - if [ \$? -ne 0 ]; then exit 1; fi - - "${NIOSEDS}/nios2_command_shell.sh" nios2-elf-query "${elffile}" --cpu_name > "${outputdir}/lower_cpu_name.txt" - if [ \$? -ne 0 ]; then exit 1; fi - - "${NIOSEDS}/nios2_command_shell.sh" nios2-elf-query "${elffile}" --sidp > "${outputdir}/lower_sidp.txt" - if [ \$? -ne 0 ]; then exit 1; fi - - "${NIOSEDS}/nios2_command_shell.sh" nios2-elf-query "${elffile}" --id > "${outputdir}/lower_id.txt" - if [ \$? -ne 0 ]; then exit 1; fi - - "${NIOSEDS}/nios2_command_shell.sh" nios2-elf-query "${elffile}" --timestamp > "${outputdir}/lower_timestamp.txt" - if [ \$? -ne 0 ]; then exit 1; fi - - "${NIOSEDS}/nios2_command_shell.sh" nios2-elf-query "${elffile}" --sopcinfo > "${outputdir}/lower_sopcinfo.txt" - if [ \$? -ne 0 ]; then exit 1; fi - """ +def dump_elf_info(NIOSEDS, elffile, meta, custominfokeyprefix) { + if (isUnix()) { + def cpu_name = sh(script: """#!/bin/bash + `"${NIOSEDS}/nios2_command_shell.sh" nios2-elf-query "${elffile}" --cpu_name` + """, + returnStdout: true + ) + meta.addCustomInfo("${custominfokeyprefix}_cpu_name", cpu_name) + def sidp = sh(script: """#!/bin/bash + `"${NIOSEDS}/nios2_command_shell.sh" nios2-elf-query "${elffile}" --sidp` + """, + returnStdout: true + ) + meta.addCustomInfo("${custominfokeyprefix}_sidp", sidp) + def id = sh(script: """#!/bin/bash + `"${NIOSEDS}/nios2_command_shell.sh" nios2-elf-query "${elffile}" --id` + """, + returnStdout: true + ) + meta.addCustomInfo("${custominfokeyprefix}_id", id) + def timestamp = sh(script: """#!/bin/bash + `"${NIOSEDS}/nios2_command_shell.sh" nios2-elf-query "${elffile}" --timestamp` + """, + returnStdout: true + ) + meta.addCustomInfo("${custominfokeyprefix}_timestamp", timestamp) + def sopcinfo = sh(script: """#!/bin/bash + `"${NIOSEDS}/nios2_command_shell.sh" nios2-elf-query "${elffile}" --sopcinfo` + """, + returnStdout: true + ) + meta.addCustomInfo("${custominfokeyprefix}_sopcinfo", sopcinfo) + } } return this; \ No newline at end of file From a20fce505017824b40b7185b6ee4127e24a92c75 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sun, 16 Dec 2018 18:33:06 +0000 Subject: [PATCH 226/237] Output version information to meta --- compile/eclipsebuild/eclipseniosbuild.groovy | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/compile/eclipsebuild/eclipseniosbuild.groovy b/compile/eclipsebuild/eclipseniosbuild.groovy index a3bb4b9..ce7d798 100644 --- a/compile/eclipsebuild/eclipseniosbuild.groovy +++ b/compile/eclipsebuild/eclipseniosbuild.groovy @@ -79,31 +79,31 @@ def modifyapp(NIOSEDS, bspfolder, wdir) { def dump_elf_info(NIOSEDS, elffile, meta, custominfokeyprefix) { if (isUnix()) { def cpu_name = sh(script: """#!/bin/bash - `"${NIOSEDS}/nios2_command_shell.sh" nios2-elf-query "${elffile}" --cpu_name` + "${NIOSEDS}/nios2_command_shell.sh" nios2-elf-query "${elffile}" --cpu_name """, returnStdout: true ) meta.addCustomInfo("${custominfokeyprefix}_cpu_name", cpu_name) def sidp = sh(script: """#!/bin/bash - `"${NIOSEDS}/nios2_command_shell.sh" nios2-elf-query "${elffile}" --sidp` + "${NIOSEDS}/nios2_command_shell.sh" nios2-elf-query "${elffile}" --sidp """, returnStdout: true ) meta.addCustomInfo("${custominfokeyprefix}_sidp", sidp) def id = sh(script: """#!/bin/bash - `"${NIOSEDS}/nios2_command_shell.sh" nios2-elf-query "${elffile}" --id` + "${NIOSEDS}/nios2_command_shell.sh" nios2-elf-query "${elffile}" --id """, returnStdout: true ) meta.addCustomInfo("${custominfokeyprefix}_id", id) def timestamp = sh(script: """#!/bin/bash - `"${NIOSEDS}/nios2_command_shell.sh" nios2-elf-query "${elffile}" --timestamp` + "${NIOSEDS}/nios2_command_shell.sh" nios2-elf-query "${elffile}" --timestamp """, returnStdout: true ) meta.addCustomInfo("${custominfokeyprefix}_timestamp", timestamp) def sopcinfo = sh(script: """#!/bin/bash - `"${NIOSEDS}/nios2_command_shell.sh" nios2-elf-query "${elffile}" --sopcinfo` + "${NIOSEDS}/nios2_command_shell.sh" nios2-elf-query "${elffile}" --sopcinfo """, returnStdout: true ) From d1f32dc580e9b5b299fddcc11d0289a780f00b00 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sun, 16 Dec 2018 21:33:59 +0000 Subject: [PATCH 227/237] Output version information to meta --- compile/eclipsebuild/eclipseniosbuild.groovy | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/compile/eclipsebuild/eclipseniosbuild.groovy b/compile/eclipsebuild/eclipseniosbuild.groovy index ce7d798..a808932 100644 --- a/compile/eclipsebuild/eclipseniosbuild.groovy +++ b/compile/eclipsebuild/eclipseniosbuild.groovy @@ -82,32 +82,34 @@ def dump_elf_info(NIOSEDS, elffile, meta, custominfokeyprefix) { "${NIOSEDS}/nios2_command_shell.sh" nios2-elf-query "${elffile}" --cpu_name """, returnStdout: true - ) + ).trim() meta.addCustomInfo("${custominfokeyprefix}_cpu_name", cpu_name) def sidp = sh(script: """#!/bin/bash "${NIOSEDS}/nios2_command_shell.sh" nios2-elf-query "${elffile}" --sidp """, returnStdout: true - ) + ).trim() meta.addCustomInfo("${custominfokeyprefix}_sidp", sidp) def id = sh(script: """#!/bin/bash "${NIOSEDS}/nios2_command_shell.sh" nios2-elf-query "${elffile}" --id """, returnStdout: true - ) + ).trim() meta.addCustomInfo("${custominfokeyprefix}_id", id) def timestamp = sh(script: """#!/bin/bash "${NIOSEDS}/nios2_command_shell.sh" nios2-elf-query "${elffile}" --timestamp """, returnStdout: true - ) + ).trim() meta.addCustomInfo("${custominfokeyprefix}_timestamp", timestamp) +/* def sopcinfo = sh(script: """#!/bin/bash "${NIOSEDS}/nios2_command_shell.sh" nios2-elf-query "${elffile}" --sopcinfo """, returnStdout: true - ) + ).trim() meta.addCustomInfo("${custominfokeyprefix}_sopcinfo", sopcinfo) +*/ } } From 9fda4bce8b159fcba75abc8cf6a91f3d7d18950e Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Tue, 18 Dec 2018 13:40:05 +0000 Subject: [PATCH 228/237] Turn off fingerprinting --- install/installhelper.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/installhelper.groovy b/install/installhelper.groovy index 0155c7f..093ddef 100644 --- a/install/installhelper.groovy +++ b/install/installhelper.groovy @@ -7,7 +7,7 @@ def Map artifactsImporter(meta, artifactDetails, installerDetails) { def artifactKey = installerDetails.get(installer)[0] (sourceProject, sourceselector, destFolder, toCopy, notToCopy, binariesFolders) = artifactDetails.get(artifactKey) if (artifactFetched.get(artifactKey) == null) { - def importmeta = importer.artifactimport(meta, sourceProject, sourceselector, destFolder, toCopy, notToCopy, true) + def importmeta = importer.artifactimport(meta, sourceProject, sourceselector, destFolder, toCopy, notToCopy) artifactFetched.put(artifactKey, importmeta) } } From c41563f0c216b19902af393136ce2d4cba468f60 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Wed, 19 Dec 2018 18:33:17 +0000 Subject: [PATCH 229/237] Basebuildnumber is now an external parameter --- versionnumbering/generate.groovy | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/versionnumbering/generate.groovy b/versionnumbering/generate.groovy index 7e5568a..f26806d 100644 --- a/versionnumbering/generate.groovy +++ b/versionnumbering/generate.groovy @@ -136,6 +136,11 @@ String generate(meta, String sourcerevision, String sourcepath, int basebuildnum return buildstamp } +String generate(meta, String sourcerevision, String sourcepath, String basebuildnumber = "1000") { + def int bbn = basebuildnumber.trim().toInteger() + return generate(meta, String sourcerevision, String sourcepath, bbn) +} + int incrementrevision(int current, int increment) { def int newrevision = (current + increment) % (maxversionnumber() + 1) echo "Current revision: ${current} Increment: ${increment} New revision: ${newrevision}" From f4c573627e3e0a949d04764bf211733892d0c096 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Wed, 19 Dec 2018 18:46:09 +0000 Subject: [PATCH 230/237] Basebuildnumber is now an external parameter - make sure it is positive --- versionnumbering/generate.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versionnumbering/generate.groovy b/versionnumbering/generate.groovy index f26806d..e2dc932 100644 --- a/versionnumbering/generate.groovy +++ b/versionnumbering/generate.groovy @@ -18,7 +18,7 @@ def getGitRevision(String gitrootpath, int basebuildnumber) { changecount = bat(returnStdout: true, script: "@git rev-list HEAD --count").trim().toInteger() } echo "Change count: ${changecount}" - adjustedchangecount = (changecount + basebuildnumber) % (maxversionnumber() + 1) + adjustedchangecount = ((changecount + basebuildnumber).abs()) % (maxversionnumber() + 1) echo "Adjusted change count: ${adjustedchangecount}" if (isUnix()) { gitrevision = sh(returnStdout: true, script: "git rev-parse HEAD").trim() From db1ebc1959b7bb4818aacc8f79e830cba1431a70 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Wed, 19 Dec 2018 18:50:06 +0000 Subject: [PATCH 231/237] Basebuildnumber is now an external parameter - make sure it is positive --- versionnumbering/generate.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versionnumbering/generate.groovy b/versionnumbering/generate.groovy index e2dc932..e28fa2f 100644 --- a/versionnumbering/generate.groovy +++ b/versionnumbering/generate.groovy @@ -138,7 +138,7 @@ String generate(meta, String sourcerevision, String sourcepath, int basebuildnum String generate(meta, String sourcerevision, String sourcepath, String basebuildnumber = "1000") { def int bbn = basebuildnumber.trim().toInteger() - return generate(meta, String sourcerevision, String sourcepath, bbn) + return generate(meta, sourcerevision, sourcepath, bbn) } int incrementrevision(int current, int increment) { From fc6258b158c691c550194a50db86bbd06fb83af4 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Wed, 19 Dec 2018 18:55:27 +0000 Subject: [PATCH 232/237] Basebuildnumber is now an external parameter - make sure it is positive --- versionnumbering/generate.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versionnumbering/generate.groovy b/versionnumbering/generate.groovy index e28fa2f..4b11cf0 100644 --- a/versionnumbering/generate.groovy +++ b/versionnumbering/generate.groovy @@ -136,7 +136,7 @@ String generate(meta, String sourcerevision, String sourcepath, int basebuildnum return buildstamp } -String generate(meta, String sourcerevision, String sourcepath, String basebuildnumber = "1000") { +String generate(meta, String sourcerevision, String sourcepath, String basebuildnumber) { def int bbn = basebuildnumber.trim().toInteger() return generate(meta, sourcerevision, sourcepath, bbn) } From f7010f5eaf8cb9aeb77ca252f0616b14ceb19b0c Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Mon, 31 Dec 2018 14:03:46 +0000 Subject: [PATCH 233/237] Set buildstamp --- meta/folder.groovy | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/meta/folder.groovy b/meta/folder.groovy index 15f77d0..629aa5b 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -161,7 +161,7 @@ class BuildStampInfo extends GISJsonSerialised { int revision String buildstamp - BuildStampInfo(script, buildstampprefix = "", revision = 0, buildstamp = "") { + BuildStampInfo(script, buildstampprefix = "1.30000.0.", revision = 0, buildstamp = "1.30000.0.0") { super(script) this.buildstampprefix = buildstampprefix this.revision = revision @@ -188,6 +188,12 @@ class BuildStampInfo extends GISJsonSerialised { script.echo("Build stamp now ${buildstamp}") } + void set(String buildstampprefix, int revision) { + buildstampprefix += buildstampprefix.endsWith('.') ? '' : '.' + this.buildstampprefix = buildstampprefix + changerevision(revision) + } + void deserialiseJson(rawmeta) { buildstampprefix = rawmeta['buildstampprefix'] revision = rawmeta['revision'] From f664375cc2bf27ccd89fc672b01d418a4a3c5462 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Mon, 31 Dec 2018 14:10:10 +0000 Subject: [PATCH 234/237] Set buildstamp --- meta/folder.groovy | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/folder.groovy b/meta/folder.groovy index 629aa5b..5ba3485 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -194,6 +194,10 @@ class BuildStampInfo extends GISJsonSerialised { changerevision(revision) } + void set(String buildstampprefix, String revision) { + set(buildstampprefix, revision.toInteger()) + } + void deserialiseJson(rawmeta) { buildstampprefix = rawmeta['buildstampprefix'] revision = rawmeta['revision'] From 83c89342711ecdc6509d1f5a312990d21b585a4c Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Mon, 31 Dec 2018 14:21:29 +0000 Subject: [PATCH 235/237] Set buildstamp --- meta/folder.groovy | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/folder.groovy b/meta/folder.groovy index 5ba3485..39de31f 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -191,6 +191,7 @@ class BuildStampInfo extends GISJsonSerialised { void set(String buildstampprefix, int revision) { buildstampprefix += buildstampprefix.endsWith('.') ? '' : '.' this.buildstampprefix = buildstampprefix + this.buildstamp = buildstampprefix + "0" changerevision(revision) } From fc17af2c5faf83682d17cd9bead0e3f5972c39e6 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Mon, 31 Dec 2018 16:09:25 +0000 Subject: [PATCH 236/237] Handle components that don't have associated source code --- release/do.groovy | 47 +++++++++++++++++++++++++++-------------------- 1 file changed, 27 insertions(+), 20 deletions(-) diff --git a/release/do.groovy b/release/do.groovy index 85753e6..1ded952 100644 --- a/release/do.groovy +++ b/release/do.groovy @@ -68,23 +68,25 @@ def checkoutreleaserepo(buildmeta, String checkoutfolder) { def checkoutsourcerepo(buildmeta, String checkoutfolder) { def String sourcerepo = buildmeta.gitinfo.remoteurl - // Get the latest revision of the source repo without checking out working copy; Check out to a folder unique to component - if (fileExists(checkoutfolder)) { - dir(checkoutfolder) { - sh(""" - git reset --hard - git clean -fdx - git pull - # Remove all tags that are not already on the remote - git tag -l | xargs git tag -d >/dev/null - git fetch -t >/dev/null - """ - ) + if (sourcerepo) { + // Get the latest revision of the source repo without checking out working copy; Check out to a folder unique to component + if (fileExists(checkoutfolder)) { + dir(checkoutfolder) { + sh(""" + git reset --hard + git clean -fdx + git pull + # Remove all tags that are not already on the remote + git tag -l | xargs git tag -d >/dev/null + git fetch -t >/dev/null + """ + ) + } } - } - else { - dir(sourcerepofolder) { - sh("git clone ${sourcerepo} ${checkoutfolder}") + else { + dir(sourcerepofolder) { + sh("git clone ${sourcerepo} ${checkoutfolder}") + } } } } @@ -297,10 +299,15 @@ def gitrelease(buildmeta, previousreleasemeta, String releaserepo, String source def String srcbuildstamp = "${buildmeta.productinfo.productname}_${buildmeta.productinfo.subcomponentname}_${buildmeta.buildstampinfo.buildstamp}" def String buildsha = buildmeta.gitinfo.gitrevision - def ArrayList srctaglist = maketaglist(srcbuildstamp, otherreleasetags) - def tagadded = sourcegittags(buildsha, srctaglist) - if (tagadded) { - sourcegitpush(dryrunpush) + if (buildsha) { + def ArrayList srctaglist = maketaglist(srcbuildstamp, otherreleasetags) + def tagadded = sourcegittags(buildsha, srctaglist) + if (tagadded) { + sourcegitpush(dryrunpush) + } + } + else { + summaryappend(",No Src ") } } } From fa1feb73b91d0ac86865e1c8d9bca9d8b0a1f9fa Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 5 Jan 2019 12:18:09 +0000 Subject: [PATCH 237/237] Automatically add the top level meta item tag to all subcomponents --- release/release.groovy | 3 +++ 1 file changed, 3 insertions(+) diff --git a/release/release.groovy b/release/release.groovy index 828f1ff..3c13368 100644 --- a/release/release.groovy +++ b/release/release.groovy @@ -42,6 +42,9 @@ pipeline { steps { script { def releaser = load("${autobuilder.commonscripts()}/release/do.groovy") + // Place the top level build stamp on all + def topleveltag = "${buildmeta.productinfo.productname}_${buildmeta.productinfo.subcomponentname}_${buildmeta.buildstampinfo.buildstamp}" + OTHER_RELEASE_TAGS = "${topleveltag},${OTHER_RELEASE_TAGS}" (summarystring, markunstable, unstablereason) = releaser.releasehierarchy(buildmeta, MAX_META_DEPTH, OTHER_RELEASE_TAGS, DRY_RUN_PUSH) if (markunstable) { env.unstablereason = unstablereason