Skip to content

Commit 24f48c4

Browse files
committed
UPSTREAM: <carry>: migrate jiazha's OLMv0 test cases to OTE
1 parent d9496b7 commit 24f48c4

File tree

10 files changed

+3113
-3092
lines changed

10 files changed

+3113
-3092
lines changed

tests-extension/.openshift-tests-extension/openshift_payload_olmv0.json

Lines changed: 335 additions & 251 deletions
Large diffs are not rendered by default.

tests-extension/test/qe/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
## Overview
22

3-
When creating test cases based on OTE (OpenShift Tests Extension) in operator-controller, there are two sources:
3+
When creating test cases based on OTE (OpenShift Tests Extension) in operator-framework-olm, there are two sources:
44

55
### 1. Migrated Cases from Origin
66
- These cases are all robust and stable, meeting OpenShift CI requirements

tests-extension/test/qe/specs/olmv0_allns.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ var _ = g.Describe("[sig-operator][Jira:OLM] OLMv0 within all namespace", func()
3838
dr.RmIr(itName)
3939
})
4040

41-
g.It("PolarionID:21418-PolarionID:25679-[OTP][Skipped:Disconnected]Cluster resource created and deleted correctly [Serial]", g.Label("NonHyperShiftHOST"), g.Label("original-name:[sig-operator][Jira:OLM] OLMv0 within all namespace PolarionID:21418-PolarionID:25679-[Skipped:Disconnected]Cluster resource created and deleted correctly [Serial]"), func() {
41+
g.It("PolarionID:21418-PolarionID:25679-[OTP][Skipped:Disconnected]Cluster resource created and deleted correctly [Serial]", g.Label("NonHyperShiftHOST"), func() {
4242
architecture.SkipArchitectures(oc, architecture.PPC64LE, architecture.S390X, architecture.MULTI)
4343
exutil.SkipBaselineCaps(oc, "None")
4444
exutil.SkipNoCapabilities(oc, "marketplace")
@@ -153,7 +153,7 @@ var _ = g.Describe("[sig-operator][Jira:OLM] OLMv0 within all namespace", func()
153153

154154
})
155155

156-
g.It("PolarionID:25783-[OTP][Skipped:Disconnected]Subscriptions are not getting processed taking very long to get processed[Serial]", g.Label("NonHyperShiftHOST"), g.Label("original-name:[sig-operator][Jira:OLM] OLMv0 within all namespace PolarionID:25783-[Skipped:Disconnected]Subscriptions are not getting processed taking very long to get processed[Serial]"), func() {
156+
g.It("PolarionID:25783-[OTP][Skipped:Disconnected]Subscriptions are not getting processed taking very long to get processed[Serial]", g.Label("NonHyperShiftHOST"), func() {
157157
architecture.SkipArchitectures(oc, architecture.PPC64LE, architecture.S390X, architecture.MULTI)
158158
exutil.SkipBaselineCaps(oc, "None")
159159
exutil.SkipNoCapabilities(oc, "marketplace")
@@ -241,7 +241,7 @@ var _ = g.Describe("[sig-operator][Jira:OLM] OLMv0 within all namespace", func()
241241
olmv0util.NewCheck("expect", exutil.AsAdmin, exutil.WithoutNamespace, exutil.Compare, "Succeeded", exutil.Ok, []string{"csv", subCockroachdb.InstalledCSV, "-n", subCockroachdb.Namespace, "-o=jsonpath={.status.phase}"}).Check(oc)
242242
})
243243

244-
g.It("PolarionID:21484-PolarionID:21532-[OTP][Skipped:Disconnected]watch special or all namespace by operator group", g.Label("original-name:[sig-operator][Jira:OLM] OLMv0 within all namespace PolarionID:21484-PolarionID:21532-[Skipped:Disconnected]watch special or all namespace by operator group"), func() {
244+
g.It("PolarionID:21484-PolarionID:21532-[OTP][Skipped:Disconnected]watch special or all namespace by operator group", func() {
245245
architecture.SkipArchitectures(oc, architecture.PPC64LE, architecture.S390X, architecture.MULTI)
246246
exutil.SkipNoCapabilities(oc, "marketplace")
247247
var (
@@ -321,7 +321,7 @@ var _ = g.Describe("[sig-operator][Jira:OLM] OLMv0 within all namespace", func()
321321

322322
})
323323

324-
g.It("PolarionID:24906-[OTP][Skipped:Disconnected]Operators requesting cluster-scoped permission can trigger kube GC bug[Serial]", g.Label("original-name:[sig-operator][Jira:OLM] OLMv0 within all namespace PolarionID:24906-[Skipped:Disconnected]Operators requesting cluster-scoped permission can trigger kube GC bug[Serial]"), func() {
324+
g.It("PolarionID:24906-[OTP][Skipped:Disconnected]Operators requesting cluster-scoped permission can trigger kube GC bug[Serial]", func() {
325325
architecture.SkipArchitectures(oc, architecture.PPC64LE, architecture.S390X, architecture.MULTI)
326326
exutil.SkipBaselineCaps(oc, "None")
327327
exutil.SkipNoCapabilities(oc, "marketplace")
@@ -400,7 +400,7 @@ var _ = g.Describe("[sig-operator][Jira:OLM] OLMv0 within all namespace", func()
400400
cl.Check(oc)
401401
})
402402

403-
g.It("PolarionID:33241-[OTP][Skipped:Disconnected]Enable generated operator component adoption for operators with all ns mode[Serial]", g.Label("original-name:[sig-operator][Jira:OLM] OLMv0 within all namespace PolarionID:33241-[Skipped:Disconnected]Enable generated operator component adoption for operators with all ns mode[Serial]"), func() {
403+
g.It("PolarionID:33241-[OTP][Skipped:Disconnected]Enable generated operator component adoption for operators with all ns mode[Serial]", func() {
404404
if isAKS, _ := exutil.IsAKSCluster(context.TODO(), oc); isAKS {
405405
g.Skip("skip for aks cluster")
406406
}
@@ -496,7 +496,7 @@ var _ = g.Describe("[sig-operator][Jira:OLM] OLMv0 within all namespace", func()
496496
}
497497
})
498498

499-
g.It("PolarionID:22226-[OTP][Skipped:Disconnected]the csv without support AllNamespaces fails for og with allnamespace", g.Label("original-name:[sig-operator][Jira:OLM] OLMv0 within all namespace PolarionID:22226-[Skipped:Disconnected]the csv without support AllNamespaces fails for og with allnamespace"), func() {
499+
g.It("PolarionID:22226-[OTP][Skipped:Disconnected]the csv without support AllNamespaces fails for og with allnamespace", func() {
500500
var (
501501
buildPruningBaseDir = exutil.FixturePath("testdata", "olm")
502502
cmNcTemplate = filepath.Join(buildPruningBaseDir, "cm-namespaceconfig.yaml")

tests-extension/test/qe/specs/olmv0_common.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ var _ = g.Describe("[sig-operator][Jira:OLM] OLMv0 should", func() {
4646
dr.RmIr(itName)
4747
})
4848

49-
g.It("PolarionID:22259-[OTP][Skipped:Disconnected]marketplace operator CR status on a running cluster[Serial]", g.Label("NonHyperShiftHOST"), g.Label("original-name:[sig-operator][Jira:OLM] OLMv0 should PolarionID:22259-[Skipped:Disconnected]marketplace operator CR status on a running cluster[Serial]"), func() {
49+
g.It("PolarionID:22259-[OTP][Skipped:Disconnected]marketplace operator CR status on a running cluster[Serial]", g.Label("NonHyperShiftHOST"), func() {
5050

5151
exutil.SkipForSNOCluster(oc)
5252
exutil.SkipNoCapabilities(oc, "marketplace")
@@ -66,7 +66,7 @@ var _ = g.Describe("[sig-operator][Jira:OLM] OLMv0 should", func() {
6666
"-o=jsonpath={.status.conditions[?(@.type==\"Available\")].status}{.status.conditions[?(@.type==\"Progressing\")].status}{.status.conditions[?(@.type==\"Degraded\")].status}"}).Check(oc)
6767
})
6868

69-
g.It("PolarionID:73695-[OTP][Skipped:Disconnected]PO is disable", g.Label("original-name:[sig-operator][Jira:OLM] OLMv0 should PolarionID:73695-[Skipped:Disconnected]PO is disable"), func() {
69+
g.It("PolarionID:73695-[OTP][Skipped:Disconnected]PO is disable", func() {
7070

7171
if !exutil.IsTechPreviewNoUpgrade(oc) {
7272
g.Skip("PO is supported in TP only currently, so skip it")
@@ -75,7 +75,7 @@ var _ = g.Describe("[sig-operator][Jira:OLM] OLMv0 should", func() {
7575
o.Expect(err).To(o.HaveOccurred(), "PO is not disable")
7676
})
7777

78-
g.It("PolarionID:24076-[OTP]check the version of olm operator is appropriate in ClusterOperator", g.Label("NonHyperShiftHOST"), g.Label("original-name:[sig-operator][Jira:OLM] OLMv0 should PolarionID:24076-check the version of olm operator is appropriate in ClusterOperator"), func() {
78+
g.It("PolarionID:24076-[OTP]check the version of olm operator is appropriate in ClusterOperator", g.Label("NonHyperShiftHOST"), func() {
7979
var (
8080
olmClusterOperatorName = "operator-lifecycle-manager"
8181
)
@@ -88,7 +88,7 @@ var _ = g.Describe("[sig-operator][Jira:OLM] OLMv0 should", func() {
8888
olmv0util.NewCheck("expect", exutil.AsAdmin, exutil.WithoutNamespace, exutil.Compare, olmVersion, exutil.Ok, []string{"clusteroperator", "-o=jsonpath={.items[?(@.metadata.name==\"" + olmClusterOperatorName + "\")].status.versions[?(@.name==\"operator\")].version}"}).Check(oc)
8989
})
9090

91-
g.It("PolarionID:29775-PolarionID:29786-[OTP][Skipped:Disconnected]as oc user on linux to mirror catalog image[Slow][Timeout:30m]", g.Label("original-name:[sig-operator][Jira:OLM] OLMv0 should PolarionID:29775-PolarionID:29786-[Skipped:Disconnected]as oc user on linux to mirror catalog image[Slow][Timeout:30m]"), func() {
91+
g.It("PolarionID:29775-PolarionID:29786-[OTP][Skipped:Disconnected]as oc user on linux to mirror catalog image[Slow][Timeout:30m]", func() {
9292
var (
9393
bundleIndex1 = "quay.io/kuiwang/operators-all:v1"
9494
bundleIndex2 = "quay.io/kuiwang/operators-dockerio:v1"
@@ -167,7 +167,7 @@ var _ = g.Describe("[sig-operator][Jira:OLM] OLMv0 should", func() {
167167
o.Expect(result).NotTo(o.ContainSubstring("docker.io/atlasmap/atlasmap-operator"))
168168
})
169169

170-
g.It("PolarionID:33452-[OTP][Skipped:Disconnected]oc adm catalog mirror does not mirror the index image itself", g.Label("original-name:[sig-operator][Jira:OLM] OLMv0 should PolarionID:33452-[Skipped:Disconnected]oc adm catalog mirror does not mirror the index image itself"), func() {
170+
g.It("PolarionID:33452-[OTP][Skipped:Disconnected]oc adm catalog mirror does not mirror the index image itself", func() {
171171
var (
172172
bundleIndex1 = "quay.io/olmqe/olm-api@sha256:71cfd4deaa493d31cd1d8255b1dce0fb670ae574f4839c778f2cfb1bf1f96995"
173173
manifestPath = "manifests-olm-api-" + exutil.GetRandomString()
@@ -190,7 +190,7 @@ var _ = g.Describe("[sig-operator][Jira:OLM] OLMv0 should", func() {
190190
o.Expect(result).To(o.ContainSubstring("quay.io/olmqe/olm-api"))
191191
})
192192

193-
g.It("PolarionID:21825-[OTP][Skipped:Disconnected]Certs for packageserver can be rotated successfully [Serial]", g.Label("NonHyperShiftHOST"), g.Label("original-name:[sig-operator][Jira:OLM] OLMv0 should PolarionID:21825-[Skipped:Disconnected]Certs for packageserver can be rotated successfully [Serial]"), func() {
193+
g.It("PolarionID:21825-[OTP][Skipped:Disconnected]Certs for packageserver can be rotated successfully [Serial]", g.Label("NonHyperShiftHOST"), func() {
194194
exutil.SkipBaselineCaps(oc, "None")
195195
exutil.SkipIfDisableDefaultCatalogsource(oc)
196196
var (
@@ -232,7 +232,7 @@ var _ = g.Describe("[sig-operator][Jira:OLM] OLMv0 should", func() {
232232
olmv0util.NewCheck("expect", exutil.AsAdmin, exutil.WithoutNamespace, exutil.Contain, "redhat-operators", exutil.Ok, []string{"packagemanifest", "--selector=catalog=redhat-operators", "-o=jsonpath={.items[*].status.catalogSource}"}).Check(oc)
233233
})
234234

235-
g.It("PolarionID:83105-[OTP][Skipped:Disconnected]olmv0 static networkpolicy on ocp", g.Label("NonHyperShiftHOST", "ReleaseGate"), g.Label("original-name:[sig-operator][Jira:OLM] OLMv0 should PolarionID:83105-[Skipped:Disconnected]olmv0 static networkpolicy on ocp"), func() {
235+
g.It("PolarionID:83105-[OTP][Skipped:Disconnected]olmv0 static networkpolicy on ocp", g.Label("NonHyperShiftHOST", "ReleaseGate"), func() {
236236

237237
policies := []olmv0util.NpExpecter{
238238
{
@@ -462,7 +462,7 @@ var _ = g.Describe("[sig-operator][Jira:OLM] OLMv0 should", func() {
462462

463463
})
464464

465-
g.It("PolarionID:83583-[OTP][Skipped:Disconnected]olmv0 networkpolicy on hosted hypershift", g.Label("NonHyperShiftHOST", "ReleaseGate"), g.Label("original-name:[sig-operator][Jira:OLM] OLMv0 should PolarionID:83583-[Skipped:Disconnected]olmv0 networkpolicy on hosted hypershift"), func() {
465+
g.It("PolarionID:83583-[OTP][Skipped:Disconnected]olmv0 networkpolicy on hosted hypershift", g.Label("NonHyperShiftHOST", "ReleaseGate"), func() {
466466

467467
topology, err := oc.WithoutNamespace().AsAdmin().Run("get").Args("infrastructures.config.openshift.io",
468468
"cluster", "-o=jsonpath={.status.controlPlaneTopology}").Output()

0 commit comments

Comments
 (0)