Skip to content

Commit

Permalink
Merge pull request #11834 from cevich/fix_gitlab_setup
Browse files Browse the repository at this point in the history
Cirrus: Fix defunct package metadata breaking cache
  • Loading branch information
openshift-merge-robot authored Oct 4, 2021
2 parents b9d8c63 + d6b9451 commit 36821d3
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions contrib/cirrus/setup_environment.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 36821d3

Please sign in to comment.