From 5ad658776da9654cb9a9ed5066cc1966a48d6589 Mon Sep 17 00:00:00 2001
From: Artemis Tosini <me@artem.ist>
Date: Fri, 19 Jul 2024 19:54:31 +0000
Subject: [PATCH] nix/tests/vm-test: Use currently supported distros

Ubuntu 16.04, Fedora 36-37, and RHEL 7 are all out of support.
Replace them with more recent VM images from vagrant, when available

Change-Id: I7760d1784d6b70757e5795499caaa6fe2c9dae83
---
 nix/tests/vm-test/default.nix | 60 ++++-------------------------------
 1 file changed, 6 insertions(+), 54 deletions(-)

diff --git a/nix/tests/vm-test/default.nix b/nix/tests/vm-test/default.nix
index f317bb5..690f892 100644
--- a/nix/tests/vm-test/default.nix
+++ b/nix/tests/vm-test/default.nix
@@ -401,24 +401,10 @@ let
 
   images = {
 
-    # End of standard support https://wiki.ubuntu.com/Releases
-    # No systemd
-    /*
-      "ubuntu-v14_04" = {
+    "ubuntu-v20_04" = {
       image = import <nix/fetchurl.nix> {
-      url = "https://app.vagrantup.com/ubuntu/boxes/trusty64/versions/20190514.0.0/providers/virtualbox.box";
-      hash = "sha256-iUUXyRY8iW7DGirb0zwGgf1fRbLA7wimTJKgP7l/OQ8=";
-      };
-      rootDisk = "box-disk1.vmdk";
-      system = "x86_64-linux";
-      };
-    */
-
-    # End of standard support https://wiki.ubuntu.com/Releases
-    "ubuntu-v16_04" = {
-      image = import <nix/fetchurl.nix> {
-        url = "https://app.vagrantup.com/generic/boxes/ubuntu1604/versions/4.1.12/providers/libvirt.box";
-        hash = "sha256-lO4oYQR2tCh5auxAYe6bPOgEqOgv3Y3GC1QM1tEEEU8=";
+        url = "https://app.vagrantup.com/generic/boxes/ubuntu2004/versions/4.3.12/providers/libvirt.box";
+        hash = "sha256-lo6fkz6N/Q9mdD+RWoUssak9TVod0F7QSgZvxnMj9IQ=";
       };
       rootDisk = "box.img";
       system = "x86_64-linux";
@@ -433,50 +419,16 @@ let
       system = "x86_64-linux";
     };
 
-    "fedora-v36" = {
+    "fedora-v39" = {
       image = import <nix/fetchurl.nix> {
-        url = "https://app.vagrantup.com/generic/boxes/fedora36/versions/4.1.12/providers/libvirt.box";
-        hash = "sha256-rxPgnDnFkTDwvdqn2CV3ZUo3re9AdPtSZ9SvOHNvaks=";
+        url = "https://app.vagrantup.com/generic/boxes/fedora39/versions/4.3.12/providers/libvirt.box";
+        hash = "sha256-VJbWmcy3XiEm7cUAXtod8VlFwsIwnVYlZ/LYTuoj9WI=";
       };
       rootDisk = "box.img";
       system = "x86_64-linux";
       upstreamScriptsWork = false; # SELinux!
     };
 
-    "fedora-v37" = {
-      image = import <nix/fetchurl.nix> {
-        url = "https://app.vagrantup.com/generic/boxes/fedora37/versions/4.2.14/providers/libvirt.box";
-        hash = "sha256-rxPgnDnFkTDwvdqn2CV3ZUo3re9AdPtSZ9SvOHNvaks=";
-      };
-      rootDisk = "box.img";
-      system = "x86_64-linux";
-      upstreamScriptsWork = false; # SELinux!
-    };
-
-    # Currently fails with 'error while loading shared libraries:
-    # libsodium.so.23: cannot stat shared object: Invalid argument'.
-    /*
-      "rhel-v6" = {
-      image = import <nix/fetchurl.nix> {
-      url = "https://app.vagrantup.com/generic/boxes/rhel6/versions/4.1.12/providers/libvirt.box";
-      hash = "sha256-QwzbvRoRRGqUCQptM7X/InRWFSP2sqwRt2HaaO6zBGM=";
-      };
-      rootDisk = "box.img";
-      upstreamScriptsWork = false; # SELinux!
-      system = "x86_64-linux";
-      };
-    */
-
-    "rhel-v7" = {
-      image = import <nix/fetchurl.nix> {
-        url = "https://app.vagrantup.com/generic/boxes/rhel7/versions/4.1.12/providers/libvirt.box";
-        hash = "sha256-b4afnqKCO9oWXgYHb9DeQ2berSwOjS27rSd9TxXDc/U=";
-      };
-      rootDisk = "box.img";
-      upstreamScriptsWork = false; # SELinux!
-      system = "x86_64-linux";
-    };
-
     "rhel-v8" = {
       image = import <nix/fetchurl.nix> {
         url = "https://app.vagrantup.com/generic/boxes/rhel8/versions/4.1.12/providers/libvirt.box";