X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=build.sh;h=c6bbd85c316781e53a1b202174a7665e030af7ee;hb=32b95f288471327304ea1b5916554cd14c8f714e;hp=641a67243a37cf6d42f34130e0625efbfdeca3cd;hpb=ef77312416c2060657f491b63dc87806a6f876dd;p=functest.git diff --git a/build.sh b/build.sh index 641a67243..c6bbd85c3 100644 --- a/build.sh +++ b/build.sh @@ -8,15 +8,17 @@ docker/core \ docker/tempest \ docker/healthcheck \ docker/smoke \ +docker/benchmarking \ docker/features \ docker/components \ docker/vnf"} arm64_dirs=${arm64_dirs-${amd64_dirs}} -build_opts=(--pull=true --no-cache --force-rm=true \ - --build-arg OPENSTACK_TAG="${OPENSTACK_TAG:-stable/queens}") +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" {} + +find . -name Dockerfile -exec sed -i \ + -e "s|opnfv/functest-tempest|${repo}/functest-tempest:amd64-latest|g" {} + for dir in ${amd64_dirs}; do (cd "${dir}" && docker build "${build_opts[@]}" \ @@ -26,13 +28,15 @@ for dir in ${amd64_dirs}; do (docker rmi "${repo}/functest-${dir##**/}:amd64-latest" || true) done [ ! -z "${amd64_dirs}" ] && - (docker rmi "${repo}/functest-core:amd64-latest" alpine:3.7 || true) + (docker rmi "${repo}/functest-core:amd64-latest" alpine:3.8 || true) find . -name Dockerfile -exec git checkout {} + find . -name Dockerfile -exec sed -i \ - -e "s|alpine:3.7|multiarch/alpine:arm64-v3.7|g" {} + + -e "s|alpine:3.8|multiarch/alpine:arm64-v3.8|g" {} + find . -name Dockerfile -exec sed -i \ -e "s|opnfv/functest-core|${repo}/functest-core:arm64-latest|g" {} + +find . -name Dockerfile -exec sed -i \ + -e "s|opnfv/functest-tempest|${repo}/functest-tempest:arm64-latest|g" {} + for dir in ${arm64_dirs}; do (cd "${dir}" && docker build "${build_opts[@]}" \ -t "${repo}/functest-${dir##**/}:arm64-latest" .) @@ -42,7 +46,7 @@ for dir in ${arm64_dirs}; do done [ ! -z "${arm64_dirs}" ] && (docker rmi "${repo}/functest-core:arm64-latest" \ - multiarch/alpine:arm64-v3.7 || true) + multiarch/alpine:arm64-v3.8 || true) find . -name Dockerfile -exec git checkout {} + exit $?