mirror of https://github.com/jenkinsci/jenkins.git
Use deleteDir again, error out if missing packages.
This commit is contained in:
parent
d3a65df0ee
commit
2eab78e744
|
@ -108,7 +108,14 @@ timestampedNode('docker') {
|
||||||
suseFileName = suseFilesFound[0]?.name
|
suseFileName = suseFilesFound[0]?.name
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
step([$class: 'ArtifactArchiver', artifacts: 'target/**/*', fingerprint: true])
|
step([$class: 'ArtifactArchiver', artifacts: 'target/**/*', fingerprint: true])
|
||||||
|
|
||||||
|
// Fail the build if we didn't find at least one of the packages, meaning they weren't built but
|
||||||
|
// somehow make didn't error out.
|
||||||
|
if (debFileName == null || rpmFileName == null || suseFileName == null) {
|
||||||
|
error "At least one of Debian, RPM or SuSE packages are missing, so failing the build."
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -132,8 +139,8 @@ if (runTests) {
|
||||||
|
|
||||||
timestampedNode("docker") {
|
timestampedNode("docker") {
|
||||||
stage "Load Lib"
|
stage "Load Lib"
|
||||||
sh 'rm -rf workflowlib'
|
|
||||||
dir ('workflowlib') {
|
dir ('workflowlib') {
|
||||||
|
deleteDir()
|
||||||
git branch: packagingBranch, url: 'https://github.com/jenkinsci/packaging.git'
|
git branch: packagingBranch, url: 'https://github.com/jenkinsci/packaging.git'
|
||||||
flow = load 'workflow/installertest.groovy'
|
flow = load 'workflow/installertest.groovy'
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue