Skip to content

Commit b493f0f

Browse files
bandradebandrade
committed
address reviews and rebase code
1 parent 766d72d commit b493f0f

File tree

2 files changed

+22
-81
lines changed

2 files changed

+22
-81
lines changed

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

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ var _ = g.Describe("[sig-operator][Jira:OLM] OLMv0 optional should", func() {
3232
exutil.SkipNoOLMCore(oc)
3333
})
3434

35-
g.It("PolarionID:54038-[OTP][Skipped:Disconnected]Comply with Operator Anti-Affinity definition", g.Label("original-name:[sig-operators] OLM should ConnectedOnly-Author:bandrade-Medium-54038-Comply with Operator Anti-Affinity definition"), func() {
35+
g.It("PolarionID:54038-[OTP][Skipped:Disconnected]Comply with Operator Anti-Affinity definition", g.Label("original-name:[sig-operator][Jira:OLM] OLMv0 optional should PolarionID:54038-[Skipped:Disconnected]Comply with Operator Anti-Affinity definition"), func() {
3636
architecture.SkipNonAmd64SingleArch(oc)
3737
exutil.SkipIfDisableDefaultCatalogsource(oc)
3838
exutil.SkipBaselineCaps(oc, "None")
@@ -118,7 +118,7 @@ var _ = g.Describe("[sig-operator][Jira:OLM] OLMv0 optional should", func() {
118118
}
119119
})
120120

121-
g.It("PolarionID:54036-[OTP][Skipped:Disconnected]Comply with Operator NodeAffinity definition", g.Label("original-name:[sig-operators] OLM should ConnectedOnly-Author:bandrade-Medium-54036-Comply with Operator NodeAffinity definition"), func() {
121+
g.It("PolarionID:54036-[OTP][Skipped:Disconnected]Comply with Operator NodeAffinity definition", g.Label("original-name:[sig-operator][Jira:OLM] OLMv0 optional should PolarionID:54036-[Skipped:Disconnected]Comply with Operator NodeAffinity definition"), func() {
122122
architecture.SkipNonAmd64SingleArch(oc)
123123
exutil.SkipIfDisableDefaultCatalogsource(oc)
124124
exutil.SkipBaselineCaps(oc, "None")
@@ -195,7 +195,7 @@ var _ = g.Describe("[sig-operator][Jira:OLM] OLMv0 optional should", func() {
195195
o.Expect(firstNode).To(o.Equal(deployedNode))
196196
})
197197

198-
g.It("PolarionID:24850-[OTP]Allow users to edit the deployment of an active CSV", g.Label("original-name:[sig-operators] OLM should Author:bandrade-Medium-24850-Allow users to edit the deployment of an active CSV"), func() {
198+
g.It("PolarionID:24850-[OTP]Allow users to edit the deployment of an active CSV", g.Label("original-name:[sig-operator][Jira:OLM] OLMv0 optional should PolarionID:24850-Allow users to edit the deployment of an active CSV"), func() {
199199
exutil.SkipMissingQECatalogsource(oc)
200200
g.By("1) Install the OperatorGroup in a random project")
201201

@@ -245,7 +245,7 @@ var _ = g.Describe("[sig-operator][Jira:OLM] OLMv0 optional should", func() {
245245
o.Expect(podName).NotTo(o.Equal(podNameAfterPatch))
246246
})
247247

248-
g.It("PolarionID:24387-[OTP][Skipped:Disconnected][Disruptive]Any CRD upgrade is allowed if there is only one owner in a cluster", g.Label("original-name:[sig-operators] OLM should Author:bandrade-ConnectedOnly-High-24387-Any CRD upgrade is allowed if there is only one owner in a cluster [Disruptive]"), func() {
248+
g.It("PolarionID:24387-[OTP][Skipped:Disconnected][Disruptive]Any CRD upgrade is allowed if there is only one owner in a cluster", g.Label("original-name:[sig-operator][Jira:OLM] OLMv0 optional should PolarionID:24387-[Skipped:Disconnected][Disruptive]Any CRD upgrade is allowed if there is only one owner in a cluster"), func() {
249249
architecture.SkipNonAmd64SingleArch(oc)
250250
exutil.SkipBaselineCaps(oc, "None")
251251
exutil.SkipIfDisableDefaultCatalogsource(oc)
@@ -334,7 +334,7 @@ var _ = g.Describe("[sig-operator][Jira:OLM] OLMv0 optional should", func() {
334334
o.Expect(crdYamlOutput).To(o.ContainSubstring("propertyIncludedTest"))
335335
})
336336

337-
g.It("PolarionID:42970-[OTP]OperatorGroup status indicates cardinality conflicts - SingleNamespace", g.Label("original-name:[sig-operators] OLM should Author:bandrade-Medium-42970-OperatorGroup status indicates cardinality conflicts - SingleNamespace"), func() {
337+
g.It("PolarionID:42970-[OTP]OperatorGroup status indicates cardinality conflicts - SingleNamespace", g.Label("original-name:[sig-operator][Jira:OLM] OLMv0 optional should PolarionID:42970-OperatorGroup status indicates cardinality conflicts - SingleNamespace"), func() {
338338
buildPruningBaseDir := exutil.FixturePath("testdata", "olm")
339339
ogTemplate := filepath.Join(buildPruningBaseDir, "operatorgroup.yaml")
340340

@@ -387,7 +387,7 @@ var _ = g.Describe("[sig-operator][Jira:OLM] OLMv0 optional should", func() {
387387
g.By("6) OCP-42970 SUCCESS")
388388
})
389389

390-
g.It("PolarionID:42972-[OTP]OperatorGroup status should indicate if the SA named in spec not found", g.Label("original-name:[sig-operators] OLM should Author:bandrade-Medium-42972-OperatorGroup status should indicate if the SA named in spec not found"), func() {
390+
g.It("PolarionID:42972-[OTP]OperatorGroup status should indicate if the SA named in spec not found", g.Label("original-name:[sig-operator][Jira:OLM] OLMv0 optional should PolarionID:42972-OperatorGroup status should indicate if the SA named in spec not found"), func() {
391391
buildPruningBaseDir := exutil.FixturePath("testdata", "olm")
392392
ogTemplate := filepath.Join(buildPruningBaseDir, "operatorgroup-serviceaccount.yaml")
393393
serviceAccount := "scoped-42972"
@@ -432,7 +432,7 @@ var _ = g.Describe("[sig-operator][Jira:OLM] OLMv0 optional should", func() {
432432
exutil.AssertWaitPollNoErr(err, "The error ServiceAccountNotFound still be reported in status")
433433
})
434434

435-
g.It("PolarionID:24771-[OTP]OLM should support for user defined ServiceAccount for OperatorGroup", g.Label("original-name:[sig-operators] OLM should Author:bandrade-Medium-24771-OLM should support for user defined ServiceAccount for OperatorGroup"), func() {
435+
g.It("PolarionID:24771-[OTP]OLM should support for user defined ServiceAccount for OperatorGroup", g.Label("original-name:[sig-operator][Jira:OLM] OLMv0 optional should PolarionID:24771-OLM should support for user defined ServiceAccount for OperatorGroup"), func() {
436436
buildPruningBaseDir := exutil.FixturePath("testdata", "olm")
437437
saRoles := filepath.Join(buildPruningBaseDir, "scoped-sa-roles.yaml")
438438
oc.SetupProject()
@@ -515,7 +515,7 @@ var _ = g.Describe("[sig-operator][Jira:OLM] OLMv0 optional should", func() {
515515
[]string{"csv", targetCSV, "-n", sub.Namespace, "-o=jsonpath={.status.phase}"}).Check(oc)
516516
})
517517

518-
g.It("PolarionID:43073-[OTP][Skipped:Disconnected]Indicate dependency class in resolution constraint text", g.Label("original-name:[sig-operators] OLM should ConnectedOnly-Author:bandrade-Medium-43073-Indicate dependency class in resolution constraint text"), func() {
518+
g.It("PolarionID:43073-[OTP][Skipped:Disconnected]Indicate dependency class in resolution constraint text", g.Label("original-name:[sig-operator][Jira:OLM] OLMv0 optional should PolarionID:43073-[Skipped:Disconnected]Indicate dependency class in resolution constraint text"), func() {
519519
architecture.SkipNonAmd64SingleArch(oc)
520520
oc.SetupProject()
521521

@@ -574,7 +574,7 @@ var _ = g.Describe("[sig-operator][Jira:OLM] OLMv0 optional should", func() {
574574
[]string{"subs", "lib-bucket-provisioner-43073", "-n", oc.Namespace(), "-o=jsonpath={.status.conditions[?(.type==\"ResolutionFailed\")].reason}"}).Check(oc)
575575
})
576576

577-
g.It("PolarionID:24772-[OTP]OLM should support for user defined ServiceAccount for OperatorGroup with fine grained permission", g.Label("original-name:[sig-operators] OLM should Author:bandrade-Medium-24772-OLM should support for user defined ServiceAccount for OperatorGroup with fine grained permission"), func() {
577+
g.It("PolarionID:24772-[OTP]OLM should support for user defined ServiceAccount for OperatorGroup with fine grained permission", g.Label("original-name:[sig-operator][Jira:OLM] OLMv0 optional should PolarionID:24772-OLM should support for user defined ServiceAccount for OperatorGroup with fine grained permission"), func() {
578578
architecture.SkipNonAmd64SingleArch(oc)
579579
buildPruningBaseDir := exutil.FixturePath("testdata", "olm")
580580
saRoles := filepath.Join(buildPruningBaseDir, "scoped-sa-fine-grained-roles.yaml")
@@ -660,7 +660,7 @@ var _ = g.Describe("[sig-operator][Jira:OLM] OLMv0 optional should", func() {
660660
[]string{"csv", targetCSV, "-n", sub.Namespace, "-o=jsonpath={.status.phase}"}).Check(oc)
661661
})
662662

663-
g.It("PolarionID:24886-[OTP]OLM should support for user defined ServiceAccount permission changes", g.Label("original-name:[sig-operators] OLM should Author:bandrade-Medium-24886-OLM should support for user defined ServiceAccount permission changes"), func() {
663+
g.It("PolarionID:24886-[OTP]OLM should support for user defined ServiceAccount permission changes", g.Label("original-name:[sig-operator][Jira:OLM] OLMv0 optional should PolarionID:24886-OLM should support for user defined ServiceAccount permission changes"), func() {
664664
buildPruningBaseDir := exutil.FixturePath("testdata", "olm")
665665
saRoles := filepath.Join(buildPruningBaseDir, "scoped-sa-etcd.yaml")
666666
oc.SetupProject()
@@ -757,7 +757,7 @@ var _ = g.Describe("[sig-operator][Jira:OLM] OLMv0 optional should", func() {
757757
[]string{"csv", targetCSV, "-n", sub.Namespace, "-o=jsonpath={.status.phase}"}).Check(oc)
758758
})
759759

760-
g.It("PolarionID:30765-[OTP][Skipped:Disconnected]Operator-version based dependencies metadata", g.Label("original-name:[sig-operators] OLM should ConnectedOnly-Author:bandrade-Medium-30765-Operator-version based dependencies metadata"), func() {
760+
g.It("PolarionID:30765-[OTP][Skipped:Disconnected]Operator-version based dependencies metadata", g.Label("original-name:[sig-operator][Jira:OLM] OLMv0 optional should PolarionID:30765-[Skipped:Disconnected]Operator-version based dependencies metadata"), func() {
761761
architecture.SkipNonAmd64SingleArch(oc)
762762
exutil.SkipIfDisableDefaultCatalogsource(oc)
763763

@@ -816,7 +816,7 @@ var _ = g.Describe("[sig-operator][Jira:OLM] OLMv0 optional should", func() {
816816
o.Expect(msg).To(o.ContainSubstring("prometheus"))
817817
})
818818

819-
g.It("PolarionID:27680-[OTP][Skipped:Disconnected][Serial]OLM Bundle support for Prometheus Types", g.Label("original-name:[sig-operators] OLM should ConnectedOnly-Author:bandrade-Medium-27680-OLM Bundle support for Prometheus Types [Serial]"), func() {
819+
g.It("PolarionID:27680-[OTP][Skipped:Disconnected][Serial]OLM Bundle support for Prometheus Types", g.Label("original-name:[sig-operator][Jira:OLM] OLMv0 optional should PolarionID:27680-[Skipped:Disconnected][Serial]OLM Bundle support for Prometheus Types"), func() {
820820
architecture.SkipNonAmd64SingleArch(oc)
821821
exutil.SkipIfDisableDefaultCatalogsource(oc)
822822

@@ -883,7 +883,7 @@ var _ = g.Describe("[sig-operator][Jira:OLM] OLMv0 optional should", func() {
883883
o.Expect(msg).To(o.ContainSubstring("my-prometheusrule"))
884884
})
885885

886-
g.It("PolarionID:24916-[OTP][Skipped:Disconnected]Operators in AllNamespaces should be granted namespace list", g.Label("original-name:[sig-operators] OLM should Author:bandrade-ConnectedOnly-Medium-24916-Operators in AllNamespaces should be granted namespace list"), func() {
886+
g.It("PolarionID:24916-[OTP][Skipped:Disconnected]Operators in AllNamespaces should be granted namespace list", g.Label("original-name:[sig-operator][Jira:OLM] OLMv0 optional should PolarionID:24916-[Skipped:Disconnected]Operators in AllNamespaces should be granted namespace list"), func() {
887887
architecture.SkipNonAmd64SingleArch(oc)
888888
exutil.SkipBaselineCaps(oc, "None")
889889
exutil.SkipMissingQECatalogsource(oc)
@@ -933,7 +933,7 @@ var _ = g.Describe("[sig-operator][Jira:OLM] OLMv0 optional should", func() {
933933
}
934934
})
935935

936-
g.It("PolarionID:47149-[OTP][Skipped:Disconnected]Conjunctive constraint of one packages and one GVK", g.Label("original-name:[sig-operators] OLM should ConnectedOnly-Author:bandrade-Medium-47149-Conjunctive constraint of one packages and one GVK"), func() {
936+
g.It("PolarionID:47149-[OTP][Skipped:Disconnected]Conjunctive constraint of one packages and one GVK", g.Label("original-name:[sig-operator][Jira:OLM] OLMv0 optional should PolarionID:47149-[Skipped:Disconnected]Conjunctive constraint of one packages and one GVK"), func() {
937937
architecture.SkipNonAmd64SingleArch(oc)
938938
exutil.SkipIfDisableDefaultCatalogsource(oc)
939939

@@ -1006,7 +1006,7 @@ var _ = g.Describe("[sig-operator][Jira:OLM] OLMv0 optional should", func() {
10061006
[]string{"csv", "etcdoperator.v0.9.4", "-n", sub.Namespace, "-o=jsonpath={.status.phase}"}).Check(oc)
10071007
})
10081008

1009-
g.It("PolarionID:47181-[OTP][Skipped:Disconnected]Disjunctive constraint of one package and one GVK", g.Label("original-name:[sig-operators] OLM should ConnectedOnly-Author:bandrade-Medium-47181-Disjunctive constraint of one package and one GVK"), func() {
1009+
g.It("PolarionID:47181-[OTP][Skipped:Disconnected]Disjunctive constraint of one package and one GVK", g.Label("original-name:[sig-operator][Jira:OLM] OLMv0 optional should PolarionID:47181-[Skipped:Disconnected]Disjunctive constraint of one package and one GVK"), func() {
10101010
architecture.SkipNonAmd64SingleArch(oc)
10111011

10121012
baseDir := exutil.FixturePath("testdata", "olm")
@@ -1060,7 +1060,7 @@ var _ = g.Describe("[sig-operator][Jira:OLM] OLMv0 optional should", func() {
10601060
[]string{"csv", sub.InstalledCSV, "-n", sub.Namespace, "-o=jsonpath={.status.phase}"}).Check(oc)
10611061
})
10621062

1063-
g.It("PolarionID:47179-[OTP][Skipped:Disconnected]Disjunctive constraint of one package and one GVK", g.Label("original-name:[sig-operators] OLM should ConnectedOnly-Author:bandrade-Medium-47179-Disjunctive constraint of one package and one GVK"), func() {
1063+
g.It("PolarionID:47179-[OTP][Skipped:Disconnected]Disjunctive constraint of one package and one GVK", g.Label("original-name:[sig-operator][Jira:OLM] OLMv0 optional should PolarionID:47179-[Skipped:Disconnected]Disjunctive constraint of one package and one GVK"), func() {
10641064
architecture.SkipNonAmd64SingleArch(oc)
10651065
exutil.SkipIfDisableDefaultCatalogsource(oc)
10661066

@@ -1115,7 +1115,7 @@ var _ = g.Describe("[sig-operator][Jira:OLM] OLMv0 optional should", func() {
11151115
[]string{"csv", "-n", sub.Namespace}).Check(oc)
11161116
})
11171117

1118-
g.It("PolarionID:49130-[OTP][Skipped:Disconnected]Default CatalogSources deployed by marketplace do not have toleration for tainted nodes", g.Label("NonHyperShiftHOST"), g.Label("original-name:[sig-operators] OLM should NonHyperShiftHOST-ConnectedOnly-Author:bandrade-Medium-49130-Default CatalogSources deployed by marketplace do not have toleration for tainted nodes"), func() {
1118+
g.It("PolarionID:49130-[OTP][Skipped:Disconnected]Default CatalogSources deployed by marketplace do not have toleration for tainted nodes", g.Label("NonHyperShiftHOST"), g.Label("original-name:[sig-operator][Jira:OLM] OLMv0 optional should PolarionID:49130-[Skipped:Disconnected]Default CatalogSources deployed by marketplace do not have toleration for tainted nodes"), func() {
11191119
exutil.SkipBaselineCaps(oc, "None")
11201120
exutil.SkipIfDisableDefaultCatalogsource(oc)
11211121

@@ -1159,7 +1159,7 @@ var _ = g.Describe("[sig-operator][Jira:OLM] OLMv0 optional should", func() {
11591159
}
11601160
})
11611161

1162-
g.It("PolarionID:21130-[OTP]Fetching non-existent PackageManifest should return 404", g.Label("original-name:[sig-operators] OLM should Author:bandrade-Medium-21130-Fetching non-existent `PackageManifest` should return 404"), func() {
1162+
g.It("PolarionID:21130-[OTP]Fetching non-existent PackageManifest should return 404", g.Label("original-name:[sig-operator][Jira:OLM] OLMv0 optional should PolarionID:21130-Fetching non-existent PackageManifest should return 404"), func() {
11631163
msg, err := oc.AsAdmin().WithoutNamespace().Run("get").Args("packagemanifest", "--all-namespaces", "--no-headers").Output()
11641164
o.Expect(err).NotTo(o.HaveOccurred())
11651165
packageserverLines := strings.Split(msg, "\n")
@@ -1172,7 +1172,7 @@ var _ = g.Describe("[sig-operator][Jira:OLM] OLMv0 optional should", func() {
11721172
}
11731173
})
11741174

1175-
g.It("PolarionID:24057-[OTP]Have terminationMessagePolicy defined as FallbackToLogsOnError", g.Label("NonHyperShiftHOST"), g.Label("original-name:[sig-operators] OLM should NonHyperShiftHOST-Author:bandrade-Low-24057-Have terminationMessagePolicy defined as FallbackToLogsOnError"), func() {
1175+
g.It("PolarionID:24057-[OTP]Have terminationMessagePolicy defined as FallbackToLogsOnError", g.Label("NonHyperShiftHOST"), g.Label("original-name:[sig-operator][Jira:OLM] OLMv0 optional should PolarionID:24057-Have terminationMessagePolicy defined as FallbackToLogsOnError"), func() {
11761176
labels := [...]string{"app=packageserver", "app=catalog-operator", "app=olm-operator"}
11771177
for _, l := range labels {
11781178
msg, err := oc.AsAdmin().WithoutNamespace().Run("get").Args("pods", "-o=jsonpath={range .items[*].spec}{.containers[*].name}{\"\\t\"}", "-n", "openshift-operator-lifecycle-manager", "-l", l).Output()
@@ -1189,7 +1189,7 @@ var _ = g.Describe("[sig-operator][Jira:OLM] OLMv0 optional should", func() {
11891189
}
11901190
})
11911191

1192-
g.It("PolarionID:32613-[OTP][Skipped:Disconnected]Operators won't install if the CSV dependency is already installed", g.Label("original-name:[sig-operators] OLM should ConnectedOnly-Author:bandrade-High-32613-Operators won't install if the CSV dependency is already installed"), func() {
1192+
g.It("PolarionID:32613-[OTP][Skipped:Disconnected]Operators won't install if the CSV dependency is already installed", g.Label("original-name:[sig-operator][Jira:OLM] OLMv0 optional should PolarionID:32613-[Skipped:Disconnected]Operators won't install if the CSV dependency is already installed"), func() {
11931193
architecture.SkipNonAmd64SingleArch(oc)
11941194
exutil.SkipIfDisableDefaultCatalogsource(oc)
11951195
exutil.SkipBaselineCaps(oc, "None")
@@ -1264,7 +1264,7 @@ var _ = g.Describe("[sig-operator][Jira:OLM] OLMv0 optional should", func() {
12641264
[]string{"subs", "prometheus-32613", "-n", oc.Namespace(), "-o=jsonpath={.status.conditions..message}"}).Check(oc)
12651265
})
12661266

1267-
g.It("PolarionID:24055-[OTP][Skipped:Disconnected]Check for defaultChannel mandatory field when having multiple channels", g.Label("original-name:[sig-operators] OLM should ConnectedOnly-Author:bandrade-Low-24055-Check for defaultChannel mandatory field when having multiple channels"), func() {
1267+
g.It("PolarionID:24055-[OTP][Skipped:Disconnected]Check for defaultChannel mandatory field when having multiple channels", g.Label("original-name:[sig-operator][Jira:OLM] OLMv0 optional should PolarionID:24055-[Skipped:Disconnected]Check for defaultChannel mandatory field when having multiple channels"), func() {
12681268
baseDir := exutil.FixturePath("testdata", "olm")
12691269
cmMapWithoutDefaultChannel := filepath.Join(baseDir, "configmap-without-defaultchannel.yaml")
12701270
cmMapWithDefaultChannel := filepath.Join(baseDir, "configmap-with-defaultchannel.yaml")
@@ -1331,7 +1331,7 @@ var _ = g.Describe("[sig-operator][Jira:OLM] OLMv0 optional should", func() {
13311331
cs.CreateWithCheck(oc, itName, dr)
13321332
})
13331333

1334-
g.It("PolarionID:31693-[OTP][Skipped:Disconnected]Check CSV information on the PackageManifest", g.Label("original-name:[sig-operators] OLM should ConnectedOnly-Author:bandrade-Medium-31693-Check CSV information on the PackageManifest"), func() {
1334+
g.It("PolarionID:31693-[OTP][Skipped:Disconnected]Check CSV information on the PackageManifest", g.Label("original-name:[sig-operator][Jira:OLM] OLMv0 optional should PolarionID:31693-[Skipped:Disconnected]Check CSV information on the PackageManifest"), func() {
13351335
exutil.SkipBaselineCaps(oc, "None")
13361336
exutil.SkipIfDisableDefaultCatalogsource(oc)
13371337

0 commit comments

Comments
 (0)