adding Hongtao's changes to vm-setup.sh to install ONOS dependencies (java, icedtea, zookeeper, JAVA_HOME)
Change-Id: Iaddfad52a0f1fcc84fe2a80a40f6b2e9087007a8
diff --git a/onos-build-vm.py b/onos-build-vm.py
index 84ce363..e1ef609 100755
--- a/onos-build-vm.py
+++ b/onos-build-vm.py
@@ -26,7 +26,7 @@
url = 'https://gerrit.onlab.us/gitweb?p=ONOS-VM.git;a=blob_plain;hb=refs/heads/master;f=vm-setup.sh'
vm.sendline( 'wget -O - "%s" | bash' % url )
# end with expect prompt
- vm.expect( prompt )
+ vm.expect( prompt, timeout=1200 )
def vmdk2size( vmdk ):
"Return virtual disk size (in bytes) of vmdk image"
diff --git a/vm-setup.sh b/vm-setup.sh
index c1fe642..366f4bb 100644
--- a/vm-setup.sh
+++ b/vm-setup.sh
@@ -6,15 +6,24 @@
ONOS_USER=mininet
ONOS_USER_HOME=/home/${ONOS_USER}
-ECLIPSE_URL=http://ftp.osuosl.org/pub/eclipse//technology/epp/downloads/release/kepler/SR1/eclipse-java-kepler-SR1-linux-gtk-x86_64.tar.gz
+ECLIPSE_URL=http://ftp.osuosl.org/pub/eclipse/technology/epp/downloads/release/kepler/SR2/eclipse-java-kepler-SR2-linux-gtk-x86_64.tar.gz
sudo apt-get update
# ------------- Install ONOS Dependencies -------------
-#sudo -u ${ONOS_USER} ./install_zookeeper.sh
-#sudo -u ${ONOS_USER} ./install_cassandra.sh
-#sudo -u ${ONOS_USER} ./install_maven.sh
+sudo apt-get install -y openjdk-7-jdk
sudo apt-get install -y maven
+
+# Not needed: Adding JAVA_HOME and adding java/bin to PATH
+#cat << EOF >> $ONOS_USER_HOME/.profile
+#JAVA_HOME=/usr/lib/jvm/java-7-openjdk-amd64
+#PATH=\$PATH:\$JAVA_HOME/bin
+#EOF
+
+# Install Zookeeper
+wget http://apache.osuosl.org/zookeeper/zookeeper-3.4.6/zookeeper-3.4.6.tar.gz
+tar xvzf zookeeper-3.4.6.tar.gz
+
# CLI dependencies
sudo apt-get install -y python-flask python-cmd2 python-pyparsing