aboutsummaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authordongwenjuan <dong.wenjuan@zte.com.cn>2017-07-25 15:41:41 +0800
committerCédric Ollivier <cedric.ollivier@orange.com>2017-09-06 10:26:09 +0200
commita6fad0c6f2570d089d5dfdb60221a04c7a3993f9 (patch)
treeafe9aa52d651892a7f3de340a4c3bebd22f2e910 /docker
parentc16361c872858c5d36ac3012bf2df2222eb280cd (diff)
Integrate doctor-test package
It updates tescases.yaml as run.sh is located in $PATH. repo_doctor is removed as it's now useless. It must be noted that doctor-test imports modules fom a relative path which can break the integration. Pylint warms them (W0403) [1]. [1] https://docs.pylint.org/en/1.6.0/features.html Co-Authored-By: Cédric Ollivier <cedric.ollivier@orange.com> Change-Id: Icd3071a8e371048370bd3e07e08b6b52ddb35c13 Depends-On: I2091cfe4751640bf83d77e1fdd713af1e31fa89d Signed-off-by: dongwenjuan <dong.wenjuan@zte.com.cn> Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
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 abb9b0d7..654643d8 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 e1214c1e..c3b1b041 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 b7cf81a8..273a20e7 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 60bd0f28..cc8f5f9c 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