1
0
Fork 0

Feature/jenkins pipeline (#2887)

* disable mac and windows by default

* copy failed to top level
This commit is contained in:
Frank Celler 2017-07-27 14:00:22 +02:00 committed by GitHub
parent 31cc349d05
commit 37e1023166
43 changed files with 19 additions and 15 deletions

View File

@ -8,8 +8,8 @@ properties(
) )
def defaultLinux = true def defaultLinux = true
def defaultMac = true def defaultMac = false
def defaultWindows = true def defaultWindows = false
def defaultBuild = true def defaultBuild = true
def defaultCleanBuild = false def defaultCleanBuild = false
def defaultCommunity = true def defaultCommunity = true
@ -522,13 +522,13 @@ def testEdition(edition, os, mode, engine) {
try { try {
try { try {
if (os == 'linux') { if (os == 'linux') {
sh "./Installation/Pipeline/test_${mode}_${edition}_${engine}_${os}.sh 10" sh "./Installation/Pipeline/linux/test_${mode}_${edition}_${engine}_${os}.sh 10"
} }
else if (os == 'mac') { else if (os == 'mac') {
sh "./Installation/Pipeline/test_${mode}_${edition}_${engine}_${os}.sh 5" sh "./Installation/Pipeline/mac/test_${mode}_${edition}_${engine}_${os}.sh 5"
} }
else if (os == 'windows') { else if (os == 'windows') {
powershell ". .\\Installation\\Pipeline\\test_${mode}_${edition}_${engine}_${os}.ps1" powershell ". .\\Installation\\Pipeline\\windows\\test_${mode}_${edition}_${engine}_${os}.ps1"
} }
} }
catch (exc) { catch (exc) {
@ -542,8 +542,8 @@ def testEdition(edition, os, mode, engine) {
if (os == 'linux' || os == 'mac') { if (os == 'linux' || os == 'mac') {
sh "rm -rf ${arch}" sh "rm -rf ${arch}"
sh "mkdir -p ${arch}" sh "mkdir -p ${arch}"
sh "find log-output -name 'FAILED_*' -exec cp '{}' ${arch} ';'" sh "find log-output -name 'FAILED_*' -exec cp '{}' . ';'"
sh "for i in logs log-output; do test -e \$i && mv \$i ${arch} || true; done" sh "for i in logs log-output core*; do test -e \$i && mv \$i ${arch} || true; done"
} }
} }
} }
@ -554,6 +554,10 @@ def testEdition(edition, os, mode, engine) {
archiveArtifacts allowEmptyArchive: true, archiveArtifacts allowEmptyArchive: true,
artifacts: "${arch}/**", artifacts: "${arch}/**",
defaultExcludes: false defaultExcludes: false
archiveArtifacts allowEmptyArchive: true,
artifacts: "FAILED_*",
defaultExcludes: false
} }
} }
@ -657,13 +661,13 @@ allResiliencesSuccessful = true
def testResilience(os, engine, foxx) { def testResilience(os, engine, foxx) {
withEnv(['LOG_COMMUNICATION=debug', 'LOG_REQUESTS=trace', 'LOG_AGENCY=trace']) { withEnv(['LOG_COMMUNICATION=debug', 'LOG_REQUESTS=trace', 'LOG_AGENCY=trace']) {
if (os == 'linux') { if (os == 'linux') {
sh "./Installation/Pipeline/test_resilience_${foxx}_${engine}_${os}.sh" sh "./Installation/Pipeline/linux/test_resilience_${foxx}_${engine}_${os}.sh"
} }
else if (os == 'mac') { else if (os == 'mac') {
sh "./Installation/Pipeline/test_resilience_${foxx}_${engine}_${os}.sh" sh "./Installation/Pipeline/mac/test_resilience_${foxx}_${engine}_${os}.sh"
} }
else if (os == 'windows') { else if (os == 'windows') {
powershell "./Installation/Pipeline/test_resilience_${foxx}_${engine}_${os}.ps1" powershell ".\\Installation\\Pipeline\\test_resilience_${foxx}_${engine}_${os}.ps1"
} }
} }
} }
@ -808,20 +812,19 @@ def buildEdition(edition, os) {
try { try {
try { try {
if (os == 'linux') { if (os == 'linux') {
sh "./Installation/Pipeline/build_${edition}_${os}.sh 64" sh "./Installation/Pipeline/linux/build_${edition}_${os}.sh 64"
} }
else if (os == 'mac') { else if (os == 'mac') {
sh "./Installation/Pipeline/build_${edition}_${os}.sh 20" sh "./Installation/Pipeline/mac/build_${edition}_${os}.sh 20"
} }
else if (os == 'windows') { else if (os == 'windows') {
powershell ". .\\Installation\\Pipeline\\build_${edition}_${os}.ps1" powershell ". .\\Installation\\Pipeline\\windows\\build_${edition}_${os}.ps1"
} }
} }
finally { finally {
if (os == 'linux' || os == 'mac') { if (os == 'linux' || os == 'mac') {
sh "rm -rf ${arch}" sh "rm -rf ${arch}"
sh "mkdir -p ${arch}" sh "mkdir -p ${arch}"
sh "find log-output -name 'FAILED_*' -exec cp '{}' ${arch} ';'"
sh "for i in log-output; do test -e \$i && mv \$i ${arch} || true; done" sh "for i in log-output; do test -e \$i && mv \$i ${arch} || true; done"
} }
else if (os == 'windows') { else if (os == 'windows') {
@ -832,6 +835,7 @@ def buildEdition(edition, os) {
} }
finally { finally {
stashBuild(edition, os) stashBuild(edition, os)
archiveArtifacts allowEmptyArchive: true, archiveArtifacts allowEmptyArchive: true,
artifacts: "${arch}/**", artifacts: "${arch}/**",
defaultExcludes: false defaultExcludes: false
@ -1031,7 +1035,7 @@ stage('result') {
&& allTestsSuccessful && allTestsSuccessful
&& allResiliencesSuccessful && allResiliencesSuccessful
&& jslintSuccessful)) { && jslintSuccessful)) {
currentBuild.result = 'FAILURE' error "run failed"
} }
} }
} }