Add a default archiver

This commit is contained in:
Dan Hawkins 2021-12-04 23:24:51 +00:00
commit cb65d2b730
13 changed files with 20 additions and 16 deletions

View file

@ -1,8 +1,12 @@
enum Store {
JENKINS,
ARTIFACTSERVER,
}
JENKINS = 0 this.JENKINS = Store.JENKINS
ARTIFACTSERVER = 1 this.ARTIFACTSERVER = Store.JENKINS
def archiveArtifacts(artifactlist, store = JENKINS ) { def archive(artifactlist, ArchiverStore store = JENKINS ) {
if (store == JENKINS) { if (store == JENKINS) {
archiveArtifacts(artifactlist) archiveArtifacts(artifactlist)
} }

View file

@ -54,7 +54,7 @@ pipeline {
script { script {
def artifactlist = meta.generateartifacts() def artifactlist = meta.generateartifacts()
artifactarchiver = load("${autobuilder.commonscripts()}/artifacts/archiver.groovy") artifactarchiver = load("${autobuilder.commonscripts()}/artifacts/archiver.groovy")
artifactarchiver.archiveArtifacts("summary/**,${artifactlist}") artifactarchiver.archive("summary/**,${artifactlist}")
} }
} }
} }

View file

@ -58,7 +58,7 @@ pipeline {
def excludes = "${IMPORTS}/*" def excludes = "${IMPORTS}/*"
echo "Archiving artifacts: Includes: ${includes} Excludes: ${excludes}" echo "Archiving artifacts: Includes: ${includes} Excludes: ${excludes}"
// This does not work: artifactarchiver = load("${autobuilder.commonscripts()}/artifacts/archiver.groovy") // 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 // so
cleanfolders = [ cleanfolders = [
IMPORTS, IMPORTS,
@ -66,7 +66,7 @@ pipeline {
] ]
cleaner.clean(cleanfolders) cleaner.clean(cleanfolders)
artifactarchiver = load("${autobuilder.commonscripts()}/artifacts/archiver.groovy") artifactarchiver = load("${autobuilder.commonscripts()}/artifacts/archiver.groovy")
artifactarchiver.archiveArtifacts(artifacts: includes) artifactarchiver.archive(artifacts: includes)
} }
} }
} }

View file

@ -42,7 +42,7 @@ pipeline {
mv -v "${ESW}"/* . mv -v "${ESW}"/* .
""" """
artifactarchiver = load("${autobuilder.commonscripts()}/artifacts/archiver.groovy") artifactarchiver = load("${autobuilder.commonscripts()}/artifacts/archiver.groovy")
artifactarchiver.archiveArtifacts(artifactlist) artifactarchiver.archive(artifactlist)
} }
} }
} }

View file

@ -49,7 +49,7 @@ pipeline {
script { script {
def artifactlist = meta.generateartifacts(["filtered/**"]) def artifactlist = meta.generateartifacts(["filtered/**"])
artifactarchiver = load("${autobuilder.commonscripts()}/artifacts/archiver.groovy") artifactarchiver = load("${autobuilder.commonscripts()}/artifacts/archiver.groovy")
artifactarchiver.archiveArtifacts(artifactlist) artifactarchiver.archive(artifactlist)
} }
} }
} }

View file

@ -44,7 +44,7 @@ pipeline {
mv -v "logic"/* . mv -v "logic"/* .
""" """
artifactarchiver = load("${autobuilder.commonscripts()}/artifacts/archiver.groovy") artifactarchiver = load("${autobuilder.commonscripts()}/artifacts/archiver.groovy")
artifactarchiver.archiveArtifacts(artifactlist) artifactarchiver.archive(artifactlist)
} }
} }
} }

View file

@ -59,7 +59,7 @@ pipeline {
script { script {
def artifactlist = meta.generateartifacts() def artifactlist = meta.generateartifacts()
artifactarchiver = load("${autobuilder.commonscripts()}/artifacts/archiver.groovy") artifactarchiver = load("${autobuilder.commonscripts()}/artifacts/archiver.groovy")
artifactarchiver.archiveArtifacts("summary/**,reports/**,${artifactlist}") artifactarchiver.archive("summary/**,reports/**,${artifactlist}")
} }
} }
} }

View file

@ -148,7 +148,7 @@ pipeline {
script { script {
def artifactlist = meta.generateartifacts() def artifactlist = meta.generateartifacts()
artifactarchiver = load("${autobuilder.commonscripts()}/artifacts/archiver.groovy") artifactarchiver = load("${autobuilder.commonscripts()}/artifacts/archiver.groovy")
artifactarchiver.archiveArtifacts("summary/**,${artifactlist}") artifactarchiver.archive("summary/**,${artifactlist}")
} }
} }
} }

View file

@ -59,7 +59,7 @@ pipeline {
script { script {
def artifactlist = meta.generateartifacts() def artifactlist = meta.generateartifacts()
artifactarchiver = load("${autobuilder.commonscripts()}/artifacts/archiver.groovy") artifactarchiver = load("${autobuilder.commonscripts()}/artifacts/archiver.groovy")
artifactarchiver.archiveArtifacts("summary/**,${artifactlist}") artifactarchiver.archive("summary/**,${artifactlist}")
} }
} }
} }

View file

@ -57,7 +57,7 @@ pipeline {
script { script {
def artifactlist = meta.generateartifacts() def artifactlist = meta.generateartifacts()
artifactarchiver = load("${autobuilder.commonscripts()}/artifacts/archiver.groovy") artifactarchiver = load("${autobuilder.commonscripts()}/artifacts/archiver.groovy")
artifactarchiver.archiveArtifacts("summary/**,${artifactlist}") artifactarchiver.archive("summary/**,${artifactlist}")
} }
} }
} }

View file

@ -130,7 +130,7 @@ pipeline {
ArrayList<String> itemsForRelease = ["${STATICANALYSIS}/**"] ArrayList<String> itemsForRelease = ["${STATICANALYSIS}/**"]
def artifactlist = meta.generateartifacts(itemsForRelease) def artifactlist = meta.generateartifacts(itemsForRelease)
artifactarchiver = load("${autobuilder.commonscripts()}/artifacts/archiver.groovy") artifactarchiver = load("${autobuilder.commonscripts()}/artifacts/archiver.groovy")
artifactarchiver.archiveArtifacts(artifactlist) artifactarchiver.archive(artifactlist)
} }
} }
} }

View file

@ -92,7 +92,7 @@ pipeline {
ArrayList<String> itemsForRelease = ["${STATICANALYSIS}/**"] ArrayList<String> itemsForRelease = ["${STATICANALYSIS}/**"]
def artifactlist = meta.generateartifacts(itemsForRelease) def artifactlist = meta.generateartifacts(itemsForRelease)
artifactarchiver = load("${autobuilder.commonscripts()}/artifacts/archiver.groovy") artifactarchiver = load("${autobuilder.commonscripts()}/artifacts/archiver.groovy")
artifactarchiver.archiveArtifacts(artifactlist) artifactarchiver.archive(artifactlist)
} }
} }
} }

View file

@ -193,7 +193,7 @@ pipeline {
script { script {
def artifactlist = meta.generateartifacts([ "${LOGGING_ROOT}/**"]) def artifactlist = meta.generateartifacts([ "${LOGGING_ROOT}/**"])
artifactarchiver = load("${autobuilder.commonscripts()}/artifacts/archiver.groovy") artifactarchiver = load("${autobuilder.commonscripts()}/artifacts/archiver.groovy")
artifactarchiver.archiveArtifacts(artifactlist) artifactarchiver.archive(artifactlist)
} }
} }
} }