diff options
| author |   MatthewLi <matthew.lijun@huawei.com> | 2017-02-20 01:31:29 -0500 |
|---|---|---|
| committer | MatthewLi <matthew.lijun@huawei.com> | 2017-02-20 01:36:04 -0500 |
| commit | dd28fcdb7a9828ecab50e824ff464ae7e7bfe602 (patch) | |
| tree | b19e0b67dcb6b86a3d0112ec0d9735deef741953 | |
| parent | 061243723f2abcd83455934909fa5e6645774fbc (diff) | |
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>
| -rw-r--r-- | jjb/releng/opnfv-docker.sh | 8 |
1 files changed, 6 insertions, 2 deletions
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} |