diff options
| author |   Marco Platania <platania@research.att.com> | 2018-08-03 13:40:01 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-08-03 13:40:01 +0000 |
| commit | 423db590adc966aa0b0a555b54a2e3fcda111114 (patch) | |
| tree | 53578ff3f3457a543db6548b6cf1cb92764fefb5 | |
| parent | 57d4d676e367b2c0f2a97e1ed9dfff12a4a944f0 (diff) | |
| parent | 2845d14cf5ff67a1e22600cb5eacb5fd988473e4 (diff) | |
Merge "Support cloud-config scripts in HEAT template"
| -rwxr-xr-x | test/ete/labs/gwu/apt-proxy.sh | 2 | ||||
| -rwxr-xr-x | test/ete/labs/huawei/apt-proxy.sh | 2 | ||||
| -rwxr-xr-x | test/ete/labs/tlab/apt-proxy.sh | 2 | ||||
| -rwxr-xr-x | test/ete/labs/windriver/apt-proxy.sh | 2 | ||||
| -rwxr-xr-x | test/ete/scripts/deploy-onap.sh | 1 |
5 files changed, 5 insertions, 4 deletions
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 |