From dc1c3a39878d7442d6ce9d1c806811392bea5c60 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Thu, 7 Dec 2017 22:57:49 +0100 Subject: Pull functest-core when only building childs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Otherwise it fails if parent and childs containers are not built on the same host [1]. It would have worked if the docker images were correctly cleant. Then the last image would have been pulled. [1] https://build.opnfv.org/ci/job/functest-apex-baremetal-daily-euphrates/362/console Conflicts: build.sh Change-Id: I293829c839c1cf68c9f7668aa643e16889359fcc Signed-off-by: Cédric Ollivier (cherry picked from commit e3281b2175ca9983d79ce17de7e7497f749e650e) --- build.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/build.sh b/build.sh index f58673029..f3fa12aad 100644 --- a/build.sh +++ b/build.sh @@ -16,6 +16,9 @@ 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:euphrates|${repo}/functest-core:amd64-euphrates|g" {} + +if [[ ${amd64_dirs} != *"docker/core"* ]]; then + docker pull "${repo}/functest-core:amd64-euphrates" +fi for dir in ${amd64_dirs}; do (cd "${dir}" && docker build --no-cache -t "${repo}/functest-${dir##**/}:amd64-euphrates" .) docker push "${repo}/functest-${dir##**/}:amd64-euphrates" @@ -24,6 +27,9 @@ find . -name Dockerfile -exec git checkout {} + 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:euphrates|${repo}/functest-core:arm64-euphrates|g" {} + +if [[ ${arm64_dirs} != *"docker/core"* ]]; then + docker pull "${repo}/functest-core:arm64-euphrates" +fi for dir in ${arm64_dirs}; do (cd "${dir}" && docker build --no-cache -t "${repo}/functest-${dir##**/}:arm64-euphrates" .) docker push "${repo}/functest-${dir##**/}:arm64-euphrates" -- cgit