From 1fef0fa8e19be37798581e0d2aa67ccad0427f78 Mon Sep 17 00:00:00 2001 From: Tom Buskey Date: Wed, 12 Feb 2020 11:01:29 -0500 Subject: [PATCH 1/4] OCP-24848: test oc explain for InstallPlan,ClusterServiceVersion,Subscription,CatalogSource,OperatorSource,OperatorGroup,PackageManifest,CatalogSourceConfig --- test/extended/operators/olm.go | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/test/extended/operators/olm.go b/test/extended/operators/olm.go index f2e282eac99..589ab6387cc 100644 --- a/test/extended/operators/olm.go +++ b/test/extended/operators/olm.go @@ -226,4 +226,28 @@ var _ = g.Describe("[Feature:Platform] an end user use OLM", func() { } }) + + // OCP-24818 - Checking OLM descriptors + // author: tbuskey@redhat.com + g.It("to explain OLM descriptors", func() { + olmErr := 0 + olmErrDescriptor := []string{""} + olmExplains := []string{"InstallPlan", "ClusterServiceVersion", "Subscription", "CatalogSource", "OperatorSource", "OperatorGroup", "PackageManifest", "CatalogSourceConfig"} + for _, olmExplain := range olmExplains { + msg, err := oc.AsAdmin().WithoutNamespace().Run("explain").Args(olmExplain).Output() + if err != nil { + olmErr++ + olmErrDescriptor = append(olmErrDescriptor, olmExplain) + } + o.Expect(err).NotTo(o.HaveOccurred()) + if strings.Contains(msg, "") { + olmErr++ + olmErrDescriptor = append(olmErrDescriptor, olmExplain) + } + } + if olmErr != 0 { + // fmt.Printf("explain errors: %d\n", olmErr) + e2e.Failf("%v errors in explaining the following OLM descriptors: %v", olmErr, olmErrDescriptor) + } + }) }) From 95d9d472623fd4b044d6d8605c76c9687cee7687 Mon Sep 17 00:00:00 2001 From: Tom Buskey Date: Tue, 18 Feb 2020 11:49:04 -0500 Subject: [PATCH 2/4] OCP-24818 Checking OLM descriptors --- test/extended/operators/olm.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/extended/operators/olm.go b/test/extended/operators/olm.go index 589ab6387cc..26c356262bd 100644 --- a/test/extended/operators/olm.go +++ b/test/extended/operators/olm.go @@ -229,7 +229,7 @@ var _ = g.Describe("[Feature:Platform] an end user use OLM", func() { // OCP-24818 - Checking OLM descriptors // author: tbuskey@redhat.com - g.It("to explain OLM descriptors", func() { + g.It("Checking OLM descriptors", func() { olmErr := 0 olmErrDescriptor := []string{""} olmExplains := []string{"InstallPlan", "ClusterServiceVersion", "Subscription", "CatalogSource", "OperatorSource", "OperatorGroup", "PackageManifest", "CatalogSourceConfig"} From a31f87191a47d98ebda7f6b3835f93e125845d40 Mon Sep 17 00:00:00 2001 From: Tom Buskey Date: Tue, 18 Feb 2020 14:40:57 -0500 Subject: [PATCH 3/4] CatalogSourceConfig is not an OLM resource --- test/extended/operators/olm.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/extended/operators/olm.go b/test/extended/operators/olm.go index 26c356262bd..8daee7f255d 100644 --- a/test/extended/operators/olm.go +++ b/test/extended/operators/olm.go @@ -232,7 +232,7 @@ var _ = g.Describe("[Feature:Platform] an end user use OLM", func() { g.It("Checking OLM descriptors", func() { olmErr := 0 olmErrDescriptor := []string{""} - olmExplains := []string{"InstallPlan", "ClusterServiceVersion", "Subscription", "CatalogSource", "OperatorSource", "OperatorGroup", "PackageManifest", "CatalogSourceConfig"} + olmExplains := []string{"InstallPlan", "ClusterServiceVersion", "Subscription", "CatalogSource", "OperatorSource", "OperatorGroup", "PackageManifest"} for _, olmExplain := range olmExplains { msg, err := oc.AsAdmin().WithoutNamespace().Run("explain").Args(olmExplain).Output() if err != nil { From 9c170f7c0d7f788f6114ddd66f7ae98601c42743 Mon Sep 17 00:00:00 2001 From: Jian Zhang Date: Fri, 20 Mar 2020 16:22:21 +0800 Subject: [PATCH 4/4] Update olm.go --- test/extended/operators/olm.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/extended/operators/olm.go b/test/extended/operators/olm.go index 2ce6f975e93..f25b25bd056 100644 --- a/test/extended/operators/olm.go +++ b/test/extended/operators/olm.go @@ -225,7 +225,6 @@ var _ = g.Describe("[Feature:Platform] an end user use OLM", func() { o.Expect(err).NotTo(o.HaveOccurred()) o.Expect(msg).To(o.ContainSubstring("Upgradeable True")) } - }) // OCP-24818 - Checking OLM descriptors @@ -281,5 +280,6 @@ var _ = g.Describe("[Feature:Platform] an end user use OLM", func() { } if olmErrs > 0 { e2e.Failf("%v ipv4 addresses found in these OLM components: %v", olmErrs, olmNames) - } + } + }) })