Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cirrus: gitlab: download packages #11821

Merged
merged 1 commit into from
Oct 1, 2021
+2 −2
Merged

cirrus: gitlab: download packages #11821

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions contrib/cirrus/setup_environment.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vrothberg the point of caching these packages and installing with --no-download is to prevent them from changing unexpectedly or crashing/burning due to remote repo. unavailability. While this is a fine fix for now (un-stucking CI is important), in the future I would appreciate a #FIXME comment or opening an issue in https://github.com/containers/automation_images so I can fix the underlying issue. I'll do that now, but you owe me a cookie 😁

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, and thanks for fixing this. I do appreciate it.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Opened containers/automation_images#95

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh! The "proper" fix here is actually really easy: #11834 Just took me 4 hours of reading man pages and stackoverflow to realize...we don't need to use apt-get 😁

/me munches his own 🍪

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great news, thanks for digging into it, @cevich!


msg "Disabling docker service and socket activation"
systemctl stop docker.service docker.socket
Expand Down