diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2018-03-01 09:10:02 +0100 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2018-03-01 19:13:53 +0100 |
| commit | 5a623d7d0c94456b133edb07b03f9a749d8efe88 (patch) | |
| tree | 85079758bdb1531a39e6872c925574d0e72d1f81 /docker/Dockerfile | |
| parent | 22b8299e29f87158c4675892b9c3189d9eb35ba7 (diff) | |
Switch from functest to Xtesting
It also fixes logging.ini and tox.ini.
Change-Id: I3001dd847d0cd4bcffb7e466ba1cf5a71705f636
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'docker/Dockerfile')
| -rw-r--r-- | docker/Dockerfile | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index d860bb93..34e75142 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,9 +1,10 @@ -FROM opnfv/functest-core +FROM alpine:3.7 ARG BRANCH=master ARG K8S_TAG=v1.7.3 +ARG OPENSTACK_TAG=stable/pike -RUN apk --no-cache add --update make bash go \ +RUN apk --no-cache add --update make py-pip bash git go \ grep rsync linux-headers musl-dev findutils && \ git clone https://github.com/kubernetes/kubernetes /src/k8s.io/kubernetes && \ (cd /src/k8s.io/kubernetes && git checkout $K8S_TAG) && \ @@ -13,8 +14,12 @@ RUN apk --no-cache add --update make bash go \ mv _output/bin/kubectl /usr/local/bin) && \ git clone https://gerrit.opnfv.org/gerrit/functest-kubernetes /src/functest-kubernetes && \ (cd /src/functest-kubernetes && git fetch origin $BRANCH && git checkout FETCH_HEAD) && \ - pip install /src/functest-kubernetes && \ - rm -rf /src/k8s.io/kubernetes/.git /src/functest-kubernetes -COPY testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml -COPY logging.ini /usr/lib/python2.7/site-packages/functest/ci/logging.ini + pip install /src/functest-kubernetes \ + -chttps://git.opnfv.org/functest/plain/upper-constraints.txt \ + -chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG && \ + rm -rf /src/k8s.io/kubernetes/.git /src/functest-kubernetes && \ + bash -c "mkdir -p /var/lib/xtesting /home/opnfv" && \ + ln -s /var/lib/xtesting /home/opnfv/functest +COPY testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml +COPY logging.ini /usr/lib/python2.7/site-packages/xtesting/ci/logging.ini CMD ["run_tests", "-t", "all"] |