summaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorCedric Ollivier <cedric.ollivier@orange.com>2017-09-07 06:18:38 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-09-07 06:18:38 +0000
commit95b37a93c609e5a0ec2c1deb4c791fb55eb6f057 (patch)
tree6d30658754a59c5de85970f22161708e2cbe91c8 /docker
parentcbb64439160caa48d5725b3ee8be0023103a9ec7 (diff)
parenta6fad0c6f2570d089d5dfdb60221a04c7a3993f9 (diff)
Merge "Integrate doctor-test package"
Diffstat (limited to 'docker')
-rw-r--r--docker/Dockerfile1
-rw-r--r--docker/features/Dockerfile2
-rw-r--r--docker/features/testcases.yaml17
-rw-r--r--docker/thirdparty-requirements.txt1
4 files changed, 20 insertions, 1 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index abb9b0d70..654643d83 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -50,6 +50,7 @@ libzmq3-dev \
python-dev \
python-mock \
python-pip \
+python3 \
postgresql \
ruby \
ruby-dev \
diff --git a/docker/features/Dockerfile b/docker/features/Dockerfile
index e1214c1e8..c3b1b041d 100644
--- a/docker/features/Dockerfile
+++ b/docker/features/Dockerfile
@@ -4,7 +4,7 @@ ARG BRANCH=master
ARG OPENSTACK_TAG=stable/ocata
COPY thirdparty-requirements.txt thirdparty-requirements.txt
-RUN apk --no-cache add --update nodejs nodejs-npm && \
+RUN apk --no-cache add --update nodejs nodejs-npm python3 && \
apk --no-cache add --virtual .build-deps --update \
python-dev build-base linux-headers libffi-dev \
openssl-dev libjpeg-turbo-dev git && \
diff --git a/docker/features/testcases.yaml b/docker/features/testcases.yaml
index b7cf81a8a..273a20e77 100644
--- a/docker/features/testcases.yaml
+++ b/docker/features/testcases.yaml
@@ -24,6 +24,23 @@ tiers:
cmd: 'run_promise_tests.py'
-
+ case_name: doctor-notification
+ enabled: false
+ project_name: doctor
+ criteria: 100
+ blocking: false
+ description: >-
+ Test suite from Doctor project.
+ dependencies:
+ installer: '(apex)|(fuel)'
+ scenario: '^((?!fdio).)*$'
+ run:
+ module: 'functest.core.feature'
+ class: 'BashFeature'
+ args:
+ cmd: '(cd /src/doctor-test/tests && run.sh)'
+
+ -
case_name: bgpvpn
project_name: sdnvpn
criteria: 100
diff --git a/docker/thirdparty-requirements.txt b/docker/thirdparty-requirements.txt
index 60bd0f28f..cc8f5f9c8 100644
--- a/docker/thirdparty-requirements.txt
+++ b/docker/thirdparty-requirements.txt
@@ -3,6 +3,7 @@ sdnvpn
securityscanning
sfc
promise
+doctor-test
tosca-parser>=0.7.0 # Apache-2.0
heat-translator>=0.4.0 # Apache-2.0
refstack-client