Integrate the promise package

Change-Id: I128bfa62b9ccd8e53683def329e8470693c2e556
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 89cf86a..cb79571 100644 (file)
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -87,7 +87,6 @@ RUN wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/uppe
 RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/copper /src/copper
 RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/domino /src/domino
 RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/doctor ${REPOS_DIR}/doctor
-RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/promise ${REPOS_DIR}/promise
 RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/netready ${REPOS_DIR}/netready
 RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/fds /src/fds
 

diff --git a/docker/features/thirdparty-requirements.txt b/docker/features/thirdparty-requirements.txt
index ee2e5e9..0fa9be3 100644 (file)
--- a/docker/features/thirdparty-requirements.txt
+++ b/docker/features/thirdparty-requirements.txt
@@ -2,3 +2,4 @@ baro_tests
 sdnvpn
 securityscanning
 sfc
+promise

diff --git a/docker/thirdparty-requirements.txt b/docker/thirdparty-requirements.txt
index be1980f..84521f2 100644 (file)
--- a/docker/thirdparty-requirements.txt
+++ b/docker/thirdparty-requirements.txt
@@ -3,6 +3,7 @@ sdnvpn
 opera
 securityscanning
 sfc
+promise
 tosca-parser>=0.7.0 # Apache-2.0
 heat-translator>=0.4.0 # Apache-2.0
 refstack-client

diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml
index 99c0cc2..42689d1 100644 (file)
--- a/functest/ci/testcases.yaml
+++ b/functest/ci/testcases.yaml
@@ -265,7 +265,7 @@ tiers:
                     module: 'functest.core.feature'
                     class: 'BashFeature'
                     args:
-                        cmd: 'cd /home/opnfv/repos/promise/promise/test/functest && python ./run_tests.py'
+                        cmd: 'run_promise_tests.py'
 
             -
                 case_name: doctor-notification

diff --git a/upper-constraints.txt b/upper-constraints.txt
index 73ec7f4..29b00e5 100644 (file)
--- a/upper-constraints.txt
+++ b/upper-constraints.txt
@@ -5,6 +5,7 @@ git+https://gerrit.opnfv.org/gerrit/sdnvpn#egg=sdnvpn
 git+https://gerrit.opnfv.org/gerrit/opera#egg=opera
 git+https://gerrit.opnfv.org/gerrit/securityscanning#egg=securityscanning
 git+https://gerrit.opnfv.org/gerrit/sfc#egg=sfc
+git+https://gerrit.opnfv.org/gerrit/promise#egg=promise&subdirectory=promise/test/functest
 -e git+https://github.com/openstack/refstack-client#egg=refstack-client
 cloudify_rest_client===4.0
 iniparse===0.4