“Canonical Kernel Team” team

Merge ~canonical-kernel-team/+git/autotest-client-tests:magalilemes/fix-2029500 into ~canonical-kernel-team/+git/autotest-client-tests:master

  1. Git
  2. lp:~canonical-kernel-team/+git/autotest-client-tests
  3. magalilemes/fix-2029500
  4. Merge into master
Proposed by Magali Lemes do Sacramento
Status: Merged
Merged at revision: 7c1782d60dd71a839648d182a0b6ea544dba7012
Proposed branch: ~canonical-kernel-team/+git/autotest-client-tests:magalilemes/fix-2029500
Merge into: ~canonical-kernel-team/+git/autotest-client-tests:master
Diff against target: 13 lines (+3/-0)
1 file modified
ubuntu_zfs_xfs_generic/ubuntu_zfs_xfs_generic.py (+3/-0)
Reviewer Review Type Date Requested Status
Po-Hsu Lin Approve
Review via email: mp+449639@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Po-Hsu Lin (cypressyew) wrote :

Tested on Lunar and this is working as expected.
Thanks!

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/ubuntu_zfs_xfs_generic/ubuntu_zfs_xfs_generic.py b/ubuntu_zfs_xfs_generic/ubuntu_zfs_xfs_generic.py
2index 0d3b8f2..37ab752 100644
3--- a/ubuntu_zfs_xfs_generic/ubuntu_zfs_xfs_generic.py
4+++ b/ubuntu_zfs_xfs_generic/ubuntu_zfs_xfs_generic.py
5@@ -80,6 +80,9 @@ class ubuntu_zfs_xfs_generic(test.test):
6 utils.system('./build-all')
7
8 os.chdir(os.path.join(self.srcdir, 'xfstests-bld', 'fstests-bld', 'xfstests-dev'))
9+ tag_xfs = 'v2023.04.09'
10+ print("Using version " + tag_xfs + " for xfstests-dev")
11+ utils.system('git reset --hard ' + tag_xfs)
12 print("Patching xfstests-dev to add minimal support for ZFS")
13 utils.system('patch -p1 < %s/0001-xfstests-add-minimal-support-for-zfs.patch' % self.bindir)
14

Subscribers

People subscribed via source and target branches

to all changes: