X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=build.sh;h=d6726d320bfa457eb4f1ccdb5e37ee238cf3586f;hb=ef837051e835774b09f5d396cc20d570710f660b;hp=f13c623ee1c6b8398c41205fa02aec8921c7b74e;hpb=9318d1ec58552603fc9f624ec07f2752bcfbc428;p=functest.git diff --git a/build.sh b/build.sh index f13c623ee..d6726d320 100644 --- a/build.sh +++ b/build.sh @@ -34,11 +34,11 @@ for dir in ${amd64_dirs}; do (docker rmi "${repo}/functest-${dir##**/}:amd64-latest" || true) done [ -n "${amd64_dirs}" ] && - (docker rmi "${repo}/functest-core:amd64-latest" alpine:3.10 || true) + (docker rmi "${repo}/functest-core:amd64-latest" alpine:3.11 || true) find . -name Dockerfile -exec git checkout {} + find . -name Dockerfile -exec sed -i \ - -e "s|alpine:3.10|multiarch/alpine:arm64-v3.10|g" {} + + -e "s|alpine:3.11|arm64v8/alpine:3.11|g" {} + find . -name Dockerfile -exec sed -i \ -e "s|opnfv/functest-core|${repo}/functest-core:arm64-latest|g" {} + find . -name Dockerfile -exec sed -i \ @@ -52,11 +52,11 @@ for dir in ${arm64_dirs}; do done [ -n "${arm64_dirs}" ] && (docker rmi "${repo}/functest-core:arm64-latest" \ - multiarch/alpine:arm64-v3.10 || true) + arm64v8/alpine:3.11 || true) find . -name Dockerfile -exec git checkout {} + find . -name Dockerfile -exec sed -i \ - -e "s|alpine:3.10|multiarch/alpine:armhf-v3.10|g" {} + + -e "s|alpine:3.11|arm32v6/alpine:3.11|g" {} + find . -name Dockerfile -exec sed -i \ -e "s|opnfv/functest-core|${repo}/functest-core:arm-latest|g" {} + find . -name Dockerfile -exec sed -i \ @@ -70,7 +70,7 @@ for dir in ${arm_dirs}; do done [ -n "${arm_dirs}" ] && (docker rmi "${repo}/functest-core:arm-latest" \ - multiarch/alpine:armhf-v3.10 || true) + arm32v6/alpine:3.11 || true) find . -name Dockerfile -exec git checkout {} + exit $?