Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump CI VMs: new pasta, crun, rawhide kernel #22082

Closed
wants to merge 1 commit into from
Closed

Bump CI VMs: new pasta, crun, rawhide kernel #22082

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .cirrus.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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"})
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did not test if rawhide requires both, or just the new one. Since these tests have to run everywhere, and both works, I'm leaving it this way.

session.WaitWithDefaultTimeout()
Expect(session).Should(ExitCleanly())
}
Expand Down
3 changes: 2 additions & 1 deletion test/e2e/systemd_test.go
View file
Open in desktop
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