Skip to content

Commit

Permalink
Merge pull request #18124 from containers/renovate/major-ci-vm-image
Browse files Browse the repository at this point in the history
chore(deps): update dependency containers/automation_images to v20230405
  • Loading branch information
openshift-merge-robot committed Apr 11, 2023
2 parents 6f2a61a + 11ac0d0 commit 887c46f
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ env:
DEBIAN_NAME: "debian-12"

# Image identifiers
IMAGE_SUFFIX: "c20230307t192532z-f37f36d12"
IMAGE_SUFFIX: "c20230405t152256z-f37f36d12"
# EC2 images
FEDORA_AMI: "fedora-aws-${IMAGE_SUFFIX}"
FEDORA_AARCH64_AMI: "fedora-podman-aws-arm64-${IMAGE_SUFFIX}"
Expand Down
7 changes: 6 additions & 1 deletion contrib/cirrus/setup_environment.sh
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,12 @@ fi

# Which distribution are we testing on.
case "$OS_RELEASE_ID" in
debian) ;;
debian)
# FIXME 2023-04-11: workaround for runc regression causing failure
# in system tests: "skipping device /dev/char/10:200 for systemd"
# FIXME: please remove this once runc >= 1.2 makes it into debian.
modprobe tun
;;
fedora)
if ((CONTAINER==0)); then
# All SELinux distros need this for systemd-in-a-container
Expand Down

0 comments on commit 887c46f

Please sign in to comment.