diff --git a/nemos-images-reference-lunar/qemu-amd64/config.sh b/nemos-images-reference-lunar/qemu-amd64/config.sh index d24b89f..7e87143 100755 --- a/nemos-images-reference-lunar/qemu-amd64/config.sh +++ b/nemos-images-reference-lunar/qemu-amd64/config.sh @@ -53,7 +53,7 @@ for profile in ${kiwi_profiles//,/ }; do # This requires network access to the Snap Store in Kiwi. 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 + for snap in snapd checkbox22 checkbox-erlangen-classic core22; do # Always download the very latest checkbox-erlangen-classic snap if [ "${snap}" = "checkbox-erlangen-classic" ]; then CHANNEL="latest/edge" @@ -67,8 +67,8 @@ for profile in ${kiwi_profiles//,/ }; do channel: ${CHANNEL} file: $(ls ${snap}_*.snap) EOF - # Checkbox snaps require classic confinement mode - if [ "${snap}" = "checkbox" ] || [ "${snap}" = "checkbox-erlangen-classic" ]; then + # checkbox-erlangen-classic snap requires classic confinement mode + if [ "${snap}" = "checkbox-erlangen-classic" ]; then cat >> /var/lib/snapd/seed/seed.yaml << EOF classic: true EOF diff --git a/nemos-images-reference-lunar/qemu-arm64/config.sh b/nemos-images-reference-lunar/qemu-arm64/config.sh index d24b89f..7e87143 100755 --- a/nemos-images-reference-lunar/qemu-arm64/config.sh +++ b/nemos-images-reference-lunar/qemu-arm64/config.sh @@ -53,7 +53,7 @@ for profile in ${kiwi_profiles//,/ }; do # This requires network access to the Snap Store in Kiwi. 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 + for snap in snapd checkbox22 checkbox-erlangen-classic core22; do # Always download the very latest checkbox-erlangen-classic snap if [ "${snap}" = "checkbox-erlangen-classic" ]; then CHANNEL="latest/edge" @@ -67,8 +67,8 @@ for profile in ${kiwi_profiles//,/ }; do channel: ${CHANNEL} file: $(ls ${snap}_*.snap) EOF - # Checkbox snaps require classic confinement mode - if [ "${snap}" = "checkbox" ] || [ "${snap}" = "checkbox-erlangen-classic" ]; then + # checkbox-erlangen-classic snap requires classic confinement mode + if [ "${snap}" = "checkbox-erlangen-classic" ]; then cat >> /var/lib/snapd/seed/seed.yaml << EOF classic: true EOF diff --git a/nemos-images-reference-lunar/s32g274ardb2/config.sh b/nemos-images-reference-lunar/s32g274ardb2/config.sh index 0bbc84b..0a49fc2 100755 --- a/nemos-images-reference-lunar/s32g274ardb2/config.sh +++ b/nemos-images-reference-lunar/s32g274ardb2/config.sh @@ -53,7 +53,7 @@ for profile in ${kiwi_profiles//,/ }; do # This requires network access to the Snap Store in Kiwi. 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 + for snap in snapd checkbox22 checkbox-erlangen-classic core22; do # Always download the very latest checkbox-erlangen-classic snap if [ "${snap}" = "checkbox-erlangen-classic" ]; then CHANNEL="latest/edge" @@ -67,8 +67,8 @@ for profile in ${kiwi_profiles//,/ }; do channel: ${CHANNEL} file: $(ls ${snap}_*.snap) EOF - # Checkbox snaps require classic confinement mode - if [ "${snap}" = "checkbox" ] || [ "${snap}" = "checkbox-erlangen-classic" ]; then + # checkbox-erlangen-classic snap requires classic confinement mode + if [ "${snap}" = "checkbox-erlangen-classic" ]; then cat >> /var/lib/snapd/seed/seed.yaml << EOF classic: true EOF diff --git a/nemos-images-reference-mantic/qemu-amd64/config.sh b/nemos-images-reference-mantic/qemu-amd64/config.sh index d24b89f..7e87143 100755 --- a/nemos-images-reference-mantic/qemu-amd64/config.sh +++ b/nemos-images-reference-mantic/qemu-amd64/config.sh @@ -53,7 +53,7 @@ for profile in ${kiwi_profiles//,/ }; do # This requires network access to the Snap Store in Kiwi. 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 + for snap in snapd checkbox22 checkbox-erlangen-classic core22; do # Always download the very latest checkbox-erlangen-classic snap if [ "${snap}" = "checkbox-erlangen-classic" ]; then CHANNEL="latest/edge" @@ -67,8 +67,8 @@ for profile in ${kiwi_profiles//,/ }; do channel: ${CHANNEL} file: $(ls ${snap}_*.snap) EOF - # Checkbox snaps require classic confinement mode - if [ "${snap}" = "checkbox" ] || [ "${snap}" = "checkbox-erlangen-classic" ]; then + # checkbox-erlangen-classic snap requires classic confinement mode + if [ "${snap}" = "checkbox-erlangen-classic" ]; then cat >> /var/lib/snapd/seed/seed.yaml << EOF classic: true EOF diff --git a/nemos-images-reference-mantic/qemu-arm64/config.sh b/nemos-images-reference-mantic/qemu-arm64/config.sh index d24b89f..7e87143 100755 --- a/nemos-images-reference-mantic/qemu-arm64/config.sh +++ b/nemos-images-reference-mantic/qemu-arm64/config.sh @@ -53,7 +53,7 @@ for profile in ${kiwi_profiles//,/ }; do # This requires network access to the Snap Store in Kiwi. 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 + for snap in snapd checkbox22 checkbox-erlangen-classic core22; do # Always download the very latest checkbox-erlangen-classic snap if [ "${snap}" = "checkbox-erlangen-classic" ]; then CHANNEL="latest/edge" @@ -67,8 +67,8 @@ for profile in ${kiwi_profiles//,/ }; do channel: ${CHANNEL} file: $(ls ${snap}_*.snap) EOF - # Checkbox snaps require classic confinement mode - if [ "${snap}" = "checkbox" ] || [ "${snap}" = "checkbox-erlangen-classic" ]; then + # checkbox-erlangen-classic snap requires classic confinement mode + if [ "${snap}" = "checkbox-erlangen-classic" ]; then cat >> /var/lib/snapd/seed/seed.yaml << EOF classic: true EOF diff --git a/nemos-images-reference-mantic/s32g274ardb2/config.sh b/nemos-images-reference-mantic/s32g274ardb2/config.sh index 0bbc84b..0a49fc2 100755 --- a/nemos-images-reference-mantic/s32g274ardb2/config.sh +++ b/nemos-images-reference-mantic/s32g274ardb2/config.sh @@ -53,7 +53,7 @@ for profile in ${kiwi_profiles//,/ }; do # This requires network access to the Snap Store in Kiwi. 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 + for snap in snapd checkbox22 checkbox-erlangen-classic core22; do # Always download the very latest checkbox-erlangen-classic snap if [ "${snap}" = "checkbox-erlangen-classic" ]; then CHANNEL="latest/edge" @@ -67,8 +67,8 @@ for profile in ${kiwi_profiles//,/ }; do channel: ${CHANNEL} file: $(ls ${snap}_*.snap) EOF - # Checkbox snaps require classic confinement mode - if [ "${snap}" = "checkbox" ] || [ "${snap}" = "checkbox-erlangen-classic" ]; then + # checkbox-erlangen-classic snap requires classic confinement mode + if [ "${snap}" = "checkbox-erlangen-classic" ]; then cat >> /var/lib/snapd/seed/seed.yaml << EOF classic: true EOF diff --git a/tests/spread/snaps/task.yaml b/tests/spread/snaps/task.yaml index 97ca52c..3a4a15f 100644 --- a/tests/spread/snaps/task.yaml +++ b/tests/spread/snaps/task.yaml @@ -16,7 +16,6 @@ execute: | for snap in \ snapd \ checkbox22 \ - checkbox \ checkbox-erlangen-classic \ core22; do snap list "${snap}"