From 6f8aa2785e0239dbed22fcb4d093a5bc110bcc3c Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Tue, 7 May 2019 10:42:23 +0200 Subject: Update to Python3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Now Xtesting containers use Python3 instead of python2. https://mail.python.org/pipermail/python-dev/2018-March/152348.html It also updates robotframework to latest release. Change-Id: I57e0d8b1af9aeaae0c445941a9bdf0b8bd346834 Signed-off-by: Cédric Ollivier --- docker/Dockerfile | 8 ++++---- docker/testcases.yaml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'docker') diff --git a/docker/Dockerfile b/docker/Dockerfile index 310ec864..e6d9537b 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -3,18 +3,18 @@ FROM alpine:3.9 ARG BRANCH=master ARG OPENSTACK_TAG=master -RUN apk --no-cache add --update python py-pip bash git && \ +RUN apk --no-cache add --update python3 bash git && \ apk --no-cache add --virtual .build-deps --update \ - python-dev build-base && \ + python3-dev build-base && \ git init /src/functest-xtesting && \ (cd /src/functest-xtesting && \ git fetch --tags https://gerrit.opnfv.org/gerrit/functest-xtesting $BRANCH && \ git checkout FETCH_HEAD) && \ - pip install --no-cache-dir --src /src \ + pip3 install --no-cache-dir --src /src \ -chttps://opendev.org/openstack/requirements/raw/branch/$OPENSTACK_TAG/upper-constraints.txt \ -chttps://git.opnfv.org/functest-xtesting/plain/upper-constraints.txt?h=$BRANCH \ /src/functest-xtesting && \ rm -r /src/functest-xtesting && \ 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/testcases.yaml b/docker/testcases.yaml index 6b787d27..0738e0df 100644 --- a/docker/testcases.yaml +++ b/docker/testcases.yaml @@ -60,7 +60,7 @@ tiers: name: 'robotframework' args: suites: - - /usr/lib/python2.7/site-packages/xtesting/samples/HelloWorld.txt + - /usr/lib/python3.6/site-packages/xtesting/samples/HelloWorld.txt variable: - 'var01:foo' - 'var02:bar' -- cgit 1.2.3-korg