From a5cfe14f9b5db5cce4d0c2c5404b76beb3543fa5 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Mon, 13 Apr 2020 21:25:05 +0100 Subject: [PATCH] Clean folders before importing by default --- import/importer.groovy | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/import/importer.groovy b/import/importer.groovy index adef629..8624421 100644 --- a/import/importer.groovy +++ b/import/importer.groovy @@ -11,6 +11,7 @@ class ImportOptions { boolean m_nested // Import all child artifacts too (identified in the related meta info boolean m_flatten // Flatten files and folders imported boolean m_includemetainfilter // Make sure meta is also included in filter + boolean m_clean // Clean import folder before obtaining artifacts boolean m_appendtoparentmeta // Append to parent meta String m_sourceselect // Where are the artifacts coming from @@ -29,6 +30,7 @@ class ImportOptions { boolean nested = false, boolean flatten = false, boolean includemetainfilter = true, + boolean clean = true, appendtoparentmeta = true) { m_script = script m_sourceselect = sourceselect.trim() @@ -39,6 +41,7 @@ class ImportOptions { m_nested = nested m_flatten = flatten m_includemetainfilter = includemetainfilter + m_clean = clean m_appendtoparentmeta = appendtoparentmeta } @@ -57,7 +60,7 @@ class ImportOptions { } } - void setincrementversionnumber(boolean incrementversionnumber) { + void setincrementversionnumber(boolean incrementversionnumber = true) { m_incrementversionnumber = incrementversionnumber } @@ -69,22 +72,26 @@ class ImportOptions { m_excludes = excludes.trim() } - void setfingerprint(boolean fingerprint) { + void setfingerprint(boolean fingerprint = true) { m_fingerprint = fingerprint } - void setnested(boolean nested) { + void setnested(boolean nested = true) { m_nested = nested } - void flattenimports(boolean flatten) { + void flattenimports(boolean flatten = true) { m_flatten = flatten } - void includemetainfilter(boolean includemetainfilter) { + void includemetainfilter(boolean includemetainfilter = true) { m_includemetainfilter = includemetainfilter } + void clean(boolean clean = true) { + m_clean = clean + } + void setappendtoparentmeta(boolean appendtoparentmeta) { m_appendtoparentmeta = appendtoparentmeta } @@ -123,12 +130,23 @@ def formFilter(ImportOptions importoptions) { return filter } +def conditionalClean(ImportOptions importoptions, String destpath) { + if (importoptions.m_clean) { + echo "Cleaning ${destpath}" + dir(destpath) { + deleteDir() + } + } +} + def artifactimportfrombuildjob(meta, importoptions, String destpath) { if (importoptions.m_sourceselect != 'Jenkins job artifact') { error("Import options settings have not been set for: Jenkins job artifact") return } + conditionalClean(importoptions, destpath) + copyArtifacts( filter: formFilter(importoptions), excludes: importoptions.m_excludes, @@ -164,6 +182,8 @@ def hierarchyartifactimportfromrepo(meta, importoptions, String destpath) { def rootrevision = importoptions.m_revision echo "Cloning root release repo: ${rooturl}, revision: ${rootrevision} at folder: ${destpath}" + conditionalClean(importoptions, destpath) + def ArrayList sparseitemlist = gh.convertSparseItemsString(formFilter(importoptions)) gh.gitCheckoutAlt(rooturl, rootrevision, destpath, "", 1, true, sparseitemlist) @@ -204,6 +224,8 @@ def artifactimportfromrepo(meta, importoptions, String destpath) { return } + conditionalClean(importoptions, destpath) + def rooturl = importoptions.m_repo def rootrevision = importoptions.m_revision echo "Cloning release repo: ${rooturl}, revision: ${rootrevision} at folder: ${destpath}"