From 61f45af6871f0eb03d1d4c18109927577ca6b208 Mon Sep 17 00:00:00 2001
From: Adam Stephens <adam@valkor.net>
Date: Fri, 16 Aug 2024 10:36:09 -0400
Subject: [PATCH 1/2] nixos: switch unstable to incus-specific image

Signed-off-by: Adam Stephens <adam@valkor.net>
---
 images/nixos.yaml             | 21 +++++++++++++++++++++
 jenkins/jobs/image-nixos.yaml |  5 ++++-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/images/nixos.yaml b/images/nixos.yaml
index 606df49d..55662e94 100644
--- a/images/nixos.yaml
+++ b/images/nixos.yaml
@@ -49,3 +49,24 @@ files:
       {
         networking.hostName = "{{ instance.name }}";
       }
+    releases:
+      - 24.05
+
+  - name: conf-hostname
+    path: /etc/nixos/incus.nix
+    generator: template
+    content: |-
+      {
+        lib,
+        config,
+        pkgs,
+        ...
+      }:
+
+      # WARNING: THIS CONFIGURATION IS AUTOGENERATED AND WILL BE OVERWRITTEN AUTOMATICALLY
+
+      {
+        networking.hostName = "{{ instance.name }}";
+      }
+    releases:
+      - unstable
diff --git a/jenkins/jobs/image-nixos.yaml b/jenkins/jobs/image-nixos.yaml
index 70d12b76..60c0e058 100644
--- a/jenkins/jobs/image-nixos.yaml
+++ b/jenkins/jobs/image-nixos.yaml
@@ -39,8 +39,11 @@
         RELEASE=${release}
         [ "${RELEASE}" = "unstable" ] && JOBSET="trunk-combined" || JOBSET="release-${RELEASE}"
 
+        # remove lxd image when 24.11 is released
+        [ "${RELEASE}" = "unstable" ] && HYDRA_IMAGE="incusVirtualMachineImage" || HYDRA_IMAGE="lxdVirtualMachineImage"
+
         # download a pre-built VM image
-        curl --location --output ${WORKSPACE}/disk.qcow2 https://hydra.nixos.org/job/nixos/${JOBSET}/nixos.lxdVirtualMachineImage.${ARCH}-linux/latest/download-by-type/file/qcow2-image
+        curl --location --output ${WORKSPACE}/disk.qcow2 https://hydra.nixos.org/job/nixos/${JOBSET}/nixos.${HYDRA_IMAGE}.${ARCH}-linux/latest/download-by-type/file/qcow2-image
 
         exec sudo /lxc-ci/bin/build-distro /lxc-ci/images/nixos.yaml \
             ${INCUS_ARCHITECTURE} container 14400 ${WORKSPACE} \

From 81f18aba5013a9b807826bcf7a3745f464df44ea Mon Sep 17 00:00:00 2001
From: Adam Stephens <adam@valkor.net>
Date: Fri, 16 Aug 2024 10:36:30 -0400
Subject: [PATCH 2/2] nixos: drop unsupported 23.11 release

Signed-off-by: Adam Stephens <adam@valkor.net>
---
 jenkins/jobs/image-nixos.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/jenkins/jobs/image-nixos.yaml b/jenkins/jobs/image-nixos.yaml
index 60c0e058..1bcb7f82 100644
--- a/jenkins/jobs/image-nixos.yaml
+++ b/jenkins/jobs/image-nixos.yaml
@@ -18,7 +18,6 @@
         type: user-defined
         values:
         - unstable
-        - 23.11
         - 24.05
 
     - axis: