aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCedric Ollivier <cedric.ollivier@orange.com>2018-09-14 03:27:13 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-09-14 03:27:13 +0000
commitfcea85fd2903499e6138335cfe8a9366a34b0086 (patch)
treebdf7b73345ec2432f5b749fee1a9d71306f79c06
parente2ef3a3fcf062e65bb22e7f59f258fd8ea786522 (diff)
parentabea5c1c65e1b381cfa2f138ac94c9b344f1289a (diff)
Merge "Disable OPNFV Features"
-rw-r--r--docker/features/Dockerfile4
-rw-r--r--docker/features/testcases.yaml2
-rw-r--r--docker/features/thirdparty-requirements.txt2
3 files changed, 7 insertions, 1 deletions
diff --git a/docker/features/Dockerfile b/docker/features/Dockerfile
index d8b1ae98..ea3bf6e3 100644
--- a/docker/features/Dockerfile
+++ b/docker/features/Dockerfile
@@ -3,6 +3,7 @@ FROM opnfv/functest-kubernetes-core
ARG OPENSTACK_TAG=master
ARG OPNFV_TAG=master
+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