From 82d62ce93f2ef11fd41ad759598b1df243955964 Mon Sep 17 00:00:00 2001 From: Anna Matczak Date: Fri, 22 May 2020 12:41:18 +0000 Subject: [PATCH 1/3] testing --- artifacts/metaexport.groovy | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/artifacts/metaexport.groovy b/artifacts/metaexport.groovy index 67d13c3..5a43292 100644 --- a/artifacts/metaexport.groovy +++ b/artifacts/metaexport.groovy @@ -1,6 +1,5 @@ - // 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, importer, subJobs) { +def combineSubjobArtifacts(meta, subJobs) { def ArrayList artifactFolders = new ArrayList() for (subJob in subJobs) { def subJobObject = subJob[0] @@ -12,7 +11,7 @@ def combineSubjobArtifacts(meta, importer, subJobs) { dir(destFolder) { deleteDir() } - importer.artifactimport(meta, subJobName, subJobNumber, destFolder, incrementversionnumber) + //importer.artifactimport(meta, subJobName, subJobNumber, destFolder, incrementversionnumber) artifactFolders.add("${destFolder}/**") } } From e8489e716781323ccfd08a6f143ebc72ba3606e4 Mon Sep 17 00:00:00 2001 From: Anna Matczak Date: Tue, 26 May 2020 15:15:17 +0000 Subject: [PATCH 2/3] Revert temporary changes --- artifacts/metaexport.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/artifacts/metaexport.groovy b/artifacts/metaexport.groovy index 5a43292..f082d3a 100644 --- a/artifacts/metaexport.groovy +++ b/artifacts/metaexport.groovy @@ -11,7 +11,7 @@ def combineSubjobArtifacts(meta, subJobs) { dir(destFolder) { deleteDir() } - //importer.artifactimport(meta, subJobName, subJobNumber, destFolder, incrementversionnumber) + importer.artifactimport(meta, subJobName, subJobNumber, destFolder, incrementversionnumber) artifactFolders.add("${destFolder}/**") } } From 5ae85f47accd66747ad67654cd3f6fcf7393f9ba Mon Sep 17 00:00:00 2001 From: Anna Matczak Date: Tue, 26 May 2020 15:15:50 +0000 Subject: [PATCH 3/3] Update metaexport.groovy --- artifacts/metaexport.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/artifacts/metaexport.groovy b/artifacts/metaexport.groovy index f082d3a..4d93cc5 100644 --- a/artifacts/metaexport.groovy +++ b/artifacts/metaexport.groovy @@ -1,5 +1,5 @@ // 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 combineSubjobArtifacts(meta, importer, subJobs) { def ArrayList artifactFolders = new ArrayList() for (subJob in subJobs) { def subJobObject = subJob[0]