From 252c731538f0043cd39651f25a480e24ccb89939 Mon Sep 17 00:00:00 2001 From: Martin Weinelt <hexa@darmstadt.ccc.de> Date: Sun, 31 Dec 2023 18:10:50 +0100 Subject: [PATCH] nixos: Add support for stable release VM images --- jenkins/jobs/image-nixos.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/jenkins/jobs/image-nixos.yaml b/jenkins/jobs/image-nixos.yaml index 79ba8f45..5bc35245 100644 --- a/jenkins/jobs/image-nixos.yaml +++ b/jenkins/jobs/image-nixos.yaml @@ -35,10 +35,11 @@ [ "${ARCH}" = "amd64" ] && ARCH="x86_64" [ "${ARCH}" = "arm64" ] && ARCH="aarch64" + RELEASE=${release} + [ "${RELEASE}" = "unstable" ] && JOBSET="trunk-combined" || JOBSET="release-${RELEASE}" + # download a pre-built VM image - if [ "${release}" = "unstable" ]; then - curl --location --output ${WORKSPACE}/disk.qcow2 https://hydra.nixos.org/job/nixos/trunk-combined/nixos.lxdVirtualMachineImage.${ARCH}-linux/latest/download-by-type/file/qcow2-image - fi + curl --location --output ${WORKSPACE}/disk.qcow2 https://hydra.nixos.org/job/nixos/${JOBSET}/nixos.lxdVirtualMachineImage.${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} \