Run spread tests on noble too

.github/workflows/spread-test.yaml

@@ -29,9 +29,9 @@ jobs:
       matrix:
         include:
           - group: ubuntu-arm
-            systems: 'ubuntu-20.04-arm-64 ubuntu-22.04-arm-64'
+            systems: 'ubuntu-20.04-arm-64 ubuntu-22.04-arm-64 ubuntu-24.04-arm-64'
           - group: ubuntu
-            systems: 'ubuntu-18.04-64 ubuntu-20.04-64 ubuntu-22.04-64 ubuntu-23.04-64 ubuntu-23.10-64'
+            systems: 'ubuntu-18.04-64 ubuntu-20.04-64 ubuntu-22.04-64 ubuntu-23.10-64 ubuntu-24.04-64'
     steps:
       - name: Cleanup job workspace
         id: cleanup-job-workspace

.gitignore

@@ -25,3 +25,6 @@ vendor/
 
 # snap
 ubuntu-image*.snap
+
+# Work dirs
+tmp/

Makefile

@@ -1,3 +1,7 @@
 .PHONY: snap
 snap:  ## Create a ubuntu-image snap
 	@snapcraft clean && snapcraft --use-lxd -v
+
+.PHONY: collect-mkfs-confs
+collect-mkfs-confs:
+	@./tools/collect-mkfs-confs.sh

debian/changelog

@@ -10,6 +10,7 @@ ubuntu-image (3.5) UNRELEASED; urgency=medium
     section is valid.
   * Rework partitions handling to avoid overridding GPT header
     and get the image size mostly right.
+  * Test running ubuntu-image on noble
 
   [ Maciej Borzecki ]
   * Improve handling of structures without a filesystem.

mkfs/db

@@ -1,6 +1,6 @@
 xenial,1.42.13-1ubuntu1.2
 bionic,1.44.1-1ubuntu1.4
-focal,1.45.5-2ubuntu1.1
-jammy,1.46.5-2ubuntu1.1
-noble,1.47.0-2.4~exp1ubuntu4
+focal,1.45.5-2ubuntu1.2
+jammy,1.46.5-2ubuntu1.2
+noble,1.47.0-2.4~exp1ubuntu4.1
 oracular,1.47.1-1ubuntu1

snapcraft.yaml

@@ -3,7 +3,7 @@ summary: Create Ubuntu images
 description: |
   Official tool for building Ubuntu images, currently supporing Ubuntu Core
   snap-based images and preinstalled Ubuntu classic images.
-version: "3.4+snap9"
+version: "3.4+snap10"
 grade: stable
 confinement: classic
 base: core24

spread.yaml

@@ -29,10 +29,10 @@ backends:
       - ubuntu-22.04-64:
           storage: 45G
           workers: 1
-      - ubuntu-23.04-64:
+      - ubuntu-23.10-64:
           storage: 45G
           workers: 1
-      - ubuntu-23.10-64:
+      - ubuntu-24.04-64:
           storage: 45G
           workers: 1
   google-arm:
@@ -50,6 +50,10 @@ backends:
           image: ubuntu-os-cloud/ubuntu-2204-lts-arm64
           workers: 1
           storage: 45G
+      - ubuntu-24.04-arm-64:
+          image: ubuntu-os-cloud/ubuntu-2404-lts-arm64
+          workers: 1
+          storage: 45G
   qemu:
     memory: 4G
     systems:
@@ -62,16 +66,21 @@ backends:
       - ubuntu-22.04-64:
             username: ubuntu
             password: ubuntu
-      - ubuntu-23.04-64:
+      - ubuntu-23.10-64:
             username: ubuntu
             password: ubuntu
-      - ubuntu-23.10-64:
+      - ubuntu-24.04-64:
             username: ubuntu
             password: ubuntu
 
 path: /home/ubuntu-image
 
 prepare: |
+  # Make sure there is a hostname file because it could be missing
+  # We will need it to have debootstrap properly run
+  if [ ! -f /etc/hostname ]; then
+      echo "hostname" > /etc/hostname
+  fi
   # NOTE: This part of the code needs to be in spread.yaml as it runs before
   # the rest of the source code (including the tests/lib directory) is
   # around. The purpose of this code is to fix some connectivity issues and

tests/commons/snap/task.yaml

@@ -4,6 +4,7 @@ environment:
     IMG/ubuntu_core_18_amd64: ubuntu-core-18-amd64
     IMG/ubuntu_core_20_amd64: ubuntu-core-20-amd64
     IMG/ubuntu_core_22_amd64: ubuntu-core-22-amd64
+    IMG/ubuntu_core_24_amd64: ubuntu-core-24-amd64
 
 execute: |
     mkdir -p /tmp/${IMG}/workdir