Fix docker tags

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

diff --git a/build.sh b/build.sh
index 8da61c4..9cef1b3 100644 (file)
--- a/build.sh
+++ b/build.sh
@@ -15,72 +15,72 @@ 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-kubernetes-core|\
-${repo}/functest-kubernetes-core:amd64-latest|g" {} +
+    -e "s|opnfv/functest-kubernetes-core:v1.25|\
+${repo}/functest-kubernetes-core:amd64-v1.25|g" {} +
 find . -name Dockerfile -exec sed -i \
-    -e "s|opnfv/functest-kubernetes-healthcheck|\
-${repo}/functest-kubernetes-healthcheck:amd64-latest|g" {} +
+    -e "s|opnfv/functest-kubernetes-healthcheck:v1.25|\
+${repo}/functest-kubernetes-healthcheck:amd64-v1.25|g" {} +
 for dir in ${amd64_dirs}; do
     (cd "${dir}" &&
         docker build "${build_opts[@]}" \
-            -t "${repo}/functest-kubernetes-${dir##**/}:amd64-latest" .)
-        docker push "${repo}/functest-kubernetes-${dir##**/}:amd64-latest"
+            -t "${repo}/functest-kubernetes-${dir##**/}:amd64-v1.25" .)
+        docker push "${repo}/functest-kubernetes-${dir##**/}:amd64-v1.25"
     [ "${dir}" != "docker/core" ] &&
         (docker rmi \
-            "${repo}/functest-kubernetes-${dir##**/}:amd64-latest" || true)
+            "${repo}/functest-kubernetes-${dir##**/}:amd64-v1.25" || true)
 done
 [ ! -z "${amd64_dirs}" ] &&
     (docker rmi \
-        "${repo}/functest-kubernetes-core:amd64-latest" \
-        alpine:3.14 || true)
+        "${repo}/functest-kubernetes-core:amd64-v1.25" \
+        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" {} +
+    -e "s|opnfv/functest-kubernetes-core:v1.25|\
+${repo}/functest-kubernetes-core:arm64-v1.25|g" {} +
 find . -name Dockerfile -exec sed -i \
-    -e "s|opnfv/functest-kubernetes-healthcheck|\
-${repo}/functest-kubernetes-healthcheck:arm64-latest|g" {} +
+    -e "s|opnfv/functest-kubernetes-healthcheck:v1.25|\
+${repo}/functest-kubernetes-healthcheck:arm64-v1.25|g" {} +
 find . -name Dockerfile -exec sed -i \
-    -e "s|opnfv/functest-kubernetes-smoke|\
-${repo}/functest-kubernetes-smoke:arm64-latest|g" {} +
+    -e "s|opnfv/functest-kubernetes-smoke:v1.25|\
+${repo}/functest-kubernetes-smoke:arm64-v1.25|g" {} +
 for dir in ${arm64_dirs}; do
     (cd "${dir}" && docker build "${build_opts[@]}" \
-        -t "${repo}/functest-kubernetes-${dir##**/}:arm64-latest" .)
-    docker push "${repo}/functest-kubernetes-${dir##**/}:arm64-latest"
+        -t "${repo}/functest-kubernetes-${dir##**/}:arm64-v1.25" .)
+    docker push "${repo}/functest-kubernetes-${dir##**/}:arm64-v1.25"
     [ "${dir}" != "docker/core" ] &&
         (docker rmi \
-            "${repo}/functest-kubernetes-${dir##**/}:arm64-latest" || true)
+            "${repo}/functest-kubernetes-${dir##**/}:arm64-v1.25" || true)
 done
 [ ! -z "${arm64_dirs}" ] &&
-    (docker rmi "${repo}/functest-kubernetes-core:arm64-latest" \
-        arm64v8/alpine:3.14 || true)
+    (docker rmi "${repo}/functest-kubernetes-core:arm64-v1.25" \
+        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" {} +
+    -e "s|opnfv/functest-kubernetes-core:v1.25|\
+${repo}/functest-kubernetes-core:arm-v1.25|g" {} +
 find . -name Dockerfile -exec sed -i \
-    -e "s|opnfv/functest-kubernetes-healthcheck|\
-${repo}/functest-kubernetes-healthcheck:arm-latest|g" {} +
+    -e "s|opnfv/functest-kubernetes-healthcheck:1.25|\
+${repo}/functest-kubernetes-healthcheck:arm-v1.25|g" {} +
 find . -name Dockerfile -exec sed -i \
-    -e "s|opnfv/functest-kubernetes-smoke|\
-${repo}/functest-kubernetes-smoke:arm-latest|g" {} +
+    -e "s|opnfv/functest-kubernetes-smoke:v1.25|\
+${repo}/functest-kubernetes-smoke:arm-v1.25|g" {} +
 for dir in ${arm_dirs}; do
     (cd "${dir}" && docker build "${build_opts[@]}" \
-        -t "${repo}/functest-kubernetes-${dir##**/}:arm-latest" .)
-    docker push "${repo}/functest-kubernetes-${dir##**/}:arm-latest"
+        -t "${repo}/functest-kubernetes-${dir##**/}:arm-v1.25" .)
+    docker push "${repo}/functest-kubernetes-${dir##**/}:arm-v1.25"
     [ "${dir}" != "docker/core" ] &&
         (docker rmi \
-            "${repo}/functest-kubernetes-${dir##**/}:arm-latest" || true)
+            "${repo}/functest-kubernetes-${dir##**/}:arm-v1.25" || true)
 done
 [ ! -z "${arm_dirs}" ] &&
-    (docker rmi "${repo}/functest-kubernetes-core:arm-latest" \
-        arm32v7/alpine:3.14 || true)
+    (docker rmi "${repo}/functest-kubernetes-core:arm-v1.25" \
+        arm32v7/alpine:3.15 || true)
 find . -name Dockerfile -exec git checkout {} +
 
 exit $?

diff --git a/docker/benchmarking/Dockerfile b/docker/benchmarking/Dockerfile
index 4bc06ef..0ad5b0b 100644 (file)
--- a/docker/benchmarking/Dockerfile
+++ b/docker/benchmarking/Dockerfile
@@ -1,4 +1,4 @@
-FROM opnfv/functest-kubernetes-smoke
+FROM opnfv/functest-kubernetes-smoke:v1.25
 
 ARG NETPERF_TAG=master
 ARG PLOTPERF_TAG=master

diff --git a/docker/cnf/Dockerfile b/docker/cnf/Dockerfile
index eafebba..9eaae4d 100644 (file)
--- a/docker/cnf/Dockerfile
+++ b/docker/cnf/Dockerfile
@@ -1,4 +1,4 @@
-FROM opnfv/functest-kubernetes-core
+FROM opnfv/functest-kubernetes-core:v1.25
 
 ARG K8S_TAG=1.25
 ARG CNF_TESTSUITE_TAG=v0.15.0

diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index 24354ce..e0459ff 100644 (file)
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -1,8 +1,8 @@
 FROM alpine:3.15
 
-ARG BRANCH=master
-ARG OPENSTACK_TAG=master
-ARG OPNFV_TAG=master
+ARG BRANCH=stable/v1.25
+ARG OPENSTACK_TAG=stable/yoga
+ARG OPNFV_TAG=stable/yoga
 
 COPY Try-a-quick-fix-vs-asynchronuous-issues.patch /tmp/Try-a-quick-fix-vs-asynchronuous-issues.patch
 COPY Switch-to-threading.Thread-for-Rally-tasks.patch /tmp/Switch-to-threading.Thread-for-Rally-tasks.patch

diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile
index 6c51490..0728068 100644 (file)
--- a/docker/healthcheck/Dockerfile
+++ b/docker/healthcheck/Dockerfile
@@ -1,4 +1,4 @@
-FROM opnfv/functest-kubernetes-core
+FROM opnfv/functest-kubernetes-core:v1.25
 
 ARG K8S_TAG=1.25
 RUN apk --no-cache add --update curl libc6-compat && \

diff --git a/docker/security/Dockerfile b/docker/security/Dockerfile
index 5ecdc9b..5a553e5 100644 (file)
--- a/docker/security/Dockerfile
+++ b/docker/security/Dockerfile
@@ -1,3 +1,3 @@
-FROM opnfv/functest-kubernetes-core
+FROM opnfv/functest-kubernetes-core:v1.25
 
 COPY testcases.yaml /etc/xtesting/testcases.yaml

diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile
index 1ae498d..0aa7a97 100644 (file)
--- a/docker/smoke/Dockerfile
+++ b/docker/smoke/Dockerfile
@@ -1,4 +1,4 @@
-FROM opnfv/functest-kubernetes-healthcheck
+FROM opnfv/functest-kubernetes-healthcheck:v1.25
 
 COPY testcases.yaml /etc/xtesting/testcases.yaml
 CMD ["run_tests", "-t", "all"]