Skip to content

Commit

Permalink
images: Move ubuntu-stable to oracular
Browse files Browse the repository at this point in the history
With the recent introduction of ubuntu-2404, let's move ubuntu-stable
off 24.04 to the current development series "oracular", which will
become 24.10. It is already past feature freeze, so now is a good time
to find and fix bugs.

Drop the workarounds which applied to 24.04.

Disable -proposed while this is still in the development phase, as that
are by definition the broken packages.

Copy naughty cockpit-project#6733 which oracular inherited from Debian testing.
  • Loading branch information
martinpitt committed Aug 28, 2024
1 parent 25f199f commit 3cddcd6
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 4 deletions.
9 changes: 5 additions & 4 deletions images/scripts/debian.setup
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ if [ "$IMAGE" = "debian-stable" ] || [ "$IMAGE" = "ubuntu-2204" ] ; then
fi

# introduced in util-linux 2.40.1-5
if [ "$IMAGE" = "debian-stable" ] || [ "$IMAGE" = "ubuntu-2204" ] || [ "$IMAGE" = "ubuntu-2404" ] || [ "$IMAGE" = "ubuntu-stable" ]; then
if [ "$IMAGE" = "debian-stable" ] || [ "$IMAGE" = "ubuntu-2204" ] || [ "$IMAGE" = "ubuntu-2404" ]; then
TEST_PACKAGES="${TEST_PACKAGES/lastlog2/}"
fi

Expand Down Expand Up @@ -154,7 +154,8 @@ if [ "$IMAGE" = "debian-testing" ]; then
COCKPIT_DEPS="${COCKPIT_DEPS/pcp /}"
fi

if [ "${IMAGE#ubuntu}" != "$IMAGE" ]; then
# Attention: Enable proposed for ubuntu-stable after 24.10 release
if [ "${IMAGE#ubuntu}" != "$IMAGE" ] && [ "$IMAGE" != "ubuntu-stable" ]; then
echo "deb http://archive.ubuntu.com/ubuntu ${RELEASE}-proposed main restricted universe" > /etc/apt/sources.list.d/proposed.list
cat <<EOF > /etc/apt/preferences.d/all-proposed
Package: *
Expand All @@ -169,7 +170,7 @@ EOF
fi

# systemd-cryptsetup was split out in 256.1-2, older releases don't have it yet
if [ "$IMAGE" = "debian-stable" ] || [ "$IMAGE" = "ubuntu-2204" ] || [ "$IMAGE" = "ubuntu-2404" ] || [ "$IMAGE" = "ubuntu-stable" ]; then
if [ "$IMAGE" = "debian-stable" ] || [ "$IMAGE" = "ubuntu-2204" ] || [ "$IMAGE" = "ubuntu-2404" ]; then
TEST_PACKAGES="${TEST_PACKAGES/systemd-cryptsetup /}"
fi

Expand Down Expand Up @@ -362,7 +363,7 @@ if [ "$RELEASE" = "testing" ]; then
fi

# HACK: https://launchpad.net/bugs/2040483
if [ "$IMAGE" = "ubuntu-2404" ] || [ "$IMAGE" = "ubuntu-stable" ]; then
if [ "$IMAGE" = "ubuntu-2404" ]; then
mkdir -p /etc/containers/containers.conf.d
printf '[CONTAINERS]\napparmor_profile=""\n' > /etc/containers/containers.conf.d/disable-apparmor.conf
fi
Expand Down
5 changes: 5 additions & 0 deletions images/scripts/ubuntu-stable.bootstrap
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,9 @@ fi
# release name is the last part of the URL
rel=${rel##*/}

# noble == 24.04 LTS, which we already have as ubuntu-2404; test the upcoming release
if [ "$rel" = "noble" ]; then
rel="oracular"
fi

exec $(dirname $0)/lib/cloudimage.bootstrap "$1" "https://cloud-images.ubuntu.com/daily/server/$rel/current/$rel-server-cloudimg-amd64.img"
2 changes: 2 additions & 0 deletions naughty/ubuntu-stable/6733-apparmor-qemu-max_map_count
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
testlib.Error: FAIL: Test completed, but found unexpected journal messages:
*apparmor="DENIED" operation="open" class="file" profile="libvirt-*" name="/proc/sys/vm/max_map_count" * comm="qemu-system-x86" requested_mask="r" denied_mask="r"

0 comments on commit 3cddcd6

Please sign in to comment.