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.

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

Merged
merged 1 commit into from
Nov 28, 2024
Merged

Bump to Fedora 41 #3975

merged 1 commit into from
Nov 28, 2024

Conversation

gursewak1997
Copy link
Member

F41 is out let's update COSA to be based on Fedora 41.

@@ -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
Copy link
Member

@dustymabe dustymabe Nov 25, 2024

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.

Suggested change
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.

@dustymabe
Copy link
Member

dustymabe commented Nov 26, 2024

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.

@gursewak1997 gursewak1997 force-pushed the bumpto41 branch 5 times, most recently from 46b494b to 617f343 Compare November 26, 2024 22:56
@dustymabe
Copy link
Member

/retest

@gursewak1997
Copy link
Member Author

/test rhcos

@jlebon
Copy link
Member

jlebon commented Nov 27, 2024

Before merging this, let's add a e.g. :f40 tag in Quay.io from current :latest. We usually also do a release, but... maybe we can stop doing that.

@jlebon
Copy link
Member

jlebon commented Nov 27, 2024

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.

@gursewak1997
Copy link
Member Author

gursewak1997 commented Nov 27, 2024

Openshift/release PR: openshift/release#59304

F41 is out let's update COSA to be based on Fedora 41.
@dustymabe
Copy link
Member

Before merging this, let's add a e.g. :f40 tag in Quay.io from current :latest. We usually also do a release, but... maybe we can stop doing that.

done - quay.io/coreos-assembler/coreos-assembler:f40

maybe we should create a release too, though now we can do that retroactively.

Copy link
Member

@jlebon jlebon left a comment

Choose a reason for hiding this comment

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

Thanks, LGTM!

@jlebon jlebon merged commit b282baf into coreos:main Nov 28, 2024
5 checks passed
@gursewak1997 gursewak1997 deleted the bumpto41 branch November 28, 2024 15:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants