Merge "Fix csit tests for multicloud"

diff --git a/plans/multicloud-fcaps/functionality1/setup.sh b/plans/multicloud-fcaps/functionality1/setup.sh
index 1e125d6..328329f 100644 (file)
--- 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 50118a5..ea8cbbe 100755 (executable)
--- 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