diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2021-08-20 12:18:25 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2021-08-20 12:18:25 +0200 |
| commit | ebd5c981b86c4e692c0f0f3a7e5c5c2dda403a90 (patch) | |
| tree | fc9cf0d94d1a596d757e29245095b9d6a64bf21c /docker | |
| parent | b63b3465c58b24ae1ef6d82e19c91aa212c705dc (diff) | |
Take v1.22 into account
Change-Id: Iec601131e41bf3e9c6c5b2e381dc9089d545bca8
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/benchmarking/Dockerfile | 6 | ||||
| -rw-r--r-- | docker/cnf/Dockerfile | 4 | ||||
| -rw-r--r-- | docker/core/Dockerfile | 6 | ||||
| -rw-r--r-- | docker/healthcheck/Dockerfile | 4 | ||||
| -rw-r--r-- | docker/security/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/smoke/Dockerfile | 2 |
6 files changed, 12 insertions, 12 deletions
diff --git a/docker/benchmarking/Dockerfile b/docker/benchmarking/Dockerfile index 3dc88c2e..fa107d51 100644 --- a/docker/benchmarking/Dockerfile +++ b/docker/benchmarking/Dockerfile @@ -1,7 +1,7 @@ -FROM opnfv/functest-kubernetes-smoke +FROM opnfv/functest-kubernetes-smoke:v1.22 -ARG NETPERF_TAG=master -ARG PLOTPERF_TAG=master +ARG NETPERF_TAG=8a5a7a23f2165b29e46b4d32aad7d5f85e4b9516 +ARG PLOTPERF_TAG=2455313f4b9581795a8f642243acaad472d91804 COPY plotperf.py.patch /tmp/plotperf.py.patch RUN apk --no-cache add --update py3-matplotlib && \ diff --git a/docker/cnf/Dockerfile b/docker/cnf/Dockerfile index c7cd53d1..1a5aa06b 100644 --- a/docker/cnf/Dockerfile +++ b/docker/cnf/Dockerfile @@ -1,11 +1,11 @@ -FROM opnfv/functest-kubernetes-core +FROM opnfv/functest-kubernetes-core:v1.22 ARG K8S_TAG=1.22 ARG CNF_TESTSUITE_TAG=v0.11.2 ARG HELM_TAG=v3.3.1 RUN apk --no-cache add --update wget curl libc6-compat ncurses && \ - tag=$(curl -s https://storage.googleapis.com/kubernetes-release/release/latest-$K8S_TAG.txt) && \ + tag=$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable-$K8S_TAG.txt) && \ case $(uname -m) in armv7l) arch=arm;; aarch64) arch=arm64;; x86_64) arch=amd64;; esac && \ curl https://storage.googleapis.com/kubernetes-release/release/$tag/bin/linux/$arch/kubectl \ --output /usr/local/bin/kubectl && \ diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index 6027f570..683bc4ec 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.22 +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 4788413d..919eb056 100644 --- a/docker/healthcheck/Dockerfile +++ b/docker/healthcheck/Dockerfile @@ -1,9 +1,9 @@ -FROM opnfv/functest-kubernetes-core +FROM opnfv/functest-kubernetes-core:v1.22 ARG K8S_TAG=1.22 RUN apk --no-cache add --update curl libc6-compat && \ - tag=$(curl -s https://storage.googleapis.com/kubernetes-release/release/latest-$K8S_TAG.txt) && \ + tag=$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable-$K8S_TAG.txt) && \ case $(uname -m) in armv7l) arch=arm;; aarch64) arch=arm64;; x86_64) arch=amd64;; esac && \ curl https://storage.googleapis.com/kubernetes-release/release/$tag/bin/linux/$arch/kubectl \ -s --output /usr/local/bin/kubectl && \ diff --git a/docker/security/Dockerfile b/docker/security/Dockerfile index d3434366..1396109e 100644 --- a/docker/security/Dockerfile +++ b/docker/security/Dockerfile @@ -1,3 +1,3 @@ -FROM opnfv/functest-kubernetes-core +FROM opnfv/functest-kubernetes-core:v1.22 COPY testcases.yaml /usr/lib/python3.9/site-packages/xtesting/ci/testcases.yaml diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile index d410efb3..1a80b508 100644 --- a/docker/smoke/Dockerfile +++ b/docker/smoke/Dockerfile @@ -1,4 +1,4 @@ -FROM opnfv/functest-kubernetes-healthcheck +FROM opnfv/functest-kubernetes-healthcheck:v1.22 COPY testcases.yaml /usr/lib/python3.9/site-packages/xtesting/ci/testcases.yaml CMD ["run_tests", "-t", "all"] |