Merge pull request #17875 from edsantiago/v441rhel_rootless_journal_skip

openshift-merge-robot · web-flow · commit 4461c9c8b2a4 · 2023-03-22T04:42:31.000-04:00
quadlet tests: skip on RHEL8 rootless
diff --git a/test/system/252-quadlet.bats b/test/system/252-quadlet.bats
@@ -15,7 +15,10 @@ function start_time() {
 
 function setup() {
     skip_if_remote "quadlet tests are meaningless over remote"
-    skip_if_rootless_cgroupsv1 "quadlet tests don't work rootless on RHEL8"
+    skip_if_rootless_cgroupsv1 "Can't use --cgroups=split w/ CGv1 (#17456)"
+    skip_if_journald_unavailable "quadlet isn't really usable without journal"
+
+    test -x "$QUADLET" || die "Cannot run quadlet tests without executable \$QUADLET ($QUADLET)"
 
     start_time
 
diff --git a/test/system/260-sdnotify.bats b/test/system/260-sdnotify.bats
@@ -244,6 +244,8 @@ READY=1" "sdnotify sent MAINPID and READY"
 }
 
 @test "sdnotify : play kube - with policies" {
+    skip_if_journald_unavailable
+
     # Pull that image. Retry in case of flakes.
     run_podman pull $SYSTEMD_IMAGE || \
         run_podman pull $SYSTEMD_IMAGE || \

Original file line number	Diff line number	Diff line change
`@@ -244,6 +244,8 @@ READY=1" "sdnotify sent MAINPID and READY"`
`244`	`244`	`}`
`245`	`245`
`246`	`246`	`@test "sdnotify : play kube - with policies" {`
	`247`	`+ skip_if_journald_unavailable`
	`248`	`+`
`247`	`249`	`# Pull that image. Retry in case of flakes.`
`248`	`250`	`run_podman pull $SYSTEMD_IMAGE \|\| \`
`249`	`251`	`run_podman pull $SYSTEMD_IMAGE \|\| \`