Merge "Update version in setup.cfg (Gambia)"

[functest.git] / build.sh

diff --git a/build.sh b/build.sh
index 99a9b46..563d252 100644 (file)
--- a/build.sh
+++ b/build.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-repo=${repo:-opnfv}
+repo=${REPO:-opnfv}
 amd64_dirs=${amd64_dirs-"\
 docker/core \
 docker/healthcheck \
@@ -10,10 +10,8 @@ docker/smoke \
 docker/features \
 docker/components \
 docker/vnf \
-docker/parser \
-docker/restapi"}
-arm64_dirs=${arm64_dirs-$(echo "${amd64_dirs}" | sed -e "s|docker/vnf||" \
-    -e "s|docker/restapi||")}
+docker/parser"}
+arm64_dirs=${arm64_dirs-${amd64_dirs}}
 build_opts=(--pull=true --no-cache --force-rm=true)
 
 find . -name Dockerfile -exec sed -i -e "s|opnfv/functest-core|${repo}/functest-core:amd64-latest|g" {} +
@@ -32,7 +30,7 @@ for dir in ${arm64_dirs}; do
     docker push "${repo}/functest-${dir##**/}:arm64-latest"
     [ "${dir}" != "docker/core" ] && (docker rmi "${repo}/functest-${dir##**/}:arm64-latest" || true)
 done
-[ ! -z "${arm64_dirs}" ] && (docker rmi "${repo}/functest-core:arm64-latest" multiarch/alpine:arm64-v3.6 || true)
+[ ! -z "${arm64_dirs}" ] && (docker rmi "${repo}/functest-core:arm64-latest" multiarch/alpine:arm64-v3.7 || true)
 find . -name Dockerfile -exec git checkout {} +
 
 exit $?