From 2009063a387c58246131137477ca67b55feb2900 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Wed, 2 May 2018 08:54:47 +0200
Subject: [PATCH] [Jenkins] Fixed conan directory setup in Docker.
---
Jenkinsfile | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/Jenkinsfile b/Jenkinsfile
index 7cdb084b96f..5fc6bb72f0a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -82,6 +82,7 @@ pipeline {
""".stripIndent())
lock(resource: "conanCache-${env.NODE_NAME}") {
+ sh 'conan user'
sh 'find $CONAN_USER_HOME -name "system_reqs.txt" -exec rm {} \\;'
configure {
cmakeOptions =
@@ -148,6 +149,7 @@ pipeline {
steps {
script {
lock(resource: "conanCache-${env.NODE_NAME}") {
+ sh 'conan user'
sh 'find $CONAN_USER_HOME -name "system_reqs.txt" -exec rm {} \\;'
configure {
cmakeOptions =
@@ -407,6 +409,7 @@ pipeline {
steps {
script {
lock(resource: "conanCache-${env.NODE_NAME}") {
+ sh 'conan user'
sh 'find $CONAN_USER_HOME -name "system_reqs.txt" -exec rm {} \\;'
configure {
cmakeOptions =
@@ -529,6 +532,7 @@ pipeline {
}
steps {
script {
+ sh 'conan user'
sh 'find $CONAN_USER_HOME -name "system_reqs.txt" -exec rm {} \\;'
configure {
cmakeOptions =
--
GitLab