Upload Parallels image

.github/workflows/main.yml

@@ -7,7 +7,6 @@ on:
     branches: [ master ]
   release:
     types: [ created ]
-  workflow_dispatch:
 
 jobs:
   build:
@@ -29,3 +28,15 @@ jobs:
           AWS_ACCESS_KEY_ID=${{secrets.S3_KEY}} AWS_SECRET_ACCESS_KEY=${{secrets.S3_SECRET_KEY}} aws s3 sync . s3://clovervm/ --acl public-read --endpoint-url https://ams3.digitaloceanspaces.com --no-progress
           echo Uploaded https://clovervm.ams3.digitaloceanspaces.com/$(ls)
         working-directory: output-virtualbox-ovf
+      - name: Install ovftool
+        run: sudo installer -pkg "VMware OVF Tool.pkg" -target /
+      - name: Convert to Parallels
+        run: |
+          mkdir parallels
+          /Applications/VMware\ OVF\ Tool/ovftool --lax output-virtualbox-ovf/*.ova parallels/clover-devel.vmx
+          ls -lh parallels
+      - name: Upload Parallels image
+        run: |
+          AWS_ACCESS_KEY_ID=${{secrets.S3_KEY}} AWS_SECRET_ACCESS_KEY=${{secrets.S3_SECRET_KEY}} aws s3 sync . s3://clovervm/ --acl public-read --endpoint-url https://ams3.digitaloceanspaces.com --no-progress
+          echo Uploaded https://clovervm.ams3.digitaloceanspaces.com/$(ls)
+        working-directory: parallels

scripts/install_software.sh

@@ -43,7 +43,7 @@ source ~/catkin_ws/devel/setup.bash
 
 echo "--- Getting Clover sources"
 cd ~/catkin_ws/src
-git clone --depth 1 --branch v0.24-release https://github.com/CopterExpress/clover
+git clone --depth 1 https://github.com/CopterExpress/clover
 git clone --depth 1 https://github.com/CopterExpress/ros_led
 git clone --depth 1 https://github.com/ethz-asl/mav_comm
 
@@ -55,7 +55,7 @@ echo "--- Installing Clover's Python dependencies"
 sudo -E sh -c '/usr/bin/python3 -m pip install -r ~/catkin_ws/src/clover/clover/requirements.txt'
 
 echo "--- Downloading PX4"
-git clone --recursive --depth 1 --branch v1.13.2 https://github.com/PX4/PX4-Autopilot.git ~/PX4-Autopilot
+git clone --recursive --depth 1 --branch v1.13.0 https://github.com/PX4/PX4-Autopilot.git ~/PX4-Autopilot
 ln -s ~/PX4-Autopilot ~/catkin_ws/src/
 ln -s ~/PX4-Autopilot/Tools/sitl_gazebo ~/catkin_ws/src/
 
@@ -89,9 +89,6 @@ ln -s "." build/mavlink/mavlink  # fix https://github.com/PX4/PX4-Autopilot/pull
 echo "--- Building the workspace"
 catkin_make -DCATKIN_WHITELIST_PACKAGES=""
 
-echo "--- Running tests"
-catkin_make run_tests && catkin_test_results
-
 echo "--- Installing Visual Studio Code"
 sudo -E sh -c 'apt-get update; apt-get install -y curl'
 curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > ${HOME}/packages.microsoft.gpg
@@ -152,10 +149,9 @@ sed "s/pi/${USER}/g" ${HOME}/catkin_ws/src/clover/builder/assets/monkey | sudo t
 sudo -E sh -c "sed -i 's/SymLink Off/SymLink On/' /etc/monkey/monkey.conf"
 sudo cp ${HOME}/catkin_ws/src/clover/builder/assets/monkey.service /etc/systemd/system/monkey.service
 sudo systemctl enable monkey
-rosrun clover www # create directory to serve
 
 echo "--- Installing additional packages"
-sudo -E sh -c 'apt-get update; apt-get install -y sshfs gvfs-fuse gvfs-backends python3-opencv byobu ipython3 byobu nmap lsof tmux vim ros-noetic-usb-cam ros-noetic-rqt-multiplot ros-noetic-image-view'
+sudo -E sh -c 'apt-get update; apt-get install -y sshfs gvfs-fuse gvfs-backends python3-opencv byobu ipython3 byobu nmap lsof tmux vim ros-noetic-rqt-multiplot ros-noetic-image-view'
 
 echo "--- Personalizing VM"
 sudo -E sh -c 'cp /usr/share/xfce4/backdrops/xubuntu-wallpaper.png /usr/share/xfce4/backdrops/xubuntu-wallpaper-old.png; cp ${HOME}/Pictures/Logo_COEX_2019_white_on_black.png /usr/share/xfce4/backdrops/xubuntu-wallpaper.png'
@@ -186,6 +182,7 @@ pip --version
 pip3 --version
 monkey --version
 systemctl --version
+# TODO: add Python tests
 
 roscore -h
 rosversion px4
@@ -211,12 +208,8 @@ make px4_sitl  # regular sitl build
 # make px4_fmu-v4_default
 make clean
 
-echo "--- Run Clover's Python and shell tests"
+echo "--- Run Clover's Python libraries validation"
-source ~/catkin_ws/devel/setup.bash
-export VM=1
-$HOME/catkin_ws/src/clover/builder/test/tests.py
 $HOME/catkin_ws/src/clover/builder/test/tests_py3.py
-$HOME/catkin_ws/src/clover/builder/test/tests.sh
 
 echo "--- Versions of all installed ROS packages"
 set +x