From dd6b7836310c1ea5062cde59652110c42a548d6d Mon Sep 17 00:00:00 2001 From: CoreOS Bot Date: Mon, 28 Apr 2025 00:04:13 +0000 Subject: [PATCH 01/11] Bump fedora-coreos-config Aashish Radhakrishnan (3): workflows/remove-graduated-overrides: Install python3-libdnf5 denylist: add snooze for ext.config.kdump.crash & kdump.crash.ssh denylist: add snooze for kdump.crash.nfs Adam Piasecki (3): tests/aws: Modify xen-assert to find xen entry in hypervisor string denylist: snooze root-reprovision on rawhide for ppc64le denylist: snooze coreos.boot-mirror for x86_64 Dusty Mabe (25): tests/manual: trim saved state in coreos-builds-bisect.py denylist: skip console warnings on ppc overlay.d: drop 40grub overlay overrides: fast-track ignition-2.21.0-2.fc41 buildroot: workaround rpmbuild bug buildroot: better workaround for rpm-build bug denylist: add denial for toolbox on rawhide tests/upgrade: always wait for fix-selinux-labels tests/upgrade: rework booted deployment processing tests/upgrade: adjust for OCI based updates tests/upgrade: use a variable for architecture tests/upgrade: fix rebase to container image workflows/add-overrides: install python3-libdnf5 tests: drop some cruft from the net behavior change test denylist: extend snooze for toolbox Move to Fedora Linux 42 image.yaml: switch to EROFS; deploying via container drop as much dead code/manifests as possible overlay.d: Drop 07fix-selinux-labels overlay overlay/15fcos: drop cgroups and wifi checks overrides: fast-track moby-engine, containerd inline the 16disable-zincati overlay manifests/user-experience.yaml: include makedumpfile kdumpctl some riscv enablement denylist: deny ext.config.multipath.resilient on s390x Etienne Champetier (1): overlay.d/40grub: remove 70_coreos-user.cfg Fifo Phonics (1): Add docker swarm overlay network auto-bridge test Huijing Hei (1): tests/networking: update `nm-ifcfg-rh-plugin` and `team-dhcp-via-ignition` working on el9 Jeremy Poulin (1): [TNF] Add podman-etcd resource agent to the expected broken symlinks in RHCOS Jonathan Lebon (2): coreos-boot-mount-generator: honor `boot=` karg better in multipath case tests: add coverage for multipath + multiple `boot` labels + no `root` karg Michael Armijo (3): manifests: include azure-vm-utils overrides: fast-track azure-vm-utils in f41 denylist: add `skip-console-warnings` to openstack Nikita Dubrovskii (6): ci/overrides.py: format code with autopep8 ci/overrides.py: use libdnf5 instead of hawkey ci/overrides.py: use libdnf5 instead of python3-dnf Revert "workflows/add-overrides: install python3-dnf" ci/overrides.py: fix comparison of nevra ci/overrides.py: don't fail with KeyError when manifest has no 'repos' jbtrystram (3): denylist: add pxe-offline-install.4k.ppcfw for PPC64le denylist: re-enable ppc64le pxe test overlay.d/15fcos: add a script to trigger zincati to rebase to OCI --- fedora-coreos-config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora-coreos-config b/fedora-coreos-config index 3ac1147b..3073b9de 160000 --- a/fedora-coreos-config +++ b/fedora-coreos-config @@ -1 +1 @@ -Subproject commit 3ac1147b7e302b22229cf5f04e86d007a0386907 +Subproject commit 3073b9dec4c020cb2db0df09636904925e4b04bc From 5d29f0d36c37073fc838099c9796796ed87f9997 Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Fri, 25 Apr 2025 11:46:51 -0400 Subject: [PATCH 02/11] drop obsolete 07fix-selinux-labels overlay This was removed upstream in [1]. [1] https://github.com/coreos/fedora-coreos-config/commit/b0ca15f2c56e483aeee048a125f8d2176c102623 --- common.yaml | 1 - overlay.d/07fix-selinux-labels | 1 - 2 files changed, 2 deletions(-) delete mode 120000 overlay.d/07fix-selinux-labels diff --git a/common.yaml b/common.yaml index df274ecc..b9a7a1b5 100644 --- a/common.yaml +++ b/common.yaml @@ -6,7 +6,6 @@ include: - fedora-coreos-config/manifests/file-transfer.yaml - fedora-coreos-config/manifests/networking-tools.yaml - fedora-coreos-config/manifests/user-experience.yaml - - fedora-coreos-config/manifests/shared-workarounds.yaml # RHCOS owned packages - packages-rhcos.yaml diff --git a/overlay.d/07fix-selinux-labels b/overlay.d/07fix-selinux-labels deleted file mode 120000 index c7b8cd46..00000000 --- a/overlay.d/07fix-selinux-labels +++ /dev/null @@ -1 +0,0 @@ -../fedora-coreos-config/overlay.d/07fix-selinux-labels \ No newline at end of file From 9ba3d756cc54962af4b54c9b17780b420a6822a8 Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Wed, 2 Apr 2025 15:16:17 -0400 Subject: [PATCH 03/11] drop obsolete 40grub overlay symlink 40grub was dropped from f-c-c in [1] since we are now using the `ignition-grub` package to provide those bits. Let's drop it here too. [1] https://github.com/coreos/fedora-coreos-config/commit/74cd2370760428605f85c2918f0452ea55f817f9 --- common.yaml | 1 - overlay.d/40grub | 1 - 2 files changed, 2 deletions(-) delete mode 120000 overlay.d/40grub diff --git a/common.yaml b/common.yaml index b9a7a1b5..8f088abe 100644 --- a/common.yaml +++ b/common.yaml @@ -24,7 +24,6 @@ ostree-layers: - overlay/30rhcos-nvme-compat-udev - overlay/30gcp-udev-rules - overlay/30lvmdevices - - overlay/40grub conditional-include: - if: basearch != "s390x" diff --git a/overlay.d/40grub b/overlay.d/40grub deleted file mode 120000 index e2b28039..00000000 --- a/overlay.d/40grub +++ /dev/null @@ -1 +0,0 @@ -../fedora-coreos-config/overlay.d/40grub \ No newline at end of file From ca549febbec041d33a7748fb6509f5e13d32d42d Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Fri, 25 Apr 2025 11:58:45 -0400 Subject: [PATCH 04/11] Require tier-x All the streams we are building now require tier-x so let's remove the option. --- common.yaml | 5 +---- manifest-c10s.yaml | 1 - manifest-c9s.yaml | 1 - manifest-rhel-10.1.yaml | 1 - manifest-rhel-9.6.yaml | 1 - 5 files changed, 1 insertion(+), 8 deletions(-) diff --git a/common.yaml b/common.yaml index 8f088abe..60d8493b 100644 --- a/common.yaml +++ b/common.yaml @@ -6,6 +6,7 @@ include: - fedora-coreos-config/manifests/file-transfer.yaml - fedora-coreos-config/manifests/networking-tools.yaml - fedora-coreos-config/manifests/user-experience.yaml + - fedora-coreos-config/manifests/tier-x.yaml # RHCOS owned packages - packages-rhcos.yaml @@ -41,10 +42,6 @@ conditional-include: - if: osversion == "centos-10" include: - fedora-coreos-config/manifests/shared-el10.yaml - - if: inherit_tier_x == true - include: fedora-coreos-config/manifests/tier-x.yaml - - if: inherit_tier_x == false - include: fedora-coreos-config/manifests/tier-x-dupes.yaml documentation: false diff --git a/manifest-c10s.yaml b/manifest-c10s.yaml index b668877a..50198d22 100644 --- a/manifest-c10s.yaml +++ b/manifest-c10s.yaml @@ -8,7 +8,6 @@ metadata: variables: id: "centos" osversion: "centos-10" - inherit_tier_x: true # Include manifests common to all RHEL and CentOS Stream versions include: diff --git a/manifest-c9s.yaml b/manifest-c9s.yaml index ea34983e..3133109c 100644 --- a/manifest-c9s.yaml +++ b/manifest-c9s.yaml @@ -8,7 +8,6 @@ metadata: variables: id: "centos" osversion: "centos-9" - inherit_tier_x: true # Include manifests common to all RHEL and CentOS Stream versions include: diff --git a/manifest-rhel-10.1.yaml b/manifest-rhel-10.1.yaml index a1d8b172..c6e77c73 100644 --- a/manifest-rhel-10.1.yaml +++ b/manifest-rhel-10.1.yaml @@ -8,7 +8,6 @@ metadata: variables: id: "rhel" osversion: "rhel-10.1" - inherit_tier_x: true # Include manifests common to all RHEL and CentOS Stream versions include: diff --git a/manifest-rhel-9.6.yaml b/manifest-rhel-9.6.yaml index 70189d09..f0c086d2 100644 --- a/manifest-rhel-9.6.yaml +++ b/manifest-rhel-9.6.yaml @@ -8,7 +8,6 @@ metadata: variables: id: "rhel" osversion: "rhel-9.6" - inherit_tier_x: true # Include manifests common to all RHEL and CentOS Stream versions include: From 5ff99680b9044cf5da0c9390df8c5ed156137a31 Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Fri, 25 Apr 2025 12:01:40 -0400 Subject: [PATCH 05/11] common.yaml: drop grub2-removals.yaml include This is done upstream anyway [1] so we don't need to do it here too. For that reason we removed it from the fedora-coreos-config repo in [2]. [1] https://github.com/coreos/fedora-coreos-config/pull/3476#pullrequestreview-2794501772 [2] https://github.com/coreos/fedora-coreos-config/commit/f6b04ccce62ff796dba2af4f6c3fb4e6314cec15 --- common.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/common.yaml b/common.yaml index 60d8493b..5b6be0b3 100644 --- a/common.yaml +++ b/common.yaml @@ -27,9 +27,6 @@ ostree-layers: - overlay/30lvmdevices conditional-include: - - if: basearch != "s390x" - # And remove some cruft from grub2 - include: fedora-coreos-config/manifests/grub2-removals.yaml # Packages specific to el9 - if: osversion == "centos-9" include: From d26c4ceef6aa86323e8a2528d2db7e0ad59fcb86 Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Fri, 25 Apr 2025 11:15:21 -0400 Subject: [PATCH 06/11] c10s/rhel10.1: pull ignition from rhel9 repos for now The ignition-grub subpackage still isn't in c10s or rhel10.1 because the pungi-centos PR [1] hasn't been merged. I've been told that will happen, we just don't know when. Let's get unblocked for now. [1] https://gitlab.com/redhat/centos-stream/release-engineering/pungi-centos/-/merge_requests/969 --- fast-tracks.yaml | 13 +++++++++++++ manifest-c10s.yaml | 3 +++ manifest-rhel-10.1.yaml | 4 ++++ 3 files changed, 20 insertions(+) create mode 100644 fast-tracks.yaml diff --git a/fast-tracks.yaml b/fast-tracks.yaml new file mode 100644 index 00000000..bd794f9f --- /dev/null +++ b/fast-tracks.yaml @@ -0,0 +1,13 @@ +c9s-appstream-back-tracks: + from: c9s-appstream + packages: + # While we wait we can pull this from c9s + # https://gitlab.com/redhat/centos-stream/release-engineering/pungi-centos/-/merge_requests/969 + - ignition* +rhel-9.6-server-ose-4.19-back-tracks: + from: rhel-9.6-server-ose-4.19 + packages: + # While we wait we can pull this from rhel-9.6 openshift rhaos repos + # https://gitlab.com/redhat/centos-stream/release-engineering/pungi-centos/-/merge_requests/969 + # which will then flow into RHEL 10.1. + - ignition* diff --git a/manifest-c10s.yaml b/manifest-c10s.yaml index 50198d22..808938b8 100644 --- a/manifest-c10s.yaml +++ b/manifest-c10s.yaml @@ -18,6 +18,9 @@ repos: - c10s-baseos - c10s-appstream - c10s-extras-common + # While we wait we can pull this from c9s + # https://gitlab.com/redhat/centos-stream/release-engineering/pungi-centos/-/merge_requests/969 + - c9s-appstream-back-tracks automatic-version-prefix: "10.0." # This ensures we're semver-compatible which OpenShift wants diff --git a/manifest-rhel-10.1.yaml b/manifest-rhel-10.1.yaml index c6e77c73..071502f6 100644 --- a/manifest-rhel-10.1.yaml +++ b/manifest-rhel-10.1.yaml @@ -20,6 +20,10 @@ repos: - rhel-10.1-appstream # Early kernel repo not available for now # - rhel-10.1-early-kernel + # While we wait we can pull this from rhel-9.6 + # https://gitlab.com/redhat/centos-stream/release-engineering/pungi-centos/-/merge_requests/969 + # which will then flow into RHEL 10.1. + - rhel-9.6-server-ose-4.19-back-tracks automatic-version-prefix: "10.1." # This ensures we're semver-compatible which OpenShift wants From 7870a4e2a039540697908f07ba4f75a9c8e90188 Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Tue, 29 Apr 2025 16:16:18 -0400 Subject: [PATCH 07/11] Revert denial for symlink test This is a partial revert for commit 15708c0. The upstream commit [1] that makes this denial unneccessary merged and is in the most recent f-c-c config bump. [1] https://github.com/coreos/fedora-coreos-config/commit/85849c53655ed5550aff1ebc9973769e6eb8d80c --- kola-denylist.yaml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/kola-denylist.yaml b/kola-denylist.yaml index 024c09bb..543c6ab5 100644 --- a/kola-denylist.yaml +++ b/kola-denylist.yaml @@ -117,11 +117,3 @@ osversion: - centos-10 - rhel-10.1 - -# We are currently adding a dead symlink to allow MCO to install a pacemaker -# resource agent in Two Node OpenShift with Fencing (TNF). This will be removed -# once the underlying agent is shipped as part of the `two-node-ha` extension -# and the TNF controller in etcd is updated to initialize pacemaker clusters -# via the version shipped in the extension. -- pattern: ext.config.shared.files.validate-symlinks - tracker: https://issues.redhat.com/browse/OCPEDGE-1706 From 09799174d19876f4e19d988fffa8de7838242ee8 Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Tue, 29 Apr 2025 19:05:50 -0400 Subject: [PATCH 08/11] extensions: delete blank line in Dockerfile Let's collapse this down so that all individual build stages are collected together. --- extensions/Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/extensions/Dockerfile b/extensions/Dockerfile index a6dd9165..6318c356 100644 --- a/extensions/Dockerfile +++ b/extensions/Dockerfile @@ -18,7 +18,6 @@ RUN rm -f /etc/yum.repos.d/*.repo \ && curl -L https://raw.githubusercontent.com/coreos/fedora-coreos-config/testing-devel/fedora-archive.repo -o /etc/yum.repos.d/fedora-archive.repo RUN dnf install -y createrepo_c RUN createrepo_c /usr/share/rpm-ostree/extensions/ - # Generate extensions.json for meta.json. # Use dnf repoquery to print 'name: version,' for each RPM # sed to remove the comma from the last RPM From cdd91139ec030bbb3d8d8ba8436f5ee4c7711813 Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Tue, 29 Apr 2025 19:05:35 -0400 Subject: [PATCH 09/11] extensions: switch to centos:stream9 for createrepo_c There was an old problem here where building on p8/s390x had some issues with createrepo_c in EL. We think those are resolved now so let's use CentOS stream again. --- extensions/Dockerfile | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/extensions/Dockerfile b/extensions/Dockerfile index 6318c356..11d680bd 100644 --- a/extensions/Dockerfile +++ b/extensions/Dockerfile @@ -10,12 +10,8 @@ ARG OPENSHIFT_CI=0 RUN --mount=type=secret,id=yumrepos,target=/os/secret.repo extensions/build.sh ## Creates the repo metadata for the extensions. -## This uses Fedora as a lowest-common-denominator because it will work on -## current p8/s390x. See https://github.com/openshift/os/issues/1000 -FROM quay.io/fedora/fedora:41 as builder +FROM quay.io/centos/centos:stream9 as builder COPY --from=os /usr/share/rpm-ostree/extensions/ /usr/share/rpm-ostree/extensions/ -RUN rm -f /etc/yum.repos.d/*.repo \ -&& curl -L https://raw.githubusercontent.com/coreos/fedora-coreos-config/testing-devel/fedora-archive.repo -o /etc/yum.repos.d/fedora-archive.repo RUN dnf install -y createrepo_c RUN createrepo_c /usr/share/rpm-ostree/extensions/ # Generate extensions.json for meta.json. From 8632bdee07bbd52981134cd4dc4a450e83a5b89b Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Wed, 30 Apr 2025 08:29:24 -0400 Subject: [PATCH 10/11] denylist: drop denials that were waiting on the submodule bump The bump has happened now so we can drop these denials too. --- kola-denylist.yaml | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/kola-denylist.yaml b/kola-denylist.yaml index 543c6ab5..f4452b30 100644 --- a/kola-denylist.yaml +++ b/kola-denylist.yaml @@ -84,27 +84,6 @@ - centos-10 - rhel-10.1 -# Waiting for submodule bump -- pattern: ext.config.shared.networking.nm-ifcfg-rh-plugin - tracker: https://github.com/openshift/os/pull/1759#issuecomment-2779700581 - osversion: - - centos-10 - - rhel-10.1 - -# Waiting for submodule bump -- pattern: ext.config.shared.networking.team-dhcp-via-ignition - tracker: https://github.com/openshift/os/pull/1759#issuecomment-2779700581 - osversion: - - centos-10 - - rhel-10.1 - -# Waiting for submodule bump -# https://github.com/coreos/fedora-coreos-config/pull/3439 -- pattern: ext.config.shared.networking.default-network-behavior-change - tracker: https://github.com/openshift/os/pull/1759#issuecomment-2779700581 - osversion: - - rhel-10.1 - - pattern: ext.config.shared.content-origins tracker: https://issues.redhat.com/browse/RHEL-86436 osversion: From 777e72edc90b04401dd783c0e30e0f8c0ef0bc1c Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Wed, 30 Apr 2025 08:06:55 -0400 Subject: [PATCH 11/11] denylist: add ext.config.shared.multipath.resilient This is a new test and it's flaky. Follow the issue to see when it gets fixed. --- kola-denylist.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/kola-denylist.yaml b/kola-denylist.yaml index f4452b30..bebd1fd9 100644 --- a/kola-denylist.yaml +++ b/kola-denylist.yaml @@ -96,3 +96,6 @@ osversion: - centos-10 - rhel-10.1 + +- pattern: ext.config.shared.multipath.resilient + tracker: https://github.com/coreos/fedora-coreos-tracker/issues/1937