From 443aadfb13bc16a1a09dcb87d72111fb0b190f14 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Fri, 30 Sep 2022 11:30:05 +0200 Subject: Complete Alpine 3.15 update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I4eaba8b410061e4d401319a020770d78b6990a85 Signed-off-by: Cédric Ollivier --- ansible/site.gate.yml | 2 +- build.sh | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ansible/site.gate.yml b/ansible/site.gate.yml index 35593ed0..f54f586e 100644 --- a/ansible/site.gate.yml +++ b/ansible/site.gate.yml @@ -10,7 +10,7 @@ - repo: _ dport: container: alpine - tag: 3.14 + tag: 3.15 steps: - name: build opnfv/functest-kubernetes-core containers: diff --git a/build.sh b/build.sh index 8da61c42..e98eb69c 100644 --- a/build.sh +++ b/build.sh @@ -32,11 +32,11 @@ done [ ! -z "${amd64_dirs}" ] && (docker rmi \ "${repo}/functest-kubernetes-core:amd64-latest" \ - alpine:3.14 || true) + alpine:3.15 || true) find . -name Dockerfile -exec git checkout {} + find . -name Dockerfile -exec sed -i \ - -e "s|alpine:3.14|arm64v8/alpine:3.14|g" {} + + -e "s|alpine:3.15|arm64v8/alpine:3.15|g" {} + find . -name Dockerfile -exec sed -i \ -e "s|opnfv/functest-kubernetes-core|\ ${repo}/functest-kubernetes-core:arm64-latest|g" {} + @@ -56,11 +56,11 @@ for dir in ${arm64_dirs}; do done [ ! -z "${arm64_dirs}" ] && (docker rmi "${repo}/functest-kubernetes-core:arm64-latest" \ - arm64v8/alpine:3.14 || true) + arm64v8/alpine:3.15 || true) find . -name Dockerfile -exec git checkout {} + find . -name Dockerfile -exec sed -i \ - -e "s|alpine:3.14|arm32v7/alpine:3.14|g" {} + + -e "s|alpine:3.15|arm32v7/alpine:3.15|g" {} + find . -name Dockerfile -exec sed -i \ -e "s|opnfv/functest-kubernetes-core|\ ${repo}/functest-kubernetes-core:arm-latest|g" {} + @@ -80,7 +80,7 @@ for dir in ${arm_dirs}; do done [ ! -z "${arm_dirs}" ] && (docker rmi "${repo}/functest-kubernetes-core:arm-latest" \ - arm32v7/alpine:3.14 || true) + arm32v7/alpine:3.15 || true) find . -name Dockerfile -exec git checkout {} + exit $? -- cgit 1.2.3-korg