From 4e140fe10a98a0b28c82bfc39c86442dc5f22a64 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Fri, 30 Nov 2018 11:07:08 +0000 Subject: [PATCH 01/18] 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 02/18] 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 03/18] 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 04/18] 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 05/18] 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 06/18] 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 07/18] 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 08/18] 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 09/18] 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 10/18] 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 11/18] 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 12/18] 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 13/18] 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 14/18] 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 15/18] 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 16/18] 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 17/18] 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 18/18] 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}"