Skip to content

Revert "test/extended/prometheus: fix test with enabled telemetry" #27957

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

Closed
neisw wants to merge 1 commit into from
Closed

Revert "test/extended/prometheus: fix test with enabled telemetry" #27957

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
12 changes: 6 additions & 6 deletions test/extended/prometheus/prometheus.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,10 +195,10 @@ var _ = g.Describe("[sig-instrumentation][Late] Alerts", func() {
})

g.It("shouldn't exceed the 650 series limit of total series sent via telemetry from each cluster", func() {
if enabledErr, err := telemetryIsEnabled(ctx, oc.AdminKubeClient()); err != nil {
if enabled, err := telemetryIsEnabled(ctx, oc.AdminKubeClient()); err != nil {
e2e.Failf("could not determine if Telemetry is enabled: %v", err)
} else if enabledErr != nil {
e2eskipper.Skipf("Telemetry is disabled: %v", enabledErr)
} else {
e2eskipper.Skipf("Telemetry is disabled: %v", enabled)
}

// we only consider series sent since the beginning of the test
Expand Down Expand Up @@ -260,10 +260,10 @@ var _ = g.Describe("[sig-instrumentation] Prometheus [apigroup:image.openshift.i

g.Describe("when installed on the cluster", func() {
g.It("should report telemetry [Late]", func() {
if enabledErr, err := telemetryIsEnabled(ctx, oc.AdminKubeClient()); err != nil {
if enabled, err := telemetryIsEnabled(ctx, oc.AdminKubeClient()); err != nil {
e2e.Failf("could not determine if Telemetry is enabled: %v", err)
} else if enabledErr != nil {
e2eskipper.Skipf("Telemetry is disabled: %v", enabledErr)
} else {
e2eskipper.Skipf("Telemetry is disabled: %v", enabled)
}

tests := map[string]bool{}
Expand Down