From 45af624b1ab4596878db5bf320e5f574e81c8724 Mon Sep 17 00:00:00 2001 From: Pieter Noordhuis Date: Wed, 18 Mar 2026 00:04:57 +0100 Subject: [PATCH] acc: parameterize bundle name in job_permissions test to avoid stale deploy locks Use $UNIQUE_NAME for the bundle name so each test run gets a unique workspace root path, preventing lock conflicts from concurrent or repeated runs. Co-authored-by: Isaac --- .../{databricks.yml => databricks.yml.tmpl} | 2 +- acceptance/bundle/apps/job_permissions/output.txt | 8 ++++---- acceptance/bundle/apps/job_permissions/script | 1 + 3 files changed, 6 insertions(+), 5 deletions(-) rename acceptance/bundle/apps/job_permissions/{databricks.yml => databricks.yml.tmpl} (96%) diff --git a/acceptance/bundle/apps/job_permissions/databricks.yml b/acceptance/bundle/apps/job_permissions/databricks.yml.tmpl similarity index 96% rename from acceptance/bundle/apps/job_permissions/databricks.yml rename to acceptance/bundle/apps/job_permissions/databricks.yml.tmpl index b16634f86e..690570d672 100644 --- a/acceptance/bundle/apps/job_permissions/databricks.yml +++ b/acceptance/bundle/apps/job_permissions/databricks.yml.tmpl @@ -1,5 +1,5 @@ bundle: - name: test-bundle + name: $UNIQUE_NAME permissions: - level: CAN_MANAGE diff --git a/acceptance/bundle/apps/job_permissions/output.txt b/acceptance/bundle/apps/job_permissions/output.txt index 2c0dea08e1..14aa7b12c2 100644 --- a/acceptance/bundle/apps/job_permissions/output.txt +++ b/acceptance/bundle/apps/job_permissions/output.txt @@ -1,6 +1,6 @@ >>> [CLI] bundle deploy -Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... +Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/default/files... Deploying resources... Updating deployment state... Deployment complete! @@ -10,7 +10,7 @@ Deployment complete! === After second deploy >>> [CLI] bundle deploy -Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... +Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/default/files... Deploying resources... Updating deployment state... Deployment complete! @@ -20,7 +20,7 @@ false === Apply fix and redeploy >>> [CLI] bundle deploy -Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... +Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/default/files... Deploying resources... Updating deployment state... Deployment complete! @@ -33,7 +33,7 @@ The following resources will be deleted: delete resources.apps.my_app delete resources.jobs.my_job -All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default +All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/default Deleting files... Destroy complete! diff --git a/acceptance/bundle/apps/job_permissions/script b/acceptance/bundle/apps/job_permissions/script index 3e39d4c0d0..df8a6b9e39 100644 --- a/acceptance/bundle/apps/job_permissions/script +++ b/acceptance/bundle/apps/job_permissions/script @@ -2,6 +2,7 @@ # Test that app-granted permissions on a job survive a second deploy. # Issue: https://github.com/databricks/cli/issues/4309 +envsubst < databricks.yml.tmpl > databricks.yml trace $CLI bundle deploy job_id=$(read_id.py my_job)