From 75797e83a25b33d3c64a745f189d0711725559a1 Mon Sep 17 00:00:00 2001 From: Chris Evich Date: Mon, 15 Nov 2021 13:54:47 -0500 Subject: [PATCH] Cirrus: Backport PR #3562 Same package metadata problem found to affect older release branch 'conformance' testing. Signed-off-by: Chris Evich --- contrib/cirrus/test.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/contrib/cirrus/test.sh b/contrib/cirrus/test.sh index d3d6c40dd45..44451ed8861 100755 --- 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 + msg "Installing previously downloaded/cached docker packages" + ooe.sh dpkg -i \ + $PACKAGE_DOWNLOAD_DIR/containerd.io*.deb \ + $PACKAGE_DOWNLOAD_DIR/docker-ce*.deb systemctl enable --now docker ;; *)