Skip to content

Commit

Permalink
tests: add support for ubuntu plucky (#14716)
Browse files Browse the repository at this point in the history
* tests: add support for ubuntu plucky

This branch adds support for ubuntu plucky. Also moves oracular to
no-lts

* update tests to make them work in 25.04

* fix shellcheck
  • Loading branch information
sergiocazzolato authored Nov 21, 2024
1 parent f23e5ed commit 11c4e84
Show file tree
Hide file tree
Showing 12 changed files with 28 additions and 19 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -282,12 +282,12 @@ jobs:
rules: 'main'
- group: ubuntu-no-lts
backend: google
systems: ''
systems: 'ubuntu-24.10-64'
tasks: 'tests/...'
rules: 'main'
- group: ubuntu-daily
backend: google
systems: 'ubuntu-24.10-64'
systems: 'ubuntu-25.04-64'
tasks: 'tests/...'
rules: 'main'
- group: ubuntu-core-18
Expand Down
4 changes: 4 additions & 0 deletions spread.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,10 @@ backends:
- ubuntu-24.10-64:
storage: 15G
workers: 8
- ubuntu-25.04-64:
image: ubuntu-os-cloud-devel/ubuntu-2504-amd64
storage: 15G
workers: 8

google-core:
type: google
Expand Down
2 changes: 1 addition & 1 deletion tests/lib/pkgdb.sh
Original file line number Diff line number Diff line change
Expand Up @@ -610,7 +610,7 @@ pkg_dependencies_ubuntu_classic(){
shellcheck
"
;;
ubuntu-22.*|ubuntu-23.*|ubuntu-24.*)
ubuntu-22.*|ubuntu-23.*|ubuntu-24.*|ubuntu-25.*)
# bpftool is part of linux-tools package
echo "
dbus-user-session
Expand Down
2 changes: 1 addition & 1 deletion tests/main/cgroup-devices-v1/task.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ systems:
- -centos-9-*
- -amazon-linux-2023-*
- -ubuntu-22.*
- -ubuntu-23.*
- -ubuntu-24.*
- -ubuntu-25.*
- -ubuntu-core-22-*
- -ubuntu-core-24-*

Expand Down
2 changes: 1 addition & 1 deletion tests/main/cgroup-freezer/task.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ systems:
- -centos-9-*
- -amazon-linux-2023-*
- -ubuntu-22.*
- -ubuntu-23.*
- -ubuntu-24.*
- -ubuntu-25.*
- -ubuntu-core-22-*
- -ubuntu-core-24-*

Expand Down
2 changes: 1 addition & 1 deletion tests/main/cgroup-tracking-failure/task.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ execute: |
MATCH 'DEBUG: create transient scope job: /org/freedesktop/systemd1/job/[0-9]+' <debug.txt
MATCH '1:name=systemd:/user.slice/user-0.slice/user@0.service/snap.test-snapd-sh.sh.[0-9a-f-]+.scope' <cgroup.txt
;;
ubuntu-22*|ubuntu-23*|ubuntu-24*)
ubuntu-22*|ubuntu-24*|ubuntu-25*)
# Ubuntu > 22 uses unified cgroup hierarchy, where we wait
# for the systemd to complete the job that creates a transient scope
MATCH 'DEBUG: using session bus' <debug.txt
Expand Down
4 changes: 2 additions & 2 deletions tests/main/lxd-mount-units/task.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ execute: |
fi
REMOTE=ubuntu
# There isn't an official image for 24.10 yet, let's use the daily one
if os.query is-ubuntu 24.10; then
# There isn't an official image for 25.04 yet, let's use the daily one
if os.query is-ubuntu 25.04; then
REMOTE=ubuntu-daily
fi
VERSION_ID="$(. /etc/os-release && echo "$VERSION_ID" )"
Expand Down
4 changes: 2 additions & 2 deletions tests/main/lxd-postrm-purge/task.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ prepare: |
"$TESTSTOOLS"/lxd-state prepare-snap
REMOTE=ubuntu
# There isn't an official image for 24.10 yet, let's use the daily one
if os.query is-ubuntu 24.10; then
# There isn't an official image for 25.04 yet, let's use the daily one
if os.query is-ubuntu 25.04; then
REMOTE=ubuntu-daily
fi
VERSION_ID="$(. /etc/os-release && echo "$VERSION_ID" )"
Expand Down
2 changes: 1 addition & 1 deletion tests/main/lxd-snapfuse/task.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ execute: |
REMOTE=ubuntu
# There isn't an official image for noble yet, let's use the daily one
if os.query is-ubuntu 24.04; then
if os.query is-ubuntu 25.04; then
REMOTE=ubuntu-daily
fi
VERSION_ID="$(. /etc/os-release && echo "$VERSION_ID" )"
Expand Down
4 changes: 2 additions & 2 deletions tests/main/lxd-try/task.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ prepare: |
"$TESTSTOOLS"/lxd-state prepare-snap
REMOTE=ubuntu
# There isn't an official image for 24.10 yet, let's use the daily one
if os.query is-ubuntu 24.10; then
# There isn't an official image for 25.04 yet, let's use the daily one
if os.query is-ubuntu 25.04; then
REMOTE=ubuntu-daily
fi
VERSION_ID="$(. /etc/os-release && echo "$VERSION_ID" )"
Expand Down
4 changes: 2 additions & 2 deletions tests/main/lxd/task.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ execute: |
# There isn't an official image for noble yet, let's use the community one
REMOTE=ubuntu
# There isn't an official image for 24.10 yet, let's use the daily one
if os.query is-ubuntu 24.10; then
# There isn't an official image for 25.04 yet, let's use the daily one
if os.query is-ubuntu 25.04; then
REMOTE=ubuntu-daily
fi
VERSION_ID="$(. /etc/os-release && echo "$VERSION_ID" )"
Expand Down
13 changes: 9 additions & 4 deletions tests/main/upgrade-from-release/task.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,25 @@ details: |
systems: [ubuntu-1*-64, ubuntu-2*-64]

prepare: |
if os.query is-arm; then
tests.exec skip-test "there is no content for arm64 in repo http://archive.ubuntu.com/ubuntu (just amd64)" && exit 0
elif os.query is-ubuntu 25.04; then
tests.exec skip-test "there is no updates content for daily images in repo http://archive.ubuntu.com/ubuntu" && exit 0
fi
#shellcheck source=tests/lib/pkgdb.sh
. "$TESTSLIB/pkgdb.sh"
distro_purge_package snapd
restore: |
tests.exec is-skipped && exit 0
#shellcheck source=tests/lib/pkgdb.sh
. "$TESTSLIB/pkgdb.sh"
distro_install_build_snapd
execute: |
if os.query is-arm; then
echo "there is no content for arm64 in repo http://archive.ubuntu.com/ubuntu (just amd64)"
exit
fi
tests.exec is-skipped && exit 0
. /etc/os-release
# trusty has no UBUNTU_CODENAME in /etc/os-release and we need to cheat
Expand Down

0 comments on commit 11c4e84

Please sign in to comment.