aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Welte <laforge@gnumonks.org>2019-06-13 10:40:09 +0200
committerOliver Smith <osmith@sysmocom.de>2019-06-13 11:46:34 +0200
commitb40355a58883e2c287d9a20e37f17d9789450632 (patch)
tree823716ba620c329ef5a5c2d224790f8f3b2b3528
parentb14af6729be1724cf7f167582f3bc3400085dc4f (diff)
jenkins-common.sh: Don't rebuild debian-stretch-build during fix_perms
When fixing the permissions at the end of a test run, it really doesn't matter if we're running a current debian-stretch-build image, or if we are using an ancient one. All we need is a 'chmod' binary. Change-Id: Ib008ee72f40aeefb307c0ba74a57b70daae9d07b Related: OS#4060
-rw-r--r--jenkins-common.sh5
1 files changed, 4 insertions, 1 deletions
diff --git a/jenkins-common.sh b/jenkins-common.sh
index a703a05..25ae26f 100644
--- a/jenkins-common.sh
+++ b/jenkins-common.sh
@@ -40,7 +40,10 @@ network_remove() {
}
fix_perms() {
- docker_images_require debian-stretch-build
+ if ! docker_image_exists "debian-stretch-build"; then
+ docker_images_require "debian-stretch-build"
+ fi
+
echo Fixing permissions
docker run --rm \
-v $VOL_BASE_DIR:/data \