summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Evich <cevich@redhat.com>2021-10-01 15:42:51 -0400
committerChris Evich <cevich@redhat.com>2021-10-01 15:45:51 -0400
commitd6b9451b49a2c508db93e1e19e80e51052f217e4 (patch)
treef7cbc4f8af8dbf31a8034a4beba4662996a11d4e
parent1de96f2c4c390bae29c303e2390da9e87a993d3f (diff)
downloadpodman-d6b9451b49a2c508db93e1e19e80e51052f217e4.tar.gz
podman-d6b9451b49a2c508db93e1e19e80e51052f217e4.tar.bz2
podman-d6b9451b49a2c508db93e1e19e80e51052f217e4.zip
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 <cevich@redhat.com>
-rwxr-xr-xcontrib/cirrus/setup_environment.sh6
1 files changed, 3 insertions, 3 deletions
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