diff options
| -rw-r--r-- | docker/Dockerfile | 16 | ||||
| -rw-r--r-- | docker/testcases.yaml | 22 |
2 files changed, 33 insertions, 5 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 76134d22..18365a39 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -3,9 +3,13 @@ FROM alpine:3.7 ARG BRANCH=master ARG K8S_TAG=v1.9.4 ARG OPENSTACK_TAG=stable/pike +ARG OPNFV_TAG=master RUN apk --no-cache add --update make py-pip bash git go \ - grep rsync linux-headers musl-dev findutils && \ + grep rsync linux-headers musl-dev findutils \ + libffi libssl1.0 libjpeg-turbo && \ + apk --no-cache add --virtual .build-deps --update \ + python-dev libffi-dev openssl-dev libjpeg-turbo-dev && \ git clone https://github.com/kubernetes/kubernetes /src/k8s.io/kubernetes && \ (cd /src/k8s.io/kubernetes && git checkout $K8S_TAG) && \ (cd /src/k8s.io/kubernetes && \ @@ -14,12 +18,14 @@ RUN apk --no-cache add --update make py-pip bash git 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 \ - -chttps://git.opnfv.org/functest/plain/upper-constraints.txt \ - -chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG && \ + pip install \ + -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$OPNFV_TAG \ + -chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG \ + /src/functest-kubernetes stor4nfv-tests && \ 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 + ln -s /var/lib/xtesting /home/opnfv/functest && \ + apk del .build-deps 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"] diff --git a/docker/testcases.yaml b/docker/testcases.yaml index 7a55bafd..dadf27c4 100644 --- a/docker/testcases.yaml +++ b/docker/testcases.yaml @@ -45,3 +45,25 @@ tiers: run: module: 'functest_kubernetes.k8stest' class: 'K8sConformanceTest' + + - + name: stor4nfv + order: 3 + ci_loop: '(daily)|(weekly)' + description: >- + Test suite from Stor4NFV project. + testcases: + - + case_name: stor4nfv_k8s + project_name: stor4nfv + criteria: 100 + blocking: false + description: >- + This tests are necessary demonstrate conformance + of the K8s+Stor4NFV deployment. + dependencies: + installer: 'compass' + scenario: 'stor4nfv' + run: + module: 'stor4nfv_tests.stor4nfv_k8s' + class: 'K8sStor4nfvTest' |