Skip to content

TRT-2647: rhcos10 default for 5.0 #3498

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
neisw wants to merge 2 commits into
base: main
Choose a base branch
from
+1,779 −1,852
Open

TRT-2647: rhcos10 default for 5.0 #3498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
54af8d3
TRT-2647: rhcos10 default for 5.0
neisw May 5, 2026
72e7de3
TRT-2647: bump tests for rhcos10
neisw May 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
96 changes: 12 additions & 84 deletions config/views.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ component_readiness:
- ovn
OS:
- rhcos9
- rhcos10
Owner:
- eng
- service-delivery
Expand Down Expand Up @@ -137,6 +138,7 @@ component_readiness:
- ovn
OS:
- rhcos9
- rhcos10
Owner:
- eng
- service-delivery
Expand Down Expand Up @@ -222,6 +224,7 @@ component_readiness:
- ovn
OS:
- rhcos9
- rhcos10
Owner:
- eng
- service-delivery
Expand Down Expand Up @@ -405,7 +408,7 @@ component_readiness:
flake_as_failure: false
metrics:
enabled: false
- name: 5.0-techpreview-rhcos9-vs-rhcos10
- name: 5.0-rhcos10-vs-rhcos9
base_release:
release: "5.0"
relative_start: now-7d
Expand Down Expand Up @@ -435,6 +438,7 @@ component_readiness:
- arm64
- multi
FeatureSet:
- default
- techpreview
Installer:
- ipi
Expand All @@ -449,7 +453,7 @@ component_readiness:
Network:
- ovn
OS:
- rhcos9
- rhcos10
Owner:
- eng
Platform:
Expand All @@ -469,20 +473,22 @@ component_readiness:
- crun
compare_variants:
OS:
- rhcos10
- rhcos9
variant_cross_compare:
- OS
advanced_options:
minimum_failure: 3
minimum_failure: 4
confidence: 95
pity_factor: 5
pity_factor: 10
ignore_missing: false
ignore_disruption: true
flake_as_failure: false
pass_rate_required_new_tests: 90
include_multi_release_analysis: false
metrics:
enabled: false
regression_tracking:
enabled: true
enabled: false
- name: 5.0-ha-vs-single
base_release:
release: "5.0"
Expand Down Expand Up @@ -1424,84 +1430,6 @@ component_readiness:
flake_as_failure: false
metrics:
enabled: false
- name: 4.22-techpreview-rhcos9-vs-rhcos10
base_release:
release: "4.22"
relative_start: now-7d
relative_end: now
sample_release:
release: "4.22"
relative_start: now-7d
relative_end: now
variant_options:
column_group_by:
Network: { }
Platform: { }
Topology: { }
db_group_by:
Architecture: { }
FeatureSet: { }
Installer: { }
Network: { }
Platform: { }
Suite: { }
Topology: { }
Upgrade: { }
LayeredProduct: { }
include_variants:
Architecture:
- amd64
- arm64
- multi
FeatureSet:
- techpreview
Installer:
- ipi
- upi
JobTier:
- blocking
- informing
- standard
- candidate
LayeredProduct:
- none
Network:
- ovn
OS:
- rhcos9
Owner:
- eng
Platform:
- aws
- azure
- gcp
- metal
- vsphere
Topology:
- ha
- microshift
- single
CGroupMode:
- v2
ContainerRuntime:
- runc
- crun
compare_variants:
OS:
- rhcos10
variant_cross_compare:
- OS
advanced_options:
minimum_failure: 3
confidence: 95
pity_factor: 5
ignore_missing: false
ignore_disruption: true
flake_as_failure: false
metrics:
enabled: false
regression_tracking:
enabled: true
- name: 4.22-ha-vs-single
base_release:
release: "4.22"
Expand Down
3 changes: 1 addition & 2 deletions pkg/variantregistry/ocp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1313,8 +1313,7 @@ func setOS(_ logrus.FieldLogger, variants map[string]string, jobName string) {
case variants[VariantReleaseMajor] == "4":
variants[VariantOS] = "rhcos9"
case variants[VariantReleaseMajor] == "5" || isMainBranch:
// OCP 5 currently defaults to rhcos9. Update this when the default changes.
variants[VariantOS] = "rhcos9"
variants[VariantOS] = "rhcos10"
default:
variants[VariantOS] = "unknown"
}
Expand Down
14 changes: 7 additions & 7 deletions pkg/variantregistry/ocp_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ func TestVariantSyncer(t *testing.T) {
VariantContainerRuntime: "crun",
VariantCGroupMode: "v2",
VariantLayeredProduct: VariantNoValue,
VariantOS: "rhcos9",
VariantOS: "rhcos10",
},
},
{
Expand Down Expand Up @@ -87,7 +87,7 @@ func TestVariantSyncer(t *testing.T) {
VariantContainerRuntime: "crun",
VariantCGroupMode: "v2",
VariantLayeredProduct: VariantNoValue,
VariantOS: "rhcos9",
VariantOS: "rhcos10",
},
},
{
Expand Down Expand Up @@ -118,7 +118,7 @@ func TestVariantSyncer(t *testing.T) {
VariantContainerRuntime: "crun",
VariantCGroupMode: "v2",
VariantLayeredProduct: VariantNoValue,
VariantOS: "rhcos9",
VariantOS: "rhcos10",
},
},
{
Expand Down Expand Up @@ -149,7 +149,7 @@ func TestVariantSyncer(t *testing.T) {
VariantContainerRuntime: "crun",
VariantCGroupMode: "v2",
VariantLayeredProduct: VariantNoValue,
VariantOS: "rhcos9",
VariantOS: "rhcos10",
},
},
{
Expand Down Expand Up @@ -1080,7 +1080,7 @@ func TestVariantSyncer(t *testing.T) {
VariantContainerRuntime: "crun",
VariantCGroupMode: "v2",
VariantLayeredProduct: VariantNoValue,
VariantOS: "rhcos9",
VariantOS: "rhcos10",
},
},
{
Expand Down Expand Up @@ -1157,7 +1157,7 @@ func TestVariantSyncer(t *testing.T) {
VariantSecurityMode: VariantDefaultValue,
VariantCGroupMode: "v2",
VariantLayeredProduct: VariantNoValue,
VariantOS: "rhcos9",
VariantOS: "rhcos10",
},
},
{
Expand Down Expand Up @@ -1858,7 +1858,7 @@ func TestVariantSyncer(t *testing.T) {
VariantContainerRuntime: "crun",
VariantCGroupMode: "v2",
VariantLayeredProduct: VariantNoValue,
VariantOS: "rhcos9",
VariantOS: "rhcos10",
},
},
{
Expand Down
Loading