aboutsummaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2022-05-18 16:17:42 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2022-05-18 16:17:42 +0200
commitb2be1ff2852320940a1450ed5f2a6f4f4e91d7da (patch)
tree70f4261985f5d3a5051fca4d2f04bd033c5e6c00 /docker
parent57d0741942c23ab66d38b7269e68694b92de9646 (diff)
Prepare v1.24 docker builds
Change-Id: I8dc1e279eeb3b5c6045499b8b2fb3c1a5d62920d Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'docker')
-rw-r--r--docker/benchmarking/Dockerfile2
-rw-r--r--docker/cnf/Dockerfile2
-rw-r--r--docker/core/Dockerfile6
-rw-r--r--docker/healthcheck/Dockerfile2
-rw-r--r--docker/security/Dockerfile2
-rw-r--r--docker/smoke/Dockerfile2
6 files changed, 8 insertions, 8 deletions
diff --git a/docker/benchmarking/Dockerfile b/docker/benchmarking/Dockerfile
index 4bc06efc..3ed21f14 100644
--- a/docker/benchmarking/Dockerfile
+++ b/docker/benchmarking/Dockerfile
@@ -1,4 +1,4 @@
-FROM opnfv/functest-kubernetes-smoke
+FROM opnfv/functest-kubernetes-smoke:v1.24
ARG NETPERF_TAG=master
ARG PLOTPERF_TAG=master
diff --git a/docker/cnf/Dockerfile b/docker/cnf/Dockerfile
index 7e6c38f9..21a97d0b 100644
--- a/docker/cnf/Dockerfile
+++ b/docker/cnf/Dockerfile
@@ -1,4 +1,4 @@
-FROM opnfv/functest-kubernetes-core
+FROM opnfv/functest-kubernetes-core:v1.24
ARG CNF_TESTSUITE_TAG=v0.15.0
ARG HELM_TAG=v3.3.1
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index 600119a4..8f6ecd0f 100644
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -1,8 +1,8 @@
FROM alpine:3.14
-ARG BRANCH=master
-ARG OPENSTACK_TAG=master
-ARG OPNFV_TAG=master
+ARG BRANCH=stable/v1.24
+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 0100d706..7f8c1009 100644
--- a/docker/healthcheck/Dockerfile
+++ b/docker/healthcheck/Dockerfile
@@ -1,4 +1,4 @@
-FROM opnfv/functest-kubernetes-core
+FROM opnfv/functest-kubernetes-core:v1.24
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 5ecdc9bd..a042c21d 100644
--- a/docker/security/Dockerfile
+++ b/docker/security/Dockerfile
@@ -1,3 +1,3 @@
-FROM opnfv/functest-kubernetes-core
+FROM opnfv/functest-kubernetes-core:v1.24
COPY testcases.yaml /etc/xtesting/testcases.yaml
diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile
index 1ae498dc..fa0fb404 100644
--- a/docker/smoke/Dockerfile
+++ b/docker/smoke/Dockerfile
@@ -1,4 +1,4 @@
-FROM opnfv/functest-kubernetes-healthcheck
+FROM opnfv/functest-kubernetes-healthcheck:v1.24
COPY testcases.yaml /etc/xtesting/testcases.yaml
CMD ["run_tests", "-t", "all"]