Cirrus: Backport PR containers#3562

Same package metadata problem found to affect older release branch 'conformance' testing. Note: This requires using a customized Ubuntu image w/ restored docker packages in a cache directory - mistakenly removed during original image creation. Signed-off-by: Chris Evich <[email protected]>
cevich · Nov 16, 2021 · 3770aeb · 3770aeb
1 parent a4caa7b
commit 3770aeb
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -36,7 +36,7 @@ env:
     _BUILT_IMAGE_SUFFIX: "podman-6530021898584064"
     FEDORA_CACHE_IMAGE_NAME: "${FEDORA_NAME}-${_BUILT_IMAGE_SUFFIX}"
     PRIOR_FEDORA_CACHE_IMAGE_NAME: "${PRIOR_FEDORA_NAME}-${_BUILT_IMAGE_SUFFIX}"
-    UBUNTU_CACHE_IMAGE_NAME: "${UBUNTU_NAME}-${_BUILT_IMAGE_SUFFIX}"
+    UBUNTU_CACHE_IMAGE_NAME: "${UBUNTU_NAME}-${_BUILT_IMAGE_SUFFIX}-a"
     PRIOR_UBUNTU_CACHE_IMAGE_NAME: "${PRIOR_UBUNTU_NAME}-${_BUILT_IMAGE_SUFFIX}"
 
     ####

diff --git a/contrib/cirrus/lib.sh b/contrib/cirrus/lib.sh
@@ -74,6 +74,9 @@ IN_PODMAN_IMAGE="quay.io/libpod/in_podman:master"
 IN_PODMAN_NAME="in_podman_$CIRRUS_TASK_ID"
 IN_PODMAN="${IN_PODMAN:-false}"
 
+# Downloaded, but not installed packages.
+PACKAGE_DOWNLOAD_DIR=/var/cache/download
+
 # Working with apt under Debian/Ubuntu automation is a PITA, make it easy
 # Avoid some ways of getting stuck waiting for user input
 export DEBIAN_FRONTEND=noninteractive

diff --git a/contrib/cirrus/test.sh b/contrib/cirrus/test.sh
@@ -48,8 +48,10 @@ then
                 systemctl enable --now docker
                 ;;
             ubuntu)
-                warn "Installing docker.io"
-                $LONG_APTGET install docker.io
+                warn "Installing previously downloaded/cached docker packages"
+                ooe.sh dpkg -i \
+                    $PACKAGE_DOWNLOAD_DIR/containerd*.deb \
+                    $PACKAGE_DOWNLOAD_DIR/docker*.deb
                 systemctl enable --now docker
                 ;;
             *)