Skip to content

NO-ISSUE: remove etcd dependency from failing cases #1241

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bandrade wants to merge 1 commit into
base: main
Choose a base branch
from
Open

NO-ISSUE: remove etcd dependency from failing cases #1241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 31 additions & 25 deletions tests-extension/test/qe/specs/olmv0_defaultoption.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -784,12 +784,12 @@ var _ = g.Describe("[sig-operator][Jira:OLM] OLMv0 optional should", func() {
subTemplate := filepath.Join(buildDir, "olm-subscription.yaml")

cs := olmv0util.CatalogSourceDescription{
Name: "prometheus-dependency-cs",
Namespace: "openshift-marketplace",
Name: "learn-32613",
Namespace: oc.Namespace(),
DisplayName: "OLM QE",
Publisher: "OLM QE",
SourceType: "grpc",
Address: "quay.io/olmqe/etcd-prometheus-dependency-index:11.0",
Address: "quay.io/olmqe/learn-operator-index:v25",
Template: csTemplate,
}
dr := make(olmv0util.DescriberResrouce)
Expand All @@ -809,36 +809,33 @@ var _ = g.Describe("[sig-operator][Jira:OLM] OLMv0 optional should", func() {
sub := olmv0util.SubscriptionDescription{
SubName: "sub-32613",
Namespace: oc.Namespace(),
CatalogSourceName: "prometheus-dependency-cs",
CatalogSourceNamespace: "openshift-marketplace",
Channel: "singlenamespace-alpha",
CatalogSourceName: cs.Name,
CatalogSourceNamespace: cs.Namespace,
Channel: "beta",
IpApproval: "Automatic",
OperatorPackage: "etcd-service-monitor",
StartingCSV: "etcdoperator.v0.9.4",
OperatorPackage: "learn",
StartingCSV: "learn-operator.v0.0.3",
SingleNamespace: true,
Template: subTemplate,
}
defer sub.Delete(itName, dr)
defer sub.DeleteCSV(itName, dr)
sub.Create(oc, itName, dr)
olmv0util.NewCheck("expect", exutil.AsAdmin, exutil.WithoutNamespace, exutil.Compare, "Succeeded", exutil.Ok, []string{"csv", "etcdoperator.v0.9.4", "-n", oc.Namespace(), "-o=jsonpath={.status.phase}"}).Check(oc)

g.By("Assert that prometheus dependency is resolved")
msg, err := oc.AsAdmin().WithoutNamespace().Run("get").Args("csv", "-n", oc.Namespace()).Output()
o.Expect(err).NotTo(o.HaveOccurred())
o.Expect(msg).To(o.ContainSubstring("prometheus"))
olmv0util.NewCheck("expect", exutil.AsAdmin, exutil.WithoutNamespace, exutil.Compare, "Succeeded", exutil.Ok, []string{"csv", "learn-operator.v0.0.3", "-n", oc.Namespace(), "-o=jsonpath={.status.phase}"}).Check(oc)

sub = olmv0util.SubscriptionDescription{
SubName: "prometheus-32613",
SubName: "sub-32613-conflict",
Namespace: oc.Namespace(),
CatalogSourceName: "community-operators",
CatalogSourceNamespace: "openshift-marketplace",
CatalogSourceName: cs.Name,
CatalogSourceNamespace: cs.Namespace,
IpApproval: "Automatic",
Channel: "beta",
OperatorPackage: "prometheus",
OperatorPackage: "learn",
SingleNamespace: true,
Template: subTemplate,
}
sub.CreateWithoutCheck(oc, itName, dr)
olmv0util.NewCheck("expect", exutil.AsAdmin, exutil.WithoutNamespace, exutil.Contain, "prometheus-beta-community-operators-openshift-marketplace exists", exutil.Ok, []string{"subs", "prometheus-32613", "-n", oc.Namespace(), "-o=jsonpath={.status.conditions..message}"}).Check(oc)
olmv0util.NewCheck("expect", exutil.AsAdmin, exutil.WithoutNamespace, exutil.Contain, "ConstraintsNotSatisfiable", exutil.Ok, []string{"subs", sub.SubName, "-n", oc.Namespace(), "-o=jsonpath={.status.conditions..reason}"}).Check(oc)
})

g.It("PolarionID:24055-[OTP][Skipped:Disconnected]Check for defaultChannel mandatory field when having multiple channels", func() {
Expand Down Expand Up @@ -3266,6 +3263,7 @@ var _ = g.Describe("[sig-operator][Jira:OLM] OLMv0 optional should", func() {
g.It("PolarionID:47181-[OTP][Skipped:Disconnected]Disjunctive constraint of one package and one GVK", func() {
olmv0util.ValidateAccessEnvironment(oc)
architecture.SkipNonAmd64SingleArch(oc)
exutil.SkipIfDisableDefaultCatalogsource(oc)

dr := make(olmv0util.DescriberResrouce)
itName := g.CurrentSpecReport().FullText()
Expand All @@ -3274,14 +3272,14 @@ var _ = g.Describe("[sig-operator][Jira:OLM] OLMv0 optional should", func() {
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")
csImageTemplate := filepath.Join(buildPruningBaseDir, "catalogsource-image-extract.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",
Address: "quay.io/olmqe/ditto-index:41565-cache",
Template: csImageTemplate,
}
cs.CreateWithCheck(oc, itName, dr)
Expand All @@ -3294,19 +3292,27 @@ var _ = g.Describe("[sig-operator][Jira:OLM] OLMv0 optional should", func() {
og.CreateWithCheck(oc, itName, dr)

sub := olmv0util.SubscriptionDescription{
SubName: "etcd",
SubName: "sub-47181",
Namespace: oc.Namespace(),
CatalogSourceName: cs.Name,
CatalogSourceNamespace: cs.Namespace,
Channel: "singlenamespace-alpha",
Channel: "alpha",
IpApproval: "Automatic",
OperatorPackage: "etcd",
OperatorPackage: "ditto-operator",
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)
waitErr := wait.PollUntilContextTimeout(context.TODO(), 10*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())
return strings.Contains(csvList, "ditto-operator") && strings.Contains(csvList, "planetscale-operator"), nil
})
if waitErr != nil {
olmv0util.LogDebugInfo(oc, sub.Namespace, "pod", "ip", "csv", "events")
}
exutil.AssertWaitPollNoErr(waitErr, "csv ditto-operator or planetscale-operator was not installed")
})

// Polarion ID: 47179
Expand Down
82 changes: 35 additions & 47 deletions tests-extension/test/qe/specs/olmv0_nonallns.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,25 +378,11 @@ var _ = g.Describe("[sig-operator][Jira:OLM] OLMv0 within a namespace", func() {
itName = g.CurrentSpecReport().FullText()
ns = oc.Namespace()
buildPruningBaseDir = exutil.FixturePath("testdata", "olm")
csImageTemplate = filepath.Join(buildPruningBaseDir, "catalogsource-image.yaml")
ogSingleTemplate = filepath.Join(buildPruningBaseDir, "operatorgroup.yaml")
prometheusTemplate = filepath.Join(buildPruningBaseDir, "prometheus-nodeaffinity.yaml")
subTemplate = filepath.Join(buildPruningBaseDir, "olm-subscription.yaml")
csvName = "etcdoperator.v0.9.4"
)

g.By("Start to create the CatalogSource CR")
catsrc := olmv0util.CatalogSourceDescription{
Name: "prometheus-dependency-27680",
Namespace: oc.Namespace(),
DisplayName: "OLM QE",
Publisher: "OLM QE",
SourceType: "grpc",
Address: "quay.io/olmqe/etcd-prometheus-dependency-index:11.0",
Template: csImageTemplate,
}
defer catsrc.Delete(itName, dr)
catsrc.CreateWithCheck(oc, itName, dr)

g.By("Install the OperatorGroup in a random project")
og := olmv0util.OperatorGroupDescription{
Name: "og-27680",
Expand All @@ -406,50 +392,52 @@ var _ = g.Describe("[sig-operator][Jira:OLM] OLMv0 within a namespace", func() {
defer og.Delete(itName, dr)
og.CreateWithCheck(oc, itName, dr)

g.By("Install the etcdoperator v0.9.4 with Automatic approval")
sub := olmv0util.SubscriptionDescription{
SubName: "sub-27680",
Namespace: ns,
CatalogSourceName: catsrc.Name,
CatalogSourceNamespace: catsrc.Namespace,
Channel: "singlenamespace-alpha",
CatalogSourceName: "community-operators",
CatalogSourceNamespace: "openshift-marketplace",
Channel: "beta",
IpApproval: "Automatic",
OperatorPackage: "etcd-service-monitor",
StartingCSV: csvName,
OperatorPackage: "prometheus",
SingleNamespace: true,
Template: subTemplate,
}
exists, _ := olmv0util.ClusterPackageExists(oc, sub)
if !exists {
g.Skip("SKIP:PackageMissing prometheus does not exist in catalog community-operators")
}

workerNodes, _ := exutil.GetSchedulableLinuxWorkerNodes(oc)
firstNode := ""
for _, worker := range workerNodes {
for _, con := range worker.Status.Conditions {
if con.Type == "Ready" && con.Status == "True" {
firstNode = worker.Name
break
}
}
if firstNode != "" {
break
}
}
if firstNode == "" {
g.Skip("Skipping because there's no schedulable worker node in READY state")
}

g.By("Install the Prometheus operator with Automatic approval")
defer sub.Delete(itName, dr)
defer sub.DeleteCSV(itName, dr)
sub.Create(oc, itName, dr)
olmv0util.NewCheck("expect", exutil.AsAdmin, exutil.WithoutNamespace, exutil.Compare, "Succeeded", exutil.Ok, []string{"csv", csvName, "-n", ns, "-o=jsonpath={.status.phase}"}).Check(oc)
olmv0util.NewCheck("expect", exutil.AsAdmin, exutil.WithoutNamespace, exutil.Compare, "Succeeded", exutil.Ok, []string{"csv", sub.InstalledCSV, "-n", ns, "-o=jsonpath={.status.phase}"}).Check(oc)

g.By("Assert that prometheus dependency is resolved")
msg, err := oc.AsAdmin().WithoutNamespace().Run("get").Args("csv", "-n", ns).Output()
g.By("Create a Prometheus resource that relies on Prometheus bundle types")
defer func() {
_ = oc.AsAdmin().WithoutNamespace().Run("delete").Args("prometheus", "example", "-n", ns, "--ignore-not-found").Execute()
}()
err := olmv0util.ApplyResourceFromTemplate(oc, "--ignore-unknown-parameters=true", "-f", prometheusTemplate, "-p", fmt.Sprintf("NAMESPACE=%s", ns), fmt.Sprintf("NODE_NAME=%s", firstNode))
o.Expect(err).NotTo(o.HaveOccurred())
o.Expect(msg).To(o.ContainSubstring("prometheus"))

g.By("Assert that ServiceMonitor is created")
err = wait.PollUntilContextTimeout(context.TODO(), 10*time.Second, 2*time.Minute, false, func(ctx context.Context) (bool, error) {
output, err := oc.AsAdmin().WithoutNamespace().Run("get").Args("ServiceMonitor", "my-servicemonitor", "-n", ns).Output()
if err != nil {
e2e.Logf("waiting for ServiceMonitor: %v", err)
return false, nil
}
return strings.Contains(output, "my-servicemonitor"), nil
})
exutil.AssertWaitPollNoErr(err, "ServiceMonitor was not created")

g.By("Assert that PrometheusRule is created")
err = wait.PollUntilContextTimeout(context.TODO(), 10*time.Second, 2*time.Minute, false, func(ctx context.Context) (bool, error) {
output, err := oc.AsAdmin().WithoutNamespace().Run("get").Args("PrometheusRule", "my-prometheusrule", "-n", ns).Output()
if err != nil {
e2e.Logf("waiting for PrometheusRule: %v", err)
return false, nil
}
return strings.Contains(output, "my-prometheusrule"), nil
})
exutil.AssertWaitPollNoErr(err, "PrometheusRule was not created")
olmv0util.NewCheck("expect", exutil.AsAdmin, exutil.WithoutNamespace, exutil.Compare, "Available", exutil.Ok, []string{"Prometheus", "example", "-n", ns, "-o=jsonpath={.status.conditions[0].type}"}).Check(oc)
})

g.It("PolarionID:22200-[OTP][Skipped:Disconnected]add minimum kube version to CSV [Slow]", g.Label("NonHyperShiftHOST"), g.Label("original-name:[sig-operator][Jira:OLM] OLMv0 within a namespace PolarionID:22200-[Skipped:Disconnected]add minimum kube version to CSV [Slow]"), func() {
Expand Down