Skip to content

Commit f59ce37

Browse files
committed
images: Move ubuntu-stable to oracular
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.
1 parent 31b7309 commit f59ce37

File tree

3 files changed

+12
-4
lines changed

3 files changed

+12
-4
lines changed

images/scripts/debian.setup

+5-4
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ if [ "$IMAGE" = "debian-stable" ] || [ "$IMAGE" = "ubuntu-2204" ] ; then
105105
fi
106106

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

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

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

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

@@ -362,7 +363,7 @@ if [ "$RELEASE" = "testing" ]; then
362363
fi
363364

364365
# HACK: https://launchpad.net/bugs/2040483
365-
if [ "$IMAGE" = "ubuntu-2404" ] || [ "$IMAGE" = "ubuntu-stable" ]; then
366+
if [ "$IMAGE" = "ubuntu-2404" ]; then
366367
mkdir -p /etc/containers/containers.conf.d
367368
printf '[CONTAINERS]\napparmor_profile=""\n' > /etc/containers/containers.conf.d/disable-apparmor.conf
368369
fi

images/scripts/ubuntu-stable.bootstrap

+5
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,9 @@ fi
1515
# release name is the last part of the URL
1616
rel=${rel##*/}
1717

18+
# noble == 24.04 LTS, which we already have as ubuntu-2404; test the upcoming release
19+
if [ "$rel" = "noble" ]; then
20+
rel="oracular"
21+
fi
22+
1823
exec $(dirname $0)/lib/cloudimage.bootstrap "$1" "https://cloud-images.ubuntu.com/daily/server/$rel/current/$rel-server-cloudimg-amd64.img"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
testlib.Error: FAIL: Test completed, but found unexpected journal messages:
2+
*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 commit comments

Comments
 (0)