Skip to content

Commit 153e921

Browse files
Björn Kirchnerabutscher
authored andcommitted
fix(crinit): itest systemounts didn't work with cgroups because of missing cgroupfs
1 parent 40b0dfa commit 153e921

File tree

1 file changed

+13
-0
lines changed

1 file changed

+13
-0
lines changed

test/integration/crinit_test/sysmounts.robot

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,9 @@ Do Chroot Cleanup
9393
Execute And Log Based On User Permissions umount -l "${TEST_CHROOT}/lib64"
9494
Execute And Log Based On User Permissions umount -l "${TEST_CHROOT}/proc"
9595
Execute And Log Based On User Permissions umount -l "${TEST_CHROOT}/run"
96+
Execute And Log Based On User Permissions umount -l "${TEST_CHROOT}/systest/fs/cgroup"
97+
Execute And Log Based On User Permissions umount -l "${TEST_CHROOT}/systest"
98+
Execute And Log Based On User Permissions rm -rf "${TEST_CHROOT}/systest"
9699

97100
Set Up A Test Case With Sysmount Option Activated
98101
Do Chroot Preparations
@@ -109,6 +112,16 @@ Set Up A Test Case With Sysmount Option Deactivated
109112
Should Be Equal As Numbers ${rc} 0
110113
${rc} Execute And Log Based On User Permissions mount --bind "/run" "${TEST_CHROOT}/run" ${RETURN_RC}
111114
Should Be Equal As Numbers ${rc} 0
115+
${rc} Execute And Log Based On User Permissions mkdir -p "${TEST_CHROOT}/sys/fs" ${RETURN_RC}
116+
Should Be Equal As Numbers ${rc} 0
117+
${rc} Execute And Log Based On User Permissions mkdir -p "${TEST_CHROOT}/systest" ${RETURN_RC}
118+
Should Be Equal As Numbers ${rc} 0
119+
${rc} Execute And Log Based On User Permissions mount --bind "/sys" "${TEST_CHROOT}/systest" ${RETURN_RC}
120+
Should Be Equal As Numbers ${rc} 0
121+
${rc} Execute And Log Based On User Permissions mount --bind "/sys/fs/cgroup" "${TEST_CHROOT}/systest/fs/cgroup" ${RETURN_RC}
122+
Should Be Equal As Numbers ${rc} 0
123+
${rc} Execute And Log Based On User Permissions ln -s "/systest/fs/cgroup" "${TEST_CHROOT}/sys/fs/" ${RETURN_RC}
124+
Should Be Equal As Numbers ${rc} 0
112125
Crinit Start chroot=${TEST_CHROOT} crinit_args=--no-sys-mounts
113126

114127
Clean Up Test Case With Sysmount Option Activated

0 commit comments

Comments
 (0)