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

VMs: bump to f41 #392

Merged
merged 5 commits into from
Nov 7, 2024
Merged

VMs: bump to f41 #392

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4392650
Fedora 41 is stable. Bump.
edsantiago Nov 6, 2024
4a12d4e
Fedora AWS query: strip the us-east-1
edsantiago Nov 6, 2024
aef024b
Changes needed for new dnf
edsantiago Nov 6, 2024
4839366
Installed packages: make them work again
edsantiago Nov 6, 2024
4b29758
bump IMG_SFX
edsantiago Nov 6, 2024
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
2 changes: 1 addition & 1 deletion IMG_SFX
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20241016t144444z-f40f39d13
20241106t163000z-f41f40d13
6 changes: 3 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ export CENTOS_STREAM_RELEASE = 9

# Warning: Beta Fedora releases are not supported. Verifiy EC2 AMI availability
# here: https://fedoraproject.org/cloud/download
export FEDORA_RELEASE = 40
export PRIOR_FEDORA_RELEASE = 39
export FEDORA_RELEASE = 41
export PRIOR_FEDORA_RELEASE = 40

# This should always be one-greater than $FEDORA_RELEASE (assuming it's actually the latest)
export RAWHIDE_RELEASE = 41
export RAWHIDE_RELEASE = 42

# Automation assumes the actual release number (after SID upgrade)
# is always one-greater than the latest DEBIAN_BASE_FAMILY (GCE image).
Expand Down
2 changes: 1 addition & 1 deletion base_images/cloud.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ builders:
architecture: 'x86_64'
image-type: 'machine'
is-public: 'true'
name: 'Fedora-Cloud-Base*-{{user `FEDORA_RELEASE`}}-*us-east-1*'
name: 'Fedora-Cloud-Base*-{{user `FEDORA_RELEASE`}}-*'
root-device-type: 'ebs'
state: 'available'
virtualization-type: 'hvm'
Expand Down
2 changes: 1 addition & 1 deletion cache_images/fedora-podman-py_packaging.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ source "$REPO_DIRPATH/lib.sh"
# shellcheck disable=SC2154
warn "Enabling updates-testing repository for $PACKER_BUILD_NAME"
lilto ooe.sh $SUDO dnf install -y 'dnf-command(config-manager)'
lilto ooe.sh $SUDO dnf config-manager --set-enabled updates-testing
lilto ooe.sh $SUDO dnf config-manager setopt updates-testing.enabled=1

msg "Updating/Installing repos and packages for $OS_REL_VER"

Expand Down
7 changes: 4 additions & 3 deletions cache_images/fedora_packaging.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ req_env_vars PACKER_BUILD_NAME
if [[ "$PACKER_BUILD_NAME" == "fedora" ]] && [[ ! "$PACKER_BUILD_NAME" =~ "prior" ]]; then
warn "Enabling updates-testing repository for $PACKER_BUILD_NAME"
lilto ooe.sh $SUDO dnf install -y 'dnf-command(config-manager)'
lilto ooe.sh $SUDO dnf config-manager --set-enabled updates-testing
lilto ooe.sh $SUDO dnf config-manager setopt updates-testing.enabled=1
Comment on lines 28 to +31
Copy link
Member

Choose a reason for hiding this comment

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

oh I think this is why we are having older kernels in f40, the prior images are not using the updates-testing repo

Copy link
Member Author

Choose a reason for hiding this comment

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

What do you recommend?

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 know the history behind why we have such difference there, I have not chased the git history to end but it is there for many years so maybe better not touch that? I mean we have a workaround in podman for the kernel problem

else
warn "NOT enabling updates-testing repository for $PACKER_BUILD_NAME"
fi
Expand Down Expand Up @@ -112,6 +112,7 @@ INSTALL_PACKAGES=(\
passt
perl-Clone
perl-FindBin
pigz
pkgconfig
podman
pre-commit
Expand Down Expand Up @@ -145,12 +146,10 @@ INSTALL_PACKAGES=(\
# Rawhide images don't need these packages
if [[ "$PACKER_BUILD_NAME" =~ fedora ]]; then
INSTALL_PACKAGES+=( \
docker-compose
python-pip-wheel
python-setuptools-wheel
python-toml
python-wheel-wheel
python2
python3-PyYAML
python3-coverage
python3-dateutil
Expand All @@ -177,7 +176,9 @@ fi
if ! ((CONTAINER)); then
INSTALL_PACKAGES+=( \
bpftrace
composefs
container-selinux
fuse-overlayfs
libguestfs-tools
selinux-policy-devel
policycoreutils
Expand Down
15 changes: 3 additions & 12 deletions cache_images/rawhide_setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,9 @@ source "$REPO_DIRPATH/lib.sh"
# for both VM and container image build workflows.
req_env_vars PACKER_BUILD_NAME

# Going from F38 -> rawhide requires some special handling WRT DNF upgrade to DNF5
if [[ "$OS_RELEASE_VER" -ge 38 ]]; then
warn "Upgrading dnf -> dnf5"
showrun $SUDO dnf update -y dnf
showrun $SUDO dnf install -y dnf5
# Even dnf5 refuses to remove the 'dnf' package.
showrun $SUDO rpm -e yum dnf
else
warn "Upgrading Fedora '$OS_RELEASE_VER' to rawhide, this might break."
# shellcheck disable=SC2154
warn "If so, this script may be found in the repo. as '$SCRIPT_DIRPATH/$SCRIPT_FILENAME'."
fi
warn "Upgrading Fedora '$OS_RELEASE_VER' to rawhide, this might break."
# shellcheck disable=SC2154
warn "If so, this script may be found in the repo. as '$SCRIPT_DIRPATH/$SCRIPT_FILENAME'."

# Show what's happening
set -x
Expand Down
4 changes: 2 additions & 2 deletions ci/Containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ ENV CIRRUS_WORKING_DIR=/var/tmp/automation_images \
# to rely on COPY or ADD instructions. See documentation for warning.
RUN test -n "$PACKER_VERSION"
RUN dnf update -y && \
dnf mark remove $(rpm -qa | grep -Ev '(gpg-pubkey)|(dnf)|(sudo)') && \
dnf -y mark dependency $(rpm -qa | grep -Ev '(gpg-pubkey)|(dnf)|(sudo)') && \
dnf install -y \
ShellCheck \
bash-completion \
Expand All @@ -38,7 +38,7 @@ RUN dnf update -y && \
util-linux \
unzip \
&& \
dnf mark install dnf sudo $_ && \
dnf -y mark user dnf sudo $_ && \
dnf autoremove -y && \
dnf clean all

Expand Down