UPSTREAM: <carry>: migrate bandrade test cases #1193
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2769,5 +2769,17 @@ | |
| "environmentSelector": { | ||
| "exclude": "topology==\"External\"" | ||
| } | ||
| }, | ||
| { | ||
| "name": "[sig-operator][Jira:OLM] OLMv0 webhook operator PolarionID:83979-[Skipped:Disconnected]ClusterExtension installs webhook-operator and webhooks work", | ||
|
Contributor
There was a problem hiding this comment. @bandrade the update is not full. you should miss some cases. please update them. |
||
| "labels": { | ||
| "Extended": {} | ||
| }, | ||
| "resources": { | ||
| "isolation": {} | ||
| }, | ||
| "source": "openshift:payload:olmv0", | ||
| "lifecycle": "blocking", | ||
| "environmentSelector": {} | ||
| } | ||
| ] | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3119,6 +3119,214 @@ var _ = g.Describe("[sig-operator][Jira:OLM] OLMv0 optional should", func() { | |
| o.Expect(msg).To(o.ContainSubstring("learn-operator.v0.0.3")) | ||
| }) | ||
|
|
||
| // Polarion ID: 43073 | ||
| g.It("PolarionID:43073-[OTP]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() { | ||
|
Contributor
There was a problem hiding this comment. @bandrade no need g.Label because it is first added. same comment for other new added cases.
Contributor
There was a problem hiding this comment. 43073 is a new case in this repo, no need to add original-name
Contributor
There was a problem hiding this comment. @bandrade it was ConnectedOnly, so need to add [Skipped:Disconnected] |
||
| olmv0util.ValidateAccessEnvironment(oc) | ||
| architecture.SkipNonAmd64SingleArch(oc) | ||
|
|
||
| dr := make(olmv0util.DescriberResrouce) | ||
| itName := g.CurrentSpecReport().FullText() | ||
| dr.AddIr(itName) | ||
| buildPruningBaseDir := exutil.FixturePath("testdata", "olm") | ||
| csImageTemplate := filepath.Join(buildPruningBaseDir, "catalogsource-image.yaml") | ||
| subTemplate := filepath.Join(buildPruningBaseDir, "olm-subscription.yaml") | ||
| ogSingleTemplate := filepath.Join(buildPruningBaseDir, "operatorgroup.yaml") | ||
|
|
||
| catsrc := olmv0util.CatalogSourceDescription{ | ||
| Name: "cs-43073", | ||
| Namespace: "openshift-marketplace", | ||
|
|
||
| DisplayName: "OLM QE Operators", | ||
| Publisher: "bandrade", | ||
| SourceType: "grpc", | ||
| Address: "quay.io/olmqe/bundle-with-dep-error-index:4.0", | ||
| Template: csImageTemplate, | ||
| } | ||
| defer catsrc.Delete(itName, dr) | ||
| catsrc.CreateWithCheck(oc, itName, dr) | ||
|
|
||
| og := olmv0util.OperatorGroupDescription{ | ||
| Name: "og-43073", | ||
| Namespace: oc.Namespace(), | ||
| Template: ogSingleTemplate, | ||
| } | ||
| og.CreateWithCheck(oc, itName, dr) | ||
|
|
||
| sub := olmv0util.SubscriptionDescription{ | ||
| SubName: "lib-bucket-provisioner-43073", | ||
| Namespace: oc.Namespace(), | ||
| CatalogSourceName: catsrc.Name, | ||
| CatalogSourceNamespace: catsrc.Namespace, | ||
| Channel: "alpha", | ||
| IpApproval: "Automatic", | ||
| OperatorPackage: "lib-bucket-provisioner", | ||
| SingleNamespace: true, | ||
| Template: subTemplate, | ||
| } | ||
| defer sub.Delete(itName, dr) | ||
| defer sub.DeleteCSV(itName, dr) | ||
| sub.CreateWithoutCheck(oc, itName, dr) | ||
|
|
||
| olmv0util.NewCheck("expect", exutil.AsAdmin, exutil.WithoutNamespace, exutil.Compare, "ConstraintsNotSatisfiable", exutil.Ok, []string{"subs", sub.SubName, "-n", oc.Namespace(), "-o=jsonpath={.status.conditions[?(@.type==\"ResolutionFailed\")].reason}"}).Check(oc) | ||
| }) | ||
|
|
||
| // Polarion ID: 47149 | ||
| g.It("PolarionID:47149-[OTP]Conjunctive constraint of one package and one GVK", g.Label("original-name:[sig-operator][Jira:OLM] OLMv0 optional should PolarionID:47149-[Skipped:Disconnected]Conjunctive constraint of one package and one GVK"), func() { | ||
|
Contributor
There was a problem hiding this comment. no need to add original-name
Contributor
There was a problem hiding this comment. @bandrade it was ConnectedOnly, so need to add [Skipped:Disconnected] |
||
| olmv0util.ValidateAccessEnvironment(oc) | ||
| architecture.SkipNonAmd64SingleArch(oc) | ||
| exutil.SkipIfDisableDefaultCatalogsource(oc) | ||
|
|
||
| dr := make(olmv0util.DescriberResrouce) | ||
| itName := g.CurrentSpecReport().FullText() | ||
| dr.AddIr(itName) | ||
|
|
||
| buildPruningBaseDir := exutil.FixturePath("testdata", "olm") | ||
| subTemplate := filepath.Join(buildPruningBaseDir, "olm-subscription.yaml") | ||
| ogTemplate := filepath.Join(buildPruningBaseDir, "operatorgroup.yaml") | ||
| csImageTemplate := filepath.Join(buildPruningBaseDir, "catalogsource-image.yaml") | ||
| cs := olmv0util.CatalogSourceDescription{ | ||
| Name: "ocp-47149", | ||
| Namespace: oc.Namespace(), | ||
| DisplayName: "ocp-47149", | ||
| Publisher: "OLM QE", | ||
| SourceType: "grpc", | ||
| Address: "quay.io/olmqe/etcd-47149:1.0", | ||
|
Contributor
There was a problem hiding this comment. @bandrade if bundle image or operand iamge is not in quay.io/olmqe, quay.io/openshifttest, quay.io/openshift-qe-optional-operators, registry.redhat.io, brew.registry.redhat.io, registry.stage.redhat.io and registry-proxy.engineering.redhat.com (I am fear etcd image is not in them), please add [Skipped:Disconnected] because qe disc env only support to mirror these registry. |
||
| Template: csImageTemplate, | ||
| } | ||
| cs.CreateWithCheck(oc, itName, dr) | ||
|
|
||
| og := olmv0util.OperatorGroupDescription{ | ||
| Name: "test-og-47149", | ||
| Namespace: oc.Namespace(), | ||
| Template: ogTemplate, | ||
| } | ||
| og.CreateWithCheck(oc, itName, dr) | ||
|
|
||
| sub := olmv0util.SubscriptionDescription{ | ||
| SubName: "etcd", | ||
| Namespace: oc.Namespace(), | ||
| CatalogSourceName: cs.Name, | ||
| CatalogSourceNamespace: cs.Namespace, | ||
| Channel: "singlenamespace-alpha", | ||
| IpApproval: "Automatic", | ||
| OperatorPackage: "etcd", | ||
| SingleNamespace: true, | ||
| Template: subTemplate, | ||
| } | ||
| sub.Create(oc, itName, dr) | ||
|
|
||
| waitErr := wait.PollUntilContextTimeout(context.TODO(), 15*time.Second, 360*time.Second, false, func(ctx context.Context) (bool, error) { | ||
| csvList, err := oc.AsAdmin().WithoutNamespace().Run("get").Args("csv", "-n", sub.Namespace).Output() | ||
| o.Expect(err).NotTo(o.HaveOccurred()) | ||
| lines := strings.Split(csvList, "\n") | ||
| for _, line := range lines { | ||
| if strings.Contains(line, "prometheusoperator") { | ||
| if strings.Contains(line, "Succeeded") { | ||
| return true, nil | ||
| } | ||
| return false, nil | ||
| } | ||
| } | ||
| return false, nil | ||
| }) | ||
| exutil.AssertWaitPollNoErr(waitErr, "csv prometheusoperator is not Succeeded") | ||
| olmv0util.NewCheck("expect", exutil.AsUser, exutil.WithoutNamespace, exutil.Compare, "Succeeded", exutil.Ok, []string{"csv", "etcdoperator.v0.9.4", "-n", sub.Namespace, "-o=jsonpath={.status.phase}"}).Check(oc) | ||
| }) | ||
|
|
||
| // Polarion ID: 47181 | ||
| g.It("PolarionID:47181-[OTP]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() { | ||
|
Contributor
There was a problem hiding this comment. no need to add original-name
Contributor
There was a problem hiding this comment. @bandrade it was ConnectedOnly, so need to add [Skipped:Disconnected] |
||
| olmv0util.ValidateAccessEnvironment(oc) | ||
| architecture.SkipNonAmd64SingleArch(oc) | ||
|
|
||
| dr := make(olmv0util.DescriberResrouce) | ||
| itName := g.CurrentSpecReport().FullText() | ||
| dr.AddIr(itName) | ||
|
|
||
| buildPruningBaseDir := exutil.FixturePath("testdata", "olm") | ||
| subTemplate := filepath.Join(buildPruningBaseDir, "olm-subscription.yaml") | ||
| ogTemplate := filepath.Join(buildPruningBaseDir, "operatorgroup.yaml") | ||
| csImageTemplate := filepath.Join(buildPruningBaseDir, "catalogsource-image.yaml") | ||
| cs := olmv0util.CatalogSourceDescription{ | ||
| Name: "ocp-47181", | ||
| Namespace: oc.Namespace(), | ||
| DisplayName: "ocp-47181", | ||
| Publisher: "OLM QE", | ||
| SourceType: "grpc", | ||
| Address: "quay.io/olmqe/etcd-47181:1.0", | ||
|
|
||
| Template: csImageTemplate, | ||
| } | ||
| cs.CreateWithCheck(oc, itName, dr) | ||
|
|
||
| og := olmv0util.OperatorGroupDescription{ | ||
| Name: "test-og-47181", | ||
| Namespace: oc.Namespace(), | ||
| Template: ogTemplate, | ||
| } | ||
| og.CreateWithCheck(oc, itName, dr) | ||
|
|
||
| sub := olmv0util.SubscriptionDescription{ | ||
| SubName: "etcd", | ||
| Namespace: oc.Namespace(), | ||
| CatalogSourceName: cs.Name, | ||
| CatalogSourceNamespace: cs.Namespace, | ||
| Channel: "singlenamespace-alpha", | ||
| IpApproval: "Automatic", | ||
| OperatorPackage: "etcd", | ||
| SingleNamespace: true, | ||
| Template: subTemplate, | ||
| } | ||
| sub.Create(oc, itName, dr) | ||
|
|
||
| olmv0util.NewCheck("expect", exutil.AsUser, exutil.WithoutNamespace, exutil.Compare, "Succeeded", exutil.Ok, []string{"csv", sub.InstalledCSV, "-n", sub.Namespace, "-o=jsonpath={.status.phase}"}).Check(oc) | ||
| }) | ||
|
|
||
| // Polarion ID: 47179 | ||
| g.It("PolarionID:47179-[OTP]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() { | ||
|
Contributor
There was a problem hiding this comment. no need to add original-name
Contributor
There was a problem hiding this comment. @bandrade it was ConnectedOnly, so need to add [Skipped:Disconnected] |
||
| olmv0util.ValidateAccessEnvironment(oc) | ||
| architecture.SkipNonAmd64SingleArch(oc) | ||
| exutil.SkipIfDisableDefaultCatalogsource(oc) | ||
|
|
||
| dr := make(olmv0util.DescriberResrouce) | ||
| itName := g.CurrentSpecReport().FullText() | ||
| dr.AddIr(itName) | ||
|
|
||
| buildPruningBaseDir := exutil.FixturePath("testdata", "olm") | ||
| subTemplate := filepath.Join(buildPruningBaseDir, "olm-subscription.yaml") | ||
| ogTemplate := filepath.Join(buildPruningBaseDir, "operatorgroup.yaml") | ||
| csImageTemplate := filepath.Join(buildPruningBaseDir, "catalogsource-image.yaml") | ||
| cs := olmv0util.CatalogSourceDescription{ | ||
| Name: "ocp-47179", | ||
| Namespace: oc.Namespace(), | ||
| DisplayName: "ocp-47179", | ||
| Publisher: "OLM QE", | ||
| SourceType: "grpc", | ||
| Address: "quay.io/olmqe/etcd-47179:1.0", | ||
|
|
||
| Template: csImageTemplate, | ||
| } | ||
| cs.CreateWithCheck(oc, itName, dr) | ||
|
|
||
| og := olmv0util.OperatorGroupDescription{ | ||
| Name: "test-og-47179", | ||
| Namespace: oc.Namespace(), | ||
| Template: ogTemplate, | ||
| } | ||
| og.CreateWithCheck(oc, itName, dr) | ||
|
|
||
| sub := olmv0util.SubscriptionDescription{ | ||
| SubName: "etcd", | ||
| Namespace: oc.Namespace(), | ||
| CatalogSourceName: cs.Name, | ||
| CatalogSourceNamespace: cs.Namespace, | ||
| Channel: "singlenamespace-alpha", | ||
| IpApproval: "Automatic", | ||
| OperatorPackage: "etcd", | ||
| SingleNamespace: true, | ||
| Template: subTemplate, | ||
| } | ||
| sub.Create(oc, itName, dr) | ||
|
|
||
| olmv0util.NewCheck("expect", exutil.AsUser, exutil.WithoutNamespace, exutil.Contain, "red-hat-camel-k-operator", exutil.Ok, []string{"csv", "-n", sub.Namespace}).Check(oc) | ||
| }) | ||
|
|
||
| // Polarion ID: 20981 | ||
| g.It("PolarionID:20981-[OTP]-contain the source commit id", g.Label("NonHyperShiftHOST"), func() { | ||
| if os.Getenv("GITHUB_TOKEN") == "" { | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
not all cases are added in this json file
please run "make update-metadata"