Merge pull request containers#1558 from cevich/new_python_images

Cirrus: Use updated VM images
mtrmac · Feb 10, 2022 · 59a4522 · 59a4522
2 parents a2dccca + 0f36349
commit 59a4522
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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