From 2f1ce39d7cff44c30d8d0d6d44e3c0146bf9a2ee Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=A9dric=20Ollivier?= Date: Thu, 19 May 2022 11:08:22 +0200 Subject: [PATCH] Revert latest docker builds MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This reverts commit b2be1ff2852320940a1450ed5f2a6f4f4e91d7da. Change-Id: If2852d6e85e11872fd0f2839445de014427dc535 Signed-off-by: Cédric Ollivier --- docker/benchmarking/Dockerfile | 2 +- docker/cnf/Dockerfile | 2 +- docker/core/Dockerfile | 6 +++--- docker/healthcheck/Dockerfile | 2 +- docker/security/Dockerfile | 2 +- docker/smoke/Dockerfile | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docker/benchmarking/Dockerfile b/docker/benchmarking/Dockerfile index 3ed21f14..4bc06efc 100644 --- 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 21a97d0b..7e6c38f9 100644 --- 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 df14f359..24354cea 100644 --- 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 7f8c1009..0100d706 100644 --- 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 a042c21d..5ecdc9bd 100644 --- 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 fa0fb404..1ae498dc 100644 --- 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"] -- 2.16.6