diff options
| author |   Cedric Ollivier <cedric.ollivier@orange.com> | 2017-09-06 08:25:19 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-09-06 08:25:19 +0000 |
| commit | c16361c872858c5d36ac3012bf2df2222eb280cd (patch) | |
| tree | 577650fa3f507a976232b52b2d5990cb2bd84bb5 | |
| parent | 955cce803147e194b03c4950d66aeac273b94759 (diff) | |
| parent | 243b6128cdd13f8e45040fb68dc8f296e0f938c1 (diff) | |
Merge "Integrate new Domino package"
| -rw-r--r-- | docker/features/testcases.yaml | 2 | ||||
| -rw-r--r-- | docker/features/thirdparty-requirements.txt | 1 | ||||
| -rw-r--r-- | docker/thirdparty-requirements.txt | 1 | ||||
| -rw-r--r-- | functest/ci/testcases.yaml | 2 | ||||
| -rw-r--r-- | upper-constraints.txt | 1 |
5 files changed, 5 insertions, 2 deletions
diff --git a/docker/features/testcases.yaml b/docker/features/testcases.yaml index ec9962f7a..b7cf81a8a 100644 --- a/docker/features/testcases.yaml +++ b/docker/features/testcases.yaml @@ -88,7 +88,7 @@ tiers: module: 'functest.core.feature' class: 'BashFeature' args: - cmd: 'cd /src/domino && ./tests/run_multinode.sh' + cmd: 'run_multinode.sh' - case_name: barometercollectd diff --git a/docker/features/thirdparty-requirements.txt b/docker/features/thirdparty-requirements.txt index 0fa9be36c..4a0b6ff88 100644 --- a/docker/features/thirdparty-requirements.txt +++ b/docker/features/thirdparty-requirements.txt @@ -3,3 +3,4 @@ sdnvpn securityscanning sfc promise +domino diff --git a/docker/thirdparty-requirements.txt b/docker/thirdparty-requirements.txt index 773af7588..60bd0f28f 100644 --- a/docker/thirdparty-requirements.txt +++ b/docker/thirdparty-requirements.txt @@ -6,3 +6,4 @@ promise tosca-parser>=0.7.0 # Apache-2.0 heat-translator>=0.4.0 # Apache-2.0 refstack-client +domino diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml index d1b78adb4..64bcf6162 100644 --- a/functest/ci/testcases.yaml +++ b/functest/ci/testcases.yaml @@ -350,7 +350,7 @@ tiers: module: 'functest.core.feature' class: 'BashFeature' args: - cmd: 'cd /src/domino && ./tests/run_multinode.sh' + cmd: 'run_multinode.sh' - case_name: barometercollectd diff --git a/upper-constraints.txt b/upper-constraints.txt index e80ffffb2..f189a2a5f 100644 --- a/upper-constraints.txt +++ b/upper-constraints.txt @@ -6,6 +6,7 @@ git+https://gerrit.opnfv.org/gerrit/securityscanning#egg=securityscanning git+https://gerrit.opnfv.org/gerrit/sfc#egg=sfc -e git+https://gerrit.opnfv.org/gerrit/promise#egg=promise -e git+https://github.com/openstack/refstack-client#egg=refstack-client +git+https://gerrit.opnfv.org/gerrit/domino#egg=domino cloudify-rest-client===4.0 iniparse===0.4 openbaton-cli===2.2.1b7 |