Merge pull request #40 from numtide/fix_ubuntu_kinetic_release

Update test ubuntu images
numtide · Sep 12, 2023 · 3071022 · 3071022
2 parents 31d86eb + af03638
commit 3071022
Show file tree

Hide file tree

Showing 3 changed files with 64 additions and 63 deletions.
diff --git a/nix/lib.nix b/nix/lib.nix
@@ -91,68 +91,6 @@ in
     in
     returnIfNoAssertions toplevel;
 
-  # TODO: put these in an external JSON file that we can automatically update
-  images.ubuntu = {
-    x86_64-linux = {
-      ubuntu_23_04_cloudimg = {
-        name = "ubuntu-23.04-server-cloudimg-amd64.img";
-        releaseName = "lunar";
-        releaseTimeStamp = "20230502";
-        hash = "sha256-E5ZchMZcurCzQyasNKwMR6iAMPnf+A5jkeVsuQd8rdA=";
-      };
-
-      ubuntu_22_10_cloudimg = {
-        name = "ubuntu-22.10-server-cloudimg-amd64.img";
-        releaseName = "kinetic";
-        releaseTimeStamp = "20230428";
-        hash = "sha256-HYgpm243gfJgY3zK2lVVlSLfW3a/Vhdop/zJErIt6r4=";
-      };
-
-      ubuntu_22_04_cloudimg = {
-        name = "ubuntu-22.04-server-cloudimg-amd64.img";
-        releaseName = "jammy";
-        releaseTimeStamp = "20230427";
-        hash = "sha256-m76TZOKYnBzOLBZpt6kcK70TkFKHaoyBzVLA+q77ZHQ=";
-      };
-
-      ubuntu_20_04_cloudimg = {
-        name = "ubuntu-20.04-server-cloudimg-amd64.img";
-        releaseName = "focal";
-        releaseTimeStamp = "20230420";
-        hash = "sha256-XFUVWvk8O1IHfp+sAiOSCU5ASk/qJG2JIF4WH0ex12U=";
-      };
-    };
-    aarch64-linux = {
-      ubuntu_23_04_cloudimg = {
-        name = "ubuntu-23.04-server-cloudimg-arm64.img";
-        releaseName = "lunar";
-        releaseTimeStamp = "20230502";
-        hash = "";
-      };
-
-      ubuntu_22_10_cloudimg = {
-        name = "ubuntu-22.10-server-cloudimg-arm64.img";
-        releaseName = "kinetic";
-        releaseTimeStamp = "20230428";
-        hash = "";
-      };
-
-      ubuntu_22_04_cloudimg = {
-        name = "ubuntu-22.04-server-cloudimg-arm64.img";
-        releaseName = "jammy";
-        releaseTimeStamp = "20230427";
-        hash = "sha256-9vkeg5VumVBxj4TaLd0SgJEWjw11pcP7SBz5zd1V0EE=";
-      };
-
-      ubuntu_20_04_cloudimg = {
-        name = "ubuntu-20.04-server-cloudimg-arm64.img";
-        releaseName = "focal";
-        releaseTimeStamp = "20230420";
-        hash = "sha256-YUtW3oMHz4Hw7WeIu6ksx+/mUfxp7cCSSETvY6KGwU4=";
-      };
-    };
-  };
-
   # Careful since we do not have the nix store yet when this service runs,
   # so we cannot use pkgs.writeTest or pkgs.writeShellScript for instance,
   # since their results would refer to the store

diff --git a/test/nix/images.json b/test/nix/images.json
@@ -0,0 +1,62 @@
+{
+  "ubuntu": {
+    "x86_64-linux": {
+      "ubuntu_23_04_cloudimg": {
+        "name": "ubuntu-23.04-server-cloudimg-amd64.img",
+        "releaseName": "lunar",
+        "releaseTimeStamp": "20230829",
+        "hash": "sha256-t51lSk9M7jaR+72i70iWtbutrkDGCgdjxd385rIe/08="
+      },
+
+      "ubuntu_22_10_cloudimg": {
+        "name": "ubuntu-22.10-server-cloudimg-amd64.img",
+        "releaseName": "kinetic",
+        "releaseTimeStamp": "20230716",
+        "hash": "sha256-ZMgnM7t0bhOSxU957aWF0VMwQIAa/RPU8EvfIYAkVno="
+      },
+
+      "ubuntu_22_04_cloudimg": {
+        "name": "ubuntu-22.04-server-cloudimg-amd64.img",
+        "releaseName": "jammy",
+        "releaseTimeStamp": "20230828",
+        "hash": "sha256-C9onYpn8XxiXGOVvZVeRc0deyl/8ImPWgBuJfISLKPg="
+      },
+
+      "ubuntu_20_04_cloudimg": {
+        "name": "ubuntu-20.04-server-cloudimg-amd64.img",
+        "releaseName": "focal",
+        "releaseTimeStamp": "20230908",
+        "hash": "sha256-N/folU4v6aAGy62vIfj3M70STZb/TOTzP1fw+mS7xiE="
+      }
+    },
+    "aarch64-linux": {
+      "ubuntu_23_04_cloudimg": {
+        "name": "ubuntu-23.04-server-cloudimg-arm64.img",
+        "releaseName": "lunar",
+        "releaseTimeStamp": "20230502",
+        "hash": ""
+      },
+
+      "ubuntu_22_10_cloudimg": {
+        "name": "ubuntu-22.10-server-cloudimg-arm64.img",
+        "releaseName": "kinetic",
+        "releaseTimeStamp": "20230716",
+        "hash": ""
+      },
+
+      "ubuntu_22_04_cloudimg": {
+        "name": "ubuntu-22.04-server-cloudimg-arm64.img",
+        "releaseName": "jammy",
+        "releaseTimeStamp": "20230427",
+        "hash": "sha256-9vkeg5VumVBxj4TaLd0SgJEWjw11pcP7SBz5zd1V0EE="
+      },
+
+      "ubuntu_20_04_cloudimg": {
+        "name": "ubuntu-20.04-server-cloudimg-arm64.img",
+        "releaseName": "focal",
+        "releaseTimeStamp": "20230420",
+        "hash": "sha256-YUtW3oMHz4Hw7WeIu6ksx+/mUfxp7cCSSETvY6KGwU4="
+      }
+    }
+  }
+}
diff --git a/test/nix/modules/default.nix b/test/nix/modules/default.nix
@@ -4,7 +4,8 @@
 }:
 
 let
-  forEachUbuntuImage = lib.flip lib.mapAttrs' system-manager.lib.images.ubuntu.${system};
+  images = lib.importJSON ../images.json;
+  forEachUbuntuImage = lib.flip lib.mapAttrs' images.ubuntu.${system};
 
   # To test reload and restart, we include two services, one that can be reloaded
   # and one that cannot.