X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=build.sh;h=929f71f1b7f164b94a196f49193efd4c92a0fc3f;hb=refs%2Fchanges%2F93%2F52093%2F2;hp=99a9b466fe8097b40a3ae66651b289f7717d097f;hpb=93833b79940a980b0afbad068cdc40d325a8e8b5;p=functest.git diff --git a/build.sh b/build.sh index 99a9b466f..929f71f1b 100644 --- a/build.sh +++ b/build.sh @@ -12,8 +12,7 @@ docker/components \ docker/vnf \ docker/parser \ docker/restapi"} -arm64_dirs=${arm64_dirs-$(echo "${amd64_dirs}" | sed -e "s|docker/vnf||" \ - -e "s|docker/restapi||")} +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 +31,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 $?