From 51012b021e861486a2f6300cf89db72cfd6e4acc Mon Sep 17 00:00:00 2001 From: Keenon Lee Date: Wed, 12 Feb 2025 11:44:39 +0800 Subject: [PATCH] rename CFE to OAP --- .../ci_analysis_qe/component_mapping.json | 274 +++++++++--------- pkg/components/certmanager/component.go | 2 +- pkg/components/oauthapiserver/component.go | 5 +- 3 files changed, 141 insertions(+), 140 deletions(-) diff --git a/data/openshift-gce-devel/ci_analysis_qe/component_mapping.json b/data/openshift-gce-devel/ci_analysis_qe/component_mapping.json index c6aa0ad2..658a37a4 100644 --- a/data/openshift-gce-devel/ci_analysis_qe/component_mapping.json +++ b/data/openshift-gce-devel/ci_analysis_qe/component_mapping.json @@ -153448,12 +153448,12 @@ "Product": "OpenShift", "Priority": 0, "StaffApprovedObsolete": false, - "Component": "cert-manager", + "Component": "Unknown", "Capabilities": [ "Other" ], - "JIRAComponent": "cert-manager", - "JIRAComponentID": "12375354" + "JIRAComponent": "Unknown", + "JIRAComponentID": "12367926" }, { "APIVersion": "v1", @@ -153464,12 +153464,12 @@ "Product": "OpenShift", "Priority": 0, "StaffApprovedObsolete": false, - "Component": "Unknown", + "Component": "cert-manager", "Capabilities": [ "Other" ], - "JIRAComponent": "Unknown", - "JIRAComponentID": "12367926" + "JIRAComponent": "cert-manager", + "JIRAComponentID": "12375354" }, { "APIVersion": "v1", @@ -153672,12 +153672,12 @@ "Product": "OpenShift", "Priority": 0, "StaffApprovedObsolete": false, - "Component": "cert-manager", + "Component": "Unknown", "Capabilities": [ "Other" ], - "JIRAComponent": "cert-manager", - "JIRAComponentID": "12375354" + "JIRAComponent": "Unknown", + "JIRAComponentID": "12367926" }, { "APIVersion": "v1", @@ -153688,12 +153688,12 @@ "Product": "OpenShift", "Priority": 0, "StaffApprovedObsolete": false, - "Component": "Unknown", + "Component": "cert-manager", "Capabilities": [ "Other" ], - "JIRAComponent": "Unknown", - "JIRAComponentID": "12367926" + "JIRAComponent": "cert-manager", + "JIRAComponentID": "12375354" }, { "APIVersion": "v1", @@ -154520,12 +154520,12 @@ "Product": "OpenShift", "Priority": 0, "StaffApprovedObsolete": false, - "Component": "cert-manager", + "Component": "Unknown", "Capabilities": [ "Other" ], - "JIRAComponent": "cert-manager", - "JIRAComponentID": "12375354" + "JIRAComponent": "Unknown", + "JIRAComponentID": "12367926" }, { "APIVersion": "v1", @@ -154536,12 +154536,12 @@ "Product": "OpenShift", "Priority": 0, "StaffApprovedObsolete": false, - "Component": "Unknown", + "Component": "cert-manager", "Capabilities": [ "Other" ], - "JIRAComponent": "Unknown", - "JIRAComponentID": "12367926" + "JIRAComponent": "cert-manager", + "JIRAComponentID": "12375354" }, { "APIVersion": "v1", @@ -154600,12 +154600,12 @@ "Product": "OpenShift", "Priority": 0, "StaffApprovedObsolete": false, - "Component": "cert-manager", + "Component": "Unknown", "Capabilities": [ "Other" ], - "JIRAComponent": "cert-manager", - "JIRAComponentID": "12375354" + "JIRAComponent": "Unknown", + "JIRAComponentID": "12367926" }, { "APIVersion": "v1", @@ -154616,12 +154616,12 @@ "Product": "OpenShift", "Priority": 0, "StaffApprovedObsolete": false, - "Component": "Unknown", + "Component": "cert-manager", "Capabilities": [ "Other" ], - "JIRAComponent": "Unknown", - "JIRAComponentID": "12367926" + "JIRAComponent": "cert-manager", + "JIRAComponentID": "12375354" }, { "APIVersion": "v1", @@ -155160,12 +155160,12 @@ "Product": "OpenShift", "Priority": 0, "StaffApprovedObsolete": false, - "Component": "cert-manager", + "Component": "Unknown", "Capabilities": [ "Other" ], - "JIRAComponent": "cert-manager", - "JIRAComponentID": "12375354" + "JIRAComponent": "Unknown", + "JIRAComponentID": "12367926" }, { "APIVersion": "v1", @@ -155192,12 +155192,12 @@ "Product": "OpenShift", "Priority": 0, "StaffApprovedObsolete": false, - "Component": "Unknown", + "Component": "cert-manager", "Capabilities": [ "Other" ], - "JIRAComponent": "Unknown", - "JIRAComponentID": "12367926" + "JIRAComponent": "cert-manager", + "JIRAComponentID": "12375354" }, { "APIVersion": "v1", @@ -155864,12 +155864,12 @@ "Product": "OpenShift", "Priority": 0, "StaffApprovedObsolete": false, - "Component": "cert-manager", + "Component": "Unknown", "Capabilities": [ "Other" ], - "JIRAComponent": "cert-manager", - "JIRAComponentID": "12375354" + "JIRAComponent": "Unknown", + "JIRAComponentID": "12367926" }, { "APIVersion": "v1", @@ -155880,12 +155880,12 @@ "Product": "OpenShift", "Priority": 0, "StaffApprovedObsolete": false, - "Component": "Unknown", + "Component": "cert-manager", "Capabilities": [ "Other" ], - "JIRAComponent": "Unknown", - "JIRAComponentID": "12367926" + "JIRAComponent": "cert-manager", + "JIRAComponentID": "12375354" }, { "APIVersion": "v1", @@ -157384,12 +157384,12 @@ "Product": "OpenShift", "Priority": 0, "StaffApprovedObsolete": false, - "Component": "cert-manager", + "Component": "Unknown", "Capabilities": [ "Other" ], - "JIRAComponent": "cert-manager", - "JIRAComponentID": "12375354" + "JIRAComponent": "Unknown", + "JIRAComponentID": "12367926" }, { "APIVersion": "v1", @@ -157400,12 +157400,12 @@ "Product": "OpenShift", "Priority": 0, "StaffApprovedObsolete": false, - "Component": "Unknown", + "Component": "cert-manager", "Capabilities": [ "Other" ], - "JIRAComponent": "Unknown", - "JIRAComponentID": "12367926" + "JIRAComponent": "cert-manager", + "JIRAComponentID": "12375354" }, { "APIVersion": "v1", @@ -157768,12 +157768,12 @@ "Product": "OpenShift", "Priority": 0, "StaffApprovedObsolete": false, - "Component": "cert-manager", + "Component": "Unknown", "Capabilities": [ "Other" ], - "JIRAComponent": "cert-manager", - "JIRAComponentID": "12375354" + "JIRAComponent": "Unknown", + "JIRAComponentID": "12367926" }, { "APIVersion": "v1", @@ -157784,12 +157784,12 @@ "Product": "OpenShift", "Priority": 0, "StaffApprovedObsolete": false, - "Component": "Unknown", + "Component": "cert-manager", "Capabilities": [ "Other" ], - "JIRAComponent": "Unknown", - "JIRAComponentID": "12367926" + "JIRAComponent": "cert-manager", + "JIRAComponentID": "12375354" }, { "APIVersion": "v1", @@ -157832,12 +157832,12 @@ "Product": "OpenShift", "Priority": 0, "StaffApprovedObsolete": false, - "Component": "cert-manager", + "Component": "Unknown", "Capabilities": [ "Other" ], - "JIRAComponent": "cert-manager", - "JIRAComponentID": "12375354" + "JIRAComponent": "Unknown", + "JIRAComponentID": "12367926" }, { "APIVersion": "v1", @@ -157848,12 +157848,12 @@ "Product": "OpenShift", "Priority": 0, "StaffApprovedObsolete": false, - "Component": "Unknown", + "Component": "cert-manager", "Capabilities": [ "Other" ], - "JIRAComponent": "Unknown", - "JIRAComponentID": "12367926" + "JIRAComponent": "cert-manager", + "JIRAComponentID": "12375354" }, { "APIVersion": "v1", @@ -162584,12 +162584,12 @@ "Product": "OpenShift", "Priority": 0, "StaffApprovedObsolete": false, - "Component": "cert-manager", + "Component": "Unknown", "Capabilities": [ "Other" ], - "JIRAComponent": "cert-manager", - "JIRAComponentID": "12375354" + "JIRAComponent": "Unknown", + "JIRAComponentID": "12367926" }, { "APIVersion": "v1", @@ -162600,12 +162600,12 @@ "Product": "OpenShift", "Priority": 0, "StaffApprovedObsolete": false, - "Component": "Unknown", + "Component": "cert-manager", "Capabilities": [ "Other" ], - "JIRAComponent": "Unknown", - "JIRAComponentID": "12367926" + "JIRAComponent": "cert-manager", + "JIRAComponentID": "12375354" }, { "APIVersion": "v1", @@ -162616,12 +162616,12 @@ "Product": "OpenShift", "Priority": 0, "StaffApprovedObsolete": false, - "Component": "cert-manager", + "Component": "Unknown", "Capabilities": [ "Other" ], - "JIRAComponent": "cert-manager", - "JIRAComponentID": "12375354" + "JIRAComponent": "Unknown", + "JIRAComponentID": "12367926" }, { "APIVersion": "v1", @@ -162632,12 +162632,12 @@ "Product": "OpenShift", "Priority": 0, "StaffApprovedObsolete": false, - "Component": "Unknown", + "Component": "cert-manager", "Capabilities": [ "Other" ], - "JIRAComponent": "Unknown", - "JIRAComponentID": "12367926" + "JIRAComponent": "cert-manager", + "JIRAComponentID": "12375354" }, { "APIVersion": "v1", @@ -162648,12 +162648,12 @@ "Product": "OpenShift", "Priority": 0, "StaffApprovedObsolete": false, - "Component": "cert-manager", + "Component": "Unknown", "Capabilities": [ "Other" ], - "JIRAComponent": "cert-manager", - "JIRAComponentID": "12375354" + "JIRAComponent": "Unknown", + "JIRAComponentID": "12367926" }, { "APIVersion": "v1", @@ -162664,12 +162664,12 @@ "Product": "OpenShift", "Priority": 0, "StaffApprovedObsolete": false, - "Component": "Unknown", + "Component": "cert-manager", "Capabilities": [ "Other" ], - "JIRAComponent": "Unknown", - "JIRAComponentID": "12367926" + "JIRAComponent": "cert-manager", + "JIRAComponentID": "12375354" }, { "APIVersion": "v1", @@ -162712,12 +162712,12 @@ "Product": "OpenShift", "Priority": 0, "StaffApprovedObsolete": false, - "Component": "cert-manager", + "Component": "Unknown", "Capabilities": [ "Other" ], - "JIRAComponent": "cert-manager", - "JIRAComponentID": "12375354" + "JIRAComponent": "Unknown", + "JIRAComponentID": "12367926" }, { "APIVersion": "v1", @@ -162728,12 +162728,12 @@ "Product": "OpenShift", "Priority": 0, "StaffApprovedObsolete": false, - "Component": "Unknown", + "Component": "cert-manager", "Capabilities": [ "Other" ], - "JIRAComponent": "Unknown", - "JIRAComponentID": "12367926" + "JIRAComponent": "cert-manager", + "JIRAComponentID": "12375354" }, { "APIVersion": "v1", @@ -162840,12 +162840,12 @@ "Product": "OpenShift", "Priority": 0, "StaffApprovedObsolete": false, - "Component": "cert-manager", + "Component": "Unknown", "Capabilities": [ "Other" ], - "JIRAComponent": "cert-manager", - "JIRAComponentID": "12375354" + "JIRAComponent": "Unknown", + "JIRAComponentID": "12367926" }, { "APIVersion": "v1", @@ -162856,12 +162856,12 @@ "Product": "OpenShift", "Priority": 0, "StaffApprovedObsolete": false, - "Component": "Unknown", + "Component": "cert-manager", "Capabilities": [ "Other" ], - "JIRAComponent": "Unknown", - "JIRAComponentID": "12367926" + "JIRAComponent": "cert-manager", + "JIRAComponentID": "12375354" }, { "APIVersion": "v1", @@ -162870,14 +162870,14 @@ "Name": "OCP-65134:yuewu:CFE:[sig-auth] CFE cert-manager Prepare cert-manager test data before OCP upgrade", "Suite": "CFE", "Product": "OpenShift", - "Priority": 0, + "Priority": -10, "StaffApprovedObsolete": false, - "Component": "cert-manager", + "Component": "Cluster Version Operator", "Capabilities": [ - "Other" + "ClusterUpgrade" ], - "JIRAComponent": "cert-manager", - "JIRAComponentID": "12375354" + "JIRAComponent": "Cluster Version Operator", + "JIRAComponentID": "12367602" }, { "APIVersion": "v1", @@ -162886,14 +162886,14 @@ "Name": "OCP-65134:yuewu:CFE:[sig-auth] CFE cert-manager cert-manager functions should work normally after OCP upgrade", "Suite": "CFE", "Product": "OpenShift", - "Priority": 0, + "Priority": -10, "StaffApprovedObsolete": false, - "Component": "cert-manager", + "Component": "Cluster Version Operator", "Capabilities": [ - "Other" + "ClusterUpgrade" ], - "JIRAComponent": "cert-manager", - "JIRAComponentID": "12375354" + "JIRAComponent": "Cluster Version Operator", + "JIRAComponentID": "12367602" }, { "APIVersion": "v1", @@ -162902,14 +162902,14 @@ "Name": "OCP-65134:yuewu:OAP:[sig-oap] OAP cert-manager Prepare cert-manager test data before OCP upgrade", "Suite": "OAP", "Product": "OpenShift", - "Priority": -10, + "Priority": 0, "StaffApprovedObsolete": false, - "Component": "Cluster Version Operator", + "Component": "cert-manager", "Capabilities": [ - "ClusterUpgrade" + "Other" ], - "JIRAComponent": "Cluster Version Operator", - "JIRAComponentID": "12367602" + "JIRAComponent": "cert-manager", + "JIRAComponentID": "12375354" }, { "APIVersion": "v1", @@ -162918,14 +162918,14 @@ "Name": "OCP-65134:yuewu:OAP:[sig-oap] OAP cert-manager cert-manager functions should work normally after OCP upgrade", "Suite": "OAP", "Product": "OpenShift", - "Priority": -10, + "Priority": 0, "StaffApprovedObsolete": false, - "Component": "Cluster Version Operator", + "Component": "cert-manager", "Capabilities": [ - "ClusterUpgrade" + "Other" ], - "JIRAComponent": "Cluster Version Operator", - "JIRAComponentID": "12367602" + "JIRAComponent": "cert-manager", + "JIRAComponentID": "12375354" }, { "APIVersion": "v1", @@ -168056,12 +168056,12 @@ "Product": "OpenShift", "Priority": 0, "StaffApprovedObsolete": false, - "Component": "cert-manager", + "Component": "Unknown", "Capabilities": [ "Other" ], - "JIRAComponent": "cert-manager", - "JIRAComponentID": "12375354" + "JIRAComponent": "Unknown", + "JIRAComponentID": "12367926" }, { "APIVersion": "v1", @@ -168072,12 +168072,12 @@ "Product": "OpenShift", "Priority": 0, "StaffApprovedObsolete": false, - "Component": "Unknown", + "Component": "cert-manager", "Capabilities": [ "Other" ], - "JIRAComponent": "Unknown", - "JIRAComponentID": "12367926" + "JIRAComponent": "cert-manager", + "JIRAComponentID": "12375354" }, { "APIVersion": "v1", @@ -184745,12 +184745,12 @@ "Product": "OpenShift", "Priority": 0, "StaffApprovedObsolete": false, - "Component": "cert-manager", + "Component": "Unknown", "Capabilities": [ "LEVEL0" ], - "JIRAComponent": "cert-manager", - "JIRAComponentID": "12375354" + "JIRAComponent": "Unknown", + "JIRAComponentID": "12367926" }, { "APIVersion": "v1", @@ -184761,12 +184761,12 @@ "Product": "OpenShift", "Priority": 0, "StaffApprovedObsolete": false, - "Component": "cert-manager", + "Component": "Unknown", "Capabilities": [ "Other" ], - "JIRAComponent": "cert-manager", - "JIRAComponentID": "12375354" + "JIRAComponent": "Unknown", + "JIRAComponentID": "12367926" }, { "APIVersion": "v1", @@ -184777,12 +184777,12 @@ "Product": "OpenShift", "Priority": 0, "StaffApprovedObsolete": false, - "Component": "Unknown", + "Component": "cert-manager", "Capabilities": [ "LEVEL0" ], - "JIRAComponent": "Unknown", - "JIRAComponentID": "12367926" + "JIRAComponent": "cert-manager", + "JIRAComponentID": "12375354" }, { "APIVersion": "v1", @@ -188777,12 +188777,12 @@ "Product": "OpenShift", "Priority": 0, "StaffApprovedObsolete": false, - "Component": "cert-manager", + "Component": "Unknown", "Capabilities": [ "Other" ], - "JIRAComponent": "cert-manager", - "JIRAComponentID": "12375354" + "JIRAComponent": "Unknown", + "JIRAComponentID": "12367926" }, { "APIVersion": "v1", @@ -188793,12 +188793,12 @@ "Product": "OpenShift", "Priority": 0, "StaffApprovedObsolete": false, - "Component": "Unknown", + "Component": "cert-manager", "Capabilities": [ "Other" ], - "JIRAComponent": "Unknown", - "JIRAComponentID": "12367926" + "JIRAComponent": "cert-manager", + "JIRAComponentID": "12375354" }, { "APIVersion": "v1", @@ -193321,12 +193321,12 @@ "Product": "OpenShift", "Priority": 0, "StaffApprovedObsolete": false, - "Component": "cert-manager", + "Component": "Unknown", "Capabilities": [ "Other" ], - "JIRAComponent": "cert-manager", - "JIRAComponentID": "12375354" + "JIRAComponent": "Unknown", + "JIRAComponentID": "12367926" }, { "APIVersion": "v1", @@ -193337,12 +193337,12 @@ "Product": "OpenShift", "Priority": 0, "StaffApprovedObsolete": false, - "Component": "Unknown", + "Component": "cert-manager", "Capabilities": [ "Other" ], - "JIRAComponent": "Unknown", - "JIRAComponentID": "12367926" + "JIRAComponent": "cert-manager", + "JIRAComponentID": "12375354" }, { "APIVersion": "v1", @@ -194649,12 +194649,12 @@ "Product": "OpenShift", "Priority": 0, "StaffApprovedObsolete": false, - "Component": "cert-manager", + "Component": "Unknown", "Capabilities": [ "Other" ], - "JIRAComponent": "cert-manager", - "JIRAComponentID": "12375354" + "JIRAComponent": "Unknown", + "JIRAComponentID": "12367926" }, { "APIVersion": "v1", @@ -194665,12 +194665,12 @@ "Product": "OpenShift", "Priority": 0, "StaffApprovedObsolete": false, - "Component": "Unknown", + "Component": "cert-manager", "Capabilities": [ "Other" ], - "JIRAComponent": "Unknown", - "JIRAComponentID": "12367926" + "JIRAComponent": "cert-manager", + "JIRAComponentID": "12375354" }, { "APIVersion": "v1", diff --git a/pkg/components/certmanager/component.go b/pkg/components/certmanager/component.go index d3bc5901..845e8de6 100644 --- a/pkg/components/certmanager/component.go +++ b/pkg/components/certmanager/component.go @@ -19,7 +19,7 @@ var CertManagerComponent = Component{ IncludeAll: []string{"bz-cert-manager"}, }, { - IncludeAll: []string{"CFE cert-manager"}, // cert-manager QE cases all have "CFE cert-manager" in junit xml + IncludeAll: []string{"OAP cert-manager"}, // cert-manager QE cases all have "OAP cert-manager" in junit xml }, }, }, diff --git a/pkg/components/oauthapiserver/component.go b/pkg/components/oauthapiserver/component.go index fbc80f0b..cddafb5b 100644 --- a/pkg/components/oauthapiserver/component.go +++ b/pkg/components/oauthapiserver/component.go @@ -25,8 +25,9 @@ var OauthApiserverComponent = Component{ IncludeAll: []string{"oauth-api", "-connections"}, }, { - SIG: "sig-auth", - Priority: -1, + SIG: "sig-auth", + Priority: -1, + ExcludeAny: []string{"CFE cert-manager"}, // comment ... }, }, TestRenames: map[string]string{