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

Feature/jenkins pipeline (#2963)

This commit is contained in:
Frank Celler 2017-08-05 21:16:32 +02:00 committed by GitHub
parent 4cc8686e82
commit ff35dce3c2
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Installation/Pipeline/Jenkinsfile.feature
View File

@ -132,6 +132,9 @@ restrictions = []
jenkinsMaster = 'jenkins-master@c1' jenkinsMaster = 'jenkins-master@c1'
jenkinsSlave = 'jenkins' jenkinsSlave = 'jenkins'
// github proxy repositiory
proxyRepo = 'http://c1:8088/github.com/arangodb/arangodb'
// github repositiory for resilience tests // github repositiory for resilience tests
resilienceRepo = 'https://github.com/arangodb/resilience-tests' resilienceRepo = 'https://github.com/arangodb/resilience-tests'
@ -186,7 +189,16 @@ def checkoutCommunity() {
retry(3) { retry(3) {
try { try {
checkout scm checkout(
changelog: false,
poll: false,
scm: [
$class: 'GitSCM',
branches: [[name: "*/${sourceBranchLabel}"]],
doGenerateSubmoduleConfigurations: false,
extensions: [],
submoduleCfg: [],
userRemoteConfigs: [[url: proxyRepo]]])
sh 'git clean -f -d -x' sh 'git clean -f -d -x'
} }
catch (exc) { catch (exc) {
@ -550,7 +562,7 @@ def testEdition(edition, os, mode, engine) {
} }
catch (exc) { catch (exc) {
if (os == 'linux' || os == 'mac') { if (os == 'linux' || os == 'mac') {
sh "for i in build core* tmp; do test -e \$i && mv \$i ${arch} || true; done" sh "for i in build core* tmp; do test -e \$i && mv \"\$i\" ${arch} || true; done"
} }
archiveArtifacts allowEmptyArchive: true, archiveArtifacts allowEmptyArchive: true,
@ -562,7 +574,7 @@ def testEdition(edition, os, mode, engine) {
finally { finally {
if (os == 'linux' || os == 'mac') { if (os == 'linux' || os == 'mac') {
sh "find log-output -name 'FAILED_*' -exec cp '{}' . ';'" 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; do test -e \$i && mv \"\$i\" ${arch} || true; done"
} }
else if (os == 'windows') { else if (os == 'windows') {
bat "move logs ${arch}" bat "move logs ${arch}"
@ -745,7 +757,7 @@ def testResilienceStep(os, engine, foxx) {
} }
catch (exc) { catch (exc) {
if (os == 'linux' || os == 'mac') { if (os == 'linux' || os == 'mac') {
sh "for i in build resilience/core* tmp; do test -e \$i && mv \$i ${arch} || true; done" sh "for i in build resilience/core* tmp; do test -e \$i && mv \"\$i\" ${arch} || true; done"
} }
archiveArtifacts allowEmptyArchive: true, archiveArtifacts allowEmptyArchive: true,
@ -756,7 +768,7 @@ def testResilienceStep(os, engine, foxx) {
} }
finally { finally {
if (os == 'linux' || os == 'mac') { if (os == 'linux' || os == 'mac') {
sh "for i in log-output; do test -e \$i && mv \$i ${arch}; done" sh "for i in log-output; do test -e \$i && mv \"\$i\" ${arch}; done"
} }
else if (os == 'windows') { else if (os == 'windows') {
bat "move log-output ${arch}" bat "move log-output ${arch}"
@ -846,7 +858,7 @@ def buildEdition(edition, os) {
} }
finally { finally {
if (os == 'linux' || os == 'mac') { if (os == 'linux' || os == 'mac') {
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') {
bat "move log-output ${arch}" bat "move log-output ${arch}"

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

@ -17,10 +17,10 @@ fi
if [ "$os" == linux ]; then if [ "$os" == linux ]; then
type="${type}_linux" type="${type}_linux"
load=20 load=40
elif [ "$os" == mac ]; then elif [ "$os" == mac ]; then
type="${type}_mac" type="${type}_mac"
load=5 load=10
else else
echo "$0: unknown os '$os', expecting 'linux' or 'mac'" echo "$0: unknown os '$os', expecting 'linux' or 'mac'"
exit 1 exit 1