Skip to content

Commit 33106ba

Browse files
authored
acc: enable default-python/integration_classic on local and GCP (#2984)
Also modify NODE_TYPE_ID in local mode to match AWS.
1 parent 70bb289 commit 33106ba

File tree

12 files changed

+21
-15
lines changed

12 files changed

+21
-15
lines changed

acceptance/acceptance_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1001,7 +1001,7 @@ func getNodeTypeID(cloudEnv string) string {
10011001
case "gcp":
10021002
return "n1-standard-4"
10031003
case "":
1004-
return "local-fake-node"
1004+
return "i3.xlarge"
10051005
default:
10061006
return "nodetype-" + cloudEnv
10071007
}

acceptance/bundle/override/clusters/output.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"min_workers": 2
77
},
88
"cluster_name": "foo",
9-
"node_type_id": "i3.xlarge",
9+
"node_type_id": "[NODE_TYPE_ID]",
1010
"num_workers": 2,
1111
"spark_conf": {
1212
"spark.executor.memory": "2g"

acceptance/bundle/override/job_cluster/output.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
{
1313
"job_cluster_key": "key",
1414
"new_cluster": {
15-
"node_type_id": "i3.xlarge",
15+
"node_type_id": "[NODE_TYPE_ID]",
1616
"num_workers": 1,
1717
"spark_version": "13.3.x-scala2.12"
1818
}

acceptance/bundle/override/job_cluster_var/output.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
{
1313
"job_cluster_key": "key",
1414
"new_cluster": {
15-
"node_type_id": "i3.xlarge",
15+
"node_type_id": "[NODE_TYPE_ID]",
1616
"num_workers": 1,
1717
"spark_version": "13.3.x-scala2.12"
1818
}

acceptance/bundle/override/job_tasks/output.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"tasks": [
99
{
1010
"new_cluster": {
11-
"node_type_id": "i3.xlarge",
11+
"node_type_id": "[NODE_TYPE_ID]",
1212
"num_workers": 1,
1313
"spark_version": "13.3.x-scala2.12"
1414
},

acceptance/bundle/override/pipeline_cluster/output.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"clusters": [
77
{
88
"label": "default",
9-
"node_type_id": "i3.xlarge",
9+
"node_type_id": "[NODE_TYPE_ID]",
1010
"num_workers": 1,
1111
"spark_conf": {
1212
"foo": "bar"

acceptance/bundle/templates/dbt-sql/output/my_dbt_sql/resources/my_dbt_sql.job.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ resources:
3232

3333
new_cluster:
3434
spark_version: 15.4.x-scala2.12
35-
node_type_id: i3.xlarge
35+
node_type_id: [NODE_TYPE_ID]
3636
data_security_mode: SINGLE_USER
3737
num_workers: 0
3838
spark_conf:

acceptance/bundle/templates/default-python/classic/out.compare-vs-serverless.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
+ - job_cluster_key: job_cluster
3535
+ new_cluster:
3636
+ spark_version: 15.4.x-scala2.12
37-
+ node_type_id: i3.xlarge
37+
+ node_type_id: [NODE_TYPE_ID]
3838
+ data_security_mode: SINGLE_USER
3939
+ autoscale:
4040
+ min_workers: 1

acceptance/bundle/templates/default-python/classic/output/my_default_python/resources/my_default_python.job.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ resources:
4343
- job_cluster_key: job_cluster
4444
new_cluster:
4545
spark_version: 15.4.x-scala2.12
46-
node_type_id: i3.xlarge
46+
node_type_id: [NODE_TYPE_ID]
4747
data_security_mode: SINGLE_USER
4848
autoscale:
4949
min_workers: 1

acceptance/bundle/templates/default-python/integration_classic/test.toml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
Cloud = true
2-
Local = false
3-
4-
# Temporarily disabling due to IsServicePrincipal/email_notifications differences.
5-
CloudEnvs.gcp = false
2+
Timeout = '1m'
63

74
Ignore = [
85
'.venv',
@@ -18,6 +15,10 @@ EnvMatrix.UV_PYTHON = [
1815

1916
EnvRepl.UV_PYTHON = true
2017

18+
[[Server]]
19+
Pattern = "PUT /api/2.0/permissions/directories/0"
20+
Response.Body = '{}'
21+
2122
[[Repls]]
2223
# for some reason leading number is lost converting "%H%M%S" 061234 to 61234
2324
Old = '\d{5,}'
@@ -41,3 +42,8 @@ New = "python3 setup.py bdist_wheel"
4142
Old = '\?o=\[(NUMBER|NUMID)\]'
4243
New = ''
4344
Order = 1000
45+
46+
[[Repls]]
47+
# Fix up for local and GCP
48+
Old = '"user_name": "\[USERNAME\]"'
49+
New = '"service_principal_name": "[USERNAME]"'

0 commit comments

Comments
 (0)