diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2019-09-20 04:19:37 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2019-09-20 05:20:31 +0200 |
| commit | 642742e80bbf2427657521f7cd3c299efa6e0782 (patch) | |
| tree | 5a3a5de37759b52f2dab11f5ed5d9b9da64496ec /docker | |
| parent | a9faa59024b8fa8ae48baae109a0f4478a70297b (diff) | |
Switch to py3.6 in containers
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 <cedric.ollivier@orange.com>
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/core/Dockerfile | 8 | ||||
| -rw-r--r-- | docker/healthcheck/Dockerfile | 6 | ||||
| -rw-r--r-- | docker/smoke/Dockerfile | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index 261a251f..179518e2 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -4,14 +4,14 @@ ARG BRANCH=stable/iruya ARG OPENSTACK_TAG=stable/stein ARG OPNFV_TAG=stable/iruya -RUN apk --no-cache add --update python py-pip bash git grep && \ +RUN apk --no-cache add --update python3 py3-pip 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/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"] diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile index 3868b278..0acba3b6 100644 --- a/docker/smoke/Dockerfile +++ b/docker/smoke/Dockerfile @@ -1,4 +1,4 @@ FROM opnfv/functest-kubernetes-healthcheck:iruya -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"] |