Skip to content

Commit

Permalink
Update test expectations to make room for additional Databricks Runti…
Browse files Browse the repository at this point in the history
…mes and add Kusto support (#182)

Fix test runner to support situations where we don't provide a process entity expectation.

Update requirements.txt for test.
  • Loading branch information
wjohnson committed Jan 2, 2024
1 parent 917e271 commit a3d1a10
Show file tree
Hide file tree
Showing 16 changed files with 932 additions and 17 deletions.
14 changes: 14 additions & 0 deletions .github/workflows/build-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,13 @@ jobs:
AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }}
AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}

- name: Start Integration ADX Cluster
run: source tests/integration/manage-adx-cluster.sh start ${{ secrets.INT_SUBSCRIPTION_ID }} ${{ secrets.ADX_RG_NAME }} ${{ secrets.ADX_CLUSTER_NAME }}
env:
AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }}
AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}

- name: Install Python Requirements and Databricks CLI
run: pip install pyapacheatlas==0.12.0 azure-identity databricks-cli

Expand Down Expand Up @@ -172,6 +179,13 @@ jobs:
AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }}
AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}

- name: Stop Integration ADX Cluster
run: source tests/integration/manage-adx-cluster.sh stop ${{ secrets.INT_SUBSCRIPTION_ID }} ${{ secrets.ADX_RG_NAME }} ${{ secrets.ADX_CLUSTER_NAME }}
env:
AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }}
AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}

createRelease:
name: Create Release
Expand Down
141 changes: 141 additions & 0 deletions tests/integration/jobdefs/dbx-delta-lts-104-def.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,141 @@
{
"name": "dbx-delta-lts-104",
"email_notifications": {
"no_alert_for_skipped_runs": false
},
"webhook_notifications": {},
"timeout_seconds": 0,
"max_concurrent_runs": 1,
"tasks": [
{
"task_key": "delta-merge-task",
"run_if": "ALL_SUCCESS",
"notebook_task": {
"notebook_path": "/Shared/examples/delta-in-delta-merge",
"source": "WORKSPACE"
},
"existing_cluster_id": "0104-045638-iaecf5ne",
"timeout_seconds": 0,
"email_notifications": {},
"notification_settings": {
"no_alert_for_skipped_runs": false,
"no_alert_for_canceled_runs": false,
"alert_on_last_attempt": false
},
"webhook_notifications": {}
},
{
"task_key": "delta-merge-package-task",
"depends_on": [
{
"task_key": "delta-merge-task"
}
],
"run_if": "ALL_DONE",
"notebook_task": {
"notebook_path": "/Shared/examples/delta-in-delta-merge-package",
"source": "WORKSPACE"
},
"existing_cluster_id": "0104-045638-iaecf5ne",
"timeout_seconds": 0,
"email_notifications": {},
"notification_settings": {
"no_alert_for_skipped_runs": false,
"no_alert_for_canceled_runs": false,
"alert_on_last_attempt": false
},
"webhook_notifications": {}
},
{
"task_key": "delta-with-abfss-task",
"depends_on": [
{
"task_key": "delta-merge-package-task"
}
],
"run_if": "ALL_DONE",
"notebook_task": {
"notebook_path": "/Shared/examples/delta-in-delta-out-abfss",
"source": "WORKSPACE"
},
"existing_cluster_id": "0104-045638-iaecf5ne",
"timeout_seconds": 0,
"email_notifications": {},
"notification_settings": {
"no_alert_for_skipped_runs": false,
"no_alert_for_canceled_runs": false,
"alert_on_last_attempt": false
},
"webhook_notifications": {}
},
{
"task_key": "delta-fs-task",
"depends_on": [
{
"task_key": "delta-with-abfss-task"
}
],
"run_if": "ALL_DONE",
"notebook_task": {
"notebook_path": "/Shared/examples/delta-in-delta-out-fs",
"source": "WORKSPACE"
},
"existing_cluster_id": "0104-045638-iaecf5ne",
"timeout_seconds": 0,
"email_notifications": {},
"notification_settings": {
"no_alert_for_skipped_runs": false,
"no_alert_for_canceled_runs": false,
"alert_on_last_attempt": false
},
"webhook_notifications": {}
},
{
"task_key": "delta-fs-col-changes-task",
"depends_on": [
{
"task_key": "delta-fs-task"
}
],
"run_if": "ALL_DONE",
"notebook_task": {
"notebook_path": "/Shared/examples/delta-in-delta-out-fs-with-col-changes",
"source": "WORKSPACE"
},
"existing_cluster_id": "0104-045638-iaecf5ne",
"timeout_seconds": 0,
"email_notifications": {},
"notification_settings": {
"no_alert_for_skipped_runs": false,
"no_alert_for_canceled_runs": false,
"alert_on_last_attempt": false
},
"webhook_notifications": {}
},
{
"task_key": "delta-mnt-task",
"depends_on": [
{
"task_key": "delta-fs-col-changes-task"
}
],
"run_if": "ALL_DONE",
"notebook_task": {
"notebook_path": "/Shared/examples/delta-in-delta-out-mnt",
"source": "WORKSPACE"
},
"existing_cluster_id": "0104-045638-iaecf5ne",
"timeout_seconds": 0,
"email_notifications": {},
"notification_settings": {
"no_alert_for_skipped_runs": false,
"no_alert_for_canceled_runs": false,
"alert_on_last_attempt": false
},
"webhook_notifications": {}
}
],
"run_as": {
"user_name": "examplemicrosoft.com"
}
}
15 changes: 15 additions & 0 deletions tests/integration/jobdefs/dbx-delta-lts-104-expectations.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
[
"databricks://<WORKSPACE_ID>.azuredatabricks.net/jobs/<JOB_ID>",
"databricks://<WORKSPACE_ID>.azuredatabricks.net/jobs/<JOB_ID>/tasks/delta-merge-task",
"databricks://<WORKSPACE_ID>.azuredatabricks.net/notebooks/Shared/examples/delta-in-delta-merge",
"databricks://<WORKSPACE_ID>.azuredatabricks.net/jobs/<JOB_ID>/tasks/delta-merge-package-task",
"databricks://<WORKSPACE_ID>.azuredatabricks.net/notebooks/Shared/examples/delta-in-delta-merge-package",
"databricks://<WORKSPACE_ID>.azuredatabricks.net/jobs/<JOB_ID>/tasks/delta-with-abfss-task",
"databricks://<WORKSPACE_ID>.azuredatabricks.net/notebooks/Shared/examples/delta-in-delta-out-abfss",
"databricks://<WORKSPACE_ID>.azuredatabricks.net/jobs/<JOB_ID>/tasks/delta-fs-task",
"databricks://<WORKSPACE_ID>.azuredatabricks.net/notebooks/Shared/examples/delta-in-delta-out-fs",
"databricks://<WORKSPACE_ID>.azuredatabricks.net/jobs/<JOB_ID>/tasks/delta-fs-col-changes-task",
"databricks://<WORKSPACE_ID>.azuredatabricks.net/notebooks/Shared/examples/delta-in-delta-out-fs-with-col-changes",
"databricks://<WORKSPACE_ID>.azuredatabricks.net/jobs/<JOB_ID>/tasks/delta-mnt-task",
"databricks://<WORKSPACE_ID>.azuredatabricks.net/notebooks/Shared/examples/delta-in-delta-out-mnt"
]
201 changes: 201 additions & 0 deletions tests/integration/jobdefs/dbx-hdfs-core-lts-104-def.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,201 @@
{
"name": "dbx-hdfs-core-lts-104",
"email_notifications": {
"no_alert_for_skipped_runs": false
},
"webhook_notifications": {},
"timeout_seconds": 0,
"max_concurrent_runs": 1,
"tasks": [
{
"task_key": "abfss-in-abfss-out-task",
"run_if": "ALL_SUCCESS",
"notebook_task": {
"notebook_path": "/Shared/examples/abfss-in-abfss-out",
"source": "WORKSPACE"
},
"existing_cluster_id": "0104-045638-iaecf5ne",
"timeout_seconds": 0,
"email_notifications": {},
"notification_settings": {
"no_alert_for_skipped_runs": false,
"no_alert_for_canceled_runs": false,
"alert_on_last_attempt": false
},
"webhook_notifications": {}
},
{
"task_key": "abfss-in-abfss-out-oauth-task",
"depends_on": [
{
"task_key": "abfss-in-abfss-out-task"
}
],
"run_if": "ALL_DONE",
"notebook_task": {
"notebook_path": "/Shared/examples/abfss-in-abfss-out-oauth",
"source": "WORKSPACE"
},
"existing_cluster_id": "0104-045638-iaecf5ne",
"timeout_seconds": 0,
"email_notifications": {},
"notification_settings": {
"no_alert_for_skipped_runs": false,
"no_alert_for_canceled_runs": false,
"alert_on_last_attempt": false
},
"webhook_notifications": {}
},
{
"task_key": "abfss-in-abfss-out-root-task",
"depends_on": [
{
"task_key": "abfss-in-abfss-out-oauth-task"
}
],
"run_if": "ALL_DONE",
"notebook_task": {
"notebook_path": "/Shared/examples/abfss-in-abfss-out-root",
"source": "WORKSPACE"
},
"existing_cluster_id": "0104-045638-iaecf5ne",
"timeout_seconds": 0,
"email_notifications": {},
"notification_settings": {
"no_alert_for_skipped_runs": false,
"no_alert_for_canceled_runs": false,
"alert_on_last_attempt": false
},
"webhook_notifications": {}
},
{
"task_key": "wasbs-in-wasbs-out-task",
"depends_on": [
{
"task_key": "abfss-in-abfss-out-root-task"
}
],
"run_if": "ALL_DONE",
"notebook_task": {
"notebook_path": "/Shared/examples/wasbs-in-wasbs-out",
"source": "WORKSPACE"
},
"existing_cluster_id": "0104-045638-iaecf5ne",
"timeout_seconds": 0,
"email_notifications": {},
"notification_settings": {
"no_alert_for_skipped_runs": false,
"no_alert_for_canceled_runs": false,
"alert_on_last_attempt": false
},
"webhook_notifications": {}
},
{
"task_key": "wasbs-in-wasbs-out-with-param-task",
"depends_on": [
{
"task_key": "wasbs-in-wasbs-out-task"
}
],
"run_if": "ALL_DONE",
"notebook_task": {
"notebook_path": "/Shared/examples/wasbs-in-wasbs-out-with-param",
"source": "WORKSPACE"
},
"existing_cluster_id": "0104-045638-iaecf5ne",
"timeout_seconds": 0,
"email_notifications": {},
"notification_settings": {
"no_alert_for_skipped_runs": false,
"no_alert_for_canceled_runs": false,
"alert_on_last_attempt": false
},
"webhook_notifications": {}
},
{
"task_key": "intermix-languages-task",
"depends_on": [
{
"task_key": "wasbs-in-wasbs-out-with-param-task"
}
],
"run_if": "ALL_DONE",
"notebook_task": {
"notebook_path": "/Shared/examples/intermix-languages",
"source": "WORKSPACE"
},
"existing_cluster_id": "0104-045638-iaecf5ne",
"timeout_seconds": 0,
"email_notifications": {},
"notification_settings": {
"no_alert_for_skipped_runs": false,
"no_alert_for_canceled_runs": false,
"alert_on_last_attempt": false
},
"webhook_notifications": {}
},
{
"task_key": "mount-task",
"depends_on": [
{
"task_key": "intermix-languages-task"
}
],
"run_if": "ALL_DONE",
"notebook_task": {
"notebook_path": "/Shared/examples/mnt-in-mnt-out",
"source": "WORKSPACE"
},
"existing_cluster_id": "0104-045638-iaecf5ne",
"timeout_seconds": 0,
"email_notifications": {},
"notification_settings": {
"no_alert_for_skipped_runs": false,
"no_alert_for_canceled_runs": false,
"alert_on_last_attempt": false
},
"webhook_notifications": {}
},
{
"task_key": "name-period-task",
"depends_on": [
{
"task_key": "mount-task"
}
],
"run_if": "ALL_DONE",
"notebook_task": {
"notebook_path": "/Shared/examples/name-with-periods",
"source": "WORKSPACE"
},
"existing_cluster_id": "0104-045638-iaecf5ne",
"timeout_seconds": 0,
"email_notifications": {},
"notification_settings": {
"no_alert_for_skipped_runs": false,
"no_alert_for_canceled_runs": false,
"alert_on_last_attempt": false
},
"webhook_notifications": {}
},
{
"task_key": "nested-parent-task",
"depends_on": [
{
"task_key": "name-period-task"
}
],
"run_if": "ALL_DONE",
"notebook_task": {
"notebook_path": "/Shared/examples/nested-parent",
"source": "WORKSPACE"
},
"existing_cluster_id": "0104-045638-iaecf5ne",
"timeout_seconds": 0,
"email_notifications": {}
}
],
"run_as": {
"user_name": "examplemicrosoft.com"
}
}
Loading

0 comments on commit a3d1a10

Please sign in to comment.