From d31086b3b212ac3cb4ee908861cfeeb898a4dbde Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Thu, 13 Sep 2018 22:10:37 +0200 Subject: Disable OPNFV Features MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From the time being, none is synced to OPNFV hunter or newer. Change-Id: If8a39bd185d1b7d396ea61bfebca2416b9bd5566 Signed-off-by: Cédric Ollivier (cherry picked from commit abea5c1c65e1b381cfa2f138ac94c9b344f1289a) --- docker/features/Dockerfile | 4 +++- docker/features/testcases.yaml | 2 ++ docker/features/thirdparty-requirements.txt | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 docker/features/thirdparty-requirements.txt diff --git a/docker/features/Dockerfile b/docker/features/Dockerfile index 91e10c17..027526b9 100644 --- a/docker/features/Dockerfile +++ b/docker/features/Dockerfile @@ -3,6 +3,7 @@ FROM opnfv/functest-kubernetes-core:hunter ARG OPENSTACK_TAG=stable/rocky ARG OPNFV_TAG=stable/hunter +COPY thirdparty-requirements.txt thirdparty-requirements.txt RUN apk --no-cache add --update make py-pip bash git go \ grep rsync linux-headers musl-dev findutils \ libffi libssl1.0 libjpeg-turbo && \ @@ -11,7 +12,8 @@ RUN apk --no-cache add --update make py-pip bash git go \ 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 \ - stor4nfv-tests clover && \ + -rthirdparty-requirements.txt && \ + rm -f thirdparty-requirements.txt && \ apk del .build-deps COPY testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml CMD ["run_tests", "-t", "all"] diff --git a/docker/features/testcases.yaml b/docker/features/testcases.yaml index ff44d59e..a23e349e 100644 --- a/docker/features/testcases.yaml +++ b/docker/features/testcases.yaml @@ -10,6 +10,7 @@ tiers: - case_name: stor4nfv_k8s project_name: stor4nfv + enabled: false criteria: 100 blocking: false description: >- @@ -30,6 +31,7 @@ tiers: - case_name: clover_k8s project_name: clover + enabled: false criteria: 100 blocking: false description: >- diff --git a/docker/features/thirdparty-requirements.txt b/docker/features/thirdparty-requirements.txt new file mode 100644 index 00000000..d557b533 --- /dev/null +++ b/docker/features/thirdparty-requirements.txt @@ -0,0 +1,2 @@ +# stor4nfv-tests +# clover -- cgit 1.2.3-korg