Skip to content

Commit ca549fe

Browse files
committed
Require tier-x
All the streams we are building now require tier-x so let's remove the option.
1 parent 9ba3d75 commit ca549fe

File tree

5 files changed

+1
-8
lines changed

5 files changed

+1
-8
lines changed

common.yaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ include:
66
- fedora-coreos-config/manifests/file-transfer.yaml
77
- fedora-coreos-config/manifests/networking-tools.yaml
88
- fedora-coreos-config/manifests/user-experience.yaml
9+
- fedora-coreos-config/manifests/tier-x.yaml
910
# RHCOS owned packages
1011
- packages-rhcos.yaml
1112

@@ -41,10 +42,6 @@ conditional-include:
4142
- if: osversion == "centos-10"
4243
include:
4344
- fedora-coreos-config/manifests/shared-el10.yaml
44-
- if: inherit_tier_x == true
45-
include: fedora-coreos-config/manifests/tier-x.yaml
46-
- if: inherit_tier_x == false
47-
include: fedora-coreos-config/manifests/tier-x-dupes.yaml
4845

4946
documentation: false
5047

manifest-c10s.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ metadata:
88
variables:
99
id: "centos"
1010
osversion: "centos-10"
11-
inherit_tier_x: true
1211

1312
# Include manifests common to all RHEL and CentOS Stream versions
1413
include:

manifest-c9s.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ metadata:
88
variables:
99
id: "centos"
1010
osversion: "centos-9"
11-
inherit_tier_x: true
1211

1312
# Include manifests common to all RHEL and CentOS Stream versions
1413
include:

manifest-rhel-10.1.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ metadata:
88
variables:
99
id: "rhel"
1010
osversion: "rhel-10.1"
11-
inherit_tier_x: true
1211

1312
# Include manifests common to all RHEL and CentOS Stream versions
1413
include:

manifest-rhel-9.6.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ metadata:
88
variables:
99
id: "rhel"
1010
osversion: "rhel-9.6"
11-
inherit_tier_x: true
1211

1312
# Include manifests common to all RHEL and CentOS Stream versions
1413
include:

0 commit comments

Comments
 (0)