ERL-467: nemos-images-reference-*: config.sh: remove checkbox snap de…

…pendency `checkbox` snap has launchers built-in but the one we use are in `checkbox-erlangen-classic` which has launchers and providers (in checkbox term, the jobs and testplans), but doesn't have checkbox-runtime so we still depend on `checkbox22` to provide the service and also the generic providers. Signed-off-by: Alexandre Esse <alexandre.esse@canonical.com>
Elektrobit · Dec 14, 2023 · b1052ee · b1052ee
1 parent 10649f8
commit b1052ee
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 19 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -16,7 +16,6 @@ execute: |
   for snap in \
     snapd \
     checkbox22 \
-    checkbox \
     checkbox-erlangen-classic \
     core22; do
       snap list "${snap}"