Skip to content

Commit a7815f1

Browse files
authored
acc: Fix CloudSlow tests; auto-enable Cloud on CloudSlow (#3231)
## Changes Extract from #3224 that - Automatically enables Cloud if CloudSlow is enabled. Note, this only affects out.test.toml but behaviour is the same. - Disables broken tests. ## Tests Commit and run with non-short tests enabled: 8a9e80b https://go/deco-tests/16198082279
1 parent 301ccb5 commit a7815f1

File tree

18 files changed

+26
-17
lines changed

18 files changed

+26
-17
lines changed

acceptance/acceptance_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -382,6 +382,7 @@ func getSkipReason(config *internal.TestConfig, configPath string) string {
382382
}
383383

384384
if isTruePtr(config.CloudSlow) {
385+
config.Cloud = config.CloudSlow
385386
if testing.Short() {
386387
return fmt.Sprintf("Disabled via CloudSlow setting in %s (CLOUD_ENV=%s, Short=%v)", configPath, cloudEnv, testing.Short())
387388
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Local = false
2-
Cloud = false
2+
Cloud = true
33
CloudSlow = true
44

55
[EnvMatrix]
6-
DATABRICKS_CLI_DEPLOYMENT = ["terraform", "direct-exp"]
6+
DATABRICKS_CLI_DEPLOYMENT = ["terraform"]
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
EnvMatrix.DATABRICKS_CLI_DEPLOYMENT = ["terraform"] # Error: deploying jobs.some_other_job: creating: Method=Jobs.Create *retries.Err *apierr.APIError StatusCode=400 ErrorCode="INVALID_PARAMETER_VALUE" Message="The field 'node_type_id' cannot be supplied when an instance pool ID is provided."
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Local = false
2-
Cloud = false
2+
Cloud = true
33
CloudSlow = true
44

55
[EnvMatrix]
6-
DATABRICKS_CLI_DEPLOYMENT = ["terraform", "direct-exp"]
6+
DATABRICKS_CLI_DEPLOYMENT = ["terraform"]
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
EnvMatrix.DATABRICKS_CLI_DEPLOYMENT = ["terraform"] # Error: deploying jobs.some_other_job: creating: Method=Jobs.Create *retries.Err *apierr.APIError StatusCode=400 ErrorCode="INVALID_PARAMETER_VALUE" Message="The field 'node_type_id' cannot be supplied when an instance pool ID is provided."
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Local = false
2-
Cloud = false
2+
Cloud = true
33
CloudSlow = true
44

55
[EnvMatrix]
6-
DATABRICKS_CLI_DEPLOYMENT = ["terraform", "direct-exp"]
6+
DATABRICKS_CLI_DEPLOYMENT = ["terraform"]
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
EnvMatrix.DATABRICKS_CLI_DEPLOYMENT = ["terraform"] # Error: deploying jobs.some_other_job: creating: Method=Jobs.Create *retries.Err *apierr.APIError StatusCode=400 ErrorCode="INVALID_PARAMETER_VALUE" Message="The field 'node_type_id' cannot be supplied when an instance pool ID is provided."

acceptance/bundle/integration_whl/interactive_cluster_dynamic_version/out.test.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Local = false
2-
Cloud = false
2+
Cloud = true
33
CloudSlow = true
44

55
[EnvMatrix]
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Local = false
2-
Cloud = false
2+
Cloud = true
33
CloudSlow = true
44

55
[EnvMatrix]
6-
DATABRICKS_CLI_DEPLOYMENT = ["terraform", "direct-exp"]
6+
DATABRICKS_CLI_DEPLOYMENT = ["terraform"]
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
EnvMatrix.DATABRICKS_CLI_DEPLOYMENT = ["terraform"] # clusters resource; Message="The field 'node_type_id' cannot be supplied when an instance pool ID is provided."

0 commit comments

Comments
 (0)