From 48c11b11ad3aaeb366eb2c4d99227fc06bf3e331 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Wed, 20 Jun 2018 15:58:08 +0200
Subject: [PATCH] [Jenkins] Disable Conan caching in Docker.
---
Jenkinsfile | 18 +++++++-----------
scripts/docker/Dockerfile.gcc.full | 1 -
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 76ed7c9c8f4..dc4f6685cff 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -90,22 +90,18 @@ pipeline {
sudo -H pip install -r requirements.txt
""".stripIndent())
- lock(resource: "conanCache-${env.NODE_NAME}") {
- sh 'conan user'
- sh 'find $CONAN_USER_HOME -name "system_reqs.txt" -exec rm {} \\;'
- configure {
- cmakeOptions =
- '-DOGS_USE_CONAN=ON ' +
- '-DOGS_CONAN_BUILD=never ' +
- '-DOGS_CPU_ARCHITECTURE=generic ' +
- '-DDOCS_GENERATE_LOGFILE=ON ' // redirects to build/DoxygenWarnings.log
- }
+ sh 'conan user'
+ configure {
+ cmakeOptions =
+ '-DOGS_USE_CONAN=ON ' +
+ '-DOGS_CONAN_BUILD=never ' +
+ '-DOGS_CPU_ARCHITECTURE=generic ' +
+ '-DDOCS_GENERATE_LOGFILE=ON ' // redirects to build/DoxygenWarnings.log
}
build { }
build { target="tests" }
build { target="ctest" }
build { target="doc" }
- sh 'find $CONAN_USER_HOME -name "system_reqs.txt" -exec rm {} \\;'
configure {
cmakeOptions =
'-DOGS_BUILD_CLI=OFF ' +
diff --git a/scripts/docker/Dockerfile.gcc.full b/scripts/docker/Dockerfile.gcc.full
index a41ac0f8adb..5574b5c6db8 100644
--- a/scripts/docker/Dockerfile.gcc.full
+++ b/scripts/docker/Dockerfile.gcc.full
@@ -36,7 +36,6 @@ ENV CCACHE_DIR=/home/jenkins/cache/ccache
RUN mkdir -p $CCACHE_DIR
ENV CCACHE_MAXSIZE=15G
ENV CCACHE_SLOPPINESS=pch_defines,time_macros
-ENV CONAN_USER_HOME=/home/jenkins/cache/conan
WORKDIR /home/jenkins
RUN conan user
--
GitLab