From 7a69fb1a477b64ee0258a1cfc824823c45932a1b Mon Sep 17 00:00:00 2001
From: Dylan Simon <dylan@dylex.net>
Date: Thu, 3 Jun 2021 14:39:01 -0400
Subject: [PATCH] [jenkins] updates for new jenkins node

---
 Dockerfile  |  2 +-
 Jenkinsfile | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 99350f0b..d322c733 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,6 +11,6 @@ RUN chown build .
 USER build
 ARG BUILD_DOC=0
 ARG BUILD_ID
-RUN cmake $SRC/$APPNAME -DTRIQS_ROOT=${INSTALL} -DBuild_Documentation=${BUILD_DOC} -DBuild_Deps=Always && make -j2 || make -j1 VERBOSE=1
+RUN cmake $SRC/$APPNAME -DTRIQS_ROOT=${INSTALL} -DBuild_Documentation=${BUILD_DOC} -DBuild_Deps=Always && make -j4 || make -j1 VERBOSE=1
 USER root
 RUN make install
diff --git a/Jenkinsfile b/Jenkinsfile
index eceda4c3..ea616d39 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -29,8 +29,8 @@ def dockerPlatforms = ["ubuntu-clang", "ubuntu-gcc", "centos-gcc"]
 /* .each is currently broken in jenkins */
 for (int i = 0; i < dockerPlatforms.size(); i++) {
   def platform = dockerPlatforms[i]
-  platforms[platform] = { -> node('docker') {
-    stage(platform) { timeout(time: 1, unit: 'HOURS') {
+  platforms[platform] = { -> node('linux && docker && triqs') {
+    stage(platform) { timeout(time: 1, unit: 'HOURS') { ansiColor('xterm') {
       checkout scm
       /* construct a Dockerfile for this base */
       sh """
@@ -47,7 +47,7 @@ for (int i = 0; i < dockerPlatforms.size(); i++) {
       if (!keepInstall) {
         sh "docker rmi --no-prune ${img.imageName()}"
       }
-    } }
+    } } }
   } }
 }
 
@@ -60,7 +60,7 @@ for (int i = 0; i < osxPlatforms.size(); i++) {
   def platformEnv = osxPlatforms[i]
   def platform = platformEnv[0]
   platforms["osx-$platform"] = { -> node('osx && triqs') {
-    stage("osx-$platform") { timeout(time: 1, unit: 'HOURS') {
+    stage("osx-$platform") { timeout(time: 1, unit: 'HOURS') { ansiColor('xterm') {
       def srcDir = pwd()
       def tmpDir = pwd(tmp:true)
       def buildDir = "$tmpDir/build"
@@ -97,7 +97,7 @@ for (int i = 0; i < osxPlatforms.size(); i++) {
         } }
         sh "make install"
       } }
-    } }
+    } } }
   } }
 }
 
@@ -105,7 +105,7 @@ for (int i = 0; i < osxPlatforms.size(); i++) {
 def error = null
 try {
   parallel platforms
-  if (keepInstall) { node("docker") {
+  if (keepInstall) { node('linux && docker && triqs') {
     /* Publish results */
     stage("publish") { timeout(time: 5, unit: 'MINUTES') {
       def commit = sh(returnStdout: true, script: "git rev-parse HEAD").trim()