summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJerry Flood <jf9860@att.com>2017-10-29 08:27:22 -0400
committerJerry Flood <jf9860@att.com>2017-10-30 06:53:15 -0400
commit5854574e93495d520456e18352e130d353c2c200 (patch)
tree717c4f7f3bb684a3538c7c0801d90b7870b09578
parent67b8c3aae4c9197df37e53bc7a78616c43b9b72e (diff)
Deploy latest demo/heat in robot VM
Issue: TEST-14 Change-Id: I8e6fed6f130f848f772957f417543445d99bc514 Signed-off-by: Jerry Flood <jf9860@att.com>
-rw-r--r--boot/robot_install.sh2
-rw-r--r--boot/robot_vm_init.sh7
2 files changed, 9 insertions, 0 deletions
diff --git a/boot/robot_install.sh b/boot/robot_install.sh
index 70cf4b14..b17e9fc7 100644
--- a/boot/robot_install.sh
+++ b/boot/robot_install.sh
@@ -8,6 +8,7 @@ CLOUD_ENV=$(cat /opt/config/cloud_env.txt)
GERRIT_BRANCH=$(cat /opt/config/gerrit_branch.txt)
MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1)
CODE_REPO=$(cat /opt/config/remote_repo.txt)
+HEAT_CODE_REPO=http://gerrit.onap.org/r/demo.git
# Short-term fix to get around MSO to SO name change
cp /opt/config/so_ip_addr.txt /opt/config/mso_ip_addr.txt
@@ -99,6 +100,7 @@ mkdir -p /opt/eteshare/logs
mkdir -p /opt/eteshare/config
cd /opt
git clone -b $GERRIT_BRANCH --single-branch $CODE_REPO testsuite/properties
+git clone -b $GERRIT_BRANCH --single-branch $HEAT_CODE_REPO demo
# Rename network interface in openstack Ubuntu 16.04 images. Then, reboot the VM to pick up changes
if [[ $CLOUD_ENV != "rackspace" ]]
diff --git a/boot/robot_vm_init.sh b/boot/robot_vm_init.sh
index c119dde8..aca28f5b 100644
--- a/boot/robot_vm_init.sh
+++ b/boot/robot_vm_init.sh
@@ -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