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>
This commit is contained in:
Chris Evich 2021-10-01 15:42:51 -04:00
parent 1de96f2c4c
commit d6b9451b49
No known key found for this signature in database
GPG Key ID: 03EDC70FD578067F
1 changed files with 3 additions and 3 deletions

View File

@ -254,11 +254,11 @@ case "$TEST_FLAVOR" in
remove_packaged_podman_files remove_packaged_podman_files
make install PREFIX=/usr ETCDIR=/etc 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" msg "Installing docker and containerd"
# N/B: Tests check/expect `docker info` output, and this `!= podman info` # 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" msg "Disabling docker service and socket activation"
systemctl stop docker.service docker.socket systemctl stop docker.service docker.socket