Merge pull request #29314 from jbpratt/osd-gcp-conformance

NO-JIRA: test/extended: additional excludes for osd-gcp
openshift · Nov 22, 2024 · e7a9cb1 · e7a9cb1
2 parents 203d2b1 + 498b24f
commit e7a9cb1
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 0 deletions.
diff --git a/test/extended/cpu_partitioning/platform.go b/test/extended/cpu_partitioning/platform.go
@@ -44,6 +44,7 @@ var _ = g.Describe("[sig-node][apigroup:config.openshift.io] CPU Partitioning cl
 			"openshift-backplane-sdcicd":               {},
 			"openshift-backplane-srep":                 {},
 			"openshift-backplane-tam":                  {},
+			"openshift-cloud-ingress-operator":         {},
 			"openshift-codeready-workspaces":           {},
 			"openshift-custom-domains-operator":        {},
 			"openshift-customer-monitoring":            {},
@@ -63,6 +64,7 @@ var _ = g.Describe("[sig-node][apigroup:config.openshift.io] CPU Partitioning cl
 			"openshift-splunk-forwarder-operator":      {},
 			"openshift-sre-pruning":                    {},
 			"openshift-validation-webhook":             {},
+			"openshift-velero":                         {},
 		}
 	)
 

diff --git a/test/extended/cpu_partitioning/pods.go b/test/extended/cpu_partitioning/pods.go
@@ -51,6 +51,9 @@ var (
 		"blackbox-exporter":                         {"openshift-route-monitor-operator"},
 		"route-monitor-operator-controller-manager": {"openshift-route-monitor-operator"},
 		"splunk-forwarder-operator":                 {"openshift-splunk-forwarder-operator"},
+		"cloud-ingress-operator":                    {"openshift-cloud-ingress-operator"},
+		"managed-velero-operator":                   {"openshift-velero"},
+		"velero":                                    {"openshift-velero"},
 	}
 
 	excludedBestEffortDaemonSets = map[string][]string{

diff --git a/test/extended/operators/crd_must_be_stable.go b/test/extended/operators/crd_must_be_stable.go
@@ -37,18 +37,21 @@ var legacyCRDSsWithUnstableVersions = map[string]sets.String{
 	"addoninstances.addons.managed.openshift.io":                    sets.NewString("v1alpha1"),
 	"addonoperators.addons.managed.openshift.io":                    sets.NewString("v1alpha1"),
 	"addons.addons.managed.openshift.io":                            sets.NewString("v1alpha1"),
+	"apischemes.cloudingress.managed.openshift.io":                  sets.NewString("v1alpha1"),
 	"clusterurlmonitors.monitoring.openshift.io":                    sets.NewString("v1alpha1"),
 	"customdomains.managed.openshift.io":                            sets.NewString("v1alpha1"),
 	"managedfleetnotificationrecords.ocmagent.managed.openshift.io": sets.NewString("v1alpha1"),
 	"managedfleetnotifications.ocmagent.managed.openshift.io":       sets.NewString("v1alpha1"),
 	"managednotifications.ocmagent.managed.openshift.io":            sets.NewString("v1alpha1"),
 	"mustgathers.managed.openshift.io":                              sets.NewString("v1alpha1"),
 	"ocmagents.ocmagent.managed.openshift.io":                       sets.NewString("v1alpha1"),
+	"publishingstrategies.cloudingress.managed.openshift.io":        sets.NewString("v1alpha1"),
 	"routemonitors.monitoring.openshift.io":                         sets.NewString("v1alpha1"),
 	"splunkforwarders.splunkforwarder.managed.openshift.io":         sets.NewString("v1alpha1"),
 	"subjectpermissions.managed.openshift.io":                       sets.NewString("v1alpha1"),
 	"uiplugins.observability.openshift.io":                          sets.NewString("v1alpha1"),
 	"upgradeconfigs.upgrade.managed.openshift.io":                   sets.NewString("v1alpha1"),
+	"veleroinstalls.managed.openshift.io":                           sets.NewString("v1alpha2"),
 }
 
 var _ = g.Describe("[sig-arch][Early]", func() {

diff --git a/test/extended/operators/qos.go b/test/extended/operators/qos.go
@@ -45,6 +45,7 @@ var _ = Describe("[sig-arch] Managed cluster should", func() {
 			"openshift-splunk-forwarder-operator",
 			"openshift-sre-pruning",
 			"openshift-validation-webhook",
+			"openshift-velero",
 		)
 		excludePodPrefix := sets.NewString(
 			"revision-pruner-",  // operators have retry logic built in. these are like jobs but cannot rely on jobs

diff --git a/test/extended/prometheus/prometheus.go b/test/extended/prometheus/prometheus.go
@@ -164,6 +164,8 @@ var _ = g.Describe("[sig-instrumentation][Late] OpenShift alerting rules [apigro
 		"AdditionalTrustBundleCAExpiringNotificationSRE",
 		"AdditionalTrustBundleCAInvalidNotificationSRE",
 		"AlertmanagerSilencesActiveSRE",
+		"APISchemeStatusFailing",
+		"APISchemeStatusUnavailable",
 		"CSRPendingLongDurationSRE",
 		"ClusterMonitoringErrorBudgetBurnSRE",
 		"ClusterProxyNetworkDegradedNotificationSRE",
@@ -640,6 +642,9 @@ var _ = g.Describe("[sig-instrumentation] Prometheus [apigroup:image.openshift.i
 				"blackbox-exporter":                              true,
 				"splunk-forwarder":                               true,
 				"validation-webhook-metrics":                     true,
+				"cloud-ingress-operator":                         true,
+				"managed-velero-operator-metrics":                true,
+				"velero-metrics":                                 true,
 			}
 
 			pattern := regexp.MustCompile("^https://.*")