From 299b527449b048603aa0184dcfbbc9499a8fc9d7 Mon Sep 17 00:00:00 2001 From: Isaac True Date: Wed, 22 Nov 2023 16:50:02 +0100 Subject: [PATCH] ERL-467: nemos-images-reference-*: *: use latest/edge for checkbox Signed-off-by: Isaac True --- nemos-images-reference-lunar/qemu-amd64/config.sh | 12 +++++++++--- nemos-images-reference-lunar/qemu-arm64/config.sh | 12 +++++++++--- nemos-images-reference-lunar/s32g274ardb2/config.sh | 12 +++++++++--- nemos-images-reference-mantic/qemu-amd64/config.sh | 12 +++++++++--- nemos-images-reference-mantic/qemu-arm64/config.sh | 12 +++++++++--- nemos-images-reference-mantic/s32g274ardb2/config.sh | 12 +++++++++--- 6 files changed, 54 insertions(+), 18 deletions(-) diff --git a/nemos-images-reference-lunar/qemu-amd64/config.sh b/nemos-images-reference-lunar/qemu-amd64/config.sh index cd50532..d15447a 100755 --- a/nemos-images-reference-lunar/qemu-amd64/config.sh +++ b/nemos-images-reference-lunar/qemu-amd64/config.sh @@ -53,14 +53,20 @@ for profile in ${kiwi_profiles//,/ }; do mkdir -p /var/lib/snapd/seed echo "snaps": > /var/lib/snapd/seed/seed.yaml for snap in snapd checkbox22 checkbox checkbox-erlangen-classic core22; do - snap download $snap + # Always download the very latest checkbox-erlangen-classic snap + if [ "${snap}" = "checkbox-erlangen-classic" ]; do + CHANNEL="latest/edge" + else + CHANNEL="latest/stable" + done + snap download "${snap}" --channel "${CHANNEL}" # Add this new snap to the list of seeded snaps cat >> /var/lib/snapd/seed/seed.yaml << EOF - name: ${snap} - channel: latest/stable + channel: ${CHANNEL} file: $(ls ${snap}_*.snap) EOF - # Checkbox snap requires classic confinement mode + # Checkbox snaps require classic confinement mode if [ "${snap}" = "checkbox" ] || [ "${snap}" = "checkbox-erlangen-classic" ]; then cat >> /var/lib/snapd/seed/seed.yaml << EOF classic: true diff --git a/nemos-images-reference-lunar/qemu-arm64/config.sh b/nemos-images-reference-lunar/qemu-arm64/config.sh index cd50532..d15447a 100755 --- a/nemos-images-reference-lunar/qemu-arm64/config.sh +++ b/nemos-images-reference-lunar/qemu-arm64/config.sh @@ -53,14 +53,20 @@ for profile in ${kiwi_profiles//,/ }; do mkdir -p /var/lib/snapd/seed echo "snaps": > /var/lib/snapd/seed/seed.yaml for snap in snapd checkbox22 checkbox checkbox-erlangen-classic core22; do - snap download $snap + # Always download the very latest checkbox-erlangen-classic snap + if [ "${snap}" = "checkbox-erlangen-classic" ]; do + CHANNEL="latest/edge" + else + CHANNEL="latest/stable" + done + snap download "${snap}" --channel "${CHANNEL}" # Add this new snap to the list of seeded snaps cat >> /var/lib/snapd/seed/seed.yaml << EOF - name: ${snap} - channel: latest/stable + channel: ${CHANNEL} file: $(ls ${snap}_*.snap) EOF - # Checkbox snap requires classic confinement mode + # Checkbox snaps require classic confinement mode if [ "${snap}" = "checkbox" ] || [ "${snap}" = "checkbox-erlangen-classic" ]; then cat >> /var/lib/snapd/seed/seed.yaml << EOF classic: true diff --git a/nemos-images-reference-lunar/s32g274ardb2/config.sh b/nemos-images-reference-lunar/s32g274ardb2/config.sh index 01c7c6b..2e458a4 100755 --- a/nemos-images-reference-lunar/s32g274ardb2/config.sh +++ b/nemos-images-reference-lunar/s32g274ardb2/config.sh @@ -54,14 +54,20 @@ for profile in ${kiwi_profiles//,/ }; do mkdir -p /var/lib/snapd/seed echo "snaps": > /var/lib/snapd/seed/seed.yaml for snap in snapd checkbox22 checkbox checkbox-erlangen-classic core22; do - snap download $snap + # Always download the very latest checkbox-erlangen-classic snap + if [ "${snap}" = "checkbox-erlangen-classic" ]; do + CHANNEL="latest/edge" + else + CHANNEL="latest/stable" + done + snap download "${snap}" --channel "${CHANNEL}" # Add this new snap to the list of seeded snaps cat >> /var/lib/snapd/seed/seed.yaml << EOF - name: ${snap} - channel: latest/stable + channel: ${CHANNEL} file: $(ls ${snap}_*.snap) EOF - # Checkbox snap requires classic confinement mode + # Checkbox snaps require classic confinement mode if [ "${snap}" = "checkbox" ] || [ "${snap}" = "checkbox-erlangen-classic" ]; then cat >> /var/lib/snapd/seed/seed.yaml << EOF classic: true diff --git a/nemos-images-reference-mantic/qemu-amd64/config.sh b/nemos-images-reference-mantic/qemu-amd64/config.sh index cd50532..d15447a 100755 --- a/nemos-images-reference-mantic/qemu-amd64/config.sh +++ b/nemos-images-reference-mantic/qemu-amd64/config.sh @@ -53,14 +53,20 @@ for profile in ${kiwi_profiles//,/ }; do mkdir -p /var/lib/snapd/seed echo "snaps": > /var/lib/snapd/seed/seed.yaml for snap in snapd checkbox22 checkbox checkbox-erlangen-classic core22; do - snap download $snap + # Always download the very latest checkbox-erlangen-classic snap + if [ "${snap}" = "checkbox-erlangen-classic" ]; do + CHANNEL="latest/edge" + else + CHANNEL="latest/stable" + done + snap download "${snap}" --channel "${CHANNEL}" # Add this new snap to the list of seeded snaps cat >> /var/lib/snapd/seed/seed.yaml << EOF - name: ${snap} - channel: latest/stable + channel: ${CHANNEL} file: $(ls ${snap}_*.snap) EOF - # Checkbox snap requires classic confinement mode + # Checkbox snaps require classic confinement mode if [ "${snap}" = "checkbox" ] || [ "${snap}" = "checkbox-erlangen-classic" ]; then cat >> /var/lib/snapd/seed/seed.yaml << EOF classic: true diff --git a/nemos-images-reference-mantic/qemu-arm64/config.sh b/nemos-images-reference-mantic/qemu-arm64/config.sh index cd50532..d15447a 100755 --- a/nemos-images-reference-mantic/qemu-arm64/config.sh +++ b/nemos-images-reference-mantic/qemu-arm64/config.sh @@ -53,14 +53,20 @@ for profile in ${kiwi_profiles//,/ }; do mkdir -p /var/lib/snapd/seed echo "snaps": > /var/lib/snapd/seed/seed.yaml for snap in snapd checkbox22 checkbox checkbox-erlangen-classic core22; do - snap download $snap + # Always download the very latest checkbox-erlangen-classic snap + if [ "${snap}" = "checkbox-erlangen-classic" ]; do + CHANNEL="latest/edge" + else + CHANNEL="latest/stable" + done + snap download "${snap}" --channel "${CHANNEL}" # Add this new snap to the list of seeded snaps cat >> /var/lib/snapd/seed/seed.yaml << EOF - name: ${snap} - channel: latest/stable + channel: ${CHANNEL} file: $(ls ${snap}_*.snap) EOF - # Checkbox snap requires classic confinement mode + # Checkbox snaps require classic confinement mode if [ "${snap}" = "checkbox" ] || [ "${snap}" = "checkbox-erlangen-classic" ]; then cat >> /var/lib/snapd/seed/seed.yaml << EOF classic: true diff --git a/nemos-images-reference-mantic/s32g274ardb2/config.sh b/nemos-images-reference-mantic/s32g274ardb2/config.sh index 01c7c6b..2e458a4 100755 --- a/nemos-images-reference-mantic/s32g274ardb2/config.sh +++ b/nemos-images-reference-mantic/s32g274ardb2/config.sh @@ -54,14 +54,20 @@ for profile in ${kiwi_profiles//,/ }; do mkdir -p /var/lib/snapd/seed echo "snaps": > /var/lib/snapd/seed/seed.yaml for snap in snapd checkbox22 checkbox checkbox-erlangen-classic core22; do - snap download $snap + # Always download the very latest checkbox-erlangen-classic snap + if [ "${snap}" = "checkbox-erlangen-classic" ]; do + CHANNEL="latest/edge" + else + CHANNEL="latest/stable" + done + snap download "${snap}" --channel "${CHANNEL}" # Add this new snap to the list of seeded snaps cat >> /var/lib/snapd/seed/seed.yaml << EOF - name: ${snap} - channel: latest/stable + channel: ${CHANNEL} file: $(ls ${snap}_*.snap) EOF - # Checkbox snap requires classic confinement mode + # Checkbox snaps require classic confinement mode if [ "${snap}" = "checkbox" ] || [ "${snap}" = "checkbox-erlangen-classic" ]; then cat >> /var/lib/snapd/seed/seed.yaml << EOF classic: true