From 6aabc148d8291a7c6519467f9d84da7d4fea7874 Mon Sep 17 00:00:00 2001 From: Frank Celler Date: Sat, 8 Jul 2017 19:15:42 +0200 Subject: [PATCH] Feature/jenkins pipeline (#2757) reduce concurrency --- Installation/Pipeline/Jenkinsfile.feature | 11 ++++++++--- .../Pipeline/include/test_MODE_EDITION_ENGINE_OS.inc | 4 ++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/Installation/Pipeline/Jenkinsfile.feature b/Installation/Pipeline/Jenkinsfile.feature index 3fca1eaff1..aa230fabbc 100644 --- a/Installation/Pipeline/Jenkinsfile.feature +++ b/Installation/Pipeline/Jenkinsfile.feature @@ -559,10 +559,10 @@ allTestsSuccessful = true def testEdition(edition, os, mode, engine) { try { 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') { - sh "./Installation/Pipeline/test_${mode}_${edition}_${engine}_${os}.sh 10" + sh "./Installation/Pipeline/test_${mode}_${edition}_${engine}_${os}.sh 5" } else if (os == 'windows') { PowerShell(". .\\Installation\\Pipeline\\test_${mode}_${edition}_${engine}_${os}.ps1") @@ -570,7 +570,7 @@ def testEdition(edition, os, mode, engine) { } catch (exc) { archiveArtifacts allowEmptyArchive: true, - artifacts: 'core.*, build/bin/arangod', + artifacts: 'core*, build/bin/arangod', defaultExcludes: false throw exc @@ -742,6 +742,11 @@ def testResilienceStep(os, engine, foxx) { catch (exc) { resiliencesSuccess[name] = false allResiliencesSuccessful = false + + archiveArtifacts allowEmptyArchive: true, + artifacts: 'core*, build/bin/arangod', + defaultExcludes: false + throw exc } finally { diff --git a/Installation/Pipeline/include/test_MODE_EDITION_ENGINE_OS.inc b/Installation/Pipeline/include/test_MODE_EDITION_ENGINE_OS.inc index 280443ffe7..7ae5ec9103 100644 --- a/Installation/Pipeline/include/test_MODE_EDITION_ENGINE_OS.inc +++ b/Installation/Pipeline/include/test_MODE_EDITION_ENGINE_OS.inc @@ -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 upgrade --minPort `expr $PORT01 + 250` --maxPort `expr $PORT01 + 259` $OPTS 2>&1 $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 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 upgrade --minPort `expr $PORT01 + 680` --maxPort `expr $PORT01 + 719` $OPTS 2>&1 $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 . ./Installation/Pipeline/include/test_check_result.inc $?