-
Notifications
You must be signed in to change notification settings - Fork 169
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.
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
Bump to Fedora 41 #3975
Bump to Fedora 41 #3975
Conversation
tests/containers/tang/Containerfile
Outdated
@@ -1,4 +1,4 @@ | |||
FROM registry.fedoraproject.org/fedora-minimal:40 | |||
FROM registry.fedoraproject.org/fedora-minimal:41 | |||
|
|||
RUN microdnf -y install tang && microdnf clean all && rm -rf /var/cache/yum |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
any use of microdnf
now should just be updated to dnf
since dnf
isn't python based any longer.
RUN microdnf -y install tang && microdnf clean all && rm -rf /var/cache/yum | |
RUN dnf -y install tang && dnf clean all && rm -rf /var/cache/yum |
There might be other uses in the code base.
for the osbuild patch application failure it's probably because those patches landed in an RPM build now.. Let's just drop the patch application and neuter it for now until (very soon) we'll apply more patches again. diff --git a/build.sh b/build.sh
index 5752c4edd..b5611a936 100755
--- a/build.sh
+++ b/build.sh
@@ -168,21 +168,18 @@ patch_osbuild() {
# To make it easier to apply patches we'll move around the osbuild
# code on the system first:
rmdir /usr/lib/osbuild/osbuild
- mv /usr/lib/python3.12/site-packages/osbuild /usr/lib/osbuild/
+ mv /usr/lib/python3.13/site-packages/osbuild /usr/lib/osbuild/
mkdir /usr/lib/osbuild/tools
mv /usr/bin/osbuild-mpp /usr/lib/osbuild/tools/
# Now all the software is under the /usr/lib/osbuild dir and we can patch
- cat /usr/lib/coreos-assembler/0001-parsing-add-parse_location_into_parts.patch \
- /usr/lib/coreos-assembler/0002-parsing-treat-locations-without-scheme-as-belonging-.patch \
- /usr/lib/coreos-assembler/0003-org.osbuild.selinux-support-operating-on-mounts.patch \
- /usr/lib/coreos-assembler/0004-org.osbuild.selinux-support-for-specifying-where-fil.patch \
+ cat foo.patch \
| patch -d /usr/lib/osbuild -p1
# And then move the files back; supermin appliance creation will need it back
# in the places delivered by the RPM.
mv /usr/lib/osbuild/tools/osbuild-mpp /usr/bin/osbuild-mpp
- mv /usr/lib/osbuild/osbuild /usr/lib/python3.12/site-packages/osbuild
+ mv /usr/lib/osbuild/osbuild /usr/lib/python3.13/site-packages/osbuild
mkdir /usr/lib/osbuild/osbuild
}
@@ -200,5 +197,5 @@ else
install_ocp_tools
trust_redhat_gpg_keys
configure_user
- patch_osbuild
+ #patch_osbuild
fi and also actually delete the patch files from git. |
46b494b
to
617f343
Compare
/retest |
/test rhcos |
Before merging this, let's add a e.g. |
The Prow failure here is because it's still using f40, because that's driven by https://github.com/openshift/release/blob/master/ci-operator/config/coreos/coreos-assembler/coreos-coreos-assembler-main.yaml as mentioned in the Dockerfile. Open a PR there to bump it and then you can iterate here. |
Openshift/release PR: openshift/release#59304 |
617f343
to
241dd68
Compare
F41 is out let's update COSA to be based on Fedora 41.
241dd68
to
943fb06
Compare
done - maybe we should create a release too, though now we can do that retroactively. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks, LGTM!
F41 is out let's update COSA to be based on Fedora 41.