From 2b3b95b267c20e2b593b3f1157c09cdc34bedcf1 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Sat, 1 May 2021 15:24:16 +0200 Subject: Allow publishing Functest K8s v1.21 containers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Idf6b5db4ac05afc18c360a54219ea914ed9ea092 Signed-off-by: Cédric Ollivier --- docker/benchmarking/Dockerfile | 2 +- docker/cnf/Dockerfile | 2 +- docker/core/Dockerfile | 6 +++--- docker/healthcheck/Dockerfile | 2 +- docker/smoke/Dockerfile | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) (limited to 'docker') diff --git a/docker/benchmarking/Dockerfile b/docker/benchmarking/Dockerfile index 6625322c..04101ce5 100644 --- a/docker/benchmarking/Dockerfile +++ b/docker/benchmarking/Dockerfile @@ -1,4 +1,4 @@ -FROM opnfv/functest-kubernetes-smoke +FROM opnfv/functest-kubernetes-smoke:v1.21 COPY testcases.yaml /usr/lib/python3.8/site-packages/xtesting/ci/testcases.yaml CMD ["run_tests", "-t", "all"] diff --git a/docker/cnf/Dockerfile b/docker/cnf/Dockerfile index a0fc1f9f..289424b3 100644 --- a/docker/cnf/Dockerfile +++ b/docker/cnf/Dockerfile @@ -1,4 +1,4 @@ -FROM opnfv/functest-kubernetes-core +FROM opnfv/functest-kubernetes-core:v1.21 ARG K8S_TAG=1.21 ARG CNF_CONFORMANCE_TAG=v0.9.19 diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index dd98ffa5..3cb6177c 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -1,8 +1,8 @@ FROM alpine:3.13 -ARG BRANCH=master -ARG OPENSTACK_TAG=master -ARG OPNFV_TAG=master +ARG BRANCH=stable/v1.21 +ARG OPENSTACK_TAG=stable/wallaby +ARG OPNFV_TAG=stable/wallaby 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 31e882a7..1d05f807 100644 --- a/docker/healthcheck/Dockerfile +++ b/docker/healthcheck/Dockerfile @@ -1,4 +1,4 @@ -FROM opnfv/functest-kubernetes-core +FROM opnfv/functest-kubernetes-core:v1.21 ARG K8S_TAG=1.21 diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile index 72ad2e6e..2b434eb8 100644 --- a/docker/smoke/Dockerfile +++ b/docker/smoke/Dockerfile @@ -1,4 +1,4 @@ -FROM opnfv/functest-kubernetes-healthcheck +FROM opnfv/functest-kubernetes-healthcheck:v1.21 COPY testcases.yaml /usr/lib/python3.8/site-packages/xtesting/ci/testcases.yaml CMD ["run_tests", "-t", "all"] -- cgit 1.2.3-korg