From: Gary Wu <gary.i.wu@huawei.com>
Date: Wed, 1 Aug 2018 19:02:37 +0000 (-0700)
Subject: Support cloud-config scripts in HEAT template
X-Git-Tag: 3.0.0~385^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=2845d14cf5ff67a1e22600cb5eacb5fd988473e4;p=integration.git

Support cloud-config scripts in HEAT template

Change-Id: I4deb3a3815885216646ce3d799289c585ba23666
Issue-ID: INT-605
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
---

diff --git a/test/ete/labs/gwu/apt-proxy.sh b/test/ete/labs/gwu/apt-proxy.sh
index 74a180bd0..b2d5d1f01 100755
--- a/test/ete/labs/gwu/apt-proxy.sh
+++ b/test/ete/labs/gwu/apt-proxy.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-sed -i '/#!\/bin\/bash/a\
+sed -i '/^            #!\/bin\/bash/a\
             # sleep up to 3 minutes to avoid disk contention\
             sleep $((RANDOM / 200))\
             mkdir -p /etc/docker\
diff --git a/test/ete/labs/huawei/apt-proxy.sh b/test/ete/labs/huawei/apt-proxy.sh
index 6fec3d03e..1e2ccd6c2 100755
--- a/test/ete/labs/huawei/apt-proxy.sh
+++ b/test/ete/labs/huawei/apt-proxy.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-sed -i '/#!\/bin\/bash/a\
+sed -i '/^            #!\/bin\/bash/a\
             mkdir -p /etc/docker\
             cat > /etc/docker/daemon.json <<EOF\
             {\
diff --git a/test/ete/labs/tlab/apt-proxy.sh b/test/ete/labs/tlab/apt-proxy.sh
index 3cf547452..9203844fc 100755
--- a/test/ete/labs/tlab/apt-proxy.sh
+++ b/test/ete/labs/tlab/apt-proxy.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-sed -i '/#!\/bin\/bash/a\
+sed -i '/^            #!\/bin\/bash/a\
             mkdir -p /etc/docker\
             cat > /etc/docker/daemon.json <<EOF\
             {\
diff --git a/test/ete/labs/windriver/apt-proxy.sh b/test/ete/labs/windriver/apt-proxy.sh
index 365b5d015..13c8221b4 100755
--- a/test/ete/labs/windriver/apt-proxy.sh
+++ b/test/ete/labs/windriver/apt-proxy.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-sed -i '/#!\/bin\/bash/a\
+sed -i '/^            #!\/bin\/bash/a\
             mkdir -p /etc/docker\
             cat > /etc/docker/daemon.json <<EOF\
             {\
diff --git a/test/ete/scripts/deploy-onap.sh b/test/ete/scripts/deploy-onap.sh
index b4d653931..aa3502163 100755
--- a/test/ete/scripts/deploy-onap.sh
+++ b/test/ete/scripts/deploy-onap.sh
@@ -28,6 +28,7 @@ fi
 SENTINEL='Docker versions and branches'
 
 mkdir -p ${LAB_DIR}/target
+rsync -avt $DEMO_DIR/heat/ONAP/ ${LAB_DIR}/target/
 YAML_FILE=${LAB_DIR}/target/onap_openstack.yaml
 ENV_FILE=${LAB_DIR}/target/onap_openstack.env
 YAML_SRC=${DEMO_DIR}/heat/ONAP/onap_openstack.yaml