Revert latest docker builds

This reverts commit b2be1ff2852320940a1450ed5f2a6f4f4e91d7da.

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

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

diff --git a/docker/cnf/Dockerfile b/docker/cnf/Dockerfile
index 21a97d0..7e6c38f 100644 (file)
--- a/docker/cnf/Dockerfile
+++ b/docker/cnf/Dockerfile
@@ -1,4 +1,4 @@
-FROM opnfv/functest-kubernetes-core:v1.24
+FROM opnfv/functest-kubernetes-core
 
 ARG CNF_TESTSUITE_TAG=v0.15.0
 ARG HELM_TAG=v3.3.1

diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index df14f35..24354ce 100644 (file)
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -1,8 +1,8 @@
 FROM alpine:3.15
 
-ARG BRANCH=stable/v1.24
-ARG OPENSTACK_TAG=stable/yoga
-ARG OPNFV_TAG=stable/yoga
+ARG BRANCH=master
+ARG OPENSTACK_TAG=master
+ARG OPNFV_TAG=master
 
 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 7f8c100..0100d70 100644 (file)
--- a/docker/healthcheck/Dockerfile
+++ b/docker/healthcheck/Dockerfile
@@ -1,4 +1,4 @@
-FROM opnfv/functest-kubernetes-core:v1.24
+FROM opnfv/functest-kubernetes-core
 
 RUN apk --no-cache add --update curl libc6-compat && \
     tag=$(curl -s https://storage.googleapis.com/kubernetes-release/release/latest.txt)  && \

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

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