X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=build.sh;h=ac5acfce118a3bc9f856ec44c1b035c706d44d7f;hb=refs%2Fchanges%2F69%2F70769%2F1;hp=f69549db927d04e8a0d48500d642da31f3a5ba49;hpb=992606d988814e9fdda83fd0398941037c8e3ae6;p=functest-kubernetes.git diff --git a/build.sh b/build.sh index f69549db..ac5acfce 100644 --- a/build.sh +++ b/build.sh @@ -9,6 +9,7 @@ docker/healthcheck \ docker/smoke \ docker/cnf \ docker/security"} +arm_dirs=${arm_dirs-${amd64_dirs}} arm64_dirs=${arm64_dirs-${amd64_dirs}} build_opts=(--pull=true --no-cache --force-rm=true) @@ -34,7 +35,7 @@ done find . -name Dockerfile -exec git checkout {} + find . -name Dockerfile -exec sed -i \ - -e "s|golang:1.13-alpine3.12|arm64v8/golang:1.13-alpine3.12|g" {} + + -e "s|golang:1.14-alpine3.12|arm64v8/golang:1.14-alpine3.12|g" {} + find . -name Dockerfile -exec sed -i \ -e "s|opnfv/functest-kubernetes-core|\ ${repo}/functest-kubernetes-core:arm64-latest|g" {} + @@ -51,7 +52,28 @@ for dir in ${arm64_dirs}; do done [ ! -z "${arm64_dirs}" ] && (docker rmi "${repo}/functest-kubernetes-core:arm64-latest" \ - arm64v8/golang:1.13-alpine3.12 || true) + arm64v8/golang:1.14-alpine3.12 || true) +find . -name Dockerfile -exec git checkout {} + + +find . -name Dockerfile -exec sed -i \ + -e "s|golang:1.14-alpine3.12|arm32v7/golang:1.14-alpine3.12|g" {} + +find . -name Dockerfile -exec sed -i \ + -e "s|opnfv/functest-kubernetes-core|\ +${repo}/functest-kubernetes-core:arm-latest|g" {} + +find . -name Dockerfile -exec sed -i \ + -e "s|opnfv/functest-kubernetes-healthcheck|\ +${repo}/functest-kubernetes-healthcheck:arm-latest|g" {} + +for dir in ${arm_dirs}; do + (cd "${dir}" && docker build "${build_opts[@]}" \ + -t "${repo}/functest-kubernetes-${dir##**/}:arm-latest" .) + docker push "${repo}/functest-kubernetes-${dir##**/}:arm-latest" + [ "${dir}" != "docker/core" ] && + (docker rmi \ + "${repo}/functest-kubernetes-${dir##**/}:arm-latest" || true) +done +[ ! -z "${arm_dirs}" ] && + (docker rmi "${repo}/functest-kubernetes-core:arm-latest" \ + arm32v7/golang:1.14-alpine3.12 || true) find . -name Dockerfile -exec git checkout {} + exit $?