diff options
| author |   Cristina Pauna <cristina.pauna@enea.com> | 2017-02-08 17:20:42 +0200 |
|---|---|---|
| committer | Cristina Pauna <cristina.pauna@enea.com> | 2017-02-10 12:06:31 +0200 |
| commit | 590d28776867b8b2453256d3963680e3a95b396c (patch) | |
| tree | ebba93009705dc4e4a7112c40cc26609f595b55a /jjb/releng/opnfv-docker.sh | |
| parent | a78118c5760c8653fe074342202dca8ac4ddf8dd (diff) | |
Add jobs to build arm functest images
Jenkins slave arm-build3 was added to build the docker image on arm
This commit adds jobs to use that jenkins slave.
JIRA: ARMBAND-108
Change-Id: I7b293d119ca3347983940639fe0cfea1098b18f3
Signed-off-by: Cristina Pauna <cristina.pauna@enea.com>
Diffstat (limited to 'jjb/releng/opnfv-docker.sh')
| -rw-r--r-- | jjb/releng/opnfv-docker.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/jjb/releng/opnfv-docker.sh b/jjb/releng/opnfv-docker.sh index 40669bcb7..c906e1fcd 100644 --- a/jjb/releng/opnfv-docker.sh +++ b/jjb/releng/opnfv-docker.sh @@ -12,6 +12,7 @@ set -o nounset set -o pipefail + echo "Starting opnfv-docker for $DOCKER_REPO_NAME ..." echo "--------------------------------------------------------" echo @@ -51,10 +52,8 @@ if [[ -n "$(docker images | grep $DOCKER_REPO_NAME)" ]]; then done fi - -# cd to directory where Dockerfile is located cd $WORKSPACE/docker -if [ ! -f ./Dockerfile ]; then +if [ ! -f ${DOCKERFILE} ]; then echo "ERROR: Dockerfile not found." exit 1 fi @@ -78,7 +77,8 @@ 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 ." +cmd="docker build --no-cache -t $DOCKER_REPO_NAME:$DOCKER_TAG --build-arg BRANCH=$BRANCH + -f $DOCKERFILE ." echo ${cmd} ${cmd} |