Manuel Diewald

Merge ~diewald/+git/overlay-shiftfs-tests:main into ~canonical-kernel-team/+git/overlay-shiftfs-tests:main

  1. Git
  2. lp:~diewald/+git/overlay-shiftfs-tests
  3. main
  4. Merge into main
Proposed by Manuel Diewald
Status: Merged
Approved by: Francis Ginther
Approved revision: d668ec217733823d8cd5b47f9b3e5f1f080b31bd
Merged at revision: 32518ecd3664018dbef2b20623b35828fae41859
Proposed branch: ~diewald/+git/overlay-shiftfs-tests:main
Merge into: ~canonical-kernel-team/+git/overlay-shiftfs-tests:main
Diff against target: 39 lines (+3/-3)
3 files modified
tests/ovl-idmapped-mount.sh (+1/-1)
tests/ovl-mkdir-xattrs.sh (+1/-1)
tests/ovl-refcnt.sh (+1/-1)
Reviewer Review Type Date Requested Status
Francis Ginther Approve
Review via email: mp+471057@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Francis Ginther (fginther) wrote :

Looks reasonable.

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

Nice finding, thanks!
I am restarting failed tests.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/tests/ovl-idmapped-mount.sh b/tests/ovl-idmapped-mount.sh
2index 8bfe3a0..4578acd 100755
3--- a/tests/ovl-idmapped-mount.sh
4+++ b/tests/ovl-idmapped-mount.sh
5@@ -15,7 +15,7 @@ touch ovl/test
6 EOF
7
8 sudo lxd init --auto
9-lxc launch ubuntu:22.04 idmap-test
10+lxc launch ubuntu:22.04 idmap-test -c security.nesting=true
11 lxc file push test.sh idmap-test/root/test.sh
12 lxc exec idmap-test -- bash -xe /root/test.sh
13 if [ $? -ne 0 ]; then
14diff --git a/tests/ovl-mkdir-xattrs.sh b/tests/ovl-mkdir-xattrs.sh
15index 8e4c1de..e3d3c5e 100755
16--- a/tests/ovl-mkdir-xattrs.sh
17+++ b/tests/ovl-mkdir-xattrs.sh
18@@ -30,7 +30,7 @@ echo "mkdir should have succeeded"
19 EOF
20
21 sudo lxd init --auto
22-lxc launch ubuntu:22.04 ovl-test
23+lxc launch ubuntu:22.04 ovl-test -c security.nesting=true
24 lxc file push test.sh ovl-test/root/test.sh
25 lxc exec ovl-test -- bash -xe /root/test.sh
26 if [ $? -ne 0 ]; then
27diff --git a/tests/ovl-refcnt.sh b/tests/ovl-refcnt.sh
28index 36baead..23c96c6 100755
29--- a/tests/ovl-refcnt.sh
30+++ b/tests/ovl-refcnt.sh
31@@ -34,7 +34,7 @@ umount $dir/ovlissue/mountpointtmp/firstunion/tmp/ovlissue/mountpointtmp/secondu
32 EOF
33
34 sudo lxd init --auto
35-lxc launch ubuntu:22.04 ovl-test
36+lxc launch ubuntu:22.04 ovl-test -c security.nesting=true
37 lxc file push test.sh ovl-test/root/test.sh
38 lxc exec ovl-test -- bash -xe /root/test.sh
39 if [ $? -ne 0 ]; then

Subscribers

People subscribed via source and target branches