1
0
Fork 0

Feature/jenkins pipeline (#3271)

* fixed core lookup
This commit is contained in:
Frank Celler 2017-09-16 12:39:34 +02:00 committed by GitHub
parent 3700f75b0c
commit c4484e7a7c
1 changed files with 6 additions and 5 deletions

View File

@ -250,7 +250,7 @@ def checkCoresAndSave(os, runDir, name, archRun) {
else { else {
sh "for i in logs out tmp result; do test -e \"${runDir}/\$i\" && mv \"${runDir}/\$i\" \"${archRun}/${name}.\$i\" || true; done" sh "for i in logs out tmp result; do test -e \"${runDir}/\$i\" && mv \"${runDir}/\$i\" \"${archRun}/${name}.\$i\" || true; done"
def files = findFiles(glob: '${runDir}/core*') def files = findFiles(glob: "${runDir}/core*")
if (files.length > 0) { if (files.length > 0) {
for (file in files) { for (file in files) {
@ -534,6 +534,7 @@ def unstashBinaries(os, edition, maintainer) {
if (os == "windows") { if (os == "windows") {
powershell "echo 'y' | pscp -i C:\\Users\\Jenkins\\.ssh\\putty-jenkins.ppk jenkins@c1:/vol/cache/binaries-${env.BUILD_TAG}-${os}-${edition}-${maintainer}.zip stash.zip" powershell "echo 'y' | pscp -i C:\\Users\\Jenkins\\.ssh\\putty-jenkins.ppk jenkins@c1:/vol/cache/binaries-${env.BUILD_TAG}-${os}-${edition}-${maintainer}.zip stash.zip"
powershell "Expand-Archive -Path stash.zip -Force -DestinationPath ." powershell "Expand-Archive -Path stash.zip -Force -DestinationPath ."
powershell "copy build\\tests\\RelWithDebInfo\\* build\\bin"
powershell "copy build\\bin\\RelWithDebInfo\\* build\\bin" powershell "copy build\\bin\\RelWithDebInfo\\* build\\bin"
} }
else { else {
@ -565,12 +566,12 @@ def jslint(os, edition, maintainer) {
} }
catch (exc) { catch (exc) {
renameFolder(arch, archFail) renameFolder(arch, archFail)
fileOperations([fileCreateOperation(fileContent: 'BUILD FAILED', fileName: "${arch}-FAIL.txt")]) fileOperations([fileCreateOperation(fileContent: 'JSLINT FAILED', fileName: "${archDir}-FAIL.txt")])
throw exc throw exc
} }
finally { finally {
archiveArtifacts allowEmptyArchive: true, archiveArtifacts allowEmptyArchive: true,
artifacts: "${arch}-*, ${arch}/**, ${archFail}/**", artifacts: "${archDir}-*, ${arch}/**, ${archFail}/**",
defaultExcludes: false defaultExcludes: false
} }
} }
@ -610,7 +611,7 @@ def getTests(os, edition, maintainer, mode, engine) {
if (mode == "singleserver") { if (mode == "singleserver") {
tests += [ tests += [
["agency", "agency", ""], ["agency", "agency", ""],
["boost", "boost", "--skipCache false"], ["catch", "catch", "--skipCache false"],
["cluster_sync", "cluster_sync", ""], ["cluster_sync", "cluster_sync", ""],
["dfdb", "dfdb", ""], ["dfdb", "dfdb", ""],
["replication_ongoing", "replication_ongoing", ""], ["replication_ongoing", "replication_ongoing", ""],
@ -753,7 +754,7 @@ def executeTests(os, edition, maintainer, mode, engine, portInit, archDir, arch,
checkCoresAndSave(os, runDir, name, archRun) checkCoresAndSave(os, runDir, name, archRun)
archiveArtifacts allowEmptyArchive: true, archiveArtifacts allowEmptyArchive: true,
artifacts: "${logFileRel}, ${logFileFailedRel}", artifacts: "${archDir}-*, ${logFileRel}, ${logFileFailedRel}",
defaultExcludes: false defaultExcludes: false
} }
} }