Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

tests: enable ubuntu 21.04 for spread tests #9792

Merged
merged 18 commits into from
Feb 17, 2021
Merged

tests: enable ubuntu 21.04 for spread tests #9792

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
d6e4909
Enable ubuntu 21.04 for spread tests
sergiocazzolato Dec 11, 2020
960460d
enable github actions execution
sergiocazzolato Dec 11, 2020
095e4b0
Use 20.10 lxd image on ubuntu 21.04 lxd test
sergiocazzolato Dec 11, 2020
ceb5d76
Merge remote-tracking branch 'upstream/master' into tests-new-hirsute…
bboozzoo Jan 4, 2021
4b83971
Merge remote-tracking branch 'upstream/master' into tests-new-hirsute…
sergiocazzolato Jan 4, 2021
0dfb36a
Merge branch 'tests-new-hirsute-image' of github.com:sergiocazzolato/…
sergiocazzolato Jan 4, 2021
26f30c5
Merge remote-tracking branch 'upstream/master' into tests-new-hirsute…
sergiocazzolato Jan 5, 2021
bc46a6b
Merge branch 'master' into tests-new-hirsute-image
sergiocazzolato Jan 6, 2021
ab72ac3
Merge remote-tracking branch 'upstream/master' into tests-new-hirsute…
sergiocazzolato Jan 11, 2021
df6ba54
Merge remote-tracking branch 'upstream/master' into tests-new-hirsute…
sergiocazzolato Jan 12, 2021
0b177d4
Merge remote-tracking branch 'upstream/master' into tests-new-hirsute…
sergiocazzolato Jan 20, 2021
085d2d8
Merge remote-tracking branch 'upstream/master' into tests-new-hirsute…
bboozzoo Jan 27, 2021
d2f2789
Merge remote-tracking branch 'upstream/master' into tests-new-hirsute…
sergiocazzolato Jan 29, 2021
b823427
Merge branch 'tests-new-hirsute-image' of github.com:sergiocazzolato/…
sergiocazzolato Jan 29, 2021
3b06637
Merge remote-tracking branch 'upstream/master' into tests-new-hirsute…
mvo5 Feb 8, 2021
cb96dee
spread: add qemu ubuntu-21.04-64 as well
mvo5 Feb 8, 2021
a5ee3eb
Merge branch 'master' into tests-new-hirsute-image
sergiocazzolato Feb 17, 2021
76f3a2b
Merge branch 'tests-new-hirsute-image' of github.com:sergiocazzolato/…
sergiocazzolato Feb 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,7 @@ jobs:
- ubuntu-18.04-64
- ubuntu-20.04-64
- ubuntu-20.10-64
- ubuntu-21.04-64
- ubuntu-core-16-64
- ubuntu-core-18-64
- ubuntu-core-20-64
Expand Down
7 changes: 6 additions & 1 deletion spread.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,9 @@ backends:
secureboot: true
- ubuntu-20.10-64:
workers: 8
image: ubuntu-20.10-64
- ubuntu-21.04-64:
workers: 8
image: ubuntu-os-cloud-devel/ubuntu-2104

- debian-9-64:
workers: 6
Expand Down Expand Up @@ -234,6 +236,9 @@ backends:
- ubuntu-20.10-64:
username: ubuntu
password: ubuntu
- ubuntu-21.04-64:
username: ubuntu
password: ubuntu
- debian-sid-64:
username: debian
password: debian
Expand Down
6 changes: 6 additions & 0 deletions tests/lib/nested.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,9 @@ nested_get_google_image_url_for_vm() {
ubuntu-20.10-64*)
echo "https://storage.googleapis.com/spread-snapd-tests/images/cloudimg/groovy-server-cloudimg-amd64.img"
;;
ubuntu-21.04-64*)
echo "https://storage.googleapis.com/spread-snapd-tests/images/cloudimg/hirsute-server-cloudimg-amd64.img"
;;
*)
echo "unsupported system"
exit 1
Expand All @@ -210,6 +213,9 @@ nested_get_ubuntu_image_url_for_vm() {
ubuntu-20.10-64*)
echo "https://cloud-images.ubuntu.com/groovy/current/groovy-server-cloudimg-amd64.img"
;;
ubuntu-21.04-64*)
echo "https://cloud-images.ubuntu.com/hirsute/current/hirsute-server-cloudimg-amd64.img"
Comment on lines +216 to +217
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

21.04 needs to be enabled in nested suites for this to have an effect right?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I already deployed the image to the gce bucket, with that it should be enough. It is because we source this script and it uses the current system independently of the suite being executed.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@stolowski, I still I see preseed tests failing with this error, any idea about how to fix it?

2020-12-12 13:18:09 (108 MB/s) - ‘cloudimg.img’ saved [563871744/563871744]

  • mkdir -p /mnt/cloudimg
  • . /home/gopath/src/github.com/snapcore/snapd/tests/lib/preseed.sh
    ++ pwd
  • mount_ubuntu_image /home/gopath/src/github.com/snapcore/snapd/tests/main/preseed/cloudimg.img /mnt/cloudimg
  • local CLOUD_IMAGE=/home/gopath/src/github.com/snapcore/snapd/tests/main/preseed/cloudimg.img
  • local IMAGE_MOUNTPOINT=/mnt/cloudimg
  • grep nbd
  • lsmod
  • modprobe nbd
    ++ command -v qemu-nbd
  • systemd-run --system --service-type=forking --unit=qemu-nbd-preseed.service '' --fork -c /dev/nbd0 /home/gopath/src/github.com/snapcore/snapd/tests/main/preseed/cloudimg.img
    Failed to find executable : No such file or directory

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, I need to investigate to see what changed on 21.04. By the way, I think we should add 'Run nested' to this PR (and close/re-open)?

;;
*)
echo "unsupported system"
exit 1
Expand Down
4 changes: 4 additions & 0 deletions tests/main/lxd-mount-units/task.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ execute: |
fi

VERSION_ID="$(. /etc/os-release && echo "$VERSION_ID" )"
# TODO: enable for ubuntu-21.04-64 when the image is available
if [ "$VERSION_ID" = "21.04" ]; then
VERSION_ID="20.10"
fi
lxd.lxc launch --quiet "ubuntu:$VERSION_ID" ubuntu

echo "Setting up proxy *inside* the container"
Expand Down
4 changes: 4 additions & 0 deletions tests/main/lxd/task.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,10 @@ execute: |
# my-nesting-ubuntu nesting container

VERSION_ID="$(. /etc/os-release && echo "$VERSION_ID" )"
# TODO: enable for ubuntu-21.04-64 when the image is available
if [ "$VERSION_ID" = "21.04" ]; then
VERSION_ID="20.10"
fi
lxd.lxc launch --quiet "ubuntu:$VERSION_ID" my-ubuntu
lxd.lxc launch --quiet "ubuntu:$VERSION_ID" my-nesting-ubuntu -c security.nesting=true
if [ "$(uname -m)" = x86_64 ] && lxd.lxc info my-ubuntu | grep "Architecture: i686"; then
Expand Down