coreos / coreos-assembler

Tooling container to assemble CoreOS-like systems
https://coreos.github.io/coreos-assembler/
Apache License 2.0
347 stars 168 forks source link

Bump to Fedora 41 #3975

Closed gursewak1997 closed 4 days ago

gursewak1997 commented 6 days ago

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

dustymabe commented 5 days ago

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.

dustymabe commented 5 days ago

/retest

gursewak1997 commented 4 days ago

/test rhcos

jlebon commented 4 days ago

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 commented 4 days ago

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 commented 4 days ago

Openshift/release PR: https://github.com/openshift/release/pull/59304

dustymabe commented 4 days ago

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.