Merge pull request #1658 from jlebon/pr/bump-fcos

NO-JIRA: Bump fedora-coreos-config
openshift · Dec 3, 2024 · b65935f · b65935f
2 parents bfec2de + 8f5353a
commit b65935f
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 3 deletions.
diff --git a/common.yaml b/common.yaml
@@ -7,7 +7,6 @@ include:
   - fedora-coreos-config/manifests/networking-tools.yaml
   - fedora-coreos-config/manifests/user-experience.yaml
   - fedora-coreos-config/manifests/shared-workarounds.yaml
-  - fedora-coreos-config/manifests/bootupd.yaml
   # RHCOS owned packages
   - packages-rhcos.yaml
 
@@ -47,10 +46,16 @@ conditional-include:
     include: fedora-coreos-config/manifests/shared-el9.yaml
   - if: osversion == "rhel-9.6"
     include: fedora-coreos-config/manifests/shared-el9.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
 
+# historical default
+recommends: true
+
 postprocess:
   # Mark the OS as of the CoreOS variant.
   # XXX: should be part of a centos/redhat-release subpackage instead

diff --git a/fedora-coreos-config b/fedora-coreos-config
diff --git a/kola-denylist.yaml b/kola-denylist.yaml
@@ -35,6 +35,18 @@
 
 - pattern: ext.config.shared.var-mount.luks
   tracker: https://github.com/openshift/os/issues/1656
+  osversion:
+    - c9s
+    - rhel-9.6
 
 - pattern: ext.config.shared.root-reprovision.luks.autosave-xfs
   tracker: https://github.com/openshift/os/issues/1656
+  osversion:
+    - c9s
+    - rhel-9.6
+
+- pattern: "*kdump*"
+  tracker: https://gitlab.com/redhat/centos-stream/containers/bootc/-/issues/1169
+  osversion:
+    - c9s
+    - rhel-9.6
diff --git a/manifest-c9s.yaml b/manifest-c9s.yaml
@@ -7,6 +7,7 @@ metadata:
 
 variables:
   osversion: "c9s"
+  inherit_tier_x: true
 
 # Include manifests common to all RHEL and CentOS Stream versions
 include:

diff --git a/manifest-rhel-9.4.yaml b/manifest-rhel-9.4.yaml
@@ -7,6 +7,7 @@ metadata:
 
 variables:
   osversion: "rhel-9.4"
+  inherit_tier_x: false
 
 # 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
@@ -7,6 +7,7 @@ metadata:
 
 variables:
   osversion: "rhel-9.6"
+  inherit_tier_x: true
 
 # Include manifests common to all RHEL and CentOS Stream versions
 include:
+2 −4		.cci.jenkinsfile
+4 −1		.github/workflows/add-override.yml
+66 −0		.github/workflows/bump-fedora-bootc.yaml
+1 −0		.github/workflows/remove-graduated-overrides.yml
+1 −1		.github/workflows/shellcheck.yml
+3 −0		.gitmodules
+1 −1		ci/buildroot/Dockerfile
+2 −2		ci/buildroot/install-buildroot.sh
+1 −0		fedora-bootc
+2 −8		kola-denylist.yaml
+486 −480		manifest-lock.aarch64.json
+27 −12		manifest-lock.overrides.yaml
+484 −472		manifest-lock.ppc64le.json
+461 −455		manifest-lock.s390x.json
+483 −483		manifest-lock.x86_64.json
+1 −1		manifest.yaml
+2 −2		manifests/bootable-rpm-ostree.yaml
+11 −2		manifests/fedora-coreos-base.yaml
+9 −4		manifests/fedora-coreos.yaml
+17 −0		manifests/ignition-and-ostree-tier-x-dupes.yaml
+3 −20		manifests/ignition-and-ostree.yaml
+8 −0		manifests/networking-tools-tier-x-dupes.yaml
+3 −5		manifests/networking-tools.yaml
+14 −0		manifests/system-configuration-tier-x-dupes.yaml
+0 −11		manifests/system-configuration.yaml
+11 −0		manifests/tier-x-dupes.yaml
+32 −0		manifests/tier-x.yaml
+26 −0		manifests/user-experience-tier-x-dupes.yaml
+0 −19		manifests/user-experience.yaml
+2 −0		overlay.d/05core/usr/lib/dracut/modules.d/35coreos-ignition/coreos-secex-ignition-prepare.service
+6 −0		overlay.d/05core/usr/lib/dracut/modules.d/35coreos-ignition/coreos-secex-ignition-prepare.sh
+3 −3		overlay.d/07fix-selinux-labels/usr/lib/systemd/system/coreos-fix-selinux-labels.service
+101 −0		tests/kola/boot/bootupd-validate
+24 −0		tests/kola/systemd/no-systemd-firstboot
+39 −9		tests/kola/upgrade/extended/test.sh