Merge pull request #800 from adamcstephens/nixos/releases

nixos: add stable version, rename current to unstable
lxc · Dec 15, 2023 · fb5ca9b · fb5ca9b
2 parents ada506d + 8560f8c
commit fb5ca9b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/bin/test-image b/bin/test-image
@@ -67,6 +67,11 @@ EOF
     fi
 else
     for PRIV in "priv" "unpriv"; do
+        if [ "${PRIV}" = "priv" ] && [ "${DIST}" = "nixos" ] && [ "${RELEASE}" = "23.11" ]; then
+            # NixOS 23.11 will never support privileged containers, but future versions do
+            continue
+        fi
+
         incus init "${TEST_IMAGE}" "${TEST_IMAGE}-${PRIV}"
         INSTANCES="${INSTANCES} ${TEST_IMAGE}-${PRIV}"
 

diff --git a/jenkins/jobs/image-nixos.yaml b/jenkins/jobs/image-nixos.yaml
@@ -17,7 +17,8 @@
         name: release
         type: user-defined
         values:
-        - current
+        - unstable
+        - 23.11
 
     - axis:
         name: variant
@@ -36,7 +37,8 @@
 
         exec sudo /lxc-ci/bin/build-distro /lxc-ci/images/nixos.yaml \
             ${INCUS_ARCHITECTURE} container 14400 ${WORKSPACE} \
-            -o image.architecture=${ARCH}
+            -o image.architecture=${ARCH} \
+            -o image.release=${release}
 
     properties:
     - build-discarder: