diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2019-05-07 11:02:43 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2019-05-13 20:10:21 +0200 |
| commit | 2a0702ea914a574ffa7c6d6f83a5c606e24ebd0a (patch) | |
| tree | a6f07cda495c2c1631b3366d0d95adee5cf30ef7 /docker/features | |
| parent | 0619955a7998868c437a462c9ece3eb1ea7a5277 (diff) | |
Update to Python3
Functest containers leverage on Python3 instead of python2.
https://mail.python.org/pipermail/python-dev/2018-March/152348.html
It also updates robotframework librairies to latest release and Vmtp
to master ([1] is needed)
It patches cloudify rest client to support python3.
Vmtp is currently disabled because it currently supports python2 only.
[1] https://github.com/openstack/vmtp/commit/a5d062881d91bf4f547d92c6e289bea30feb5d6e#diff-b4ef698db8ca845e5845c4618278f29a
Change-Id: I39964a212ec2d4dbf53c9ea7c63f02e0b6a05b48
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'docker/features')
| -rw-r--r-- | docker/features/Dockerfile | 11 | ||||
| -rw-r--r-- | docker/features/thirdparty-requirements.txt | 14 |
2 files changed, 11 insertions, 14 deletions
diff --git a/docker/features/Dockerfile b/docker/features/Dockerfile index 3561865c3..c321032dd 100644 --- a/docker/features/Dockerfile +++ b/docker/features/Dockerfile @@ -4,21 +4,18 @@ ARG BRANCH=master ARG OPENSTACK_TAG=master COPY thirdparty-requirements.txt thirdparty-requirements.txt -RUN apk --no-cache add --update python3 sshpass && \ +RUN apk --no-cache add --update sshpass && \ apk --no-cache add --virtual .build-deps --update \ - python-dev python3-dev build-base linux-headers libffi-dev \ + python3-dev build-base linux-headers libffi-dev \ openssl-dev libjpeg-turbo-dev file && \ wget -q -O- https://opendev.org/openstack/requirements/raw/branch/$OPENSTACK_TAG/upper-constraints.txt > upper-constraints.txt && \ sed -i -E s/^tempest==+.*$/-e\ git+https:\\/\\/opendev.org\\/openstack\\/tempest#egg=tempest/ upper-constraints.txt && \ wget -q -O- https://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH > upper-constraints.opnfv.txt && \ sed -i -E /#egg=functest/d upper-constraints.opnfv.txt && \ - pip install --no-cache-dir --src /src -cupper-constraints.txt \ - -cupper-constraints.opnfv.txt \ - -rthirdparty-requirements.txt && \ - python3 -m pip install --no-cache-dir --src /src -cupper-constraints.txt \ + pip3 install --no-cache-dir --src /src -cupper-constraints.txt \ -cupper-constraints.opnfv.txt \ -rthirdparty-requirements.txt && \ rm -r upper-constraints.txt upper-constraints.opnfv.txt 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/features/thirdparty-requirements.txt b/docker/features/thirdparty-requirements.txt index ec5f4802f..dd01480fd 100644 --- a/docker/features/thirdparty-requirements.txt +++ b/docker/features/thirdparty-requirements.txt @@ -1,7 +1,7 @@ -robotframework-httplibrary;python_version<'3.0' -robotframework-requests;python_version<'3.0' -robotframework-sshlibrary;python_version<'3.0' -# baro_tests;python_version<'3.0' -sfc;python_version<'3.0' -# stor4nfv_tests;python_version<'3.0' -# doctor-tests;python_version>='3.0' +robotframework-httplibrary +robotframework-requests +robotframework-sshlibrary +# baro_tests +# sfc +# stor4nfv_tests +# doctor-tests |