From 0f363498c26be6ba176ec85de3ac11cac4a4ef7a Mon Sep 17 00:00:00 2001 From: Chris Evich Date: Tue, 1 Feb 2022 12:19:52 -0500 Subject: [PATCH] Cirrus: Use updated VM images Mainly this is to confirm some changes needed for the podman-py CI setup don't disrupt operations here. Ref: https://github.com/containers/automation_images/pull/111 Note: Glibc resolver configuration has changed from previous images. An additional setup command was added to remove systemd-resolved from the chain. Signed-off-by: Chris Evich --- .cirrus.yml | 2 +- contrib/cirrus/runner.sh | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index a6285c0215..21302d28fc 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -28,7 +28,7 @@ env: UBUNTU_NAME: "ubuntu-2110" # Google-cloud VM Images - IMAGE_SUFFIX: "c6226133906620416" + IMAGE_SUFFIX: "c4764556961513472" FEDORA_CACHE_IMAGE_NAME: "fedora-${IMAGE_SUFFIX}" PRIOR_FEDORA_CACHE_IMAGE_NAME: "prior-fedora-${IMAGE_SUFFIX}" UBUNTU_CACHE_IMAGE_NAME: "ubuntu-${IMAGE_SUFFIX}" diff --git a/contrib/cirrus/runner.sh b/contrib/cirrus/runner.sh index bfb724bf10..7022c3b031 100755 --- a/contrib/cirrus/runner.sh +++ b/contrib/cirrus/runner.sh @@ -64,6 +64,10 @@ _run_setup() { # Required for testing the SIF transport dnf install -y fakeroot squashfs-tools + msg "Removing systemd-resolved from nsswitch.conf" + # /etc/resolv.conf is already set to bypass systemd-resolvd + sed -i -r -e 's/^(hosts.+)resolve.+dns/\1dns/' /etc/nsswitch.conf + # A slew of compiled binaries are pre-built and distributed # within the CI/Dev container image, but we want to run # things directly on the host VM. Fortunately they're all