From 61547aeba84b224abcbff15f1ae395e452293933 Mon Sep 17 00:00:00 2001 From: Scott Little Date: Thu, 13 Oct 2022 09:51:22 -0400 Subject: [PATCH] Independent control of use of docker cache for builder containers Signed-off-by: Scott Little Change-Id: I1c00af1efb695aea7908ec415266a0f53e8444a5 --- pipelines/monolithic.Jenkinsfile | 3 +++ pipelines/parts/start-containers.Jenkinsfile | 3 +++ scripts/start-containers.sh | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pipelines/monolithic.Jenkinsfile b/pipelines/monolithic.Jenkinsfile index c18214b..a14d859 100644 --- a/pipelines/monolithic.Jenkinsfile +++ b/pipelines/monolithic.Jenkinsfile @@ -134,6 +134,9 @@ pipeline { booleanParam ( name: 'REBUILD_BUILDER_IMAGES' ) + booleanParam ( + name: 'BUILDER_USE_DOCKER_CACHE' + ) booleanParam ( name: 'REFRESH_SOURCE' ) diff --git a/pipelines/parts/start-containers.Jenkinsfile b/pipelines/parts/start-containers.Jenkinsfile index 79c87f0..f7961e5 100644 --- a/pipelines/parts/start-containers.Jenkinsfile +++ b/pipelines/parts/start-containers.Jenkinsfile @@ -40,6 +40,9 @@ pipeline { booleanParam ( name: 'REBUILD_BUILDER_IMAGES' ) + booleanParam ( + name: 'BUILDER_USE_DOCKER_CACHE' + ) booleanParam ( name: 'USE_DOCKER_CACHE' ) diff --git a/scripts/start-containers.sh b/scripts/start-containers.sh index 5aae076..24b29ac 100755 --- a/scripts/start-containers.sh +++ b/scripts/start-containers.sh @@ -17,7 +17,7 @@ set -x load_build_env # start containers -if $USE_DOCKER_CACHE ; then +if $BUILDER_USE_DOCKER_CACHE ; then cache_opts="--cache" fi if $REBUILD_BUILDER_IMAGES ; then