X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=build.sh;h=9f0542b1a227a8d3490c9f7acba4b228d6faa178;hb=a3542307b369ab91ee24d1fed534b565cd4030d7;hp=7074d8c5af7b37994e1b43faa938d8ab125b09fd;hpb=726c1ab2e6eb4d7a3679df3d2302aed0572de81c;p=functest.git

diff --git a/build.sh b/build.sh
index 7074d8c5a..9f0542b1a 100644
--- a/build.sh
+++ b/build.sh
@@ -10,29 +10,38 @@ docker/smoke \
 docker/features \
 docker/components \
 docker/vnf \
-docker/parser \
-docker/patrole \
-docker/restapi"}
+docker/parser"}
 arm64_dirs=${arm64_dirs-${amd64_dirs}}
 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-core|${repo}/functest-core:amd64-latest|g" {} +
 for dir in ${amd64_dirs}; do
-    (cd "${dir}" && docker build "${build_opts[@]}" -t "${repo}/functest-${dir##**/}:amd64-latest" .)
-    docker push "${repo}/functest-${dir##**/}:amd64-latest"
-    [ "${dir}" != "docker/core" ] && (docker rmi "${repo}/functest-${dir##**/}:amd64-latest" || true)
+    (cd "${dir}" &&
+        docker build "${build_opts[@]}" \
+            -t "${repo}/functest-${dir##**/}:amd64-latest" .)
+        docker push "${repo}/functest-${dir##**/}:amd64-latest"
+    [ "${dir}" != "docker/core" ] &&
+        (docker rmi "${repo}/functest-${dir##**/}:amd64-latest" || true)
 done
-[ ! -z "${amd64_dirs}" ] && (docker rmi "${repo}/functest-core:amd64-latest" alpine:3.7 || true)
+[ ! -z "${amd64_dirs}" ] &&
+    (docker rmi "${repo}/functest-core:amd64-latest" alpine:3.7 || true)
 find . -name Dockerfile -exec git checkout {} +
 
-find . -name Dockerfile -exec sed -i -e "s|alpine:3.7|multiarch/alpine:arm64-v3.7|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|alpine:3.7|multiarch/alpine:arm64-v3.7|g" {} +
+find . -name Dockerfile -exec sed -i \
+    -e "s|opnfv/functest-core|${repo}/functest-core:arm64-latest|g" {} +
 for dir in ${arm64_dirs}; do
-    (cd "${dir}" && docker build "${build_opts[@]}" -t "${repo}/functest-${dir##**/}:arm64-latest" .)
+    (cd "${dir}" && docker build "${build_opts[@]}" \
+        -t "${repo}/functest-${dir##**/}:arm64-latest" .)
     docker push "${repo}/functest-${dir##**/}:arm64-latest"
-    [ "${dir}" != "docker/core" ] && (docker rmi "${repo}/functest-${dir##**/}:arm64-latest" || true)
+    [ "${dir}" != "docker/core" ] &&
+        (docker rmi "${repo}/functest-${dir##**/}:arm64-latest" || true)
 done
-[ ! -z "${arm64_dirs}" ] && (docker rmi "${repo}/functest-core:arm64-latest" multiarch/alpine:arm64-v3.7 || true)
+[ ! -z "${arm64_dirs}" ] &&
+    (docker rmi "${repo}/functest-core:arm64-latest" \
+        multiarch/alpine:arm64-v3.7 || true)
 find . -name Dockerfile -exec git checkout {} +
 
 exit $?