Skip to content

Commit

Permalink
common: inherit from tier-x on c9s/el9.6+
Browse files Browse the repository at this point in the history
Inherit from FCOS inheriting from tier-x starting from c9s and el9.6+.

The only major delta here for RHCOS is that FCOS and tier-x turn off
weak deps, but RHCOS historically has enabled them. Would be nice to
also turn them off in RHCOS as well but let's do that move separately
from this one since it additionally requires careful analysis e.g. of
what packages get dropped.
  • Loading branch information
jlebon committed Nov 29, 2024
1 parent dba7f76 commit 2558d82
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 1 deletion.
8 changes: 7 additions & 1 deletion common.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -47,10 +46,17 @@ 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/bootupd.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
Expand Down
1 change: 1 addition & 0 deletions manifest-c9s.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ metadata:

variables:
osversion: "c9s"
inherit_tier_x: true

# Include manifests common to all RHEL and CentOS Stream versions
include:
Expand Down
1 change: 1 addition & 0 deletions manifest-rhel-9.4.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 1 addition & 0 deletions manifest-rhel-9.6.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 2558d82

Please sign in to comment.