Skip to content

Commit

Permalink
CI: Bump VMs to 2024-03-20
Browse files Browse the repository at this point in the history
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:
    containers/automation_images#337 (comment)

Signed-off-by: Ed Santiago <[email protected]>
  • Loading branch information
edsantiago committed Mar 27, 2024
1 parent a77f705 commit 1125590
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
5 changes: 1 addition & 4 deletions test/e2e/common_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion test/e2e/run_device_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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())
}
Expand Down
3 changes: 2 additions & 1 deletion test/e2e/systemd_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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())
}

Expand Down

0 comments on commit 1125590

Please sign in to comment.