From 075e4821dbbb6ac49b25161935a93b957fcd389a Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Thu, 6 Aug 2020 06:32:14 +0200 Subject: Use alpine edge for py3-distlib only MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Alpine 3.12 doesn't offer a version compatible with latest OpenStack constraints. It may fix all issues when compiling Functest for arm [1]. [1] https://travis-ci.org/github/collivier/functest/jobs/715229717 Change-Id: I7f55cafff2c7a34909440c5ca1d1f641194761c9 Signed-off-by: Cédric Ollivier --- build.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'build.sh') diff --git a/build.sh b/build.sh index 3ddfdb55b..2a3603b1a 100644 --- a/build.sh +++ b/build.sh @@ -34,11 +34,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:edge || true) + (docker rmi "${repo}/functest-core:amd64-latest" alpine:3.12 || true) find . -name Dockerfile -exec git checkout {} + find . -name Dockerfile -exec sed -i \ - -e "s|alpine:edge|arm64v8/alpine:edge|g" {} + + -e "s|alpine:3.12|arm64v8/alpine:3.12|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 +52,11 @@ for dir in ${arm64_dirs}; do done [ -n "${arm64_dirs}" ] && (docker rmi "${repo}/functest-core:arm64-latest" \ - arm64v8/alpine:edge || true) + arm64v8/alpine:3.12 || true) find . -name Dockerfile -exec git checkout {} + find . -name Dockerfile -exec sed -i \ - -e "s|alpine:edge|arm32v6/alpine:edge|g" {} + + -e "s|alpine:3.12|arm32v6/alpine:3.12|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 +70,7 @@ for dir in ${arm_dirs}; do done [ -n "${arm_dirs}" ] && (docker rmi "${repo}/functest-core:arm-latest" \ - arm32v6/alpine:edge || true) + arm32v6/alpine:3.12 || true) find . -name Dockerfile -exec git checkout {} + exit $? -- cgit 1.2.3-korg