From c4484e7a7c986571a2adc2af8ab9b66beeb37e8c Mon Sep 17 00:00:00 2001
From: Frank Celler <frank@arangodb.com>
Date: Sat, 16 Sep 2017 12:39:34 +0200
Subject: [PATCH] Feature/jenkins pipeline (#3271)

* fixed core lookup
---
 Installation/Pipeline/Jenkinsfile.groovy | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/Installation/Pipeline/Jenkinsfile.groovy b/Installation/Pipeline/Jenkinsfile.groovy
index 87a77cd9d0..f879684c43 100644
--- a/Installation/Pipeline/Jenkinsfile.groovy
+++ b/Installation/Pipeline/Jenkinsfile.groovy
@@ -250,7 +250,7 @@ def checkCoresAndSave(os, runDir, name, archRun) {
     else {
         sh "for i in logs out tmp result; do test -e \"${runDir}/\$i\" && mv \"${runDir}/\$i\" \"${archRun}/${name}.\$i\" || true; done"
 
-        def files = findFiles(glob: '${runDir}/core*')
+        def files = findFiles(glob: "${runDir}/core*")
 
         if (files.length > 0) {
             for (file in files) {
@@ -534,6 +534,7 @@ def unstashBinaries(os, edition, maintainer) {
     if (os == "windows") {
         powershell "echo 'y' | pscp -i C:\\Users\\Jenkins\\.ssh\\putty-jenkins.ppk jenkins@c1:/vol/cache/binaries-${env.BUILD_TAG}-${os}-${edition}-${maintainer}.zip stash.zip"
         powershell "Expand-Archive -Path stash.zip -Force -DestinationPath ."
+        powershell "copy build\\tests\\RelWithDebInfo\\* build\\bin"
         powershell "copy build\\bin\\RelWithDebInfo\\* build\\bin"
     }
     else {
@@ -565,12 +566,12 @@ def jslint(os, edition, maintainer) {
     }
     catch (exc) {
         renameFolder(arch, archFail)
-        fileOperations([fileCreateOperation(fileContent: 'BUILD FAILED', fileName: "${arch}-FAIL.txt")])
+        fileOperations([fileCreateOperation(fileContent: 'JSLINT FAILED', fileName: "${archDir}-FAIL.txt")])
         throw exc
     }
     finally {
         archiveArtifacts allowEmptyArchive: true,
-            artifacts: "${arch}-*, ${arch}/**, ${archFail}/**",
+            artifacts: "${archDir}-*, ${arch}/**, ${archFail}/**",
             defaultExcludes: false
     }
 }
@@ -610,7 +611,7 @@ def getTests(os, edition, maintainer, mode, engine) {
     if (mode == "singleserver") {
         tests += [
             ["agency", "agency", ""],
-            ["boost", "boost", "--skipCache false"],
+            ["catch", "catch", "--skipCache false"],
             ["cluster_sync", "cluster_sync", ""],
             ["dfdb", "dfdb", ""],
             ["replication_ongoing", "replication_ongoing", ""],
@@ -753,7 +754,7 @@ def executeTests(os, edition, maintainer, mode, engine, portInit, archDir, arch,
                         checkCoresAndSave(os, runDir, name, archRun)
 
                         archiveArtifacts allowEmptyArchive: true,
-                            artifacts: "${logFileRel}, ${logFileFailedRel}",
+                            artifacts: "${archDir}-*, ${logFileRel}, ${logFileFailedRel}",
                             defaultExcludes: false
                     }
                 }