Skip to content

Commit

Permalink
Merge pull request #9792 from sergiocazzolato/tests-new-hirsute-image
Browse files Browse the repository at this point in the history
tests: enable ubuntu 21.04 for spread tests
  • Loading branch information
sergiocazzolato authored Feb 17, 2021
2 parents 75b3d4d + 76f3a2b commit 54f6401
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 1 deletion.
1 change: 1 addition & 0 deletions .github/workflows/test.yaml
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
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
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"
;;
*)
echo "unsupported system"
exit 1
Expand Down
4 changes: 4 additions & 0 deletions tests/main/lxd-mount-units/task.yaml
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
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

0 comments on commit 54f6401

Please sign in to comment.