Update to Python3

Functest containers leverage on Python3 instead of python2.
https://mail.python.org/pipermail/python-dev/2018-March/152348.html

Change-Id: I4f148e91259377b4e3b9076621f192a6e00f6009
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index 19fe3c7..88a6ea7 100644 (file)
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -4,14 +4,14 @@ ARG BRANCH=master
 ARG OPENSTACK_TAG=master
 ARG OPNFV_TAG=master
 
-RUN apk --no-cache add --update python py-pip bash git grep && \
+RUN apk --no-cache add --update python3 bash git grep && \
     apk --no-cache add --virtual .build-deps --update \
-        python-dev build-base && \
+        python3-dev build-base && \
     git init /src/functest-kubernetes && \
     (cd /src/functest-kubernetes && \
         git fetch --tags https://gerrit.opnfv.org/gerrit/functest-kubernetes $BRANCH && \
         git checkout FETCH_HEAD) && \
-    pip install \
+    pip3 install \
         -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$OPNFV_TAG \
         -chttps://opendev.org/openstack/requirements/raw/branch/$OPENSTACK_TAG/upper-constraints.txt \
         /src/functest-kubernetes && \
@@ -19,5 +19,5 @@ RUN apk --no-cache add --update python py-pip bash git grep && \
     bash -c "mkdir -p /var/lib/xtesting /home/opnfv" && \
     ln -s /var/lib/xtesting /home/opnfv/functest && \
     apk del .build-deps
-COPY logging.ini /usr/lib/python2.7/site-packages/xtesting/ci/logging.ini
+COPY logging.ini /usr/lib/python3.6/site-packages/xtesting/ci/logging.ini
 CMD ["run_tests", "-t", "all"]

diff --git a/docker/features/Dockerfile b/docker/features/Dockerfile
index e3b0dca..e4c60b6 100644 (file)
--- a/docker/features/Dockerfile
+++ b/docker/features/Dockerfile
@@ -4,16 +4,16 @@ ARG OPENSTACK_TAG=master
 ARG OPNFV_TAG=master
 
 COPY thirdparty-requirements.txt thirdparty-requirements.txt
-RUN apk --no-cache add --update make py-pip bash git go \
+RUN apk --no-cache add --update make bash git go \
         grep rsync linux-headers musl-dev findutils \
         libffi openssl libjpeg-turbo && \
     apk --no-cache add --virtual .build-deps --update \
-        python-dev libffi-dev openssl-dev libjpeg-turbo-dev && \
-    pip install \
+        python3-dev libffi-dev openssl-dev libjpeg-turbo-dev && \
+    pip3 install \
         -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$OPNFV_TAG \
         -chttps://opendev.org/openstack/requirements/raw/branch/$OPENSTACK_TAG/upper-constraints.txt \
         -rthirdparty-requirements.txt && \
     rm -f thirdparty-requirements.txt && \
     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"]

diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile
index bafc3c4..1ee82be 100644 (file)
--- a/docker/healthcheck/Dockerfile
+++ b/docker/healthcheck/Dockerfile
@@ -2,11 +2,11 @@ FROM opnfv/functest-kubernetes-core
 
 ARG K8S_TAG=master
 
-RUN apk --no-cache add --update make py-pip bash git \
+RUN apk --no-cache add --update make 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"]

diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile
index 137cc16..e5424d0 100644 (file)
--- a/docker/smoke/Dockerfile
+++ b/docker/smoke/Dockerfile
@@ -1,4 +1,4 @@
 FROM opnfv/functest-kubernetes-healthcheck
 
-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"]

diff --git a/functest_kubernetes/k8stest.py b/functest_kubernetes/k8stest.py
index 76693e9..bf28a61 100644 (file)
--- a/functest_kubernetes/k8stest.py
+++ b/functest_kubernetes/k8stest.py
@@ -46,7 +46,7 @@ class K8sTesting(testcase.TestCase):
 
         process = subprocess.Popen(cmd_line, stdout=subprocess.PIPE,
                                    stderr=subprocess.STDOUT)
-        output = process.stdout.read()
+        output = process.stdout.read().decode()
         if ('Error loading client' in output or
                 'Unexpected error' in output):
             raise Exception(output)