X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=build.sh;h=9ccb16a1cf8decbb33ac5ea5e070d3dacd1c1b2f;hb=39ab5b6cab5d6c664dc96bbb92781a9eed0aa41d;hp=470b9d52be1282835ca2200de909370464af51fd;hpb=13b0e1cbcd873664e3d93dab42d3bff6caaf3e76;p=functest.git diff --git a/build.sh b/build.sh index 470b9d52b..9ccb16a1c 100644 --- a/build.sh +++ b/build.sh @@ -8,12 +8,11 @@ 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" {} + @@ -28,11 +27,11 @@ 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 \ @@ -46,7 +45,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 $?