Merge "Filter out orchestra for ssl enabled deployments"

[functest.git] / build.sh

diff --git a/build.sh b/build.sh
index 3b46cb0..e384ce3 100644 (file)
--- a/build.sh
+++ b/build.sh
@@ -3,7 +3,7 @@
 set -e
 
 repo=${repo:-opnfv}
-x86_64_dirs=${x86_64_dirs-"\
+amd64_dirs=${amd64_dirs-"\
 docker/core \
 docker/healthcheck \
 docker/smoke \
@@ -12,21 +12,27 @@ docker/components \
 docker/vnf \
 docker/parser \
 docker/restapi"}
-aarch64_dirs=${aarch64_dirs-$(echo "${x86_64_dirs}" | sed -e "s|docker/vnf||" \
+arm64_dirs=${arm64_dirs-$(echo "${amd64_dirs}" | sed -e "s|docker/vnf||" \
     -e "s|docker/restapi||")}
 
-find . -name Dockerfile -exec sed -i -e "s|opnfv/functest-core|${repo}/functest-core:x86_64-latest|g" {} +
-for dir in ${x86_64_dirs}; do
-    (cd "${dir}" && docker build -t "${repo}/functest-${dir##**/}:x86_64-latest" .)
-    docker push "${repo}/functest-${dir##**/}:x86_64-latest"
+find . -name Dockerfile -exec sed -i -e "s|opnfv/functest-core|${repo}/functest-core:amd64-latest|g" {} +
+if [[ ${amd64_dirs} != *"docker/core"* ]]; then
+    docker pull "${repo}/functest-core:amd64-latest"
+fi
+for dir in ${amd64_dirs}; do
+    (cd "${dir}" && docker build --no-cache -t "${repo}/functest-${dir##**/}:amd64-latest" .)
+    docker push "${repo}/functest-${dir##**/}:amd64-latest"
 done
 find . -name Dockerfile -exec git checkout {} +
 
-find . -name Dockerfile -exec sed -i -e "s|alpine:3.6|multiarch/alpine:aarch64-v3.6|g" {} +
-find . -name Dockerfile -exec sed -i -e "s|opnfv/functest-core|${repo}/functest-core:aarch64-latest|g" {} +
-for dir in ${aarch64_dirs}; do
-    (cd "${dir}" && docker build -t "${repo}/functest-${dir##**/}:aarch64-latest" .)
-    docker push "${repo}/functest-${dir##**/}:aarch64-latest"
+find . -name Dockerfile -exec sed -i -e "s|alpine:3.6|multiarch/alpine:arm64-v3.6|g" {} +
+find . -name Dockerfile -exec sed -i -e "s|opnfv/functest-core|${repo}/functest-core:arm64-latest|g" {} +
+if [[ ${arm64_dirs} != *"docker/core"* ]]; then
+    docker pull "${repo}/functest-core:arm64-latest"
+fi
+for dir in ${arm64_dirs}; do
+    (cd "${dir}" && docker build --no-cache -t "${repo}/functest-${dir##**/}:arm64-latest" .)
+    docker push "${repo}/functest-${dir##**/}:arm64-latest"
 done
 find . -name Dockerfile -exec git checkout {} +