Defer archiving artifacts to a loaded script

This commit is contained in:
Dan Hawkins 2021-12-04 21:28:24 +00:00
commit 721375a968
12 changed files with 26 additions and 13 deletions

View file

@ -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}")
}
}
}

View file

@ -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)
}
}
}

View file

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

View file

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

View file

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

View file

@ -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}")
}
}
}

View file

@ -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}")
}
}
}

View file

@ -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}")
}
}
}

View file

@ -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}")
}
}
}

View file

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

View file

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

View file

@ -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)
}
}
}