Skip to content

Commit 21381cb

Browse files
authored
Acc: tweak cloud tests for Lakebase (#3520)
## Changes - rename database instances to have distinct names in each test - move catalog test to `CloudSlow=true`
1 parent fcc397e commit 21381cb

File tree

10 files changed

+22
-18
lines changed

10 files changed

+22
-18
lines changed

acceptance/bundle/deploy/lakebase/database-catalog/databricks.yml.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ bundle:
44
resources:
55
database_instances:
66
my_instance:
7-
name: test-database-instance-$UNIQUE_NAME
7+
name: test-db-catalog-$UNIQUE_NAME
88
capacity: CU_1
99
database_catalogs:
1010
my_catalog:

acceptance/bundle/deploy/lakebase/database-catalog/out.test.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
Local = true
22
Cloud = true
3+
CloudSlow = true
34
RequiresUnityCatalog = true
45

56
[CloudEnvs]

acceptance/bundle/deploy/lakebase/database-catalog/output.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ Resources:
2020
Name: my_catalog_[UNIQUE_NAME]
2121
Database instances:
2222
my_instance:
23-
Name: test-database-instance-[UNIQUE_NAME]
23+
Name: test-db-catalog-[UNIQUE_NAME]
2424

2525
>>> [CLI] bundle deploy
2626
Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-lakebase-catalog-[UNIQUE_NAME]/default/files...
2727
Deploying resources...
2828
Updating deployment state...
2929
Deployment complete!
3030

31-
>>> [CLI] database get-database-instance test-database-instance-[UNIQUE_NAME]
31+
>>> [CLI] database get-database-instance test-db-catalog-[UNIQUE_NAME]
3232
{
3333
"capacity": "CU_1",
3434
"creation_time": "[TIMESTAMP]Z",
@@ -37,7 +37,7 @@ Deployment complete!
3737
"effective_node_count": 1,
3838
"effective_retention_window_in_days": 7,
3939
"effective_stopped": false,
40-
"name": "test-database-instance-[UNIQUE_NAME]",
40+
"name": "test-db-catalog-[UNIQUE_NAME]",
4141
"pg_version": "PG_VERSION_16",
4242
"state": "AVAILABLE",
4343
"uid": "[UUID]"
@@ -55,7 +55,7 @@ Resources:
5555
Name: my_catalog_[UNIQUE_NAME]
5656
Database instances:
5757
my_instance:
58-
Name: test-database-instance-[UNIQUE_NAME]
58+
Name: test-db-catalog-[UNIQUE_NAME]
5959

6060
>>> [CLI] bundle destroy --auto-approve
6161
The following resources will be deleted:

acceptance/bundle/deploy/lakebase/database-catalog/script

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ trace $CLI bundle validate
1111
trace $CLI bundle summary | grep -v "URL"
1212
trace $CLI bundle deploy
1313
# _dns fields are excluded since they differ between cloud envs
14-
trace $CLI database get-database-instance "test-database-instance-${UNIQUE_NAME}" | jq 'del(.read_only_dns, .read_write_dns)'
14+
trace $CLI database get-database-instance "test-db-catalog-${UNIQUE_NAME}" | jq 'del(.read_only_dns, .read_write_dns)'
1515
trace $CLI bundle summary | grep -v "URL"
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
Local = true
22
Cloud = true
33

4+
# Mitigates running into quota limits in workspaces
5+
CloudSlow = true
6+
47
RecordRequests = false

acceptance/bundle/deploy/lakebase/database-instance/single-instance/databricks.yml.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ bundle:
44
resources:
55
database_instances:
66
my_database:
7-
name: test-database-instance-$UNIQUE_NAME
7+
name: test-db-instance-single-$UNIQUE_NAME
88
capacity: CU_1

acceptance/bundle/deploy/lakebase/database-instance/single-instance/output.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Workspace:
1717
Resources:
1818
Database instances:
1919
my_database:
20-
Name: test-database-instance-[UNIQUE_NAME]
20+
Name: test-db-instance-single-[UNIQUE_NAME]
2121
URL: (not deployed)
2222

2323
>>> [CLI] bundle deploy
@@ -26,7 +26,7 @@ Deploying resources...
2626
Updating deployment state...
2727
Deployment complete!
2828

29-
>>> [CLI] database get-database-instance test-database-instance-[UNIQUE_NAME]
29+
>>> [CLI] database get-database-instance test-db-instance-single-[UNIQUE_NAME]
3030
{
3131
"capacity": "CU_1",
3232
"creation_time": "[TIMESTAMP]Z",
@@ -35,7 +35,7 @@ Deployment complete!
3535
"effective_node_count": 1,
3636
"effective_retention_window_in_days": 7,
3737
"effective_stopped": false,
38-
"name": "test-database-instance-[UNIQUE_NAME]",
38+
"name": "test-db-instance-single-[UNIQUE_NAME]",
3939
"pg_version": "PG_VERSION_16",
4040
"state": "AVAILABLE",
4141
"uid": "[UUID]"
@@ -50,8 +50,8 @@ Workspace:
5050
Resources:
5151
Database instances:
5252
my_database:
53-
Name: test-database-instance-[UNIQUE_NAME]
54-
URL: [DATABRICKS_URL]/compute/database-instances/test-database-instance-[UNIQUE_NAME]
53+
Name: test-db-instance-single-[UNIQUE_NAME]
54+
URL: [DATABRICKS_URL]/compute/database-instances/test-db-instance-single-[UNIQUE_NAME]
5555

5656
>>> [CLI] bundle destroy --auto-approve
5757
The following resources will be deleted:

acceptance/bundle/deploy/lakebase/database-instance/single-instance/script

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ trace $CLI bundle deploy
1313

1414
# Poll for database instance to become available (max 10 attempts, 5s between attempts)
1515
for i in {1..10}; do
16-
state=$($CLI database get-database-instance "test-database-instance-${UNIQUE_NAME}" --output json 2>/dev/null | jq -r '.state')
16+
state=$($CLI database get-database-instance "test-db-instance-single-${UNIQUE_NAME}" --output json 2>/dev/null | jq -r '.state')
1717
if [ "$state" = "AVAILABLE" ]; then
1818
break
1919
fi
@@ -25,6 +25,6 @@ for i in {1..10}; do
2525
done
2626

2727
# _dns fields are excluded since they differ between cloud envs
28-
trace $CLI database get-database-instance "test-database-instance-${UNIQUE_NAME}" | jq 'del(.read_only_dns, .read_write_dns)'
28+
trace $CLI database get-database-instance "test-db-instance-single-${UNIQUE_NAME}" | jq 'del(.read_only_dns, .read_write_dns)'
2929

3030
trace $CLI bundle summary

acceptance/bundle/deploy/lakebase/synced-database-table/databricks.yml.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ bundle:
44
resources:
55
database_instances:
66
my_instance:
7-
name: test-database-instance-$UNIQUE_NAME
7+
name: test-db-synced-table-$UNIQUE_NAME
88
capacity: CU_1
99
database_catalogs:
1010
my_catalog:

acceptance/bundle/deploy/lakebase/synced-database-table/output.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Resources:
2121
URL: [DATABRICKS_URL]/explore/data/my_catalog_[UNIQUE_NAME]
2222
Database instances:
2323
my_instance:
24-
Name: test-database-instance-[UNIQUE_NAME]
24+
Name: test-db-synced-table-[UNIQUE_NAME]
2525
URL: (not deployed)
2626
Synced database tables:
2727
my_synced_table:
@@ -47,8 +47,8 @@ Resources:
4747
URL: [DATABRICKS_URL]/explore/data/my_catalog_[UNIQUE_NAME]
4848
Database instances:
4949
my_instance:
50-
Name: test-database-instance-[UNIQUE_NAME]
51-
URL: [DATABRICKS_URL]/compute/database-instances/test-database-instance-[UNIQUE_NAME]
50+
Name: test-db-synced-table-[UNIQUE_NAME]
51+
URL: [DATABRICKS_URL]/compute/database-instances/test-db-synced-table-[UNIQUE_NAME]
5252
Synced database tables:
5353
my_synced_table:
5454
Name: ${resources.database_catalogs.my_catalog.name}.${resources.database_catalogs.my_catalog.database_name}.my_synced_table

0 commit comments

Comments
 (0)