test: Update upgrade test to pick random region + disable log router tenant tests (#269)

ocofaigh · web-flow · commit fc9c1881ea55 · 2025-02-24T13:09:25.000Z
diff --git a/tests/pr_test.go b/tests/pr_test.go
@@ -116,6 +116,7 @@ func TestRunUpgradeSolutionInstances(t *testing.T) {
 		"management_endpoint_type_for_bucket": "public",
 		"enable_platform_logs":                "false",
 		"enable_platform_metrics":             "false",
+		"region":                              options.Region,
 		"cloud_logs_policies": []map[string]interface{}{
 			{
 				"logs_policy_name":     "upg-test-policy",
@@ -368,6 +369,7 @@ func TestRunExistingResourcesInstancesSchematics(t *testing.T) {
 }
 
 func TestTenantsInSchematics(t *testing.T) {
+	t.Skip("Skipping test until https://github.ibm.com/GoldenEye/issues/issues/10676 is complete")
 	t.Parallel()
 
 	tenant_configuration := []map[string]interface{}{
@@ -401,6 +403,7 @@ func TestTenantsInSchematics(t *testing.T) {
 }
 
 func TestTenantsUpgradeTest(t *testing.T) {
+	t.Skip("Skipping test until https://github.ibm.com/GoldenEye/issues/issues/10676 is complete")
 	t.Parallel()
 
 	tenant_configuration := []map[string]interface{}{

Original file line number	Diff line number	Diff line change
`@@ -116,6 +116,7 @@ func TestRunUpgradeSolutionInstances(t *testing.T) {`
`116`	`116`	`"management_endpoint_type_for_bucket": "public",`
`117`	`117`	`"enable_platform_logs": "false",`
`118`	`118`	`"enable_platform_metrics": "false",`
	`119`	`+ "region": options.Region,`
`119`	`120`	`"cloud_logs_policies": []map[string]interface{}{`
`120`	`121`	`{`
`121`	`122`	`"logs_policy_name": "upg-test-policy",`
`@@ -368,6 +369,7 @@ func TestRunExistingResourcesInstancesSchematics(t *testing.T) {`
`368`	`369`	`}`
`369`	`370`
`370`	`371`	`func TestTenantsInSchematics(t *testing.T) {`
	`372`	`+ t.Skip("Skipping test until https://github.ibm.com/GoldenEye/issues/issues/10676 is complete")`
`371`	`373`	`t.Parallel()`
`372`	`374`
`373`	`375`	`tenant_configuration := []map[string]interface{}{`
`@@ -401,6 +403,7 @@ func TestTenantsInSchematics(t *testing.T) {`
`401`	`403`	`}`
`402`	`404`
`403`	`405`	`func TestTenantsUpgradeTest(t *testing.T) {`
	`406`	`+ t.Skip("Skipping test until https://github.ibm.com/GoldenEye/issues/issues/10676 is complete")`
`404`	`407`	`t.Parallel()`
`405`	`408`
`406`	`409`	`tenant_configuration := []map[string]interface{}{`