diff --git a/bin/test-image b/bin/test-image index 8b50a67f..4fde2b7e 100755 --- 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 index 5e8d8c8d..f674cf32 100644 --- 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: