diff --git a/artifacts/archiver.groovy b/artifacts/archiver.groovy index bc365af..30360d0 100644 --- a/artifacts/archiver.groovy +++ b/artifacts/archiver.groovy @@ -1,8 +1,12 @@ +enum Store { + JENKINS, + ARTIFACTSERVER, +} -JENKINS = 0 -ARTIFACTSERVER = 1 +this.JENKINS = Store.JENKINS +this.ARTIFACTSERVER = Store.JENKINS -def archiveArtifacts(artifactlist, store = JENKINS ) { +def archive(artifactlist, ArchiverStore store = JENKINS ) { if (store == JENKINS) { archiveArtifacts(artifactlist) } diff --git a/check/build_meta.groovy b/check/build_meta.groovy index 04f5d3f..fb8a75d 100644 --- a/check/build_meta.groovy +++ b/check/build_meta.groovy @@ -54,7 +54,7 @@ pipeline { script { def artifactlist = meta.generateartifacts() artifactarchiver = load("${autobuilder.commonscripts()}/artifacts/archiver.groovy") - artifactarchiver.archiveArtifacts("summary/**,${artifactlist}") + artifactarchiver.archive("summary/**,${artifactlist}") } } } diff --git a/copy/all.groovy b/copy/all.groovy index 686ec26..9b95eb6 100644 --- a/copy/all.groovy +++ b/copy/all.groovy @@ -58,7 +58,7 @@ pipeline { def excludes = "${IMPORTS}/*" echo "Archiving artifacts: Includes: ${includes} Excludes: ${excludes}" // This does not work: artifactarchiver = load("${autobuilder.commonscripts()}/artifacts/archiver.groovy") - // This does not work: artifactarchiver.archiveArtifacts(artifacts: includes, excludes: excludes) + // This does not work: artifactarchiver.archive(artifacts: includes, excludes: excludes) // so cleanfolders = [ IMPORTS, @@ -66,7 +66,7 @@ pipeline { ] cleaner.clean(cleanfolders) artifactarchiver = load("${autobuilder.commonscripts()}/artifacts/archiver.groovy") - artifactarchiver.archiveArtifacts(artifacts: includes) + artifactarchiver.archive(artifacts: includes) } } } diff --git a/copy/esw.groovy b/copy/esw.groovy index 1ccc52d..6ccb53e 100644 --- a/copy/esw.groovy +++ b/copy/esw.groovy @@ -42,7 +42,7 @@ pipeline { mv -v "${ESW}"/* . """ artifactarchiver = load("${autobuilder.commonscripts()}/artifacts/archiver.groovy") - artifactarchiver.archiveArtifacts(artifactlist) + artifactarchiver.archive(artifactlist) } } } diff --git a/copy/filtered.groovy b/copy/filtered.groovy index 6ae8257..251de93 100644 --- a/copy/filtered.groovy +++ b/copy/filtered.groovy @@ -49,7 +49,7 @@ pipeline { script { def artifactlist = meta.generateartifacts(["filtered/**"]) artifactarchiver = load("${autobuilder.commonscripts()}/artifacts/archiver.groovy") - artifactarchiver.archiveArtifacts(artifactlist) + artifactarchiver.archive(artifactlist) } } } diff --git a/copy/logic.groovy b/copy/logic.groovy index 98e26ca..7b20935 100644 --- a/copy/logic.groovy +++ b/copy/logic.groovy @@ -44,7 +44,7 @@ pipeline { mv -v "logic"/* . """ artifactarchiver = load("${autobuilder.commonscripts()}/artifacts/archiver.groovy") - artifactarchiver.archiveArtifacts(artifactlist) + artifactarchiver.archive(artifactlist) } } } diff --git a/differences/metahierarchy.groovy b/differences/metahierarchy.groovy index 78d0641..60d9835 100644 --- a/differences/metahierarchy.groovy +++ b/differences/metahierarchy.groovy @@ -59,7 +59,7 @@ pipeline { script { def artifactlist = meta.generateartifacts() artifactarchiver = load("${autobuilder.commonscripts()}/artifacts/archiver.groovy") - artifactarchiver.archiveArtifacts("summary/**,reports/**,${artifactlist}") + artifactarchiver.archive("summary/**,reports/**,${artifactlist}") } } } diff --git a/publish/promptingpublish.groovy b/publish/promptingpublish.groovy index 57cb1a1..58c72eb 100644 --- a/publish/promptingpublish.groovy +++ b/publish/promptingpublish.groovy @@ -148,7 +148,7 @@ pipeline { script { def artifactlist = meta.generateartifacts() artifactarchiver = load("${autobuilder.commonscripts()}/artifacts/archiver.groovy") - artifactarchiver.archiveArtifacts("summary/**,${artifactlist}") + artifactarchiver.archive("summary/**,${artifactlist}") } } } diff --git a/publish/publish.groovy b/publish/publish.groovy index 9c26d06..ad33df9 100644 --- a/publish/publish.groovy +++ b/publish/publish.groovy @@ -59,7 +59,7 @@ pipeline { script { def artifactlist = meta.generateartifacts() artifactarchiver = load("${autobuilder.commonscripts()}/artifacts/archiver.groovy") - artifactarchiver.archiveArtifacts("summary/**,${artifactlist}") + artifactarchiver.archive("summary/**,${artifactlist}") } } } diff --git a/release/release.groovy b/release/release.groovy index aa074a1..42357fc 100644 --- a/release/release.groovy +++ b/release/release.groovy @@ -57,7 +57,7 @@ pipeline { script { def artifactlist = meta.generateartifacts() artifactarchiver = load("${autobuilder.commonscripts()}/artifacts/archiver.groovy") - artifactarchiver.archiveArtifacts("summary/**,${artifactlist}") + artifactarchiver.archive("summary/**,${artifactlist}") } } } diff --git a/staticanalysis/cpd.groovy b/staticanalysis/cpd.groovy index 508c726..f9ddfcb 100644 --- a/staticanalysis/cpd.groovy +++ b/staticanalysis/cpd.groovy @@ -130,7 +130,7 @@ pipeline { ArrayList itemsForRelease = ["${STATICANALYSIS}/**"] def artifactlist = meta.generateartifacts(itemsForRelease) artifactarchiver = load("${autobuilder.commonscripts()}/artifacts/archiver.groovy") - artifactarchiver.archiveArtifacts(artifactlist) + artifactarchiver.archive(artifactlist) } } } diff --git a/staticanalysis/cppcheck.groovy b/staticanalysis/cppcheck.groovy index 2847cac..696f11d 100644 --- a/staticanalysis/cppcheck.groovy +++ b/staticanalysis/cppcheck.groovy @@ -92,7 +92,7 @@ pipeline { ArrayList itemsForRelease = ["${STATICANALYSIS}/**"] def artifactlist = meta.generateartifacts(itemsForRelease) artifactarchiver = load("${autobuilder.commonscripts()}/artifacts/archiver.groovy") - artifactarchiver.archiveArtifacts(artifactlist) + artifactarchiver.archive(artifactlist) } } } diff --git a/test/testethernetproduct.groovy b/test/testethernetproduct.groovy index 9ff1229..f45cf19 100644 --- a/test/testethernetproduct.groovy +++ b/test/testethernetproduct.groovy @@ -193,7 +193,7 @@ pipeline { script { def artifactlist = meta.generateartifacts([ "${LOGGING_ROOT}/**"]) artifactarchiver = load("${autobuilder.commonscripts()}/artifacts/archiver.groovy") - artifactarchiver.archiveArtifacts(artifactlist) + artifactarchiver.archive(artifactlist) } } }