diff --git a/check/build_meta.groovy b/check/build_meta.groovy index 6e669bc..5258740 100644 --- a/check/build_meta.groovy +++ b/check/build_meta.groovy @@ -53,7 +53,8 @@ pipeline { steps { script { def artifactlist = meta.generateartifacts() - archiveArtifacts "summary/**,${artifactlist}" + artifactarchiver = load(${autobuilder.commonscripts()}/artifacts/archiver.groovy) + artifactarchiver.archiveArtifacts("summary/**,${artifactlist}") } } } diff --git a/copy/all.groovy b/copy/all.groovy index 6d09903..5a7e424 100644 --- a/copy/all.groovy +++ b/copy/all.groovy @@ -57,14 +57,16 @@ pipeline { def includes = '**/*' def excludes = "${IMPORTS}/*" echo "Archiving artifacts: Includes: ${includes} Excludes: ${excludes}" - // This does not work: archiveArtifacts artifacts: includes, excludes: excludes + // This does not work: artifactarchiver = load(${autobuilder.commonscripts()}/artifacts/archiver.groovy) + // This does not work: artifactarchiver.archiveArtifacts(artifacts: includes, excludes: excludes) // so cleanfolders = [ IMPORTS, 'autobuild', ] cleaner.clean(cleanfolders) - archiveArtifacts artifacts: includes + artifactarchiver = load(${autobuilder.commonscripts()}/artifacts/archiver.groovy) + artifactarchiver.archiveArtifacts(artifacts: includes) } } } diff --git a/copy/esw.groovy b/copy/esw.groovy index c6c0147..a3f1b23 100644 --- a/copy/esw.groovy +++ b/copy/esw.groovy @@ -41,7 +41,8 @@ pipeline { rm -v -rf meta mv -v "${ESW}"/* . """ - archiveArtifacts artifactlist + artifactarchiver = load(${autobuilder.commonscripts()}/artifacts/archiver.groovy) + artifactarchiver.archiveArtifacts(artifactlist) } } } diff --git a/copy/filtered.groovy b/copy/filtered.groovy index 7fd87b6..f0f6f6a 100644 --- a/copy/filtered.groovy +++ b/copy/filtered.groovy @@ -48,7 +48,8 @@ pipeline { steps { script { def artifactlist = meta.generateartifacts(["filtered/**"]) - archiveArtifacts artifactlist + artifactarchiver = load(${autobuilder.commonscripts()}/artifacts/archiver.groovy) + artifactarchiver.archiveArtifacts(artifactlist) } } } diff --git a/copy/logic.groovy b/copy/logic.groovy index 9585f01..1663904 100644 --- a/copy/logic.groovy +++ b/copy/logic.groovy @@ -43,7 +43,8 @@ pipeline { rm -v -rf diff mv -v "logic"/* . """ - archiveArtifacts artifactlist + artifactarchiver = load(${autobuilder.commonscripts()}/artifacts/archiver.groovy) + artifactarchiver.archiveArtifacts(artifactlist) } } } diff --git a/differences/metahierarchy.groovy b/differences/metahierarchy.groovy index 10b24a0..f7251dc 100644 --- a/differences/metahierarchy.groovy +++ b/differences/metahierarchy.groovy @@ -58,7 +58,8 @@ pipeline { steps { script { def artifactlist = meta.generateartifacts() - archiveArtifacts "summary/**,reports/**,${artifactlist}" + artifactarchiver = load(${autobuilder.commonscripts()}/artifacts/archiver.groovy) + artifactarchiver.archiveArtifacts("summary/**,reports/**,${artifactlist}") } } } diff --git a/publish/promptingpublish.groovy b/publish/promptingpublish.groovy index 9d51915..8d4b702 100644 --- a/publish/promptingpublish.groovy +++ b/publish/promptingpublish.groovy @@ -147,7 +147,8 @@ pipeline { steps { script { def artifactlist = meta.generateartifacts() - archiveArtifacts "summary/**,${artifactlist}" + artifactarchiver = load(${autobuilder.commonscripts()}/artifacts/archiver.groovy) + artifactarchiver.archiveArtifacts("summary/**,${artifactlist}") } } } diff --git a/publish/publish.groovy b/publish/publish.groovy index 82a32ad..38ee12e 100644 --- a/publish/publish.groovy +++ b/publish/publish.groovy @@ -58,7 +58,8 @@ pipeline { steps { script { def artifactlist = meta.generateartifacts() - archiveArtifacts "summary/**,${artifactlist}" + artifactarchiver = load(${autobuilder.commonscripts()}/artifacts/archiver.groovy) + artifactarchiver.archiveArtifacts("summary/**,${artifactlist}") } } } diff --git a/release/release.groovy b/release/release.groovy index 351985d..5be1ccd 100644 --- a/release/release.groovy +++ b/release/release.groovy @@ -56,7 +56,8 @@ pipeline { steps { script { def artifactlist = meta.generateartifacts() - archiveArtifacts "summary/**,${artifactlist}" + artifactarchiver = load(${autobuilder.commonscripts()}/artifacts/archiver.groovy) + artifactarchiver.archiveArtifacts("summary/**,${artifactlist}") } } } diff --git a/staticanalysis/cpd.groovy b/staticanalysis/cpd.groovy index 5a77cab..476734e 100644 --- a/staticanalysis/cpd.groovy +++ b/staticanalysis/cpd.groovy @@ -129,7 +129,8 @@ pipeline { script { ArrayList itemsForRelease = ["${STATICANALYSIS}/**"] def artifactlist = meta.generateartifacts(itemsForRelease) - archiveArtifacts artifactlist + artifactarchiver = load(${autobuilder.commonscripts()}/artifacts/archiver.groovy) + artifactarchiver.archiveArtifacts(artifactlist) } } } diff --git a/staticanalysis/cppcheck.groovy b/staticanalysis/cppcheck.groovy index 9455b0b..fc9345e 100644 --- a/staticanalysis/cppcheck.groovy +++ b/staticanalysis/cppcheck.groovy @@ -91,7 +91,8 @@ pipeline { script { ArrayList itemsForRelease = ["${STATICANALYSIS}/**"] def artifactlist = meta.generateartifacts(itemsForRelease) - archiveArtifacts artifactlist + artifactarchiver = load(${autobuilder.commonscripts()}/artifacts/archiver.groovy) + artifactarchiver.archiveArtifacts(artifactlist) } } } diff --git a/test/testethernetproduct.groovy b/test/testethernetproduct.groovy index 92d6414..79c9ba7 100644 --- a/test/testethernetproduct.groovy +++ b/test/testethernetproduct.groovy @@ -192,7 +192,8 @@ pipeline { steps{ script { def artifactlist = meta.generateartifacts([ "${LOGGING_ROOT}/**"]) - archiveArtifacts artifactlist + artifactarchiver = load(${autobuilder.commonscripts()}/artifacts/archiver.groovy) + artifactarchiver.archiveArtifacts(artifactlist) } } }