diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2019-09-20 04:13:52 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2019-09-20 04:49:54 +0200 |
| commit | 8b3e8b1912038fba6afb8ce47ef993d6ffa49f54 (patch) | |
| tree | b8749a45731bb6329b81a7154cab2753772ec23d /docker | |
| parent | 094012d09b08a269536821fbe337fbaeb6bad008 (diff) | |
Switch to py3.6 in containers
Xtesting has supported both py2 and py3.
py3 is now selected due to the OPNFV Iruya planning closed to python2
EOL.
It also removes energy as in master which should have been updated
(pylint).
Change-Id: Ic1113b95f85f5882676e10acea1159a808a98f32
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile | 8 | ||||
| -rw-r--r-- | docker/testcases.yaml | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 18457e6e..2f1952ac 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -3,18 +3,18 @@ FROM alpine:3.9 ARG BRANCH=stable/iruya ARG OPENSTACK_TAG=stable/stein -RUN apk --no-cache add --update python py-pip bash git && \ +RUN apk --no-cache add --update python3 py3-pip 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 f57e66a4..0fc50487 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.robot + - /usr/lib/python3.6/site-packages/xtesting/samples/HelloWorld.robot variable: - 'var01:foo' - 'var02:bar' |