aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorumry8364 <morgan.richomme@orange.com>2019-10-01 11:16:49 +0200
committerMorgan Richomme <morgan.richomme@orange.com>2019-10-10 05:32:03 +0000
commitb3fa8eec6cd1d84cabf960acd610be01e20a8553 (patch)
treec39dfd381a8be703cce81befda48c9296c4ccd52
parent87d5a68690385d9a4a83779085709e81af648fe8 (diff)
Fix csit tests for multicloud
split 95349 in several smaller patches Issue-ID: INT-1237 Signed-off-by: umry8364 <morgan.richomme@orange.com> Change-Id: I32be406a18781937eedba8e7d9703784cad4470e Signed-off-by: umry8364 <morgan.richomme@orange.com>
-rw-r--r--plans/multicloud-fcaps/functionality1/setup.sh4
-rwxr-xr-xplans/multicloud/functionality1/setup.sh5
2 files changed, 5 insertions, 4 deletions
diff --git a/plans/multicloud-fcaps/functionality1/setup.sh b/plans/multicloud-fcaps/functionality1/setup.sh
index 1e125d69..328329f2 100644
--- a/plans/multicloud-fcaps/functionality1/setup.sh
+++ b/plans/multicloud-fcaps/functionality1/setup.sh
@@ -16,9 +16,9 @@
# Start all process required for executing test case
source ${SCRIPTS}/common_functions.sh
-
+MULTICLOUD_DOCKER_VERSION=1.4.1
# start multicloud-fcaps
-docker run -d --name multicloud-fcaps nexus3.onap.org:10001/onap/multicloud/openstack-fcaps
+docker run -d --name multicloud-fcaps nexus3.onap.org:10001/onap/multicloud/openstack-fcaps:$MULTICLOUD_DOCKER_VERSION
SERVICE_IP=`get-instance-ip.sh multicloud-fcaps`
SERVICE_PORT=9011
diff --git a/plans/multicloud/functionality1/setup.sh b/plans/multicloud/functionality1/setup.sh
index 50118a54..ea8cbbed 100755
--- a/plans/multicloud/functionality1/setup.sh
+++ b/plans/multicloud/functionality1/setup.sh
@@ -19,9 +19,10 @@
source ${SCRIPTS}/common_functions.sh
+MULTICLOUD_DOCKER_VERSION=1.4.1
# start multivim-broker
-docker run -d --name multivim-vio nexus3.onap.org:10001/onap/multicloud/vio
-docker run -d --name multivim-broker --link multivim-vio -e MSB_ADDR=multivim-vio -e MSB_PORT=9004 nexus3.onap.org:10001/onap/multicloud/framework
+docker run -d --name multivim-vio nexus3.onap.org:10001/onap/multicloud/vio:$MULTICLOUD_DOCKER_VERSION
+docker run -d --name multivim-broker --link multivim-vio -e MSB_ADDR=multivim-vio -e MSB_PORT=9004 nexus3.onap.org:10001/onap/multicloud/framework:$MULTICLOUD_DOCKER_VERSION
BROKER_IP=`get-instance-ip.sh multivim-broker`
for i in {1..50}; do