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

Update dependency containers/automation_images to v20230807 #19541

Merged
merged 5 commits into from
Aug 8, 2023
Merged

Update dependency containers/automation_images to v20230807 #19541

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5ec8566
Update dependency containers/automation_images to v20230807
renovate[bot] Aug 7, 2023
d79e3a2
CI FIXME removal/update.
cevich Aug 7, 2023
c193dbd
Require a non-generic reason for non-Fedora skip
cevich Aug 8, 2023
95ceace
Re-enable checkpoint test on Debian SID
cevich Aug 8, 2023
7ef0351
Skip podman exec cannot be invoked on Debian
cevich Aug 8, 2023
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
13 changes: 5 additions & 8 deletions .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: "c20230726t191046z-f38f37d13"
IMAGE_SUFFIX: "c20230807t144831z-f38f37d13"

# EC2 images
FEDORA_AMI: "fedora-aws-${IMAGE_SUFFIX}"
Expand Down Expand Up @@ -243,13 +243,10 @@ validate_task:
<<: *stdenvars
VM_IMAGE_NAME: ${FEDORA_CACHE_IMAGE_NAME}
DISTRO_NV: ${FEDORA_NAME}
# FIXME: #18612 c20230726t191046z-f38f37d13 Python dependnecies
# broken in rawhide image cause this task to fail. Re-enable
# check if fixed in next set of images.
# - env:
# <<: *stdenvars
# VM_IMAGE_NAME: ${RAWHIDE_CACHE_IMAGE_NAME}
# DISTRO_NV: ${RAWHIDE_NAME}
- env:
<<: *stdenvars
VM_IMAGE_NAME: ${RAWHIDE_CACHE_IMAGE_NAME}
DISTRO_NV: ${RAWHIDE_NAME}
env:
TEST_FLAVOR: validate
# N/B: This script depends on ${DISTRO_NV} being defined for the task.
Expand Down
1 change: 1 addition & 0 deletions contrib/cirrus/setup_environment.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ case "$OS_RELEASE_ID" in
debian)
# FIXME 2023-04-11: workaround for runc regression causing failure
# in system tests: "skipping device /dev/char/10:200 for systemd"
# (Checked on 2023-08-08 and it's still too old: 1.1.5)
# FIXME: please remove this once runc >= 1.2 makes it into debian.
modprobe tun
;;
Expand Down
2 changes: 0 additions & 2 deletions test/e2e/checkpoint_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,8 +341,6 @@ var _ = Describe("Podman checkpoint", func() {
})

It("podman checkpoint container with established tcp connections", func() {
// Broken on Ubuntu.
SkipIfNotFedora()
localRunString := getRunString([]string{REDIS_IMAGE})
session := podmanTest.Podman(localRunString)
session.WaitWithDefaultTimeout()
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/common_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -817,10 +817,10 @@ func SkipOnOSVersion(os, version string) {
}
}

func SkipIfNotFedora() {
func SkipIfNotFedora(reason string) {
info := GetHostDistributionInfo()
if info.Distribution != "fedora" {
Skip("Test can only run on Fedora")
Skip(reason)
}
}

Expand Down
1 change: 1 addition & 0 deletions test/e2e/exec_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,6 +408,7 @@ var _ = Describe("Podman exec", func() {
})

It("podman exec cannot be invoked", func() {
SkipIfNotFedora("FIXME: #19552 fails on Debian SID w/ runc 1.1.5")
setup := podmanTest.RunTopContainer("test1")
setup.WaitWithDefaultTimeout()
Expect(setup).Should(Exit(0))
Expand Down