summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCedric Ollivier <cedric.ollivier@orange.com>2017-08-17 06:12:29 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-08-17 06:12:29 +0000
commitd54c6883e2c347b9db6114b3793d3af0ae2d85dd (patch)
treeacb74a59e8c0fbbf1a492900fd83dd2516571e35
parent469abc969a94e3e3c6f4967b6d1fd8953a56e497 (diff)
parent2efe2a7033396defbdcc2b5d2109c702700e3306 (diff)
Merge "Fully integrate promise in functest-features"
-rw-r--r--docker/features/Dockerfile5
-rw-r--r--docker/features/testcases.yaml16
2 files changed, 20 insertions, 1 deletions
diff --git a/docker/features/Dockerfile b/docker/features/Dockerfile
index 6cd88b2bc..54bffe827 100644
--- a/docker/features/Dockerfile
+++ b/docker/features/Dockerfile
@@ -4,13 +4,16 @@ ARG BRANCH=master
ARG OPENSTACK_TAG=stable/ocata
COPY thirdparty-requirements.txt thirdparty-requirements.txt
-RUN apk --no-cache add --virtual .build-deps --update \
+RUN apk --no-cache add --update nodejs nodejs-npm && \
+ apk --no-cache add --virtual .build-deps --update \
python-dev build-base linux-headers libffi-dev \
openssl-dev libjpeg-turbo-dev git && \
pip install --no-cache-dir --src /src \
-chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG \
-chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
-rthirdparty-requirements.txt && \
+ npm -g install npm@latest && \
+ (cd /src/promise/source && npm install) && \
git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/domino /src/domino && \
rm -r thirdparty-requirements.txt /src/domino/.git && \
apk del .build-deps
diff --git a/docker/features/testcases.yaml b/docker/features/testcases.yaml
index 3587b59c8..052bd47f3 100644
--- a/docker/features/testcases.yaml
+++ b/docker/features/testcases.yaml
@@ -8,6 +8,22 @@ tiers:
integrated in functest
testcases:
-
+ case_name: promise
+ project_name: promise
+ criteria: 100
+ blocking: false
+ description: >-
+ Test suite from Promise project.
+ dependencies:
+ installer: '(fuel)|(joid)'
+ scenario: ''
+ run:
+ module: 'functest.core.feature'
+ class: 'BashFeature'
+ args:
+ cmd: 'run_promise_tests.py'
+
+ -
case_name: bgpvpn
project_name: sdnvpn
criteria: 100