Generate tutorial p4vm with a specific ONOS version
Also:
- Updated Bazel version
- Removed non-working code to auto-login user and disable screen saver
- Reduce size by doing a shallow clone of ONOS
Change-Id: Ie6efc3ebd6766164e7051f28dff89046141afa7f
(cherry picked from commit 68a0a00b4f332cb1cc518dc9c76e587d70cb4492)
diff --git a/tools/dev/p4vm/root-bootstrap.sh b/tools/dev/p4vm/root-bootstrap.sh
index cf90ea2..0c3302c 100755
--- a/tools/dev/p4vm/root-bootstrap.sh
+++ b/tools/dev/p4vm/root-bootstrap.sh
@@ -1,10 +1,19 @@
#!/bin/bash
set -xe
+ONOS_BRANCH_DEV="master"
+ONOS_BRANCH_TUTORIAL="onos-1.14"
+BAZEL_VER="0.19.2"
+
VM_TYPE=${1:-dev}
-BAZEL_VER="0.15.2"
-BAZEL_SH="bazel-${BAZEL_VER}-installer-linux-x86_64.sh"
+if [[ ${VM_TYPE} = "tutorial" ]]
+then
+ ONOS_BRANCH=${ONOS_BRANCH_TUTORIAL}
+else
+ ONOS_BRANCH=${ONOS_BRANCH_DEV}
+fi
+
# Create user sdn
useradd -m -d /home/sdn -s /bin/bash sdn
echo "sdn:rocks" | chpasswd
@@ -13,7 +22,7 @@
usermod -aG vboxsf sdn
update-locale LC_ALL="en_US.UTF-8"
-if [ ${VM_TYPE} = "tutorial" ]
+if [[ ${VM_TYPE} = "tutorial" ]]
then
su sdn <<'EOF'
cd /home/sdn
@@ -58,6 +67,7 @@
DEBIAN_FRONTEND=noninteractive apt-get -yq install wireshark
# Install Bazel
+BAZEL_SH="bazel-${BAZEL_VER}-installer-linux-x86_64.sh"
wget https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VER}/${BAZEL_SH}
chmod +x ${BAZEL_SH}
./${BAZEL_SH}
@@ -76,5 +86,5 @@
su sdn <<'EOF'
cd /home/sdn
-bash /vagrant/user-bootstrap.sh
+bash /vagrant/user-bootstrap.sh ${ONOS_BRANCH}
EOF