Skip to content

Commit 218f588

Browse files
kuiwang02kuiwang02
committed
enhance OCPQE-31297, OCPQE-31284, OCPQE-31283 and microshfit case
1 parent 7d2dd62 commit 218f588

File tree

14 files changed

+706
-465
lines changed

14 files changed

+706
-465
lines changed

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

Lines changed: 42 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,17 @@
3838
"originalName": "[sig-operator][Jira:OLM] OLMv0 within all namespace PolarionID:21484-PolarionID:21532-[Skipped:Disconnected]watch special or all namespace by operator group",
3939
"labels": {
4040
"Extended": {},
41+
"NonHyperShiftHOST": {},
4142
"original-name:[sig-operator][Jira:OLM] OLMv0 within all namespace PolarionID:21484-PolarionID:21532-[Skipped:Disconnected]watch special or all namespace by operator group": {}
4243
},
4344
"resources": {
4445
"isolation": {}
4546
},
4647
"source": "openshift:payload:olmv0",
4748
"lifecycle": "blocking",
48-
"environmentSelector": {}
49+
"environmentSelector": {
50+
"exclude": "topology==\"External\""
51+
}
4952
},
5053
{
5154
"name": "[sig-operator][Jira:OLM] OLMv0 within all namespace PolarionID:24906-[OTP]Operators requesting cluster-scoped permission can trigger kube GC bug[Serial]",
@@ -201,42 +204,6 @@
201204
"exclude": "topology==\"External\""
202205
}
203206
},
204-
{
205-
"name": "[sig-operator][Jira:OLM] OLMv0 should PolarionID:83105-[OTP][Skipped:Disconnected]olmv0 static networkpolicy on ocp",
206-
"originalName": "[sig-operator][Jira:OLM] OLMv0 should PolarionID:83105-[Skipped:Disconnected]olmv0 static networkpolicy on ocp",
207-
"labels": {
208-
"Extended": {},
209-
"NonHyperShiftHOST": {},
210-
"ReleaseGate": {},
211-
"original-name:[sig-operator][Jira:OLM] OLMv0 should PolarionID:83105-[Skipped:Disconnected]olmv0 static networkpolicy on ocp": {}
212-
},
213-
"resources": {
214-
"isolation": {}
215-
},
216-
"source": "openshift:payload:olmv0",
217-
"lifecycle": "blocking",
218-
"environmentSelector": {
219-
"exclude": "topology==\"External\""
220-
}
221-
},
222-
{
223-
"name": "[sig-operator][Jira:OLM] OLMv0 should PolarionID:83583-[OTP][Skipped:Disconnected]olmv0 networkpolicy on hosted hypershift",
224-
"originalName": "[sig-operator][Jira:OLM] OLMv0 should PolarionID:83583-[Skipped:Disconnected]olmv0 networkpolicy on hosted hypershift",
225-
"labels": {
226-
"Extended": {},
227-
"NonHyperShiftHOST": {},
228-
"ReleaseGate": {},
229-
"original-name:[sig-operator][Jira:OLM] OLMv0 should PolarionID:83583-[Skipped:Disconnected]olmv0 networkpolicy on hosted hypershift": {}
230-
},
231-
"resources": {
232-
"isolation": {}
233-
},
234-
"source": "openshift:payload:olmv0",
235-
"lifecycle": "blocking",
236-
"environmentSelector": {
237-
"exclude": "topology==\"External\""
238-
}
239-
},
240207
{
241208
"name": "[sig-operator][Jira:OLM] OLMv0 should PolarionID:21080-[OTP][Skipped:Disconnected]Check metrics[Serial]",
242209
"labels": {
@@ -856,49 +823,40 @@
856823
"originalName": "[sig-operator][Jira:OLM] OLMv0 on hypershift mgmt PolarionID:45381-[Skipped:Disconnected]Support custom catalogs in hypershift",
857824
"labels": {
858825
"Extended": {},
859-
"NonHyperShiftHOST": {},
860826
"original-name:[sig-operator][Jira:OLM] OLMv0 on hypershift mgmt PolarionID:45381-[Skipped:Disconnected]Support custom catalogs in hypershift": {}
861827
},
862828
"resources": {
863829
"isolation": {}
864830
},
865831
"source": "openshift:payload:olmv0",
866832
"lifecycle": "blocking",
867-
"environmentSelector": {
868-
"exclude": "topology==\"External\""
869-
}
833+
"environmentSelector": {}
870834
},
871835
{
872836
"name": "[sig-operator][Jira:OLM] OLMv0 on hypershift mgmt PolarionID:45408-[OTP][Skipped:Disconnected]Eliminate use of imagestreams in catalog management",
873837
"originalName": "[sig-operator][Jira:OLM] OLMv0 on hypershift mgmt PolarionID:45408-[Skipped:Disconnected]Eliminate use of imagestreams in catalog management",
874838
"labels": {
875839
"Extended": {},
876-
"NonHyperShiftHOST": {},
877840
"original-name:[sig-operator][Jira:OLM] OLMv0 on hypershift mgmt PolarionID:45408-[Skipped:Disconnected]Eliminate use of imagestreams in catalog management": {}
878841
},
879842
"resources": {
880843
"isolation": {}
881844
},
882845
"source": "openshift:payload:olmv0",
883846
"lifecycle": "blocking",
884-
"environmentSelector": {
885-
"exclude": "topology==\"External\""
886-
}
847+
"environmentSelector": {}
887848
},
888849
{
889850
"name": "[sig-operator][Jira:OLM] OLMv0 on hypershift mgmt PolarionID:45543-[OTP][Skipped:Disconnected]Enable hypershift to deploy OperatorLifecycleManager resources",
890851
"labels": {
891-
"Extended": {},
892-
"NonHyperShiftHOST": {}
852+
"Extended": {}
893853
},
894854
"resources": {
895855
"isolation": {}
896856
},
897857
"source": "openshift:payload:olmv0",
898858
"lifecycle": "blocking",
899-
"environmentSelector": {
900-
"exclude": "topology==\"External\""
901-
}
859+
"environmentSelector": {}
902860
},
903861
{
904862
"name": "[sig-operator][Jira:OLM] OLMv0 on microshift PolarionID:69867-[OTP][Skipped:Disconnected]deployed in microshift and install one operator with single mode.",
@@ -999,6 +957,39 @@
999957
"exclude": "topology==\"External\""
1000958
}
1001959
},
960+
{
961+
"name": "[sig-operator][Jira:OLM] OLMv0 networkpolicy PolarionID:83105-[OTP][Skipped:Disconnected]olmv0 static networkpolicy on ocp",
962+
"originalName": "[sig-operator][Jira:OLM] OLMv0 should PolarionID:83105-[Skipped:Disconnected]olmv0 static networkpolicy on ocp",
963+
"labels": {
964+
"Extended": {},
965+
"NonHyperShiftHOST": {},
966+
"ReleaseGate": {},
967+
"original-name:[sig-operator][Jira:OLM] OLMv0 should PolarionID:83105-[Skipped:Disconnected]olmv0 static networkpolicy on ocp": {}
968+
},
969+
"resources": {
970+
"isolation": {}
971+
},
972+
"source": "openshift:payload:olmv0",
973+
"lifecycle": "blocking",
974+
"environmentSelector": {
975+
"exclude": "topology==\"External\""
976+
}
977+
},
978+
{
979+
"name": "[sig-operator][Jira:OLM] OLMv0 networkpolicy PolarionID:83583-[OTP][Skipped:Disconnected]olmv0 networkpolicy on hosted hypershift",
980+
"originalName": "[sig-operator][Jira:OLM] OLMv0 should PolarionID:83583-[Skipped:Disconnected]olmv0 networkpolicy on hosted hypershift",
981+
"labels": {
982+
"Extended": {},
983+
"ReleaseGate": {},
984+
"original-name:[sig-operator][Jira:OLM] OLMv0 should PolarionID:83583-[Skipped:Disconnected]olmv0 networkpolicy on hosted hypershift": {}
985+
},
986+
"resources": {
987+
"isolation": {}
988+
},
989+
"source": "openshift:payload:olmv0",
990+
"lifecycle": "blocking",
991+
"environmentSelector": {}
992+
},
1002993
{
1003994
"name": "[sig-operator][Jira:OLM] OLMv0 within a namespace PolarionID:24870-[OTP][Skipped:Disconnected]can not create csv without operator group",
1004995
"originalName": "[sig-operator][Jira:OLM] OLMv0 within a namespace PolarionID:24870-[Skipped:Disconnected]can not create csv without operator group",
@@ -1360,7 +1351,7 @@
13601351
"environmentSelector": {}
13611352
},
13621353
{
1363-
"name": "[sig-operator][Jira:OLM] OLMv0 within a namespace PolarionID:50136-[OTP][Skipped:Disconnected]automatic upgrade for failed operator installation csv fails[Slow][Timeout:30m]",
1354+
"name": "[sig-operator][Jira:OLM] OLMv0 within a namespace PolarionID:50136-[OTP][Skipped:Disconnected]automatic upgrade for failed operator installation csv fails[Slow][Timeout:40m]",
13641355
"originalName": "[sig-operator][Jira:OLM] OLMv0 within a namespace PolarionID:50136-[Skipped:Disconnected]automatic upgrade for failed operator installation csv fails[Slow][Timeout:30m]",
13651356
"labels": {
13661357
"Extended": {},

‎tests-extension/pkg/bindata/qe/bindata.go‎

Lines changed: 145 additions & 22 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ var _ = g.Describe("[sig-operator][Jira:OLM] OLMv0 within all namespace", func()
242242
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)
243243
})
244244

245-
g.It("PolarionID:21484-PolarionID:21532-[OTP]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() {
245+
g.It("PolarionID:21484-PolarionID:21532-[OTP]watch special or all namespace by operator group", g.Label("NonHyperShiftHOST"), 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() {
246246
architecture.SkipArchitectures(oc, architecture.PPC64LE, architecture.S390X, architecture.MULTI)
247247
exutil.SkipNoCapabilities(oc, "marketplace")
248248
olmv0util.ValidateAccessEnvironment(oc)

0 commit comments

Comments
 (0)