From 1125590a935abd6c785ff0d5837bc34495670384 Mon Sep 17 00:00:00 2001
From: Ed Santiago <santiago@redhat.com>
Date: Mon, 18 Mar 2024 15:35:39 -0600
Subject: [PATCH] CI: Bump VMs to 2024-03-20

Pasta 03-20, crun 1.14.4, and /tmp on tmpfs

One unexplained difference: fc39 and rawhide now create:

    /run/log/journal/SOMETHING/system.journal

...and the SOMETHING is o-rwx. This triggers journalctl to spit out a warning:

    Hint: You are currently not seeing messages from the system.
          Users in groups 'adm', 'systemd-journal', 'wheel' can see all messages.
          Pass -q to turn off this notice.

...which in turn causes ExitCleanly() to fail.

It is not clear who/what is creating this journal directory, or
why it allofasudden started just now. Workaround is to add -q
to journalctl in one test.

VM package info:
    https://github.com/containers/automation_images/pull/337#issuecomment-2010128930

Signed-off-by: Ed Santiago <santiago@redhat.com>
---
 .cirrus.yml                 | 2 +-
 test/e2e/common_test.go     | 5 +----
 test/e2e/run_device_test.go | 3 ++-
 test/e2e/systemd_test.go    | 3 ++-
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 7d76b5c2a9..c38aa25ee6 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -33,7 +33,7 @@ env:
     DEBIAN_NAME: "debian-13"
 
     # Image identifiers
-    IMAGE_SUFFIX: "c20240227t125812z-f39f38d13"
+    IMAGE_SUFFIX: "c20240327t162918z-f39f38d13"
 
     # EC2 images
     FEDORA_AMI: "fedora-aws-${IMAGE_SUFFIX}"
diff --git a/test/e2e/common_test.go b/test/e2e/common_test.go
index d0bbdb0d86..0a4da0e2e0 100644
--- a/test/e2e/common_test.go
+++ b/test/e2e/common_test.go
@@ -393,10 +393,7 @@ func (p PodmanTestIntegration) AddImageToRWStore(image string) {
 func imageTarPath(image string) string {
 	cacheDir := os.Getenv("PODMAN_TEST_IMAGE_CACHE_DIR")
 	if cacheDir == "" {
-		cacheDir = os.Getenv("TMPDIR")
-		if cacheDir == "" {
-			cacheDir = "/tmp"
-		}
+		cacheDir = "/var/tmp"
 	}
 
 	// e.g., registry.com/fubar:latest -> registry.com-fubar-latest.tar
diff --git a/test/e2e/run_device_test.go b/test/e2e/run_device_test.go
index 129f3cdaef..4fa98d7e20 100644
--- a/test/e2e/run_device_test.go
+++ b/test/e2e/run_device_test.go
@@ -38,7 +38,8 @@ var _ = Describe("Podman run device", func() {
 		session.WaitWithDefaultTimeout()
 		Expect(session).Should(ExitCleanly())
 		if !isRootless() {
-			session = podmanTest.Podman([]string{"run", "-q", "--security-opt", "label=disable", "--device", "/dev/kmsg", "--cap-add", "SYS_ADMIN", ALPINE, "head", "-n", "1", "/dev/kmsg"})
+			// Kernel 6.9.0 (2024-03) requires SYSLOG
+			session = podmanTest.Podman([]string{"run", "-q", "--security-opt", "label=disable", "--device", "/dev/kmsg", "--cap-add", "SYS_ADMIN,SYSLOG", ALPINE, "head", "-n", "1", "/dev/kmsg"})
 			session.WaitWithDefaultTimeout()
 			Expect(session).Should(ExitCleanly())
 		}
diff --git a/test/e2e/systemd_test.go b/test/e2e/systemd_test.go
index ce599e7c3e..2b835b3059 100644
--- a/test/e2e/systemd_test.go
+++ b/test/e2e/systemd_test.go
@@ -66,7 +66,8 @@ WantedBy=default.target
 
 		checkAvailableJournald()
 		if !journald.journaldSkip {
-			logs := SystemExec("journalctl", []string{dashWhat, "-n", "20", "-u", serviceName})
+			// "-q" needed on fc40+ because something creates /run/log/journal/XXX 2750
+			logs := SystemExec("journalctl", []string{dashWhat, "-q", "-n", "20", "-u", serviceName})
 			Expect(logs).Should(ExitCleanly())
 		}