databricks · shreyas-goenka · Aug 19, 2026 · Aug 19, 2026 · Aug 19, 2026 · Aug 19, 2026
diff --git a/.agents/rules/testing.md b/.agents/rules/testing.md
@@ -146,6 +146,7 @@ Ignore = ["databricks.yml"]   # parsed as EnvMatrix.Ignore, not top-level Ignore
 - `errcode CMD...`: run CMD; if it exits non-zero, append `Exit code: N` to the output but let the script continue (scripts run under `bash -e`, which would otherwise abort). Use when a command is *allowed* to fail and later steps must still run.
 - `musterr CMD...`: run CMD and fail the whole test if it *succeeds*; on the expected failure the script continues. Use to assert a command must error.
 - `withdir DIR CMD...`: run CMD with the working directory set to DIR, restoring it afterwards.
+- `destroy-bundle [ARGS...]`: run `bundle destroy --auto-approve` (traced, so output is identical to calling it directly) and then remove the `~/.bundle/<name>` directory the bundle was deployed under. Prefer it over a bare `trace $CLI bundle destroy --auto-approve` when the test is done with the bundle: on a real workspace a leftover directory is never reused, and they accumulate against the workspace's child-node limit. It removes the directory recursively, so do not use it to destroy one target while another target of the same bundle must stay deployed.
 - `git-repo-init`: initialize a deterministic git repo (fixed user/email, no hooks) and commit `databricks.yml`.
 - `uuid`, `sethome DIR`, `venv_activate`, `as-test-sp CMD...`, `readplanarg FILE`, `envsubst`: see `acceptance/script.prepare` for the full list and exact semantics.
 

diff --git a/acceptance/apps/deploy/bundle-no-args-with-flags/script b/acceptance/apps/deploy/bundle-no-args-with-flags/script
@@ -3,4 +3,4 @@
 
 trace $CLI apps deploy --skip-validation --auto-approve --force-lock --fail-on-active-runs
 
-trace $CLI bundle destroy --auto-approve
+destroy-bundle
diff --git a/acceptance/apps/deploy/bundle-no-args/script b/acceptance/apps/deploy/bundle-no-args/script
@@ -4,4 +4,4 @@
 
 trace $CLI apps deploy --skip-validation
 
-trace $CLI bundle destroy --auto-approve
+destroy-bundle
diff --git a/acceptance/bundle/ai_runtime_task/local_code_source/script b/acceptance/bundle/ai_runtime_task/local_code_source/script
@@ -25,5 +25,5 @@ trace $CLI bundle deploy
 trace print_requests.py --sort --del-field raw_body '//.air_snapshots/'
 
 title "destroy removes the deployed bundle (including the synced snapshots)\n"
-trace $CLI bundle destroy --auto-approve
+destroy-bundle
 rm out.requests.txt
diff --git a/acceptance/bundle/apps/app_yaml/script b/acceptance/bundle/apps/app_yaml/script
@@ -5,5 +5,5 @@ trace jq 'select(.path | test("app.yml"))' out.requests.txt | sed 's/\\r//g'  >
 #trace print_requests.py //apps  # currently fails due to TF inserting description=""
 rm out.requests.txt
 
-trace $CLI bundle destroy --auto-approve
+destroy-bundle
 trace print_requests.py //apps
diff --git a/acceptance/bundle/apps/compute_size/script b/acceptance/bundle/apps/compute_size/script
@@ -5,7 +5,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 # Set up cleanup trap to ensure resources are destroyed even on failure
 cleanup() {
-  trace $CLI bundle destroy --auto-approve
+  destroy-bundle
 }
 trap cleanup EXIT
 

diff --git a/acceptance/bundle/apps/git_source/script b/acceptance/bundle/apps/git_source/script
@@ -5,7 +5,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 # Set up cleanup trap to ensure resources are destroyed even on failure
 cleanup() {
-  trace $CLI bundle destroy --auto-approve
+  destroy-bundle
 }
 trap cleanup EXIT
 

diff --git a/acceptance/bundle/apps/job_permissions/script b/acceptance/bundle/apps/job_permissions/script
@@ -35,4 +35,4 @@ patch -s --no-backup-if-mismatch databricks.yml < fix.patch
 trace $CLI bundle deploy -qq
 trace has_manage_run
 
-trace $CLI bundle destroy --auto-approve
+destroy-bundle
diff --git a/acceptance/bundle/bundle_tag/id/script b/acceptance/bundle/bundle_tag/id/script
@@ -4,5 +4,5 @@ trace $CLI bundle plan
 trace $CLI bundle deploy
 trace print_requests.py //jobs
 trace $CLI bundle summary
-trace $CLI bundle destroy --auto-approve
+destroy-bundle
 trace print_requests.py //jobs
diff --git a/acceptance/bundle/bundle_tag/url/script b/acceptance/bundle/bundle_tag/url/script
@@ -4,5 +4,5 @@ trace $CLI bundle plan
 trace $CLI bundle deploy
 trace print_requests.py //jobs
 trace $CLI bundle summary
-trace $CLI bundle destroy --auto-approve
+destroy-bundle
 trace print_requests.py //jobs
diff --git a/acceptance/bundle/config-remote-sync/cli_defaults/script b/acceptance/bundle/config-remote-sync/cli_defaults/script
@@ -3,7 +3,7 @@
 envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
-  trace $CLI bundle destroy --auto-approve
+  destroy-bundle
 }
 trap cleanup EXIT
 

diff --git a/acceptance/bundle/config-remote-sync/config_edits/script b/acceptance/bundle/config-remote-sync/config_edits/script
@@ -3,7 +3,7 @@
 envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
-  trace $CLI bundle destroy --auto-approve
+  destroy-bundle
 }
 trap cleanup EXIT
 

diff --git a/acceptance/bundle/config-remote-sync/dashboard_etag/script b/acceptance/bundle/config-remote-sync/dashboard_etag/script
@@ -3,7 +3,7 @@
 envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
-  trace $CLI bundle destroy --auto-approve
+  destroy-bundle
 }
 trap cleanup EXIT
 

diff --git a/acceptance/bundle/config-remote-sync/flushed_cache/script b/acceptance/bundle/config-remote-sync/flushed_cache/script
@@ -3,7 +3,7 @@
 envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
-  trace $CLI bundle destroy --auto-approve
+  destroy-bundle
 }
 trap cleanup EXIT
 

diff --git a/acceptance/bundle/config-remote-sync/formatting_preserved/script b/acceptance/bundle/config-remote-sync/formatting_preserved/script
@@ -3,7 +3,7 @@
 envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
-  trace $CLI bundle destroy --auto-approve
+  destroy-bundle
 }
 trap cleanup EXIT
 

diff --git a/acceptance/bundle/config-remote-sync/job_fields/script b/acceptance/bundle/config-remote-sync/job_fields/script
@@ -5,7 +5,7 @@ add_repl "$DEFAULT_SPARK_VERSION" DEFAULT_SPARK_VERSION
 add_repl "$NODE_TYPE_ID" NODE_TYPE_ID
 
 cleanup() {
-  trace $CLI bundle destroy --auto-approve
+  destroy-bundle
   # destroy records requests too; drop the recorded file so it is not compared.
   rm -f out.requests.txt
 }

diff --git a/acceptance/bundle/config-remote-sync/job_multiple_tasks/script b/acceptance/bundle/config-remote-sync/job_multiple_tasks/script
@@ -3,7 +3,7 @@
 envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
-  trace $CLI bundle destroy --auto-approve
+  destroy-bundle
 }
 trap cleanup EXIT
 

diff --git a/acceptance/bundle/config-remote-sync/job_params_variables/script b/acceptance/bundle/config-remote-sync/job_params_variables/script
@@ -3,7 +3,7 @@
 envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
-  trace $CLI bundle destroy --auto-approve
+  destroy-bundle
 }
 trap cleanup EXIT
 

diff --git a/acceptance/bundle/config-remote-sync/job_pipeline_task/script b/acceptance/bundle/config-remote-sync/job_pipeline_task/script
@@ -3,7 +3,7 @@
 envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
-  trace $CLI bundle destroy --auto-approve
+  destroy-bundle
 }
 trap cleanup EXIT
 

diff --git a/acceptance/bundle/config-remote-sync/multiple_files/script b/acceptance/bundle/config-remote-sync/multiple_files/script
@@ -5,7 +5,7 @@ envsubst < resources/job1.yml.tmpl > resources/job1.yml
 envsubst < resources/job2.yml.tmpl > resources/job2.yml
 
 cleanup() {
-  trace $CLI bundle destroy --auto-approve
+  destroy-bundle
 }
 trap cleanup EXIT
 

diff --git a/acceptance/bundle/config-remote-sync/multiple_resources/script b/acceptance/bundle/config-remote-sync/multiple_resources/script
@@ -6,7 +6,7 @@ cleanup() {
   # Restore original config before destroy to avoid Terraform errors
   # from server-side-only fields (e.g. creator_name) written by config-remote-sync.
   envsubst < databricks.yml.tmpl > databricks.yml
-  trace $CLI bundle destroy --auto-approve
+  destroy-bundle
 }
 trap cleanup EXIT
 

diff --git a/acceptance/bundle/config-remote-sync/output_json/script b/acceptance/bundle/config-remote-sync/output_json/script
@@ -3,7 +3,7 @@
 envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
-  trace $CLI bundle destroy --auto-approve
+  destroy-bundle
 }
 trap cleanup EXIT
 

diff --git a/acceptance/bundle/config-remote-sync/output_no_changes/script b/acceptance/bundle/config-remote-sync/output_no_changes/script
@@ -3,7 +3,7 @@
 envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
-  trace $CLI bundle destroy --auto-approve
+  destroy-bundle
 }
 trap cleanup EXIT
 

diff --git a/acceptance/bundle/config-remote-sync/pipeline_fields/script b/acceptance/bundle/config-remote-sync/pipeline_fields/script
@@ -3,7 +3,7 @@
 envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
-  trace $CLI bundle destroy --auto-approve
+  destroy-bundle
 }
 trap cleanup EXIT
 

diff --git a/acceptance/bundle/config-remote-sync/policy_injected_cluster_fields/script b/acceptance/bundle/config-remote-sync/policy_injected_cluster_fields/script
@@ -3,7 +3,7 @@
 envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
-  trace $CLI bundle destroy --auto-approve
+  destroy-bundle
 }
 trap cleanup EXIT
 

diff --git a/acceptance/bundle/config-remote-sync/resolve_variables/script b/acceptance/bundle/config-remote-sync/resolve_variables/script
@@ -3,7 +3,7 @@
 envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
-  trace $CLI bundle destroy --auto-approve
+  destroy-bundle
   # destroy records requests too; drop the recorded file so it is not compared.
   rm -f out.requests.txt
 }

diff --git a/acceptance/bundle/config-remote-sync/select_basic/script b/acceptance/bundle/config-remote-sync/select_basic/script
@@ -3,7 +3,7 @@
 envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
-  trace $CLI bundle destroy --auto-approve
+  destroy-bundle
 }
 trap cleanup EXIT
 

diff --git a/acceptance/bundle/config-remote-sync/select_multiple/script b/acceptance/bundle/config-remote-sync/select_multiple/script
@@ -3,7 +3,7 @@
 envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
-  trace $CLI bundle destroy --auto-approve
+  destroy-bundle
 }
 trap cleanup EXIT
 

diff --git a/acceptance/bundle/config-remote-sync/skip_permissions/script b/acceptance/bundle/config-remote-sync/skip_permissions/script
@@ -3,7 +3,7 @@
 envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
-  trace $CLI bundle destroy --auto-approve
+  destroy-bundle
 }
 trap cleanup EXIT
 

diff --git a/acceptance/bundle/config-remote-sync/split/isolation/script b/acceptance/bundle/config-remote-sync/split/isolation/script
@@ -3,7 +3,7 @@
 envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
-  trace $CLI bundle destroy --auto-approve -t dev
+  destroy-bundle -t dev
 }
 trap cleanup EXIT
 

diff --git a/acceptance/bundle/config-remote-sync/split/keyed_edit/script b/acceptance/bundle/config-remote-sync/split/keyed_edit/script
@@ -3,7 +3,7 @@
 envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
-  trace $CLI bundle destroy --auto-approve -t dev
+  destroy-bundle -t dev
 }
 trap cleanup EXIT
 

diff --git a/acceptance/bundle/config-remote-sync/split/keyed_remove/script b/acceptance/bundle/config-remote-sync/split/keyed_remove/script
@@ -3,7 +3,7 @@
 envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
-  trace $CLI bundle destroy --auto-approve -t dev
+  destroy-bundle -t dev
 }
 trap cleanup EXIT
 

diff --git a/acceptance/bundle/config-remote-sync/split/keyed_rename/script b/acceptance/bundle/config-remote-sync/split/keyed_rename/script
@@ -3,7 +3,7 @@
 envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
-  trace $CLI bundle destroy --auto-approve -t dev
+  destroy-bundle -t dev
 }
 trap cleanup EXIT
 

diff --git a/acceptance/bundle/config-remote-sync/split/keyed_twoblock/script b/acceptance/bundle/config-remote-sync/split/keyed_twoblock/script
@@ -3,7 +3,7 @@
 envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
-  trace $CLI bundle destroy --auto-approve -t dev
+  destroy-bundle -t dev
 }
 trap cleanup EXIT
 

diff --git a/acceptance/bundle/config-remote-sync/split/multifile/script b/acceptance/bundle/config-remote-sync/split/multifile/script
@@ -5,7 +5,7 @@ envsubst < overrides/10-first.yml.tmpl > overrides/10-first.yml
 envsubst < overrides/20-second.yml.tmpl > overrides/20-second.yml
 
 cleanup() {
-  trace $CLI bundle destroy --auto-approve -t dev
+  destroy-bundle -t dev
 }
 trap cleanup EXIT
 

diff --git a/acceptance/bundle/config-remote-sync/split/nested_sequence/script b/acceptance/bundle/config-remote-sync/split/nested_sequence/script
@@ -3,7 +3,7 @@
 envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
-  trace $CLI bundle destroy --auto-approve -t dev
+  destroy-bundle -t dev
 }
 trap cleanup EXIT
 

diff --git a/acceptance/bundle/config-remote-sync/split/positional/script b/acceptance/bundle/config-remote-sync/split/positional/script
@@ -3,7 +3,7 @@
 envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
-  trace $CLI bundle destroy --auto-approve -t dev
+  destroy-bundle -t dev
 }
 trap cleanup EXIT
 

diff --git a/acceptance/bundle/config-remote-sync/split/target_variable/script b/acceptance/bundle/config-remote-sync/split/target_variable/script
@@ -3,7 +3,7 @@
 envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
-  trace $CLI bundle destroy --auto-approve -t dev
+  destroy-bundle -t dev
 }
 trap cleanup EXIT
 

diff --git a/acceptance/bundle/config-remote-sync/target_override/script b/acceptance/bundle/config-remote-sync/target_override/script
@@ -3,7 +3,7 @@
 envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
-  trace $CLI bundle destroy --auto-approve -t dev
+  destroy-bundle -t dev
 }
 trap cleanup EXIT
 

diff --git a/acceptance/bundle/config-remote-sync/task_rename_revert/script b/acceptance/bundle/config-remote-sync/task_rename_revert/script
@@ -3,7 +3,7 @@
 envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
-  trace $CLI bundle destroy --auto-approve
+  destroy-bundle
 }
 trap cleanup EXIT
 

diff --git a/acceptance/bundle/config-remote-sync/validation_errors/script b/acceptance/bundle/config-remote-sync/validation_errors/script
@@ -8,7 +8,7 @@ cleanup() {
   # Restore valid paths for destroy to work (includes pipeline_root_v2 from sync)
   mkdir -p pipeline_root pipeline_root_v2 src
   echo '# Databricks notebook source' > src/notebook.py
-  trace $CLI bundle destroy --auto-approve
+  destroy-bundle
 }
 trap cleanup EXIT
 

diff --git a/acceptance/bundle/deploy/empty-bundle/script b/acceptance/bundle/deploy/empty-bundle/script
@@ -1,6 +1,6 @@
 envsubst < databricks.yml.tmpl > databricks.yml
 cleanup() {
-    trace $CLI bundle destroy --auto-approve
+    destroy-bundle
 }
 trap cleanup EXIT
 

diff --git a/acceptance/bundle/deploy/files/no-snapshot-sync/script b/acceptance/bundle/deploy/files/no-snapshot-sync/script
@@ -1,7 +1,7 @@
 envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
-    trace $CLI bundle destroy --auto-approve
+    destroy-bundle
 }
 trap cleanup EXIT
 

diff --git a/acceptance/bundle/deploy/immutable-no-artifacts/script b/acceptance/bundle/deploy/immutable-no-artifacts/script
@@ -15,4 +15,4 @@ trace $CLI jobs get $JOB_ID | jq '.settings.tasks' | jq '.[] | select(.spark_pyt
 trace $CLI jobs get $JOB_ID | jq '.settings.tasks' | jq '.[] | select(.notebook_task != null) | .notebook_task.notebook_path'
 trace $CLI jobs get $JOB_ID | jq '.settings.tasks' | jq '.[] | select(.notebook_task != null) | .notebook_task.base_parameters.path'
 
-trace $CLI bundle destroy --auto-approve
+destroy-bundle
diff --git a/acceptance/bundle/deploy/immutable-permissions-change/script b/acceptance/bundle/deploy/immutable-permissions-change/script
@@ -1,7 +1,7 @@
 envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
-    trace $CLI bundle destroy --auto-approve
+    destroy-bundle
 }
 trap cleanup EXIT
 

diff --git a/acceptance/bundle/deploy/immutable/script b/acceptance/bundle/deploy/immutable/script
@@ -1,6 +1,6 @@
 envsubst < databricks.yml.tmpl > databricks.yml
 cleanup() {
-    trace $CLI bundle destroy --auto-approve
+    destroy-bundle
 }
 trap cleanup EXIT
 

diff --git a/acceptance/bundle/deploy/partial-summary-on-push-fail/script b/acceptance/bundle/deploy/partial-summary-on-push-fail/script
@@ -2,7 +2,7 @@ cleanup() {
     # Second deploy has no fault, so it succeeds and prints both summary lines; this
     # both cleans up and shows the contrast with the failed deploy above.
     trace $CLI bundle deploy
-    trace $CLI bundle destroy --auto-approve
+    destroy-bundle
 }
 trap cleanup EXIT
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,4 +3,4 @@

		trace $CLI apps deploy --skip-validation --auto-approve --force-lock --fail-on-active-runs

		trace $CLI bundle destroy --auto-approve
		destroy-bundle
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,4 +4,4 @@

		trace $CLI apps deploy --skip-validation

		trace $CLI bundle destroy --auto-approve
		destroy-bundle