Update Alpine to 3.21

http://172.30.13.89:8080/job/functest-kubernetes-opnfv-functest-kubernetes-benchmarking-latest-build/10/console

Change-Id: I0fd67ab83a6bf74b78f3e6ace4767536f5619072
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

diff --git a/ansible/site.gate.yml b/ansible/site.gate.yml
index 1180905..fdab6d0 100644 (file)
--- a/ansible/site.gate.yml
+++ b/ansible/site.gate.yml
@@ -10,7 +10,7 @@
       docker_tags:
         - latest:
             branch: master
-            dependency: '3.20'
+            dependency: '3.21'
       builds:
         dependency:
           repo: _

diff --git a/build.sh b/build.sh
index a0b5563..f7a62a1 100644 (file)
--- a/build.sh
+++ b/build.sh
@@ -35,11 +35,11 @@ done
 [ ! -z "${amd64_dirs}" ] &&
     (docker rmi \
         "${repo}/functest-kubernetes-core:amd64-latest" \
-        alpine:3.20 || true)
+        alpine:3.21 || true)
 find . -name Dockerfile -exec git checkout {} +
 
 find . -name Dockerfile -exec sed -i \
-    -e "s|alpine:3.20|arm64v8/alpine:3.20|g" {} +
+    -e "s|alpine:3.21|arm64v8/alpine:3.21|g" {} +
 find . -name Dockerfile -exec sed -i \
     -e "s|opnfv/functest-kubernetes-core|\
 ${repo}/functest-kubernetes-core:arm64-latest|g" {} +
@@ -59,11 +59,11 @@ for dir in ${arm64_dirs}; do
 done
 [ ! -z "${arm64_dirs}" ] &&
     (docker rmi "${repo}/functest-kubernetes-core:arm64-latest" \
-        arm64v8/alpine:3.20 || true)
+        arm64v8/alpine:3.21 || true)
 find . -name Dockerfile -exec git checkout {} +
 
 find . -name Dockerfile -exec sed -i \
-    -e "s|alpine:3.20|arm32v7/alpine:3.20|g" {} +
+    -e "s|alpine:3.21|arm32v7/alpine:3.21|g" {} +
 find . -name Dockerfile -exec sed -i \
     -e "s|opnfv/functest-kubernetes-core|\
 ${repo}/functest-kubernetes-core:arm-latest|g" {} +
@@ -83,7 +83,7 @@ for dir in ${arm_dirs}; do
 done
 [ ! -z "${arm_dirs}" ] &&
     (docker rmi "${repo}/functest-kubernetes-core:arm-latest" \
-        arm32v7/alpine:3.20 || true)
+        arm32v7/alpine:3.21 || true)
 find . -name Dockerfile -exec git checkout {} +
 
 exit $?

diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index 8ebd2c5..bc5492b 100644 (file)
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.20
+FROM alpine:3.21
 
 ARG BRANCH=master
 ARG OPENSTACK_TAG=master