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: Update CI VMs to F36 #3931

Merged
merged 2 commits into from
Apr 28, 2022
Merged

Cirrus: Update CI VMs to F36 #3931

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
68395f9
fix staticcheck linter warning for deprecated function
cevich Apr 26, 2022
cc5e80f
Cirrus: Update CI VMs to F36
cevich Apr 26, 2022
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
6 changes: 3 additions & 3 deletions .cirrus.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ env:
####
# GCE project where images live
IMAGE_PROJECT: "libpod-218412"
FEDORA_NAME: "fedora-35"
PRIOR_FEDORA_NAME: "fedora-34"
FEDORA_NAME: "fedora-36"
PRIOR_FEDORA_NAME: "fedora-35"
UBUNTU_NAME: "ubuntu-2110"

IMAGE_SUFFIX: "c4764556961513472"
IMAGE_SUFFIX: "c4955393725038592"
FEDORA_CACHE_IMAGE_NAME: "fedora-${IMAGE_SUFFIX}"
PRIOR_FEDORA_CACHE_IMAGE_NAME: "prior-fedora-${IMAGE_SUFFIX}"
UBUNTU_CACHE_IMAGE_NAME: "ubuntu-${IMAGE_SUFFIX}"
Expand Down
1 change: 0 additions & 1 deletion contrib/cirrus/lib.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,6 @@ in_podman() {
echo "$envarg" | tee -a $envfile | indent
done
showrun podman run -i --name="$IN_PODMAN_NAME" \
--net=host \
--net="container:registry" \
--security-opt=label=disable \
--security-opt=seccomp=unconfined \
Expand Down
3 changes: 3 additions & 0 deletions contrib/cirrus/logcollector.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@ case $1 in
)
case $OS_RELEASE_ID in
fedora*)
if [[ "$OS_RELEASE_VER" -ge 36 ]]; then
PKG_NAMES+=(aardvark-dns netavark)
fi
PKG_LST_CMD='rpm -q --qf=%{N}-%{V}-%{R}-%{ARCH}\n'
;;
ubuntu*)
Expand Down
8 changes: 7 additions & 1 deletion contrib/cirrus/setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,13 @@ source $(dirname $0)/lib.sh

req_env_vars OS_RELEASE_ID OS_RELEASE_VER GOSRC IN_PODMAN_IMAGE

echo "Setting up $OS_RELEASE_ID $OS_RELEASE_VER"
msg "Disabling git repository owner-check system-wide."
# Newer versions of git bark if repo. files are unexpectedly owned.
# This mainly affects rootless and containerized testing. But
# the testing environment is disposable, so we don't care.=
git config --system --add safe.directory $GOSRC

msg "Setting up $OS_RELEASE_ID $OS_RELEASE_VER"
cd $GOSRC
case "$OS_RELEASE_ID" in
fedora)
Expand Down
4 changes: 4 additions & 0 deletions pkg/formats/templates.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ var basicFunctions = template.FuncMap{
},
"split": strings.Split,
"join": strings.Join,
// strings.Title is deprecated since go 1.18
// However for our use case it is still fine. The recommended replacement
// is adding about 400kb binary size so lets keep using this for now.
//nolint:staticcheck
Copy link
Member

Choose a reason for hiding this comment

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

Should we add a TODO or similar tag so we can more easily find this?

Copy link
Member Author

Choose a reason for hiding this comment

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

Hrmmm, I dunno. I literally copy-pasted @Luap99 fix from podman. Paul?

Copy link
Member

Choose a reason for hiding this comment

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

I don't think it is a problem. Since it is in the stdlib it will stay there until golang decides to actively break code.

Copy link
Member

Choose a reason for hiding this comment

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

better question why do we have this package? I thought we have this in c/common.
cc @jwhonce

"title": strings.Title,
"lower": strings.ToLower,
"upper": strings.ToUpper,
Expand Down