Skip to content

Commit 23343b3

Browse files
committed
[pwx-30005] Resolve telemetry automation race condition
1 parent 671de5d commit 23343b3

File tree

1 file changed

+1
-17
lines changed

1 file changed

+1
-17
lines changed

test/integration_test/basic_test.go

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -474,23 +474,7 @@ func BasicTelemetryRegression(tc *types.TestCase) func(*testing.T) {
474474
cluster, ok := testSpec.(*corev1.StorageCluster)
475475
require.True(t, ok)
476476

477-
// Since the Telemetry only enabled by PX Operator by default once the cluster has UUID
478-
// we need to first deploy StorageCluster, then check that cluster is online, get new cluster object and only then validate all components
479-
// to make sure that cluster has UUID and PX Operator enabled Telemetry in the StorageCluster by default
480-
cluster, err = ci_utils.DeployStorageCluster(cluster, ci_utils.PxSpecImages)
481-
require.NoError(t, err)
482-
483-
cluster, err = testutil.ValidateStorageClusterIsOnline(cluster, ci_utils.DefaultValidateDeployTimeout, ci_utils.DefaultValidateDeployRetryInterval)
484-
require.NoError(t, err)
485-
486-
time.Sleep(30 * time.Second) // NOTE: We need this timeout or PX Operator might not yet set Telemetry to enabled, might be resolved by PWX-29521
487-
488-
cluster, err = operator.Instance().GetStorageCluster(cluster.Name, cluster.Namespace)
489-
require.NoError(t, err)
490-
491-
err = testutil.ValidateStorageCluster(ci_utils.PxSpecImages, cluster, ci_utils.DefaultValidateDeployTimeout, ci_utils.DefaultValidateDeployRetryInterval, true, "")
492-
require.NoError(t, err)
493-
477+
cluster = ci_utils.DeployAndValidateStorageCluster(cluster, ci_utils.PxSpecImages, t)
494478
telemetryEnabled := cluster.Spec.Monitoring != nil && cluster.Spec.Monitoring.Telemetry != nil && cluster.Spec.Monitoring.Telemetry.Enabled
495479

496480
// Validate Telemetry is enabled by default with PX 2.12+ and Operator 23.3.0+

0 commit comments

Comments
 (0)