Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions acceptance/bundle/integration_whl/base/output.txt
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Updating deployment state...
Deployment complete!

>>> [CLI] bundle run some_other_job
Run URL: [DATABRICKS_URL]/?o=[NUMID]#job/[NUMID]/run/[NUMID]
Run URL: [DATABRICKS_URL]/?o=[NUMID]#job/[JOB_ID]/run/[NUMID]

[TIMESTAMP] "[default] Test Wheel Job [UNIQUE_NAME]" RUNNING
[TIMESTAMP] "[default] Test Wheel Job [UNIQUE_NAME]" TERMINATED SUCCESS
Expand All @@ -57,7 +57,7 @@ Updating deployment state...
Deployment complete!

>>> [CLI] bundle run some_other_job
Run URL: [DATABRICKS_URL]/?o=[NUMID]#job/[NUMID]/run/[NUMID]
Run URL: [DATABRICKS_URL]/?o=[NUMID]#job/[JOB_ID]/run/[NUMID]

[TIMESTAMP] "[default] Test Wheel Job [UNIQUE_NAME]" RUNNING
[TIMESTAMP] "[default] Test Wheel Job [UNIQUE_NAME]" TERMINATED SUCCESS
Expand Down
5 changes: 5 additions & 0 deletions acceptance/bundle/integration_whl/base/script
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@ envsubst < databricks.yml.tmpl > databricks.yml
trace cat databricks.yml
trap "errcode trace '$CLI' bundle destroy --auto-approve" EXIT
trace $CLI bundle deploy

# Capture job ID and add to runtime replacements to avoid pattern matching ambiguity
job_id=$(read_id.py jobs some_other_job)
echo "$job_id:JOB_ID" >> ACC_REPLS

trace $CLI bundle run some_other_job

title "Make a change to code without version change and run the job again"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Updating deployment state...
Deployment complete!

>>> [CLI] bundle run some_other_job --python-params param1,param2
Run URL: [DATABRICKS_URL]/?o=[NUMID]#job/[NUMID]/run/[NUMID]
Run URL: [DATABRICKS_URL]/?o=[NUMID]#job/[JOB_ID]/run/[NUMID]

[TIMESTAMP] "[default] Test Wheel Job [UNIQUE_NAME]" RUNNING
[TIMESTAMP] "[default] Test Wheel Job [UNIQUE_NAME]" TERMINATED SUCCESS
Expand Down
5 changes: 5 additions & 0 deletions acceptance/bundle/integration_whl/custom_params/script
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,9 @@ cp -r $TESTDIR/../base/{$EXTRA_CONFIG,setup.py,my_test_code} .
trace cat databricks.yml
trap "errcode trace '$CLI' bundle destroy --auto-approve" EXIT
trace $CLI bundle deploy

# Capture job ID and add to runtime replacements to avoid pattern matching ambiguity
job_id=$(read_id.py jobs some_other_job)
echo "$job_id:JOB_ID" >> ACC_REPLS

trace $CLI bundle run some_other_job --python-params param1,param2
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Updating deployment state...
Deployment complete!

>>> [CLI] bundle run some_other_job
Run URL: [DATABRICKS_URL]/?o=[NUMID]#job/[NUMID]/run/[NUMID]
Run URL: [DATABRICKS_URL]/?o=[NUMID]#job/[JOB_ID]/run/[NUMID]

[TIMESTAMP] "[default] Test Wheel Job [UNIQUE_NAME]" RUNNING
[TIMESTAMP] "[default] Test Wheel Job [UNIQUE_NAME]" TERMINATED SUCCESS
Expand All @@ -57,7 +57,7 @@ Updating deployment state...
Deployment complete!

>>> [CLI] bundle run some_other_job
Run URL: [DATABRICKS_URL]/?o=[NUMID]#job/[NUMID]/run/[NUMID]
Run URL: [DATABRICKS_URL]/?o=[NUMID]#job/[JOB_ID]/run/[NUMID]

[TIMESTAMP] "[default] Test Wheel Job [UNIQUE_NAME]" RUNNING
[TIMESTAMP] "[default] Test Wheel Job [UNIQUE_NAME]" TERMINATED SUCCESS
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@ envsubst < databricks.yml.tmpl > databricks.yml
trace cat databricks.yml
trap "errcode trace '$CLI' bundle destroy --auto-approve" EXIT
trace $CLI bundle deploy

# Capture job ID and add to runtime replacements to avoid pattern matching ambiguity
job_id=$(read_id.py jobs some_other_job)
echo "$job_id:JOB_ID" >> ACC_REPLS

trace $CLI bundle run some_other_job

title "Make a change to code without version change and run the job again"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Updating deployment state...
Deployment complete!

>>> [CLI] bundle run some_other_job
Run URL: [DATABRICKS_URL]/?o=[NUMID]#job/[NUMID]/run/[NUMID]
Run URL: [DATABRICKS_URL]/?o=[NUMID]#job/[JOB_ID]/run/[NUMID]

[TIMESTAMP] "[default] Test Wheel Job [UNIQUE_NAME]" RUNNING
[TIMESTAMP] "[default] Test Wheel Job [UNIQUE_NAME]" TERMINATED SUCCESS
Expand All @@ -26,7 +26,7 @@ Updating deployment state...
Deployment complete!

>>> [CLI] bundle run some_other_job
Run URL: [DATABRICKS_URL]/?o=[NUMID]#job/[NUMID]/run/[NUMID]
Run URL: [DATABRICKS_URL]/?o=[NUMID]#job/[JOB_ID]/run/[NUMID]

[TIMESTAMP] "[default] Test Wheel Job [UNIQUE_NAME]" RUNNING
[TIMESTAMP] "[default] Test Wheel Job [UNIQUE_NAME]" TERMINATED SUCCESS
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@ envsubst < databricks.yml.tmpl > databricks.yml
cp -r $TESTDIR/../interactive_cluster/{setup.py,my_test_code} .
trap "errcode trace '$CLI' bundle destroy --auto-approve" EXIT
trace $CLI bundle deploy

# Capture job ID and add to runtime replacements to avoid pattern matching ambiguity
job_id=$(read_id.py jobs some_other_job)
echo "$job_id:JOB_ID" >> ACC_REPLS

trace $CLI bundle run some_other_job

title "Make a change to code without version change and run the job again"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Updating deployment state...
Deployment complete!

>>> [CLI] bundle run some_other_job
Run URL: [DATABRICKS_URL]/?o=[NUMID]#job/[NUMID]/run/[NUMID]
Run URL: [DATABRICKS_URL]/?o=[NUMID]#job/[JOB_ID]/run/[NUMID]

[TIMESTAMP] "[default] Test Wheel Job [UNIQUE_NAME]" RUNNING
[TIMESTAMP] "[default] Test Wheel Job [UNIQUE_NAME]" TERMINATED SUCCESS
Expand All @@ -54,7 +54,7 @@ Updating deployment state...
Deployment complete!

>>> [CLI] bundle run some_other_job
Run URL: [DATABRICKS_URL]/?o=[NUMID]#job/[NUMID]/run/[NUMID]
Run URL: [DATABRICKS_URL]/?o=[NUMID]#job/[JOB_ID]/run/[NUMID]

[TIMESTAMP] "[default] Test Wheel Job [UNIQUE_NAME]" RUNNING
[TIMESTAMP] "[default] Test Wheel Job [UNIQUE_NAME]" TERMINATED SUCCESS
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ trace cat databricks.yml
cp -r $TESTDIR/../interactive_cluster/{setup.py,my_test_code} .
trap "errcode trace '$CLI' bundle destroy --auto-approve" EXIT
trace $CLI bundle deploy

# Capture job ID and add to runtime replacements to avoid pattern matching ambiguity
job_id=$(read_id.py jobs some_other_job)
echo "$job_id:JOB_ID" >> ACC_REPLS

trace $CLI bundle run some_other_job > out.$DATABRICKS_BUNDLE_ENGINE.txt

title "Make a change to code without version change and run the job again"
Expand Down
4 changes: 2 additions & 2 deletions acceptance/bundle/integration_whl/serverless/output.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Updating deployment state...
Deployment complete!

>>> [CLI] bundle run some_other_job
Run URL: [DATABRICKS_URL]/?o=[NUMID]#job/[NUMID]/run/[NUMID]
Run URL: [DATABRICKS_URL]/?o=[NUMID]#job/[JOB_ID]/run/[NUMID]

[TIMESTAMP] "My Wheel Job" RUNNING
[TIMESTAMP] "My Wheel Job" TERMINATED SUCCESS
Expand All @@ -28,7 +28,7 @@ Updating deployment state...
Deployment complete!

>>> [CLI] bundle run some_other_job
Run URL: [DATABRICKS_URL]/?o=[NUMID]#job/[NUMID]/run/[NUMID]
Run URL: [DATABRICKS_URL]/?o=[NUMID]#job/[JOB_ID]/run/[NUMID]

[TIMESTAMP] "My Wheel Job" RUNNING
[TIMESTAMP] "My Wheel Job" TERMINATED SUCCESS
Expand Down
5 changes: 5 additions & 0 deletions acceptance/bundle/integration_whl/serverless/script
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@ envsubst < databricks.yml.tmpl > databricks.yml
trace cp -r $TESTDIR/../base/{setup.py,my_test_code} .
trap "errcode trace '$CLI' bundle destroy --auto-approve" EXIT
trace $CLI bundle deploy

# Capture job ID and add to runtime replacements to avoid pattern matching ambiguity
job_id=$(read_id.py jobs some_other_job)
echo "$job_id:JOB_ID" >> ACC_REPLS

trace $CLI bundle run some_other_job

title "Make a change to code without version change and run the job again"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Updating deployment state...
Deployment complete!

>>> [CLI] bundle run some_other_job
Run URL: [DATABRICKS_URL]/?o=[NUMID]#job/[NUMID]/run/[NUMID]
Run URL: [DATABRICKS_URL]/?o=[NUMID]#job/[JOB_ID]/run/[NUMID]

[TIMESTAMP] "[default] Test Wheel Job With Environments [UNIQUE_NAME]" RUNNING
[TIMESTAMP] "[default] Test Wheel Job With Environments [UNIQUE_NAME]" TERMINATED SUCCESS
Expand All @@ -17,7 +17,7 @@ Got arguments:
['my_test_code', 'one', 'two']

>>> [CLI] bundle run some_other_job --python-params=param1,param2
Run URL: [DATABRICKS_URL]/?o=[NUMID]#job/[NUMID]/run/[NUMID]
Run URL: [DATABRICKS_URL]/?o=[NUMID]#job/[JOB_ID]/run/[NUMID]

[TIMESTAMP] "[default] Test Wheel Job With Environments [UNIQUE_NAME]" RUNNING
[TIMESTAMP] "[default] Test Wheel Job With Environments [UNIQUE_NAME]" TERMINATED SUCCESS
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,9 @@ trap cleanup EXIT

trace $CLI bundle deploy

# Capture job ID and add to runtime replacements to avoid pattern matching ambiguity
job_id=$(read_id.py jobs some_other_job)
echo "$job_id:JOB_ID" >> ACC_REPLS

trace $CLI bundle run some_other_job
trace $CLI bundle run some_other_job --python-params=param1,param2
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Updating deployment state...
Deployment complete!

>>> [CLI] bundle run some_other_job
Run URL: [DATABRICKS_URL]/?o=[NUMID]#job/[NUMID]/run/[NUMID]
Run URL: [DATABRICKS_URL]/?o=[NUMID]#job/[JOB_ID]/run/[NUMID]

[TIMESTAMP] "My Wheel Job" RUNNING
[TIMESTAMP] "My Wheel Job" TERMINATED SUCCESS
Expand All @@ -28,7 +28,7 @@ Updating deployment state...
Deployment complete!

>>> [CLI] bundle run some_other_job
Run URL: [DATABRICKS_URL]/?o=[NUMID]#job/[NUMID]/run/[NUMID]
Run URL: [DATABRICKS_URL]/?o=[NUMID]#job/[JOB_ID]/run/[NUMID]

[TIMESTAMP] "My Wheel Job" RUNNING
[TIMESTAMP] "My Wheel Job" TERMINATED SUCCESS
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@ envsubst < databricks.yml.tmpl > databricks.yml
trace cp -r $TESTDIR/../base/{setup.py,my_test_code} .
trap "errcode trace '$CLI' bundle destroy --auto-approve" EXIT
trace $CLI bundle deploy

# Capture job ID and add to runtime replacements to avoid pattern matching ambiguity
job_id=$(read_id.py jobs some_other_job)
echo "$job_id:JOB_ID" >> ACC_REPLS

trace $CLI bundle run some_other_job

title "Make a change to code without version change and run the job again"
Expand Down
2 changes: 1 addition & 1 deletion acceptance/bundle/integration_whl/wrapper/output.txt
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Updating deployment state...
Deployment complete!

>>> [CLI] bundle run some_other_job
Run URL: [DATABRICKS_URL]/?o=[NUMID]#job/[NUMID]/run/[NUMID]
Run URL: [DATABRICKS_URL]/?o=[NUMID]#job/[JOB_ID]/run/[NUMID]

[TIMESTAMP] "[default] Test Wheel Job [UNIQUE_NAME]" RUNNING
[TIMESTAMP] "[default] Test Wheel Job [UNIQUE_NAME]" TERMINATED SUCCESS
Expand Down
5 changes: 5 additions & 0 deletions acceptance/bundle/integration_whl/wrapper/script
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,9 @@ cp -r $TESTDIR/../base/{$EXTRA_CONFIG,setup.py,my_test_code} .
trace cat databricks.yml
trap "errcode trace '$CLI' bundle destroy --auto-approve" EXIT
trace $CLI bundle deploy

# Capture job ID and add to runtime replacements to avoid pattern matching ambiguity
job_id=$(read_id.py jobs some_other_job)
echo "$job_id:JOB_ID" >> ACC_REPLS

trace $CLI bundle run some_other_job
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Updating deployment state...
Deployment complete!

>>> [CLI] bundle run foo
Run URL: [DATABRICKS_URL]/?o=[NUMID]#job/[NUMID]/run/[NUMID]
Run URL: [DATABRICKS_URL]/?o=[NUMID]#job/[JOB_ID]/run/[NUMID]

[TIMESTAMP] "test-job-with-cluster-[UNIQUE_NAME]" RUNNING
[TIMESTAMP] "test-job-with-cluster-[UNIQUE_NAME]" TERMINATED SUCCESS
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,9 @@ cleanup() {
trap cleanup EXIT

trace $CLI bundle deploy

# Capture job ID and add to runtime replacements to avoid pattern matching ambiguity
job_id=$(read_id.py jobs foo)
echo "$job_id:JOB_ID" >> ACC_REPLS

trace $CLI bundle run foo