summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGary Wu <gary.i.wu@huawei.com>2018-07-31 09:39:35 -0700
committerGary Wu <gary.i.wu@huawei.com>2018-07-31 09:50:13 -0700
commita253c609e89e75c49a4ff3524de7268b2c051d2c (patch)
treea33339a528c4f88f996685dfc1c26751d80644ea
parent5ffc9e96efdcc5e272e40cce71dfe4c83cb87bdf (diff)
Bug fix in robot VM install script
Change-Id: I057181b9da353ab51b7bd4ce2275b67c3ea89ef2 Issue-ID: INT-605 Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
-rw-r--r--boot/robot_install.sh10
-rw-r--r--boot/robot_serv.sh2
2 files changed, 6 insertions, 6 deletions
diff --git a/boot/robot_install.sh b/boot/robot_install.sh
index b19faac9..827b2ce4 100644
--- a/boot/robot_install.sh
+++ b/boot/robot_install.sh
@@ -1,13 +1,10 @@
-#!/bin/bash
+#!/bin/bash -x
# Read configuration files
ARTIFACTS_VERSION=$(cat /opt/config/artifacts_version.txt)
DNS_IP_ADDR=$(cat /opt/config/dns_ip_addr.txt)
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
HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
@@ -63,8 +60,11 @@ apt-get install -y apt-transport-https ca-certificates wget git ntp ntpdate make
# Download scripts from Nexus
unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip robot_vm_init.sh > /opt/robot_vm_init.sh
+chmod +x /opt/robot_vm_init.sh
unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip robot_serv.sh > /opt/robot_serv.sh
+chmod +x /opt/robot_serv.sh
unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip imagetest.sh > /opt/imagetest.sh
+chmod +x /opt/imagetest.sh
mkdir -p /opt/eteshare/config
unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip robot/integration_preload_parameters.py > /opt/eteshare/config/integration_preload_parameters.py
@@ -78,7 +78,7 @@ chmod +x /opt/demo.sh
mkdir -p /opt/eteshare/logs
-mv /opt/robot_serv.sh /etc/init.d
+cp /opt/robot_serv.sh /etc/init.d
update-rc.d robot_serv.sh defaults
# Download and install docker-engine
diff --git a/boot/robot_serv.sh b/boot/robot_serv.sh
index 656b9afb..75934f4e 100644
--- a/boot/robot_serv.sh
+++ b/boot/robot_serv.sh
@@ -1,6 +1,6 @@
#!/bin/sh
### BEGIN INIT INFO
-# Provides:
+# Provides: onap-testsuite
# Required-Start: $remote_fs $syslog
# Required-Stop: $remote_fs $syslog
# Default-Start: 2 3 4 5