diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2021-08-11 15:56:12 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2021-08-18 13:20:37 +0200 |
| commit | 8b86dd02328e331cc01b21bf1072e515bbd6db68 (patch) | |
| tree | 484b197627525fb513bde77fa1e92864e0700565 /docker | |
| parent | 89dfd5adb8a1e4ac8a1278e421ef7fd90847c65e (diff) | |
Update to Alpine 3.14
It also disabled wrong order check as it fails vs kubernetes amongst
others.
[1] https://github.com/PyCQA/pylint/issues/2175
Change-Id: I3d641c213067428848212a148d25d78051c5674f
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/benchmarking/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/cnf/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/core/Dockerfile | 7 | ||||
| -rw-r--r-- | docker/healthcheck/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/security/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/smoke/Dockerfile | 2 |
6 files changed, 9 insertions, 8 deletions
diff --git a/docker/benchmarking/Dockerfile b/docker/benchmarking/Dockerfile index 09935bd1..3dc88c2e 100644 --- a/docker/benchmarking/Dockerfile +++ b/docker/benchmarking/Dockerfile @@ -16,5 +16,5 @@ RUN apk --no-cache add --update py3-matplotlib && \ mv plotperf.py plotperf && chmod a+x plotperf) && \ rm -rf perf-tests /tmp/plotperf.py.patch && \ apk del .build-deps -COPY testcases.yaml /usr/lib/python3.8/site-packages/xtesting/ci/testcases.yaml +COPY testcases.yaml /usr/lib/python3.9/site-packages/xtesting/ci/testcases.yaml CMD ["run_tests", "-t", "all"] diff --git a/docker/cnf/Dockerfile b/docker/cnf/Dockerfile index f5a89754..c7cd53d1 100644 --- a/docker/cnf/Dockerfile +++ b/docker/cnf/Dockerfile @@ -29,5 +29,5 @@ RUN apk --no-cache add --update wget curl libc6-compat ncurses && \ ln -s /src/cnf-testsuite/points-all.yml /src/cnf-testsuite/points.yml && \ helm repo add stable https://cncf.gitlab.io/stable && \ rm -rf /src/cnf-testsuite-$CNF_TESTSUITE_TAG.tar.gz /src/cnf-testsuite/.git ;; esac -COPY testcases.yaml /usr/lib/python3.8/site-packages/xtesting/ci/testcases.yaml +COPY testcases.yaml /usr/lib/python3.9/site-packages/xtesting/ci/testcases.yaml CMD ["run_tests", "-t", "all"] diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index af6d90c5..89e54fc9 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.13 +FROM alpine:3.14 ARG BRANCH=master ARG OPENSTACK_TAG=master @@ -19,6 +19,7 @@ RUN apk -U upgrade && \ apk add --no-cache py3-pynacl ;; esac && \ sed -i -E /^six=/d /src/requirements/upper-constraints.txt && \ sed -i -E /^distlib=/d /src/requirements/upper-constraints.txt && \ + sed -i -E /^packaging=/d /src/requirements/upper-constraints.txt && \ apk --no-cache add --update py3-distlib\>=0.3.1 \ --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main && \ git init /src/functest-kubernetes && \ @@ -44,6 +45,6 @@ RUN apk -U upgrade && \ mkdir -p /var/lib/rally/database && rally db create && \ rm -r /src/requirements/.git /tmp/Try-a-quick-fix-vs-asynchronuous-issues.patch && \ apk del .build-deps -COPY logging.ini /usr/lib/python3.8/site-packages/xtesting/ci/logging.ini -COPY logging.debug.ini /usr/lib/python3.8/site-packages/xtesting/ci/logging.debug.ini +COPY logging.ini /usr/lib/python3.9/site-packages/xtesting/ci/logging.ini +COPY logging.debug.ini /usr/lib/python3.9/site-packages/xtesting/ci/logging.debug.ini CMD ["run_tests", "-t", "all"] diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile index 0a19e3a1..4788413d 100644 --- a/docker/healthcheck/Dockerfile +++ b/docker/healthcheck/Dockerfile @@ -13,5 +13,5 @@ RUN apk --no-cache add --update curl libc6-compat && \ mv /src/kubernetes/test/bin/e2e.test /src/kubernetes/test/bin/ginkgo /usr/local/bin/ && \ chmod +x /usr/local/bin/kubectl /usr/local/bin/e2e.test /usr/local/bin/ginkgo && \ rm -r /src/kubernetes /src/kubernetes-test-linux-$arch.tar.gz -COPY testcases.yaml /usr/lib/python3.8/site-packages/xtesting/ci/testcases.yaml +COPY testcases.yaml /usr/lib/python3.9/site-packages/xtesting/ci/testcases.yaml CMD ["run_tests", "-t", "all"] diff --git a/docker/security/Dockerfile b/docker/security/Dockerfile index 915ebd65..d3434366 100644 --- a/docker/security/Dockerfile +++ b/docker/security/Dockerfile @@ -1,3 +1,3 @@ FROM opnfv/functest-kubernetes-core -COPY testcases.yaml /usr/lib/python3.8/site-packages/xtesting/ci/testcases.yaml +COPY testcases.yaml /usr/lib/python3.9/site-packages/xtesting/ci/testcases.yaml diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile index 72ad2e6e..d410efb3 100644 --- a/docker/smoke/Dockerfile +++ b/docker/smoke/Dockerfile @@ -1,4 +1,4 @@ FROM opnfv/functest-kubernetes-healthcheck -COPY testcases.yaml /usr/lib/python3.8/site-packages/xtesting/ci/testcases.yaml +COPY testcases.yaml /usr/lib/python3.9/site-packages/xtesting/ci/testcases.yaml CMD ["run_tests", "-t", "all"] |