Merge ~canonical-kernel-team/+git/overlay-shiftfs-tests:phlin/f-lxd-520 into ~canonical-kernel-team/+git/overlay-shiftfs-tests:main

Proposed by Po-Hsu Lin
Status: Merged
Merge reported by: Po-Hsu Lin
Merged at revision: d8ca168a8440d37be13d04dd36a18bc73a3e644c
Proposed branch: ~canonical-kernel-team/+git/overlay-shiftfs-tests:phlin/f-lxd-520
Merge into: ~canonical-kernel-team/+git/overlay-shiftfs-tests:main
Diff against target: 26 lines (+8/-1)
1 file modified
install-deps (+8/-1)
Reviewer Review Type Date Requested Status
Francis Ginther Approve
Review via email: mp+464522@code.launchpad.net

Commit message

On Focal the newly released LXD 5.21 in latest/stable require ZFS 2.1
from 5.15 HWE kernel.
With that version of LXD installed the shiftfs-lxd.sh test will fail
with:
   Error: Required tool zpool is missing

LXD team suggests to use 5.21/stable, which contains ZFS 0.8 suport.

To post a comment you must log in.
Revision history for this message
Francis Ginther (fginther) wrote :

+1

review: Approve
Revision history for this message
Po-Hsu Lin (cypressyew) wrote :

Applied and pushed, thanks.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/install-deps b/install-deps
2index 4e91bf8..5900d7e 100755
3--- a/install-deps
4+++ b/install-deps
5@@ -4,13 +4,20 @@
6 #
7
8 DISTRO=$(lsb_release -sr | tr '.' ' ' | awk '{print ($1 * 100) + $2}')
9+KERNEL_VERSION=$(uname -r | awk '{split($0,v,"."); printf "%s.%s\n",v[1],v[2]}')
10 # Limit older releases (< F) to just ubuntu_overlayfs_smoke_test.sh test
11 # Only newer release will need these packages LP: #2032779
12 if [[ $DISTRO -ge 2004 ]]; then
13 sudo apt-get install -y bc docker.io snapd zfsutils-linux
14
15 sudo snap install lxd
16- sudo snap refresh lxd --channel=latest/stable
17+ if dpkg --compare-versions "$KERNEL_VERSION" eq 5.4; then
18+ # LXD 5.21.x requires ZFS 2.1, which is only avilable in 5.15+ (LP: #2061107)
19+ # Let's use 5.20 for F-5.4
20+ sudo snap refresh lxd --channel=5.20/stable
21+ else
22+ sudo snap refresh lxd --channel=latest/stable
23+ fi
24 else
25 echo "Not installing anything for release < Focal"
26 fi

Subscribers

People subscribed via source and target branches

to all changes: