acceptance: make generate/*_and_deploy bundle names unique (#5446)

pietern · web-flow · commit 15cdda5a42ae · 2026-06-04T15:07:26.000Z
## Changes
Append `-$UNIQUE_NAME` to the bundle name in
`generate/pipeline_and_deploy` and `python_job_and_deploy` (via
`databricks.yml.tmpl` + `envsubst`).

## Why
The static bundle name made all parallel cloud variants deploy to the
same path, causing deploy-lock contention where all but one variant
failed.

## Tests
Regenerated outputs; both tests pass across all engine variants.
diff --git a/acceptance/bundle/generate/pipeline_and_deploy/databricks.yml b/acceptance/bundle/generate/pipeline_and_deploy/databricks.yml
diff --git a/acceptance/bundle/generate/pipeline_and_deploy/databricks.yml.tmpl b/acceptance/bundle/generate/pipeline_and_deploy/databricks.yml.tmpl
@@ -0,0 +1,2 @@
+bundle:
+  name: pipeline_and_deploy-$UNIQUE_NAME
diff --git a/acceptance/bundle/generate/pipeline_and_deploy/output.txt b/acceptance/bundle/generate/pipeline_and_deploy/output.txt
@@ -13,13 +13,13 @@ Pipeline configuration successfully saved to resources/out.pipeline.yml
 === Verify generated yaml has expected fields
 === Deploy the generated bundle
 >>> [CLI] bundle deploy
-Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/pipeline_and_deploy/default/files...
+Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/pipeline_and_deploy-[UNIQUE_NAME]/default/files...
 Deploying resources...
 Deployment complete!
 
 === Destroy the deployed bundle
 >>> [CLI] bundle destroy --auto-approve
-All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/pipeline_and_deploy/default
+All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/pipeline_and_deploy-[UNIQUE_NAME]/default
 
 Deleting files...
 Destroy complete!
diff --git a/acceptance/bundle/generate/pipeline_and_deploy/script b/acceptance/bundle/generate/pipeline_and_deploy/script
@@ -1,3 +1,5 @@
+envsubst < databricks.yml.tmpl > databricks.yml
+
 title "Upload files to workspace"
 trace $CLI workspace import "/Workspace/Users/${CURRENT_USER_NAME}/notebook.py" --file notebook.py --format AUTO --overwrite
 trace $CLI workspace import "/Workspace/Users/${CURRENT_USER_NAME}/test.py" --file test.py --format AUTO --overwrite
diff --git a/acceptance/bundle/generate/python_job_and_deploy/databricks.yml b/acceptance/bundle/generate/python_job_and_deploy/databricks.yml
diff --git a/acceptance/bundle/generate/python_job_and_deploy/databricks.yml.tmpl b/acceptance/bundle/generate/python_job_and_deploy/databricks.yml.tmpl
@@ -0,0 +1,2 @@
+bundle:
+  name: python_job_and_deploy-$UNIQUE_NAME
diff --git a/acceptance/bundle/generate/python_job_and_deploy/output.txt b/acceptance/bundle/generate/python_job_and_deploy/output.txt
@@ -12,13 +12,13 @@ Job configuration successfully saved to resources/out.job.yml
 === Verify generated yaml has expected fields
 === Deploy the generated bundle
 >>> [CLI] bundle deploy
-Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/python_job_and_deploy/default/files...
+Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/python_job_and_deploy-[UNIQUE_NAME]/default/files...
 Deploying resources...
 Deployment complete!
 
 === Destroy the deployed bundle
 >>> [CLI] bundle destroy --auto-approve
-All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/python_job_and_deploy/default
+All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/python_job_and_deploy-[UNIQUE_NAME]/default
 
 Deleting files...
 Destroy complete!
diff --git a/acceptance/bundle/generate/python_job_and_deploy/script b/acceptance/bundle/generate/python_job_and_deploy/script
@@ -1,3 +1,5 @@
+envsubst < databricks.yml.tmpl > databricks.yml
+
 title "Upload notebook to a workspace path"
 trace $CLI workspace import "/Workspace/Users/${CURRENT_USER_NAME}/test_notebook.py" --file test_notebook.py --format AUTO --overwrite
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+bundle:`
	`2`	`+ name: pipeline_and_deploy-$UNIQUE_NAME`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+envsubst < databricks.yml.tmpl > databricks.yml`
	`2`	`+`
`1`	`3`	`title "Upload files to workspace"`
`2`	`4`	`trace $CLI workspace import "/Workspace/Users/${CURRENT_USER_NAME}/notebook.py" --file notebook.py --format AUTO --overwrite`
`3`	`5`	`trace $CLI workspace import "/Workspace/Users/${CURRENT_USER_NAME}/test.py" --file test.py --format AUTO --overwrite`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+bundle:`
	`2`	`+ name: python_job_and_deploy-$UNIQUE_NAME`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+envsubst < databricks.yml.tmpl > databricks.yml`
	`2`	`+`
`1`	`3`	`title "Upload notebook to a workspace path"`
`2`	`4`	`trace $CLI workspace import "/Workspace/Users/${CURRENT_USER_NAME}/test_notebook.py" --file test_notebook.py --format AUTO --overwrite`
`3`	`5`