Skip to content

Commit

Permalink
Cirrus: Fix defunct package metadata breaking cache
Browse files Browse the repository at this point in the history
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: containers/automation_images#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>
  • Loading branch information
cevich committed Oct 1, 2021
1 parent 954c481 commit 6542126
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions contrib/cirrus/setup.sh
Expand Up @@ -34,10 +34,10 @@ EOF
;;
ubuntu)
if [[ "$1" == "conformance" ]]; then
# Need to re-build lists (removed during image production)
lilto apt-get -qq -y update
msg "Installing previously downloaded/cached packages"
$SHORT_APTGET install --no-download --ignore-missing containerd.io docker-ce docker-ce-cli
ooe.sh dpkg -i \
$PACKAGE_DOWNLOAD_DIR/containerd.io*.deb \
$PACKAGE_DOWNLOAD_DIR/docker-ce*.deb

# At the time of this comment, Ubuntu is using systemd-resolved
# which interfears badly with conformance testing. Some tests
Expand Down

0 comments on commit 6542126

Please sign in to comment.