Merge pull request #840 from adamcstephens/nixos/incus-specific

nixos: switch unstable to incus-specific image
lxc · Aug 16, 2024 · e83cc88 · e83cc88
2 parents 91c00b9 + 81f18ab
commit e83cc88
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 2 deletions.
diff --git 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
@@ -18,7 +18,6 @@
         type: user-defined
         values:
         - unstable
-        - 23.11
         - 24.05
 
     - axis:
@@ -39,8 +38,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} \