From 642742e80bbf2427657521f7cd3c299efa6e0782 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Fri, 20 Sep 2019 04:19:37 +0200 Subject: Switch to py3.6 in containers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Functest Kubernetes has supported both py2 and py3. py3 is now selected due to the OPNFV Iruya planning closed to python2 EOL. Change-Id: I62a142b658e6d478021038a36138ce00ea4bced8 Signed-off-by: Cédric Ollivier --- docker/healthcheck/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'docker/healthcheck') diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile index c12913be..ef39a522 100644 --- a/docker/healthcheck/Dockerfile +++ b/docker/healthcheck/Dockerfile @@ -2,11 +2,11 @@ FROM opnfv/functest-kubernetes-core:iruya ARG K8S_TAG=v1.15.1 -RUN apk --no-cache add --update make py-pip bash git \ +RUN apk --no-cache add --update make py3-pip bash git \ grep rsync linux-headers musl-dev findutils \ libffi openssl libjpeg-turbo && \ apk --no-cache add --virtual .build-deps --update \ - gcc python-dev libffi-dev openssl-dev libjpeg-turbo-dev && \ + gcc python3-dev libffi-dev openssl-dev libjpeg-turbo-dev && \ git init /src/k8s.io/kubernetes && \ (cd /src/k8s.io/kubernetes && \ git fetch --tags https://github.com/kubernetes/kubernetes $K8S_TAG && \ @@ -16,5 +16,5 @@ RUN apk --no-cache add --update make py-pip bash git \ mv _output/bin/* /usr/local/bin) && \ rm -r /src/k8s.io && \ apk del .build-deps -COPY testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml +COPY testcases.yaml /usr/lib/python3.6/site-packages/xtesting/ci/testcases.yaml CMD ["run_tests", "-t", "all"] -- cgit 1.2.3-korg