build: Bring back check for prebuilt image

Not sure if it's going to help, but why not?

.travis.yml

@@ -4,7 +4,7 @@ before_install:
 - wget https://www.virtualbox.org/download/oracle_vbox_2016.asc -O- | sudo apt-key
   add - && sudo sh -c "echo deb https://download.virtualbox.org/virtualbox/debian
   bionic contrib >> /etc/apt/sources.list" && sudo apt-get update && sudo apt-get
-  install build-essential gcc make linux-headers-$(uname -r) virtualbox-6.1 && sudo
+  install build-essential gcc make linux-headers-$(uname -r) virtualbox-6.0 && sudo
   usermod -aG vboxusers $(whoami)
 - mkdir output-virtualbox-iso && pushd output-virtualbox-iso && wget --progress=dot:giga https://github.com/sfalexrog/clever_vm/releases/download/v0_base_vm/clever-devel.ova
   && popd

build.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -e
+
 # FIXME: Use system Packer if possible
 #PACKER=$(which packer)
 
@@ -14,12 +16,18 @@ fi
 
 echo "--- Using Packer version $(${PACKER} --version)"
 
-echo "--- Building base image"
-
-${PACKER} build -only=virtualbox-iso base_vm.json
+if [ ! -f output-virtualbox-iso/clever-devel.ova ]; then
+    echo "--- Building base image"
+    ${PACKER} build -only=virtualbox-iso base_vm.json || true
+fi
 
 echo "--- Building extended image"
 
 ${PACKER} build ros_ide_vm.json
 
+echo "--- Marking the VM"
+
+GIT_REV=$(git rev-parse --short HEAD)
+mv ./output-virtualbox-ovf/clever-devel.ova ./output-virtualbox-ovf/clover-devel_v0.20+${GIT_REV}.ova 
+
 echo "--- All done!"

scripts/installSoftware.sh

@@ -8,27 +8,31 @@ echo "--- Current environment:"
 echo "Enabling passwordless sudo"
 echo "${PASSWORD}" | sudo -E -S sh -c 'echo "clever ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers'
 
+echo "--- Increasing apt retries"
+sudo -E sh -c 'echo "APT::Acquire::Retries \"3\";" > /etc/apt/apt.conf.d/80-retries'
+cat /etc/apt/apt.conf.d/80-retries
+
 echo "--- Allowing apt to perform its updates"
 sudo -E sh -c 'apt update; while fuser /var/lib/dpkg/lock ; do sleep 0.5 ; done'
 
 echo "--- Installing open-vm-tools"
 
-echo "${PASSWORD}" | sudo -E -S sh -c 'apt update; apt install -y open-vm-tools open-vm-tools-desktop'
+sudo -E sh -c 'apt update; apt install -y open-vm-tools open-vm-tools-desktop'
 
 echo "--- Installing ROS desktop packages"
 
-echo "${PASSWORD}" | sudo -E -S sh -c 'echo "deb http://packages.ros.org/ros/ubuntu $(lsb_release -sc) main" > /etc/apt/sources.list.d/ros-latest.list'
-echo "${PASSWORD}" | sudo -E -S sh -c 'apt-key adv --keyserver "hkp://keyserver.ubuntu.com:80" --recv-key C1CF6E31E6BADE8868B172B4F42ED6FBAB17C654'
-echo "${PASSWORD}" | sudo -E -S sh -c 'apt update; apt install -y python-rosdep python-rosinstall-generator python-wstool build-essential ros-melodic-desktop'
+sudo -E sh -c 'echo "deb http://packages.ros.org/ros/ubuntu $(lsb_release -sc) main" > /etc/apt/sources.list.d/ros-latest.list'
+sudo -E sh -c 'apt-key adv --keyserver "hkp://keyserver.ubuntu.com:80" --recv-key C1CF6E31E6BADE8868B172B4F42ED6FBAB17C654'
+sudo -E sh -c 'apt update; apt install -y python-rosdep python-rosinstall-generator python-wstool build-essential ros-melodic-desktop'
 
-echo "${PASSWORD}" | sudo -E -S sh -c 'rosdep init'
+sudo -E sh -c 'rosdep init'
 rosdep update
 
 echo "--- Downloading PX4 and installing its dependencies"
 git clone -b v1.10.1-clever https://github.com/CopterExpress/Firmware ${HOME}/Firmware
-echo "${PASSWORD}" | sudo -E -S sh -c '${HOME}/Firmware/Tools/setup/ubuntu.sh'
-echo "${PASSWORD}" | sudo -E -S sh -c 'echo "2" | update-alternatives --config java'
-echo "${PASSWROD}" | sudo -E -S sed -i -e '/^assistive_technologies=/s/^/#/' /etc/java-*-openjdk/accessibility.properties
+sudo -E -S sh -c '${HOME}/Firmware/Tools/setup/ubuntu.sh'
+sudo -E -S sh -c 'echo "2" | update-alternatives --config java'
+sudo -E -S sed -i -e '/^assistive_technologies=/s/^/#/' /etc/java-*-openjdk/accessibility.properties
 
 echo "--- Prebuilding PX4 SITL configuration"
 make -C ${HOME}/Firmware px4_sitl
@@ -41,12 +45,12 @@ echo "source /opt/ros/melodic/setup.bash" >> ~/.bashrc
 
 echo "--- Installing Visual Studio Code"
 
-echo "${PASSWORD}" | sudo -E -S sh -c 'apt update; apt install -y curl'
+sudo -E sh -c 'apt update; apt install -y curl'
 curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > ${HOME}/packages.microsoft.gpg
-echo "${PASSWORD}" | sudo -E -S sh -c 'install -o root -g root -m 644 ${HOME}/packages.microsoft.gpg /usr/share/keyrings'
+sudo -E sh -c 'install -o root -g root -m 644 ${HOME}/packages.microsoft.gpg /usr/share/keyrings'
 rm ${HOME}/packages.microsoft.gpg
-echo "${PASSWORD}" | sudo -E -S sh -c 'echo "deb [arch=amd64 signed-by=/usr/share/keyrings/packages.microsoft.gpg] https://packages.microsoft.com/repos/vscode stable main" > /etc/apt/sources.list.d/vscode.list'
-echo "${PASSWORD}" | sudo -E -S sh -c 'apt install -y apt-transport-https; apt update; apt install -y code'
+sudo -E sh -c 'echo "deb [arch=amd64 signed-by=/usr/share/keyrings/packages.microsoft.gpg] https://packages.microsoft.com/repos/vscode stable main" > /etc/apt/sources.list.d/vscode.list'
+sudo -E sh -c 'apt install -y apt-transport-https; apt update; apt install -y code'
 code --install-extension ms-python.python
 code --install-extension DavidAnson.vscode-markdownlint
 code --install-extension ms-vscode.cmake-tools
@@ -67,7 +71,7 @@ ln -s ${HOME}/Firmware/Tools/sitl_gazebo ${HOME}/catkin_ws/src/sitl_gazebo
 rosdep install --from-paths ${HOME}/catkin_ws/src --ignore-src --rosdistro melodic -y
 curl https://raw.githubusercontent.com/mavlink/mavros/master/mavros/scripts/install_geographiclib_datasets.sh -o ${HOME}/install_geographiclib_datasets.sh
 chmod a+x ${HOME}/install_geographiclib_datasets.sh
-echo "${PASSWORD}" | sudo -E -S sh -c '${HOME}/install_geographiclib_datasets.sh'
+sudo -E sh -c '${HOME}/install_geographiclib_datasets.sh'
 source /opt/ros/melodic/setup.bash
 cd ${HOME}/catkin_ws && catkin_make
 echo "source /home/clever/catkin_ws/devel/setup.bash" >> ~/.bashrc
@@ -78,13 +82,13 @@ sudo cp ${HOME}/catkin_ws/src/clover/builder/assets/roscore.service /etc/systemd
 sudo systemctl enable roscore.service
 
 echo "--- Installing QGroundControl"
-echo "${PASSWORD}" | sudo -E -S sh -c "usermod -a -G dialout $USER"
-echo "${PASSWORD}" | sudo -E -S sh -c 'apt remove -y modemmanager; apt install -y gstreamer1.0-plugins-bad gstreamer1.0-libav'
+sudo -E sh -c "usermod -a -G dialout $USER"
+sudo -E sh -c 'apt remove -y modemmanager; apt install -y gstreamer1.0-plugins-bad gstreamer1.0-libav'
 curl https://s3-us-west-2.amazonaws.com/qgroundcontrol/latest/QGroundControl.AppImage -o ${HOME}/QGroundControl.AppImage
 chmod a+x ${HOME}/QGroundControl.AppImage
 
 echo "--- Installing Firefox web browser"
-echo "${PASSWORD}" | sudo -E -S sh -c 'apt update; apt install -y firefox'
+sudo -E sh -c 'apt update; apt install -y firefox'
 
 echo "--- Installing Monkey web server"
 sudo apt install -y /tmp/packages/monkey_1.6.9-1_amd64.deb
@@ -96,11 +100,11 @@ echo "--- Installing additional packages"
 sudo -E sh -c 'apt update; apt install -y sshfs gvfs-fuse gvfs-backends python3-opencv byobu ipython ipython3 byobu nmap lsof tmux vim ros-melodic-rqt-multiplot'
 
 echo "--- Personalizing VM"
-echo "${PASSWORD}" | sudo -E -S sh -c 'mv /etc/xdg/autostart/light-locker.desktop /etc/xdg/autostart/light-locker.desktop.old'
-echo "${PASSWORD}" | sudo -E -S sh -c 'cp /usr/share/xfce4/backdrops/xubuntu-wallpaper.png /usr/share/xfce4/backdrops/xubuntu-wallpaper-old.png; cp /home/clever/Pictures/Logo_COEX_2019_white_on_black.png /usr/share/xfce4/backdrops/xubuntu-wallpaper.png'
-echo "${PASSWORD}" | sudo -E -S sh -c 'hostnamectl set-hostname clever-dev; sed -i "s/ubuntu/clever-dev clever-dev.local/g" /etc/hosts'
+sudo -E sh -c 'mv /etc/xdg/autostart/light-locker.desktop /etc/xdg/autostart/light-locker.desktop.old'
+sudo -E sh -c 'cp /usr/share/xfce4/backdrops/xubuntu-wallpaper.png /usr/share/xfce4/backdrops/xubuntu-wallpaper-old.png; cp /home/clever/Pictures/Logo_COEX_2019_white_on_black.png /usr/share/xfce4/backdrops/xubuntu-wallpaper.png'
+sudo -E sh -c 'hostnamectl set-hostname clever-dev; sed -i "s/ubuntu/clever-dev clever-dev.local/g" /etc/hosts'
 echo "export ROS_HOSTNAME=\`hostname\`.local" >> ${HOME}/.bashrc
 chmod a+x /home/clever/Desktop/*
 
 echo "--- Cleaning up"
-echo "${PASSWORD}" | sudo -E -S sh -c 'apt-get -y autoremove; apt-get -y autoclean; apt-get -y clean; fstrim -v /'
+sudo -E sh -c 'apt-get -y autoremove; apt-get -y autoclean; apt-get -y clean; fstrim -v /'