From 120e6a9100af8ab35ea5f948423fa2118f3ee4a0 Mon Sep 17 00:00:00 2001 From: "red-hat-konflux-kflux-prd-rh03[bot]" <206760901+red-hat-konflux-kflux-prd-rh03[bot]@users.noreply.github.com> Date: Tue, 28 Oct 2025 20:02:45 +0000 Subject: [PATCH 1/2] chore(deps): update dependency fedora to v43 Signed-off-by: red-hat-konflux-kflux-prd-rh03 <206760901+red-hat-konflux-kflux-prd-rh03[bot]@users.noreply.github.com> --- Dockerfile | 2 +- tests/containers/nfs/Containerfile | 2 +- tests/containers/tang/Containerfile | 2 +- tests/containers/targetcli/Containerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index febc4dae67..b8fb1bfcee 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # When rebasing to new Fedora, also update openshift/release: # https://github.com/openshift/release/tree/master/ci-operator/config/coreos/coreos-assembler/coreos-coreos-assembler-main.yaml -FROM quay.io/fedora/fedora:42 +FROM quay.io/fedora/fedora:43 WORKDIR /root/containerbuild # This variable is enabled by Konflux to build the container image hermatically. ARG NO_NETWORK=0 diff --git a/tests/containers/nfs/Containerfile b/tests/containers/nfs/Containerfile index f45d9fac75..0af4ffb932 100644 --- a/tests/containers/nfs/Containerfile +++ b/tests/containers/nfs/Containerfile @@ -1,4 +1,4 @@ -FROM quay.io/fedora/fedora:42 +FROM quay.io/fedora/fedora:43 RUN dnf -y install /usr/bin/ps nfs-utils && dnf clean all && rm -rf /var/cache/yum diff --git a/tests/containers/tang/Containerfile b/tests/containers/tang/Containerfile index 4a83ef5590..b5d13852da 100644 --- a/tests/containers/tang/Containerfile +++ b/tests/containers/tang/Containerfile @@ -1,4 +1,4 @@ -FROM quay.io/fedora/fedora:42 +FROM quay.io/fedora/fedora:43 RUN dnf -y install systemd tang && dnf clean all && rm -rf /var/cache/yum EXPOSE 80 diff --git a/tests/containers/targetcli/Containerfile b/tests/containers/targetcli/Containerfile index 8f745b2795..2255ad47dd 100644 --- a/tests/containers/targetcli/Containerfile +++ b/tests/containers/targetcli/Containerfile @@ -1,4 +1,4 @@ -FROM quay.io/fedora/fedora:42 +FROM quay.io/fedora/fedora:43 RUN dnf install -y targetcli kmod && dnf clean all RUN systemctl enable target From 5784f71b8522a08e53009dd8e4f6cfe1c7bd6efc Mon Sep 17 00:00:00 2001 From: Michael Armijo Date: Fri, 7 Nov 2025 10:31:33 -0700 Subject: [PATCH 2/2] build.sh/patch_osbuild: dynamically detect python lib dir Fedora 43 now includes Python 3.14, which broke patch_upload since the python3.13 directory was hard-coded. Dynamically detect the python lib directory to avoid this in the future. https://fedoraproject.org/wiki/Changes/Python3.14 --- build.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build.sh b/build.sh index b46b9c886b..825bf32a70 100755 --- a/build.sh +++ b/build.sh @@ -198,7 +198,8 @@ 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.13/site-packages/osbuild /usr/lib/osbuild/ + python_lib_dir=$(ls -d /usr/lib/python*) + mv ${python_lib_dir}/site-packages/osbuild /usr/lib/osbuild/ mkdir -p /usr/lib/osbuild/tools mv /usr/bin/osbuild-mpp /usr/lib/osbuild/tools/ @@ -214,7 +215,7 @@ patch_osbuild() { # 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.13/site-packages/osbuild + mv /usr/lib/osbuild/osbuild ${python_lib_dir}/site-packages/osbuild mkdir -p /usr/lib/osbuild/osbuild }