ci/cirrus: fix failures on Centos 9

.cirrus.yml

@@ -71,7 +71,7 @@ task:
     HOME: /root
     CIRRUS_WORKING_DIR: /home/runc
     GO_VERSION: "1.19"
-    BATS_VERSION: "v1.3.0"
+    BATS_VERSION: "v1.9.0"
     RPMS: gcc git iptables jq glibc-static libseccomp-devel make criu fuse-sshfs
     # yamllint disable rule:key-duplicates
     matrix:
@@ -104,6 +104,7 @@ task:
     centos-stream-9)
       dnf config-manager --set-enabled crb # for glibc-static
       dnf -y install epel-release epel-next-release # for fuse-sshfs
+      dnf -y update
       ;;
     esac
     # Work around dnf mirror failures by retrying a few times.
@@ -158,8 +159,6 @@ task:
     /home/runc/script/check-config.sh
   unit_tests_script: |
     ssh -tt localhost "make -C /home/runc localunittest"
-  integration_systemd_script: |
-    ssh -tt localhost "make -C /home/runc localintegration RUNC_USE_SYSTEMD=yes"
   integration_fs_script: |
     ssh -tt localhost "make -C /home/runc localintegration"
   integration_systemd_rootless_script: |
@@ -173,3 +172,5 @@ task:
       ssh -tt localhost "make -C /home/runc localrootlessintegration"
       ;;
     esac
+  integration_systemd_script: |
+    ssh -tt localhost "make -C /home/runc localintegration RUNC_USE_SYSTEMD=yes"

Dockerfile

@@ -1,5 +1,5 @@
 ARG GO_VERSION=1.19
-ARG BATS_VERSION=v1.3.0
+ARG BATS_VERSION=v1.9.0
 ARG LIBSECCOMP_VERSION=2.5.4
 
 FROM golang:${GO_VERSION}-bullseye

tests/integration/helpers.bash

@@ -609,6 +609,15 @@ function teardown_bundle() {
 		__runc delete -f "$ct"
 	done
 	rm -rf "$ROOT"
+	# Check that systemd unit is removed.
+	if [ -v RUNC_USE_SYSTEMD ]; then
+		run systemctl status runc-test_busybox.scope
+		echo "$output"
+		[ "$status" -eq 4 ] # "no such unit"
+		if ls /run/systemd/transient/runc-test_busybox.scope.d; then
+			fail "should not have test_busybox left"
+		fi
+	fi
 	remove_parent
 }
 

tests/integration/ps.bats

@@ -4,6 +4,11 @@ load helpers
 
 function setup() {
 	setup_busybox
+	id=test_busybox
+	#id=ct-${RANDOM}
+	#	if [ -v RUNC_USE_SYSTEMD ]; then
+	#		update_config '.linux.cgroupsPath |= ":runc:test_busybox-'${RANDOM}'"'
+	#	fi
 }
 
 function teardown() {
@@ -14,14 +19,13 @@ function teardown() {
 	# ps is not supported, it requires cgroups
 	requires root
 
-	# start busybox detached
-	runc run -d --console-socket "$CONSOLE_SOCKET" test_busybox
+	systemctl status runc-test_busybox.scope || true
+	runc run -d --console-socket "$CONSOLE_SOCKET" $id
 	[ "$status" -eq 0 ]
 
-	# check state
-	testcontainer test_busybox running
+	testcontainer $id running
 
-	runc ps test_busybox
+	runc ps $id
 	[ "$status" -eq 0 ]
 	[[ ${lines[0]} =~ UID\ +PID\ +PPID\ +C\ +STIME\ +TTY\ +TIME\ +CMD+ ]]
 	[[ "${lines[1]}" == *"$(id -un 2>/dev/null)"*[0-9]* ]]
@@ -31,14 +35,13 @@ function teardown() {
 	# ps is not supported, it requires cgroups
 	requires root
 
-	# start busybox detached
-	runc run -d --console-socket "$CONSOLE_SOCKET" test_busybox
+	systemctl status runc-test_busybox.scope || true
+	runc run -d --console-socket "$CONSOLE_SOCKET" $id
 	[ "$status" -eq 0 ]
 
-	# check state
-	testcontainer test_busybox running
+	testcontainer $id running
 
-	runc ps -f json test_busybox
+	runc ps -f json $id
 	[ "$status" -eq 0 ]
 	[[ ${lines[0]} =~ [0-9]+ ]]
 }
@@ -47,14 +50,13 @@ function teardown() {
 	# ps is not supported, it requires cgroups
 	requires root
 
-	# start busybox detached
-	runc run -d --console-socket "$CONSOLE_SOCKET" test_busybox
+	systemctl status runc-test_busybox.scope || true
+	runc run -d --console-socket "$CONSOLE_SOCKET" $id
 	[ "$status" -eq 0 ]
 
-	# check state
-	testcontainer test_busybox running
+	testcontainer $id running
 
-	runc ps test_busybox -e -x
+	runc ps $id -e -x
 	[ "$status" -eq 0 ]
 	[[ ${lines[0]} =~ \ +PID\ +TTY\ +STAT\ +TIME\ +COMMAND+ ]]
 	[[ "${lines[1]}" =~ [0-9]+ ]]
@@ -65,20 +67,18 @@ function teardown() {
 	[ $EUID -ne 0 ] && requires rootless_cgroup
 	set_cgroups_path
 
-	# start busybox detached
-	runc run -d --console-socket "$CONSOLE_SOCKET" test_busybox
+	runc run -d --console-socket "$CONSOLE_SOCKET" $id
 	[ "$status" -eq 0 ]
 
-	# check state
-	testcontainer test_busybox running
+	testcontainer $id running
 
-	runc ps test_busybox
+	runc ps $id
 	[ "$status" -eq 0 ]
 
-	runc kill test_busybox KILL
+	runc kill $id KILL
 	[ "$status" -eq 0 ]
-	wait_for_container 10 1 test_busybox stopped
+	wait_for_container 10 1 $id stopped
 
-	runc ps test_busybox
+	runc ps $id
 	[ "$status" -eq 0 ]
 }

tests/integration/update.bats

@@ -455,6 +455,7 @@ EOF
 	done
 
 	# test update other option won't impact on cpu.idle
+	check_cgroup_value "cpu.idle" "1"
 	runc update --cpu-period 10000 test_update
 	[ "$status" -eq 0 ]
 	check_cgroup_value "cpu.idle" "1"