Blacklist create_and_delete_stack if no floating ip

[functest.git] / build.sh

diff --git a/build.sh b/build.sh
index 9fdbc25..eff3f6b 100644 (file)
--- a/build.sh
+++ b/build.sh
@@ -9,15 +9,13 @@ docker/tempest \
 docker/healthcheck \
 docker/smoke \
 docker/benchmarking \
-docker/features \
 docker/vnf"}
 arm_dirs=${arm_dirs-"\
 docker/core \
 docker/tempest \
 docker/healthcheck \
 docker/smoke \
-docker/benchmarking \
-docker/features"}
+docker/benchmarking"}
 arm64_dirs=${arm64_dirs-${amd64_dirs}}
 build_opts=("--pull=true" --no-cache "--force-rm=true")
 
@@ -34,11 +32,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.9 || true)
+    (docker rmi "${repo}/functest-core:amd64-latest" alpine:3.10 || true)
 find . -name Dockerfile -exec git checkout {} +
 
 find . -name Dockerfile -exec sed -i \
-    -e "s|alpine:3.9|multiarch/alpine:arm64-v3.9|g" {} +
+    -e "s|alpine:3.10|multiarch/alpine:arm64-v3.10|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 +50,11 @@ for dir in ${arm64_dirs}; do
 done
 [ -n "${arm64_dirs}" ] &&
     (docker rmi "${repo}/functest-core:arm64-latest" \
-        multiarch/alpine:arm64-v3.9 || true)
+        multiarch/alpine:arm64-v3.10 || true)
 find . -name Dockerfile -exec git checkout {} +
 
 find . -name Dockerfile -exec sed -i \
-    -e "s|alpine:3.9|multiarch/alpine:armhf-v3.9|g" {} +
+    -e "s|alpine:3.10|multiarch/alpine:armhf-v3.10|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 +68,7 @@ for dir in ${arm_dirs}; do
 done
 [ -n "${arm_dirs}" ] &&
     (docker rmi "${repo}/functest-core:arm-latest" \
-        multiarch/alpine:armhf-v3.9 || true)
+        multiarch/alpine:armhf-v3.10 || true)
 find . -name Dockerfile -exec git checkout {} +
 
 exit $?