Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Feature/jenkins pipeline (#2757) 

reduce concurrency
This commit is contained in:
Frank Celler 2017-07-08 19:15:42 +02:00 committed by GitHub
parent 0450700419
commit 6aabc148d8
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Installation/Pipeline/Jenkinsfile.feature
View File

@ -559,10 +559,10 @@ allTestsSuccessful = true
def testEdition(edition, os, mode, engine) { def testEdition(edition, os, mode, engine) {
try { try {
if (os == 'linux') { if (os == 'linux') {
sh "./Installation/Pipeline/test_${mode}_${edition}_${engine}_${os}.sh 10" sh "./Installation/Pipeline/test_${mode}_${edition}_${engine}_${os}.sh 5"
} }
else if (os == 'mac') { else if (os == 'mac') {
sh "./Installation/Pipeline/test_${mode}_${edition}_${engine}_${os}.sh 10" sh "./Installation/Pipeline/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\\test_${mode}_${edition}_${engine}_${os}.ps1")
@ -570,7 +570,7 @@ def testEdition(edition, os, mode, engine) {
} }
catch (exc) { catch (exc) {
archiveArtifacts allowEmptyArchive: true, archiveArtifacts allowEmptyArchive: true,
artifacts: 'core.*, build/bin/arangod', artifacts: 'core*, build/bin/arangod',
defaultExcludes: false defaultExcludes: false
throw exc throw exc
@ -742,6 +742,11 @@ def testResilienceStep(os, engine, foxx) {
catch (exc) { catch (exc) {
resiliencesSuccess[name] = false resiliencesSuccess[name] = false
allResiliencesSuccessful = false allResiliencesSuccessful = false
archiveArtifacts allowEmptyArchive: true,
artifacts: 'core*, build/bin/arangod',
defaultExcludes: false
throw exc throw exc
} }
finally { finally {

4
Installation/Pipeline/include/test_MODE_EDITION_ENGINE_OS.inc
View File

@ -83,7 +83,7 @@ if [ "$mode" == singleserver ]; then
scripts/unittest ssl_server --minPort `expr $PORT01 + 240` --maxPort `expr $PORT01 + 249` $OPTS 2>&1 scripts/unittest ssl_server --minPort `expr $PORT01 + 240` --maxPort `expr $PORT01 + 249` $OPTS 2>&1
scripts/unittest upgrade --minPort `expr $PORT01 + 250` --maxPort `expr $PORT01 + 259` $OPTS 2>&1 scripts/unittest upgrade --minPort `expr $PORT01 + 250` --maxPort `expr $PORT01 + 259` $OPTS 2>&1
$ENTERPRISE_TESTS $ENTERPRISE_TESTS
" | parallel --header 1 --results log-output --files --no-notice --load 10 --jobs $concurrency > log-output/${type}.log " | parallel --verbose --header 1 --results log-output --files --no-notice --load 10 --jobs $concurrency > log-output/${type}.log
elif [ "$mode" == cluster ]; then elif [ "$mode" == cluster ]; then
OPTS="$OPTS --cluster true" OPTS="$OPTS --cluster true"
@ -112,7 +112,7 @@ elif [ "$mode" == cluster ]; then
scripts/unittest ssl_server --minPort `expr $PORT01 + 640` --maxPort `expr $PORT01 + 679` $OPTS 2>&1 scripts/unittest ssl_server --minPort `expr $PORT01 + 640` --maxPort `expr $PORT01 + 679` $OPTS 2>&1
scripts/unittest upgrade --minPort `expr $PORT01 + 680` --maxPort `expr $PORT01 + 719` $OPTS 2>&1 scripts/unittest upgrade --minPort `expr $PORT01 + 680` --maxPort `expr $PORT01 + 719` $OPTS 2>&1
$ENTERPRISE_TESTS $ENTERPRISE_TESTS
" | parallel --header 1 --results log-output --files --no-notice --load 10 --jobs $concurrency > log-output/${type}.log " | parallel --verbose --header 1 --results log-output --files --no-notice --load 10 --jobs $concurrency > log-output/${type}.log
fi fi
. ./Installation/Pipeline/include/test_check_result.inc $? . ./Installation/Pipeline/include/test_check_result.inc $?