Skip to content
Draft
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
8 changes: 8 additions & 0 deletions acceptance/acceptance_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,10 @@ const (
// The tests the don't set SERVERLESS variable or set to empty string will also be run.
EnvFilterVar = "ENVFILTER"

// Set to "true" by test environments that cannot create classic compute, so
// tests marked RequiresClassic are skipped there.
EnvNoClassic = "DATABRICKS_TEST_NO_CLASSIC"

// File where scripts can output custom replacements
// export $job_id=100200300
// $ echo "$job_id:MY_JOB" >> ACC_REPLS # This will replace 100200300 with [MY_JOB] in the output
Expand Down Expand Up @@ -721,6 +725,10 @@ func getSkipReason(config *internal.TestConfig, configPath, dir, skipLocalMode s
return fmt.Sprintf("Disabled via RequiresCluster setting in %s (TEST_DEFAULT_CLUSTER_ID is empty)", configPath)
}

if isTruePtr(config.RequiresClassic) && os.Getenv(EnvNoClassic) == "true" {
return fmt.Sprintf("Disabled via RequiresClassic setting in %s (%s=true)", configPath, EnvNoClassic)
}

} else {
// Local run
if !isTruePtr(config.Local) {
Expand Down
2 changes: 2 additions & 0 deletions acceptance/bundle/apps/job_permissions/test.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
Cloud = true
RequiresUnityCatalog = true
RecordRequests = false
# Deploys a job with a spark_python_task, which runs on a cluster.
RequiresClassic = true

[EnvMatrix]
DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
4 changes: 4 additions & 0 deletions acceptance/bundle/config-remote-sync/dashboard_etag/test.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
Cloud = true
RequiresWarehouse = true

# Unlike its siblings this test syncs a dashboard, not a job cluster, so it runs
# in serverless-only environments.
RequiresClassic = false

RecordRequests = false

Ignore = [".databricks", "databricks.yml", "databricks.yml.backup"]
Expand Down
5 changes: 5 additions & 0 deletions acceptance/bundle/config-remote-sync/test.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# These tests sync job config that defines a job cluster, so they need an
# environment where classic compute can be created. dashboard_etag overrides
# this back to false: it syncs a dashboard bound to a SQL warehouse.
RequiresClassic = true

# Disable Windows tests for config-remote-sync tests
[GOOS]
windows = false
2 changes: 2 additions & 0 deletions acceptance/bundle/deploy/files/no-snapshot-sync/test.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
Local = true
Cloud = true
# Deploys a job with a job cluster (new_cluster)
RequiresClassic = true

Ignore = [
"databricks.yml",
Expand Down
1 change: 1 addition & 0 deletions acceptance/bundle/deploy/mlops-stacks/test.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
Cloud=true
Local=true
RequiresClassic = true

# The MLOps Stacks template registers the model in Unity Catalog and runs its
# jobs on serverless compute, so this test only works on a UC-enabled workspace
Expand Down
2 changes: 2 additions & 0 deletions acceptance/bundle/deploy/snapshot-comparison/test.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
Cloud = true
# Deploys a pipeline and job; pipelines run on classic compute
RequiresClassic = true

RecordRequests = true

Expand Down
2 changes: 2 additions & 0 deletions acceptance/bundle/deploy/spark-jar-task/test.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
Local = true
Cloud = true
# Deploys a job with a job cluster and spark_jar_task
RequiresClassic = true
EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]

Ignore = [
Expand Down
2 changes: 2 additions & 0 deletions acceptance/bundle/deployment/bind/cluster/test.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
Local = true
Cloud = true
RequiresCluster = true
# Tests bind an all-purpose cluster to a bundle
RequiresClassic = true
2 changes: 2 additions & 0 deletions acceptance/bundle/deployment/bind/job/test.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Cloud tests deploy job clusters (classic compute resources)
RequiresClassic = true
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
Cloud = true
# Tests bind a pipeline to a bundle; pipelines run on classic compute
RequiresClassic = true
RecordRequests = true
Ignore = [".databricks", "pipeline.json"]
2 changes: 2 additions & 0 deletions acceptance/bundle/destroy/jobs-and-pipeline/test.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
Local = true
Cloud = true
# Destroys jobs with job clusters and a pipeline
RequiresClassic = true

Ignore = [
"databricks.yml",
Expand Down
2 changes: 2 additions & 0 deletions acceptance/bundle/generate/auto-bind/test.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
Local = true
Cloud = true
# Generates and binds a job with a job cluster
RequiresClassic = true

Ignore = [
"databricks.yml",
Expand Down
2 changes: 2 additions & 0 deletions acceptance/bundle/generate/pipeline_and_deploy/test.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
Local = true
Cloud = true
# Generates from a pipeline and deploys it; pipelines run on classic compute
RequiresClassic = true

Ignore = [
"databricks.yml",
Expand Down
2 changes: 2 additions & 0 deletions acceptance/bundle/generate/python_job_and_deploy/test.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
Local = true
Cloud = true
# Generates from a job with a job cluster and deploys it
RequiresClassic = true

Ignore = [
"databricks.yml",
Expand Down
1 change: 1 addition & 0 deletions acceptance/bundle/integration_whl/test.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
Local = true
CloudSlow = true
RequiresClassic = true

# Workspace file system does not allow initializing python envs on it.
# I suspect something about the default python env on DBR interferes with it.
Expand Down
1 change: 1 addition & 0 deletions acceptance/bundle/invariant/test.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
Local = true
Cloud = true
RequiresUnityCatalog = true
RequiresClassic = true
Timeout = '10m'

Ignore = [
Expand Down
2 changes: 2 additions & 0 deletions acceptance/bundle/local_state_staleness/test.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
Cloud = true
Local = true
# Tests local state staleness with a job that has a job cluster
RequiresClassic = true
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
Cloud = true
RequiresUnityCatalog = true
# Deploys a pipeline, which runs on classic compute
RequiresClassic = true

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions acceptance/bundle/resources/clusters/test.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Cloud tests deploy all-purpose and job clusters (classic compute resources)
RequiresClassic = true

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions acceptance/bundle/resources/jobs/check-metadata/test.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
Local = true
Cloud = true
# Deploys a job with a job cluster to test metadata
RequiresClassic = true
RecordRequests = false

Ignore = [
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
Local = true
Cloud = true
# Deploys jobs with job clusters
RequiresClassic = true
RecordRequests = false
RunsOnDbr = true

Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
Local = true
Cloud = true
# Deploys a job with a job cluster to test active run prevention
RequiresClassic = true
RecordRequests = false
RunsOnDbr = true

Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions acceptance/bundle/resources/jobs/no-git-provider/test.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
Local = true
Cloud = true
# Deploys a job with a job cluster and notebook task
RequiresClassic = true

RecordRequests = false
RunsOnDbr = true

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions acceptance/bundle/resources/jobs/shared-root-path/test.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
Local = true
Cloud = true
# Deploys a job with a job cluster to Shared workspace path
RequiresClassic = true
RecordRequests = false
RunsOnDbr = true

Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
Local = true
CloudSlow = true
RequiresClassic = true
RecordRequests = false
RunsOnDbr = true

Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@ Local = true
Cloud = true
IsServicePrincipal = true
RequiresUnityCatalog = true
# Deploys a job with a notebook_task, which runs on a cluster.
RequiresClassic = true

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions acceptance/bundle/resources/pipelines/test.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Cloud tests require classic compute to deploy Databricks SQL pipelines
RequiresClassic = true
1 change: 1 addition & 0 deletions acceptance/bundle/resources/pipelines/update/out.test.toml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading