From d6b9451b49a2c508db93e1e19e80e51052f217e4 Mon Sep 17 00:00:00 2001 From: Chris Evich Date: Fri, 1 Oct 2021 15:42:51 -0400 Subject: Cirrus: Fix defunct package metadata breaking cache Original workaround https://github.com/containers/podman/pull/11821 During VM image build, a number of packages are downloaded but not installed, since they may interfere with some testing. Then at runtime, where required, the packages are installed from cache and used. However, between image build and runtime it's possible the repository contents change, which will invalidate the package cache. Since the `--no-download --ignore-missing` options were used, the install will fail. Ref: https://github.com/containers/automation_images/issues/95 Fortunately, when it comes to the docker packages, no other dependencies are required and so `apt-get` isn't required. Switch to using a simple dpkg install command on the necessary files. If this ever breaks due to new dependencies, the list of files may simply be updated. Signed-off-by: Chris Evich --- contrib/cirrus/setup_environment.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'contrib/cirrus') diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh index 1f594000f..f2afbfef5 100755 --- a/contrib/cirrus/setup_environment.sh +++ b/contrib/cirrus/setup_environment.sh @@ -254,11 +254,11 @@ case "$TEST_FLAVOR" in remove_packaged_podman_files make install PREFIX=/usr ETCDIR=/etc - # Need to re-build lists (removed during image production) - ooe.sh apt-get -qq -y update msg "Installing docker and containerd" # N/B: Tests check/expect `docker info` output, and this `!= podman info` - ooe.sh apt-get install --yes containerd.io docker-ce docker-ce-cli + ooe.sh dpkg -i \ + $PACKAGE_DOWNLOAD_DIR/containerd.io*.deb \ + $PACKAGE_DOWNLOAD_DIR/docker-ce*.deb msg "Disabling docker service and socket activation" systemctl stop docker.service docker.socket -- cgit v1.2.3-54-g00ecf