Skip to content

Commit ee7dded

Browse files
Merge pull request #3561 from QiWang19/candidate-techpreview
OCPNODE-4125: Promote disruptive long-running jobs to candidate tier for stabilization
2 parents 2739439 + 9d78599 commit ee7dded

3 files changed

Lines changed: 123 additions & 64 deletions

File tree

pkg/variantregistry/ocp.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -803,6 +803,9 @@ func (v *OCPVariantLoader) setJobTier(_ logrus.FieldLogger, variants map[string]
803803
// GCP multi-operator periodic jobs are not yet stable enough for component readiness
804804
{[]string{"e2e-gcp-multi-operator-periodic"}, "candidate"},
805805

806+
// Disruptive longrunning jobs promoted to candidate while stabilizing
807+
{[]string{"-disruptive-longrunning"}, "candidate"},
808+
806809
// Hidden jobs
807810
{[]string{"-cilium"}, "hidden"},
808811
{[]string{"-disruptive"}, "hidden"},

pkg/variantregistry/ocp_test.go

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2094,6 +2094,62 @@ func TestVariantSyncer(t *testing.T) {
20942094
VariantOS: "rhcos9",
20952095
},
20962096
},
2097+
{
2098+
job: "periodic-ci-openshift-release-main-nightly-5.0-e2e-aws-disruptive-longrunning",
2099+
expected: map[string]string{
2100+
VariantRelease: "5.0",
2101+
VariantReleaseMajor: "5",
2102+
VariantReleaseMinor: "0",
2103+
VariantArch: "amd64",
2104+
VariantInstaller: "ipi",
2105+
VariantPlatform: "aws",
2106+
VariantProcedure: "none",
2107+
VariantJobTier: "candidate",
2108+
VariantNetwork: "ovn",
2109+
VariantNetworkStack: "ipv4",
2110+
VariantOwner: "eng",
2111+
VariantSuite: "unknown",
2112+
VariantTopology: "ha",
2113+
VariantUpgrade: VariantNoValue,
2114+
VariantAggregation: VariantNoValue,
2115+
VariantFeatureSet: "default",
2116+
VariantNetworkAccess: VariantDefaultValue,
2117+
VariantScheduler: VariantDefaultValue,
2118+
VariantSecurityMode: VariantDefaultValue,
2119+
VariantContainerRuntime: "crun",
2120+
VariantCGroupMode: "v2",
2121+
VariantLayeredProduct: VariantNoValue,
2122+
VariantOS: "rhcos9",
2123+
},
2124+
},
2125+
{
2126+
job: "periodic-ci-openshift-release-main-nightly-5.0-e2e-aws-disruptive-longrunning-techpreview-1of2",
2127+
expected: map[string]string{
2128+
VariantRelease: "5.0",
2129+
VariantReleaseMajor: "5",
2130+
VariantReleaseMinor: "0",
2131+
VariantArch: "amd64",
2132+
VariantInstaller: "ipi",
2133+
VariantPlatform: "aws",
2134+
VariantProcedure: "none",
2135+
VariantJobTier: "candidate",
2136+
VariantNetwork: "ovn",
2137+
VariantNetworkStack: "ipv4",
2138+
VariantOwner: "eng",
2139+
VariantSuite: "unknown",
2140+
VariantTopology: "ha",
2141+
VariantUpgrade: VariantNoValue,
2142+
VariantAggregation: VariantNoValue,
2143+
VariantFeatureSet: "techpreview",
2144+
VariantNetworkAccess: VariantDefaultValue,
2145+
VariantScheduler: VariantDefaultValue,
2146+
VariantSecurityMode: VariantDefaultValue,
2147+
VariantContainerRuntime: "crun",
2148+
VariantCGroupMode: "v2",
2149+
VariantLayeredProduct: VariantNoValue,
2150+
VariantOS: "rhcos9",
2151+
},
2152+
},
20972153
{
20982154
job: "periodic-ci-openshift-no-release-in-name-e2e-aws-ovn",
20992155
variantsFile: map[string]string{

0 commit comments

Comments
 (0)