arangodb · fceller · Sep 28, 2017 · Sep 27, 2017 · Sep 27, 2017 · Sep 27, 2017
diff --git a/Installation/Pipeline/Jenkinsfile.groovy b/Installation/Pipeline/Jenkinsfile.groovy
@@ -11,6 +11,7 @@ def defaultLinux = true
 def defaultMac = false
 def defaultWindows = false
 def defaultBuild = true
+def defaultDocker = false
 def defaultCleanBuild = false
 def defaultCommunity = true
 def defaultEnterprise = true
@@ -36,6 +37,11 @@ properties([
             description: 'build and run tests in Windows',
             name: 'Windows'
         ),
+        booleanParam(
+            defaultValue: defaultDocker,
+            description: 'build docker images',
+            name: 'Docker'
+        ),
         booleanParam(
             defaultValue: defaultCleanBuild,
             description: 'clean build directories',
@@ -86,6 +92,9 @@ useMac = params.Mac
 // build windows
 useWindows = params.Windows
 
+// build docker image
+useDocker = params.Docker
+
 // build and test community
 useCommunity = params.Community
 
@@ -98,9 +107,6 @@ useMaintainer = params.Maintainer
 // build user mode
 useUser = params.User
 
-// build docker
-useDocker = true
-
 // run resilience tests
 //runResilience = params.runResilience
 
@@ -318,7 +324,10 @@ def deleteDirDocker(os) {
 }
 
 def shellAndPipe(command, logfile) {
-  sh "(echo 1 > \"${logfile}.result\" ; ${command} ; echo \$? > \"${logfile}.result\") 2>&1 | tee -a \"${logfile}\" ; exit `cat \"${logfile}.result\"`"
+    def cmd = command.replaceAll(/"/, "\\\"")
+
+    echo "executing ${cmd}"
+    sh "(echo 1 > \"${logfile}.result\" ; ${cmd} ; echo \$? > \"${logfile}.result\") 2>&1 | ts '[%Y-%m-%d %H:%M:%S]' | tee -a \"${logfile}\" ; exit `cat \"${logfile}.result\"`"
 }
 
 def logStartStage(os, logFile, link) {
@@ -331,7 +340,7 @@ def logStartStage(os, logFile, link) {
     echo "started ${logFile}: ${resultsStart[logFile]}"
 
     if (os == "linux") {
-        sh "echo 'started ${logFile}: ${resultsStart[logFile]}' | tee -a ${logFile}"
+        shellAndPipe("echo 'started ${logFile}: ${resultsStart[logFile]}'", logFile)
     }
 
     generateResult()
@@ -344,7 +353,7 @@ def logStopStage(os, logFile) {
     echo "finished ${logFile}: ${resultsStop[logFile]}"
 
     if (os == "linux") {
-        sh "echo 'finished ${logFile}: ${resultsStop[logFile]}' | tee -a ${logFile}"
+        shellAndPipe("echo 'finished ${logFile}: ${resultsStop[logFile]}'", logFile)
     }
 
     generateResult()
@@ -363,7 +372,7 @@ def logExceptionStage(os, logFile, link, exc) {
     echo "failed ${logFile}: ${resultsStop[logFile]} ${msg}"
 
     if (os == "linux") {
-        sh "echo 'failed ${logFile}: ${resultsStart[logFile]} ${msg}' | tee -a ${logFile}"
+        shellAndPipe("echo 'failed ${logFile}: ${resultsStart[logFile]} ${msg}'", logFile)
     }
 
     generateResult()
@@ -387,21 +396,21 @@ def generateResult() {
         def diff = (start != "" && stop != "") ? groovy.time.TimeCategory.minus(stop, start) : "-"
         def startf = start == "" ? "-" : start.format('yyyy/MM/dd HH:mm:ss')
         def stopf = stop == "" ? "-" : stop.format('yyyy/MM/dd HH:mm:ss')
-        def color = 'bgcolor="#FF8080"'
+        def color = 'bgcolor="#FFA0A0"'
 
         def la = ""
         def lb = ""
 
-        if (link != null) {
+        if (link != "") {
             la = "<a href=\"$link\">"
             lb = "</a>"
         }
 
         if (msg == "finished") {
-            color = 'bgcolor="#80FF80"'
+            color = 'bgcolor="#A0FFA0"'
         }
         else if (msg == "started") {
-            color = 'bgcolor="#8080FF"'
+            color = 'bgcolor="#A0A0FF"'
             la = ""
             lb = ""
         }
@@ -444,6 +453,7 @@ def checkoutCommunity(os) {
         }
         catch (exc) {
             echo "GITHUB checkout failed, retrying in 1min"
+            deleteDir()
             sleep 60
             throw exc
         }
@@ -608,7 +618,8 @@ def checkCommitMessages() {
                 "build-linux-enterprise-maintainer" : true,
 
                 // OS EDITION MAINTAINER MODE ENGINE
-                "test-linux-enterprise-maintainer-cluster-rocksdb" : true
+                "test-linux-enterprise-maintainer-singleserver-rocksdb" : true,
+                "test-linux-enterprise-maintainer-cluster-mmfiles" : true
             ]
         }
     }
@@ -762,7 +773,7 @@ def jslint(os, edition, maintainer) {
     try {
         logStartStage(os, logFile, logFile)
 
-        shellAndPipe("./Installation/Pipeline/test_jslint.sh",logFile)
+        shellAndPipe("./Installation/Pipeline/test_jslint.sh", logFile)
         sh "if grep ERROR ${logFile}; then exit 1; fi"
 
         logStopStage(os, logFile)
@@ -918,9 +929,9 @@ def singleTest(os, edition, maintainer, mode, engine, test, testArgs, testIndex,
                               powershell "cd ${runDir} ; ${command} | Add-Content -PassThru ${logFile}"
                           }
                           else {
-                              sh "echo \"Host: `hostname`\" | tee -a ${logFile}"
-                              sh "echo \"PWD:  `pwd`\" | tee -a ${logFile}"
-                              sh "echo \"Date: `date`\" | tee -a ${logFile}"
+                              shellAndPipe("echo \"Host: `hostname`\"", logFile)
+                              shellAndPipe("echo \"PWD:  `pwd`\"", logFile)
+                              shellAndPipe("echo \"Date: `date`\"", logFile)
 
                               shellAndPipe("cd ${runDir} ; ./build/bin/arangosh --version", logFile)
 
@@ -1014,7 +1025,9 @@ def executeTests(os, edition, maintainer, mode, engine, stageName) {
 
                 testIndex++
 
-                testMap["${stageName}-${name}"] = singleTest(os, edition, maintainer, mode, engine, test, testArgs, testIndex, stageName, name, port)
+                testMap["${stageName}-${name}"] = singleTest(os, edition, maintainer, mode, engine,
+                                                             test, testArgs, testIndex,
+                                                             stageName, name, port)
 
                 return testMap
             }
@@ -1073,14 +1086,16 @@ def testStepParallel(os, edition, maintainer, modeList) {
 
     def name = "test-${os}-${edition}-${maintainer}"
 
-    try {
-        logStartStage(null, name, null)
-        parallel branches
-        logStopStage(null, name)
-    }
-    catch (exc) {
-        logExceptionStage(null, name, null, exc)
-        throw exc
+    if (branches) {
+        try {
+            logStartStage(null, name, null)
+            parallel branches
+            logStopStage(null, name)
+        }
+        catch (exc) {
+            logExceptionStage(null, name, null, exc)
+            throw exc
+        }
     }
 }
 
@@ -1234,33 +1249,18 @@ def buildEdition(os, edition, maintainer) {
                 unstashBuild(os, edition, maintainer)
             }
 
-            sh "echo \"Host: `hostname`\" | tee -a ${logFile}"
-            sh "echo \"PWD:  `pwd`\" | tee -a ${logFile}"
-            sh "echo \"Date: `date`\" | tee -a ${logFile}"
+            shellAndPipe("echo \"Host: `hostname`\"", logFile)
+            shellAndPipe("echo \"PWD:  `pwd`\"", logFile)
+            shellAndPipe("echo \"Date: `date`\"", logFile)
 
             if (os == 'linux') {
-                sh "./Installation/Pipeline/build_OS_EDITION_MAINTAINER.sh 64 ${os} ${edition} ${maintainer} ${arch}"
+                shellAndPipe("./Installation/Pipeline/build_OS_EDITION_MAINTAINER.sh 64 ${os} ${edition} ${maintainer}", logFile)
             }
             else if (os == 'mac') {
-                sh "./Installation/Pipeline/build_OS_EDITION_MAINTAINER.sh 16 ${os} ${edition} ${maintainer} ${arch}"
+                shellAndPipe("./Installation/Pipeline/build_OS_EDITION_MAINTAINER.sh 16 ${os} ${edition} ${maintainer}", logFile)
             }
         }
         else if (os == 'windows') {
-            // def tmpDir = "${arch}/tmp"
-
-            // fileOperations([
-            //     folderCreateOperation(tmpDir)
-            // ])
-
-            // withEnv(["TMPDIR=${tmpDir}", "TEMPDIR=${tmpDir}", "TMP=${tmpDir}",
-            //          "_MSPDBSRV_ENDPOINT_=${edition}-${env.BUILD_TAG}", "GYP_USE_SEPARATE_MSPDBSRV=1"]) {
-            //    powershell ". .\\Installation\\Pipeline\\windows\\build_${os}_${edition}.ps1"
-            // }
-
-            // fileOperations([
-            //     folderDeleteOperation(tmpDir)
-            // ])
-
             powershell ". .\\Installation\\Pipeline\\windows\\build_${os}_${edition}_${maintainer}.ps1"
         }
 

diff --git a/Installation/Pipeline/build_OS_EDITION_MAINTAINER.sh b/Installation/Pipeline/build_OS_EDITION_MAINTAINER.sh
@@ -3,7 +3,6 @@ concurrency=$1
 os=$2
 edition=$3
 maintainer=$4
-logdir=$5
 
 ENTERPRISE=""
 type="build"
@@ -62,17 +61,9 @@ rm -f $GENPATH
 ln -s `pwd` $GENPATH
 cd $GENPATH
 
-if [ -z "$logdir" ]; then
-  logdir=log-output
-  rm -rf $logdir
-  mkdir -p $logdir
-fi
-
-touch $logdir/build.log
-
-echo "CONCURRENY: $concurrency" | tee -a $logdir/build.log
-echo "HOST: `hostname`" | tee -a $logdir/build.log
-echo "PWD: `pwd`" | tee -a $logdir/build.log
+echo "CONCURRENY: $concurrency"
+echo "HOST: `hostname`"
+echo "PWD: `pwd`"
 
 function configureBuild {
     echo "`date +%T` configuring..."
@@ -85,7 +76,7 @@ function configureBuild {
             $ENTERPRISE \
             $MAINTAINER \
             $PACKAGING \
-            ..  2>&1 | tee -a ../$logdir/build.log
+            ..
 }
 
 (
@@ -94,18 +85,8 @@ function configureBuild {
 
     configureBuild
 
-    if grep -q "Re-run cmake with a different source directory" ../$logdir/build.log; then
-        cd ..
-        mv build/location location.$$
-        rm -rf build
-        mkdir build
-        mv location.$$ build
-        cd build
-        configureBuild
-    fi
-
     echo "`date +%T` building..."
-    make -j $concurrency -l $load 2>&1 | tee -a ../$logdir/build.log
+    make -j $concurrency -l $load 2>&1
 ) || exit 1
 
 echo "`date +%T` done..."