aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCedric Ollivier <cedric.ollivier@orange.com>2017-08-10 14:40:31 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-08-10 14:40:31 +0000
commitc6502c8fc4f43e753ffe6d631643ddf43002d4dc (patch)
treea2e079ca0d1cc4d3170b5ee14d4c319c7fc133c8
parent13067de652d6ccdcfc85f0f5e65841b644d9a6e9 (diff)
parentc18c62e1dc094a12f3a19eaae0ba04a1ba67bacd (diff)
Merge "Integrate the promise package"
-rw-r--r--docker/Dockerfile1
-rw-r--r--docker/features/thirdparty-requirements.txt1
-rw-r--r--docker/thirdparty-requirements.txt1
-rw-r--r--functest/ci/testcases.yaml2
-rw-r--r--upper-constraints.txt1
5 files changed, 4 insertions, 2 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 89cf86a69..cb7957163 100644
--- 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 ee2e5e9ca..0fa9be36c 100644
--- 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 be1980f2c..84521f233 100644
--- 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 99c0cc202..42689d1ec 100644
--- 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 73ec7f41b..29b00e594 100644
--- 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