summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorStamatis Katsaounis <mokats@intracom-telecom.com>2019-03-26 11:23:54 +0200
committerStamatis Katsaounis <mokats@intracom-telecom.com>2019-03-26 16:33:03 +0200
commit12b41cdb31cda908aa3a9ec25cfc541661d890fd (patch)
tree5aed97226a197d8aa86289aa3ececad609610fd0 /jjb
parentfec1da85bea695e5e23464841762cd1a78c8718e (diff)
Provide a way to add extra arguements when building docker images
This patch adds a parameter for extra arguements to be used to build OPNFV docker images. Change-Id: I65d5b96e5b0db348a4f200e6ef26b5b6ca65b348 Signed-off-by: Stamatis Katsaounis <mokats@intracom-telecom.com>
Diffstat (limited to 'jjb')
-rw-r--r--jjb/releng/opnfv-docker-arm.yaml5
-rw-r--r--jjb/releng/opnfv-docker.sh8
-rw-r--r--jjb/releng/opnfv-docker.yaml6
3 files changed, 18 insertions, 1 deletions
diff --git a/jjb/releng/opnfv-docker-arm.yaml b/jjb/releng/opnfv-docker-arm.yaml
index 7e87c5f0d..102069ad9 100644
--- a/jjb/releng/opnfv-docker-arm.yaml
+++ b/jjb/releng/opnfv-docker-arm.yaml
@@ -44,6 +44,7 @@
dockerdir: "docker"
docker_repo_name: "opnfv/{project}_aarch64"
arch_tag: ""
+ extra_build_args: ""
# yamllint disable rule:key-duplicates
dockerrepo:
@@ -177,6 +178,10 @@
name: ARCH_TAG
default: "{arch_tag}"
description: "If set, this value will be added to the docker image tag"
+ - string:
+ name: EXTRA_BUILD_ARGS
+ default: "{extra_build_args}"
+ description: "Whitespace separated key=value pairs. If set, these args will be used to build docker image"
properties:
- throttle:
diff --git a/jjb/releng/opnfv-docker.sh b/jjb/releng/opnfv-docker.sh
index e64764128..174bb57b9 100644
--- a/jjb/releng/opnfv-docker.sh
+++ b/jjb/releng/opnfv-docker.sh
@@ -130,12 +130,18 @@ if [[ -n "${ARCH_TAG}" ]]; then
ARCH_BUILD_ARG="--build-arg ARCH=${ARCH_TAG}"
fi
+EXTRA_BUILD_ARGS=${EXTRA_BUILD_ARGS:-}
+if [ -n "${EXTRA_BUILD_ARGS}" ]; then
+ EXTRA_BUILD_ARGS=" "$(echo ${EXTRA_BUILD_ARGS})
+ EXTRA_BUILD_ARGS=${EXTRA_BUILD_ARGS// / --build-arg }
+fi
+
# Start the build
echo "Building docker image: $DOCKER_REPO_NAME:$DOCKER_TAG"
echo "--------------------------------------------------------"
echo
cmd="docker build --pull=true --no-cache -t $DOCKER_REPO_NAME:$DOCKER_TAG --build-arg BRANCH=$BUILD_BRANCH
- $ARCH_BUILD_ARG
+ $ARCH_BUILD_ARG $EXTRA_BUILD_ARGS
-f $DOCKERFILE $DOCKER_PATH"
echo ${cmd}
diff --git a/jjb/releng/opnfv-docker.yaml b/jjb/releng/opnfv-docker.yaml
index 591452a74..446b305bf 100644
--- a/jjb/releng/opnfv-docker.yaml
+++ b/jjb/releng/opnfv-docker.yaml
@@ -45,6 +45,7 @@
dockerfile: "Dockerfile"
dockerdir: "docker"
arch_tag: ""
+ extra_build_args: ""
# This is the dockerhub repo the image will be pushed to as
# 'opnfv/{dockerrepo}. See: DOCKER_REPO_NAME parameter.
@@ -415,6 +416,7 @@
dockerfile: "Dockerfile"
dockerdir: "docker"
arch_tag: ""
+ extra_build_args: ""
project:
# projects with jobs for master
@@ -466,6 +468,10 @@
name: ARCH_TAG
default: "{arch_tag}"
description: "If set, this value will be added to the docker image tag as a prefix"
+ - string:
+ name: EXTRA_BUILD_ARGS
+ default: "{extra_build_args}"
+ description: "Whitespace separated key=value pairs. If set, these args will be used to build docker image"
properties:
- throttle: