From dd28fcdb7a9828ecab50e824ff464ae7e7bfe602 Mon Sep 17 00:00:00 2001
From: MatthewLi <matthew.lijun@huawei.com>
Date: Mon, 20 Feb 2017 01:31:29 -0500
Subject: dovetail: docker build not set branch parameter
JIRA: DOVETAIL-354
1)in https://build.opnfv.org/ci/view/dovetail/job/dovetail-compass-baremetal-debug-master/200/artifact/results/dovetail_report.txt
Version isn't correct, version should be obtained from https://git.opnfv.org/dovetail/tree/setup.cfg
2)since dovetail not have A/B/C/D branches such as Danube, no need to set branch parameter
when doing "docker build", if branch parameter settled, the "version" info in setup.cfg will not obtained.
3)related patch https://gerrit.opnfv.org/gerrit/#/c/29045/
Change-Id: I2b2880e417460a4a3da3e108bb83800e2acb3a83
Signed-off-by: MatthewLi <matthew.lijun@huawei.com>
---
jjb/releng/opnfv-docker.sh | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
(limited to 'jjb')
diff --git a/jjb/releng/opnfv-docker.sh b/jjb/releng/opnfv-docker.sh
index c906e1fcd..edb10d160 100644
--- a/jjb/releng/opnfv-docker.sh
+++ b/jjb/releng/opnfv-docker.sh
@@ -77,8 +77,12 @@ fi
echo "Building docker image: $DOCKER_REPO_NAME:$DOCKER_TAG"
echo "--------------------------------------------------------"
echo
-cmd="docker build --no-cache -t $DOCKER_REPO_NAME:$DOCKER_TAG --build-arg BRANCH=$BRANCH
- -f $DOCKERFILE ."
+if [[ $DOCKER_REPO_NAME == *"dovetail"* ]]; then
+ cmd="docker build --no-cache -t $DOCKER_REPO_NAME:$DOCKER_TAG -f $DOCKERFILE ."
+else
+ cmd="docker build --no-cache -t $DOCKER_REPO_NAME:$DOCKER_TAG --build-arg BRANCH=$BRANCH
+ -f $DOCKERFILE ."
+fi
echo ${cmd}
${cmd}
--
cgit