Vagrant: add hirsute and hirsute-desktop

And tidy testing a little

Vagrantfile

@@ -2,6 +2,7 @@
 # vi: set ft=ruby :
 
 # Testing an ArduPilot VM:
+# rm -rf /vagrant/build
 # dpkg -l | grep modemmanager
 # sim_vehicle.py --map --console # in the starting directory should start a Copter simulation
 # sim_vehicle.py --debug --gdb
@@ -167,7 +168,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 #    eoan.vm.boot_timeout = 1200
 #  end
 
-  # 20.04 LTS
+  # 20.04 LTS  EOL April 2025
   config.vm.define "focal", autostart: false do |focal|
     focal.vm.box = "ubuntu/focal64"
     focal.vm.provision :shell, path: "Tools/vagrant/initvagrant.sh"
@@ -176,8 +177,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     end
     focal.vm.boot_timeout = 1200
   end
-
-  # 20.04 LTS
   config.vm.define "focal-desktop", autostart: false do |focal|
     focal.vm.box = "ubuntu/focal64"
     focal.vm.provision :shell, path: "Tools/vagrant/initvagrant-desktop.sh"
@@ -198,5 +197,24 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     groovy.vm.boot_timeout = 1200
   end
 
+  # 21.04
+  config.vm.define "hirsute", autostart: false do |hirsute|
+    hirsute.vm.box = "ubuntu/hirsute64"
+    hirsute.vm.provision :shell, path: "Tools/vagrant/initvagrant.sh"
+    hirsute.vm.provider "virtualbox" do |vb|
+      vb.name = "ArduPilot (hirsute)"
+    end
+    hirsute.vm.boot_timeout = 1200
+  end
+  config.vm.define "hirsute-desktop", autostart: false do |hirsute|
+    hirsute.vm.box = "ubuntu/hirsute64"
+    hirsute.vm.provision :shell, path: "Tools/vagrant/initvagrant-desktop.sh"
+    hirsute.vm.provider "virtualbox" do |vb|
+      vb.name = "ArduPilot (hirsute-desktop)"
+      vb.gui = true
+    end
+    hirsute.vm.boot_timeout = 1200
+  end
+
 end