Remove hardcoded sniroemulator docker version

[demo.git] / boot / robot_vm_init.sh

diff --git a/boot/robot_vm_init.sh b/boot/robot_vm_init.sh
index c119dde..e306e91 100644 (file)
--- a/boot/robot_vm_init.sh
+++ b/boot/robot_vm_init.sh
@@ -3,12 +3,12 @@
 NEXUS_USERNAME=$(cat /opt/config/nexus_username.txt)
 NEXUS_PASSWD=$(cat /opt/config/nexus_password.txt)
 NEXUS_DOCKER_REPO=$(cat /opt/config/nexus_docker_repo.txt)
-NEXUS_REPO=$(cat /opt/config/nexus_repo.txt)
 DOCKER_IMAGE_VERSION=$(cat /opt/config/docker_version.txt)
+SNIRO_DOCKER_IMAGE_VERSION=$(cat /opt/config/sniro_docker_version.txt)
 CLOUD_ENV=$(cat /opt/config/cloud_env.txt)
 
 #
-# Deploy latest robot configuration 
+# Deploy latest robot configuration
 #
 cd /opt/testsuite/properties
 git pull
@@ -17,6 +17,13 @@ cp vm_config2robot.sh /opt/eteshare/config
 cp ete.sh /opt
 cp demo.sh /opt
 
+#
+# Deploy latest heat templates
+#
+cd /opt/demo
+git pull
+cp -rf heat /opt/eteshare
+
 #if [[ $CLOUD_ENV != "rackspace" ]]
 #then
 #      sed -i "s/10.0.1.1/"$(cat /opt/config/aai1_ip_addr.txt)"/g" /opt/eteshare/config/integration_robot_properties.py
@@ -39,11 +46,11 @@ chmod +x /opt/demo.sh
 /bin/bash /opt/eteshare/config/vm_config2robot.sh
 
 docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO
-docker pull $NEXUS_DOCKER_REPO/openecomp/testsuite:$DOCKER_IMAGE_VERSION
+docker pull $NEXUS_DOCKER_REPO/onap/testsuite:$DOCKER_IMAGE_VERSION
 docker rm -f openecompete_container
 
-docker pull $NEXUS_DOCKER_REPO/onap/sniroemulator:latest
+docker pull $NEXUS_DOCKER_REPO/onap/sniroemulator:$SNIRO_DOCKER_IMAGE_VERSION
 docker rm -f sniroemulator
 
-docker run -d --name openecompete_container -v /opt/eteshare:/share -p 88:88 $NEXUS_DOCKER_REPO/openecomp/testsuite:$DOCKER_IMAGE_VERSION
-docker run -d --name sniroemulator -p 8080:9999 $NEXUS_DOCKER_REPO/onap/sniroemulator:latest
+docker run -d --name openecompete_container -v /opt/eteshare:/share -p 88:88 $NEXUS_DOCKER_REPO/onap/testsuite:$DOCKER_IMAGE_VERSION
+docker run -d --name sniroemulator -p 8080:9999 $NEXUS_DOCKER_REPO/onap/sniroemulator:$SNIRO_DOCKER_IMAGE_VERSION