X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=build.sh;h=d882997f96d71ebb2c1c0361ad6828809cfcec70;hb=refs%2Fchanges%2F16%2F68216%2F1;hp=8238795f6591ffb86671434879cb4e9f2adfdc0e;hpb=f351c301be1396e5dd578209c606a111afbc8758;p=functest-kubernetes.git diff --git a/build.sh b/build.sh index 8238795f..d882997f 100644 --- a/build.sh +++ b/build.sh @@ -8,24 +8,49 @@ docker/core \ docker/healthcheck \ docker/smoke \ docker/features"} +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-kubernetes-core|${repo}/functest-kubernetes-core|g" \ - {} + + -e "s|opnfv/functest-kubernetes-core:hunter|\ +${repo}/functest-kubernetes-core:amd64-hunter|g" {} + find . -name Dockerfile -exec sed -i \ - -e "s|opnfv/functest-kubernetes-healthcheck|\ -${repo}/functest-kubernetes-healthcheck|g" {} + + -e "s|opnfv/functest-kubernetes-healthcheck:hunter|\ +${repo}/functest-kubernetes-healthcheck:amd64-hunter|g" {} + for dir in ${amd64_dirs}; do - (cd "${dir}" && docker build "${build_opts[@]}" \ - -t "${repo}/functest-kubernetes-${dir##**/}" .) - #docker push "${repo}/functest-kubernetes-${dir##**/}" + (cd "${dir}" && + docker build "${build_opts[@]}" \ + -t "${repo}/functest-kubernetes-${dir##**/}:amd64-hunter" .) + docker push "${repo}/functest-kubernetes-${dir##**/}:amd64-hunter" [ "${dir}" != "docker/core" ] && - (docker rmi "${repo}/functest-kubernetes-${dir##**/}" || true) + (docker rmi \ + "${repo}/functest-kubernetes-${dir##**/}:amd64-hunter" || true) done [ ! -z "${amd64_dirs}" ] && - (docker rmi "${repo}/functest-kubernetes-healthcheck" \ - "${repo}/functest-kubernetes-core" alpine:3.7 || true) + (docker rmi \ + "${repo}/functest-kubernetes-core:amd64-hunter" \ + golang:1.11-alpine3.9 || true) +find . -name Dockerfile -exec git checkout {} + + +find . -name Dockerfile -exec sed -i \ + -e "s|golang:1.11-alpine3.9|arm64v8/golang:1.11-alpine3.9|g" {} + +find . -name Dockerfile -exec sed -i \ + -e "s|opnfv/functest-kubernetes-core:hunter|\ +${repo}/functest-kubernetes-core:arm64-hunter|g" {} + +find . -name Dockerfile -exec sed -i \ + -e "s|opnfv/functest-kubernetes-healthcheck:hunter|\ +${repo}/functest-kubernetes-healthcheck:arm64-hunter|g" {} + +for dir in ${arm64_dirs}; do + (cd "${dir}" && docker build "${build_opts[@]}" \ + -t "${repo}/functest-kubernetes-${dir##**/}:arm64-hunter" .) + docker push "${repo}/functest-kubernetes-${dir##**/}:arm64-hunter" + [ "${dir}" != "docker/core" ] && + (docker rmi \ + "${repo}/functest-kubernetes-${dir##**/}:arm64-hunter" || true) +done +[ ! -z "${arm64_dirs}" ] && + (docker rmi "${repo}/functest-kubernetes-core:arm64-hunter" \ + arm64v8/golang:1.11-alpine3.9 || true) find . -name Dockerfile -exec git checkout {} + exit $?