Revert "Switch to cgroup v2 for extension BATS tests on Lima"

This reverts commit a2b57b7. Signed-off-by: Jan Dubois <[email protected]>
rancher-sandbox · Sep 7, 2023 · 710e7bc · 710e7bc
1 parent e9ddcbc
commit 710e7bc
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 42 deletions.
diff --git a/bats/tests/extensions/allow-list.bats b/bats/tests/extensions/allow-list.bats
@@ -47,20 +47,6 @@ check_extension_installed() { # refute, name
 
 @test 'start container engine' {
     RD_ENV_EXTENSIONS=1 start_container_engine
-}
-
-@test 'switch to cgroup v2' {
-    # TODO TODO TODO This is a workaround because #5363 hasn't been fixed yet
-    if is_windows; then
-        skip "Skipped because switching cgroup layout is not needed on Windows"
-    fi
-    wait_for_shell
-    rdctl shell sudo sed -E -i 's/#(rc_cgroup_mode).*/\1="unified"/' /etc/rc.conf
-    rdctl shutdown
-    RD_ENV_EXTENSIONS=1 start_container_engine
-}
-
-@test 'wait for container engine' {
     wait_for_container_engine
 }
 

diff --git a/bats/tests/extensions/containers.bats b/bats/tests/extensions/containers.bats
@@ -26,20 +26,6 @@ encoded_id() { # variant
 
 @test 'start container engine' {
     RD_ENV_EXTENSIONS=1 start_container_engine
-}
-
-@test 'switch to cgroup v2' {
-    # TODO TODO TODO This is a workaround because #5363 hasn't been fixed yet
-    if is_windows; then
-        skip "Skipped because switching cgroup layout is not needed on Windows"
-    fi
-    wait_for_shell
-    rdctl shell sudo sed -E -i 's/#(rc_cgroup_mode).*/\1="unified"/' /etc/rc.conf
-    rdctl shutdown
-    RD_ENV_EXTENSIONS=1 start_container_engine
-}
-
-@test 'wait for container engine' {
     wait_for_container_engine
 }
 

diff --git a/bats/tests/extensions/install.bats b/bats/tests/extensions/install.bats
@@ -36,20 +36,6 @@ encoded_id() { # variant
 
 @test 'start container engine' {
     RD_ENV_EXTENSIONS=1 start_container_engine
-}
-
-@test 'switch to cgroup v2' {
-    # TODO TODO TODO This is a workaround because #5363 hasn't been fixed yet
-    if is_windows; then
-        skip "Skipped because switching cgroup layout is not needed on Windows"
-    fi
-    wait_for_shell
-    rdctl shell sudo sed -E -i 's/#(rc_cgroup_mode).*/\1="unified"/' /etc/rc.conf
-    rdctl shutdown
-    RD_ENV_EXTENSIONS=1 start_container_engine
-}
-
-@test 'wait for container engine' {
     wait_for_container_engine
 }