Merge pull request #3519 from cevich/update_images

Update VM Images + Drop prior-ubuntu testing
containers · Sep 16, 2021 · 52dfdd7 · 52dfdd7
2 parents 69b3e56 + 1156cf0
commit 52dfdd7
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -28,13 +28,11 @@ env:
     FEDORA_NAME: "fedora-34"
     PRIOR_FEDORA_NAME: "fedora-33"
     UBUNTU_NAME: "ubuntu-2104"
-    PRIOR_UBUNTU_NAME: "ubuntu-2010"
 
-    IMAGE_SUFFIX: "c6248193773010944"
+    IMAGE_SUFFIX: "c6431352024203264"
     FEDORA_CACHE_IMAGE_NAME: "fedora-${IMAGE_SUFFIX}"
     PRIOR_FEDORA_CACHE_IMAGE_NAME: "prior-fedora-${IMAGE_SUFFIX}"
     UBUNTU_CACHE_IMAGE_NAME: "ubuntu-${IMAGE_SUFFIX}"
-    PRIOR_UBUNTU_CACHE_IMAGE_NAME: "prior-ubuntu-${IMAGE_SUFFIX}"
 
     IN_PODMAN_IMAGE: "quay.io/libpod/fedora_podman:${IMAGE_SUFFIX}"
 
@@ -76,7 +74,6 @@ meta_task:
             ${FEDORA_CACHE_IMAGE_NAME}
             ${PRIOR_FEDORA_CACHE_IMAGE_NAME}
             ${UBUNTU_CACHE_IMAGE_NAME}
-            ${PRIOR_UBUNTU_CACHE_IMAGE_NAME}
         BUILDID: "${CIRRUS_BUILD_ID}"
         REPOREF: "${CIRRUS_CHANGE_IN_REPO}"
         GCPJSON: ENCRYPTED[d3614d6f5cc0e66be89d4252b3365fd84f14eee0259d4eb47e25fc0bc2842c7937f5ee8c882b7e547b4c5ec4b6733b14]
@@ -271,10 +268,6 @@ integration_task:
             DISTRO_NV: "${UBUNTU_NAME}"
             IMAGE_NAME: "${UBUNTU_CACHE_IMAGE_NAME}"
             STORAGE_DRIVER: 'vfs'
-        - env:
-            DISTRO_NV: "${PRIOR_UBUNTU_NAME}"
-            IMAGE_NAME: "${PRIOR_UBUNTU_CACHE_IMAGE_NAME}"
-            STORAGE_DRIVER: 'vfs'
         # OVERLAY
         - env:
             DISTRO_NV: "${FEDORA_NAME}"
@@ -288,10 +281,6 @@ integration_task:
             DISTRO_NV: "${UBUNTU_NAME}"
             IMAGE_NAME: "${UBUNTU_CACHE_IMAGE_NAME}"
             STORAGE_DRIVER: 'overlay'
-        - env:
-            DISTRO_NV: "${PRIOR_UBUNTU_NAME}"
-            IMAGE_NAME: "${PRIOR_UBUNTU_CACHE_IMAGE_NAME}"
-            STORAGE_DRIVER: 'overlay'
 
     gce_instance:
         image_name: "$IMAGE_NAME"

diff --git a/contrib/cirrus/setup.sh b/contrib/cirrus/setup.sh
@@ -21,7 +21,7 @@ case "$OS_RELEASE_ID" in
         fi
 
         warn "Hard-coding podman to use crun"
-	cat > /etc/containers/containers.conf <<EOF
+        cat > /etc/containers/containers.conf <<EOF
 [engine]
 runtime="crun"
 EOF
@@ -34,8 +34,19 @@ EOF
         ;;
     ubuntu)
         if [[ "$1" == "conformance" ]]; then
+            # Need to re-build lists (removed during image production)
+            lilto apt-get -qq -y update
             msg "Installing previously downloaded/cached packages"
-            bigto dpkg -i $PACKAGE_DOWNLOAD_DIR/*.deb
+            $SHORT_APTGET install --no-download --ignore-missing containerd.io docker-ce docker-ce-cli
+
+            # At the time of this comment, Ubuntu is using systemd-resolved
+            # which interfears badly with conformance testing.  Some tests
+            # need to run dnsmasq on port 53.
+            if [[ -r "/run/systemd/resolve/resolv.conf" ]]; then
+                msg "Disabling systemd-resolved service"
+                systemctl stop systemd-resolved.service
+                cp /run/systemd/resolve/resolv.conf /etc/
+            fi
         fi
         ;;
     *)