diff options
author | Cédric Ollivier <cedric.ollivier@orange.com> | 2020-01-04 22:31:40 +0100 |
---|---|---|
committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2020-01-24 23:17:43 +0100 |
commit | ef837051e835774b09f5d396cc20d570710f660b (patch) | |
tree | 4c6139d4b70f0a22e878759830e63563bfab857a /docker | |
parent | 9318d1ec58552603fc9f624ec07f2752bcfbc428 (diff) |
Update Alpine to 3.11
It also updates Python to 3.8 (default version).
It selects arm32v6 et arm64v8 repos and switches multiarch binfmt.
https://alpinelinux.org/posts/Alpine-3.11.0-released.html
Change-Id: Ib41cf0ab805ce2137658f3ff656b0a88c7b4ebf5
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'docker')
-rw-r--r-- | docker/benchmarking-cntt/Dockerfile | 2 | ||||
-rw-r--r-- | docker/benchmarking/Dockerfile | 2 | ||||
-rw-r--r-- | docker/core/Dockerfile | 6 | ||||
-rw-r--r-- | docker/healthcheck/Dockerfile | 2 | ||||
-rw-r--r-- | docker/smoke-cntt/Dockerfile | 4 | ||||
-rw-r--r-- | docker/smoke/Dockerfile | 2 | ||||
-rw-r--r-- | docker/vnf/Dockerfile | 2 |
7 files changed, 10 insertions, 10 deletions
diff --git a/docker/benchmarking-cntt/Dockerfile b/docker/benchmarking-cntt/Dockerfile index 56641e352..59fe5a88d 100644 --- a/docker/benchmarking-cntt/Dockerfile +++ b/docker/benchmarking-cntt/Dockerfile @@ -1,4 +1,4 @@ FROM opnfv/functest-benchmarking -COPY testcases.yaml /usr/lib/python3.7/site-packages/xtesting/ci/testcases.yaml +COPY testcases.yaml /usr/lib/python3.8/site-packages/xtesting/ci/testcases.yaml CMD ["run_tests", "-t", "all"] diff --git a/docker/benchmarking/Dockerfile b/docker/benchmarking/Dockerfile index a282886f2..f53f22b10 100644 --- a/docker/benchmarking/Dockerfile +++ b/docker/benchmarking/Dockerfile @@ -30,5 +30,5 @@ RUN apk --no-cache add --update libxml2 libxslt && \ cp -r /src/neutron/rally-jobs /home/opnfv/functest/data/rally/neutron/rally-jobs && \ rm -r upper-constraints.txt upper-constraints.opnfv.txt /src/vmtp /src/neutron && \ apk del .build-deps -COPY testcases.yaml /usr/lib/python3.7/site-packages/xtesting/ci/testcases.yaml +COPY testcases.yaml /usr/lib/python3.8/site-packages/xtesting/ci/testcases.yaml CMD ["run_tests", "-t", "all"] diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index 7bf9297a2..7d66e3b10 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.10 +FROM alpine:3.11 ARG BRANCH=master ARG OPENSTACK_TAG=master @@ -25,8 +25,8 @@ RUN apk --no-cache add --update \ pip3 install --no-cache-dir --src /src -cupper-constraints.opnfv.txt -cupper-constraints.txt \ /src/functest && \ rm -r upper-constraints.txt upper-constraints.opnfv.txt /src/functest && \ - cp /usr/lib/python3.7/site-packages/functest/ci/logging.ini /usr/lib/python3.7/site-packages/xtesting/ci/ && \ - cp /usr/lib/python3.7/site-packages/functest/ci/logging.debug.ini /usr/lib/python3.7/site-packages/xtesting/ci/ && \ + cp /usr/lib/python3.8/site-packages/functest/ci/logging.ini /usr/lib/python3.8/site-packages/xtesting/ci/ && \ + cp /usr/lib/python3.8/site-packages/functest/ci/logging.debug.ini /usr/lib/python3.8/site-packages/xtesting/ci/ && \ bash -c "mkdir -p /var/lib/xtesting /home/opnfv" && \ ln -s /var/lib/xtesting /home/opnfv/functest && \ bash -c "mkdir -p /home/opnfv/functest{/conf,/data,/images,/results} /home/opnfv/repos/vnfs" && \ diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile index b9e126790..885d501b2 100644 --- a/docker/healthcheck/Dockerfile +++ b/docker/healthcheck/Dockerfile @@ -27,5 +27,5 @@ RUN apk --no-cache add --virtual .build-deps --update \ rm -r /src/odl_test/.git /src/tempest-horizon/ thirdparty-requirements.txt \ upper-constraints.txt upper-constraints.opnfv.txt && \ apk del .build-deps -COPY testcases.yaml /usr/lib/python3.7/site-packages/xtesting/ci/testcases.yaml +COPY testcases.yaml /usr/lib/python3.8/site-packages/xtesting/ci/testcases.yaml CMD ["run_tests", "-t", "all"] diff --git a/docker/smoke-cntt/Dockerfile b/docker/smoke-cntt/Dockerfile index 4c78ecb1b..c6b097093 100644 --- a/docker/smoke-cntt/Dockerfile +++ b/docker/smoke-cntt/Dockerfile @@ -1,5 +1,5 @@ FROM opnfv/functest-smoke -COPY testcases.yaml /usr/lib/python3.7/site-packages/xtesting/ci/testcases.yaml -COPY tempest_conf.yaml /usr/lib/python3.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml +COPY testcases.yaml /usr/lib/python3.8/site-packages/xtesting/ci/testcases.yaml +COPY tempest_conf.yaml /usr/lib/python3.8/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml CMD ["run_tests", "-t", "all"] diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile index e62a35076..1467dd615 100644 --- a/docker/smoke/Dockerfile +++ b/docker/smoke/Dockerfile @@ -71,5 +71,5 @@ RUN apk --no-cache add --update libxml2 libxslt && \ COPY compute.txt /home/opnfv/functest/data/refstack/compute.txt COPY object.txt /home/opnfv/functest/data/refstack/object.txt COPY platform.txt /home/opnfv/functest/data/refstack/platform.txt -COPY testcases.yaml /usr/lib/python3.7/site-packages/xtesting/ci/testcases.yaml +COPY testcases.yaml /usr/lib/python3.8/site-packages/xtesting/ci/testcases.yaml CMD ["run_tests", "-t", "all"] diff --git a/docker/vnf/Dockerfile b/docker/vnf/Dockerfile index cf67c8a77..dc5290de0 100644 --- a/docker/vnf/Dockerfile +++ b/docker/vnf/Dockerfile @@ -77,5 +77,5 @@ RUN apk --no-cache add --update \ /src/vims-test/build-infra/.git /src/opnfv-vnf-vyos-blueprint/.git \ /tmp/clearwater-heat-singlenet-deps.patch && \ apk del .build-deps -COPY testcases.yaml /usr/lib/python3.7/site-packages/xtesting/ci/testcases.yaml +COPY testcases.yaml /usr/lib/python3.8/site-packages/xtesting/ci/testcases.yaml CMD ["run_tests", "-t", "all"] |