diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-10-01 07:27:15 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-01 07:27:15 -0400 |
| commit | 1da364783dace3480ba1a142326aff2a644f19a8 (patch) | |
| tree | e8af1b747cb6dab50de6a77b26439fc93a69e1c6 | |
| parent | 317e20a8d5a39088ea112f8321630aacfe27ddbc (diff) | |
| parent | 0b5a2b7468eaf8bb2804621a97724c0074fd118f (diff) | |
| download | podman-1da364783dace3480ba1a142326aff2a644f19a8.tar.gz podman-1da364783dace3480ba1a142326aff2a644f19a8.tar.bz2 podman-1da364783dace3480ba1a142326aff2a644f19a8.zip | |
Merge pull request #11821 from vrothberg/gitlab
cirrus: gitlab: download packages
| -rwxr-xr-x | contrib/cirrus/setup_environment.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh index ef1f83024..1f594000f 100755 --- a/contrib/cirrus/setup_environment.sh +++ b/contrib/cirrus/setup_environment.sh @@ -256,9 +256,9 @@ case "$TEST_FLAVOR" in # Need to re-build lists (removed during image production) ooe.sh apt-get -qq -y update - msg "Installing previously downloaded/cached packages" + msg "Installing docker and containerd" # N/B: Tests check/expect `docker info` output, and this `!= podman info` - ooe.sh apt-get install --yes --no-download --ignore-missing containerd.io docker-ce docker-ce-cli + ooe.sh apt-get install --yes containerd.io docker-ce docker-ce-cli msg "Disabling docker service and socket activation" systemctl stop docker.service docker.socket |