Merge pull request #811 from dbt-labs/enable-engine-tests-1.7

dbt-labs · Oct 14, 2023 · ca6ba89 · ca6ba89
2 parents d6c5942 + 85abc5a
commit ca6ba89
Show file tree

Hide file tree

Showing 5 changed files with 151 additions and 433 deletions.
diff --git a/.github/workflows/cd-sql-engine-populate-persistent-source-schema.yaml b/.github/workflows/cd-sql-engine-populate-persistent-source-schema.yaml
@@ -93,7 +93,7 @@ jobs:
         uses: ./.github/actions/run-mf-tests
         with:
           python-version: ${{ env.PYTHON_VERSION }}
-          mf_sql_engine_url: ${{ secrets.MF_DATABRICKS_SQL_WAREHOUSE_URL }}
+          mf_sql_engine_url: ${{ secrets.MF_DATABRICKS_URL }}
           mf_sql_engine_password: ${{ secrets.MF_DATABRICKS_PWD }}
           parallelism: 1
           make-target: "populate-persistent-source-schema-databricks"

diff --git a/.github/workflows/cd-sql-engine-tests.yaml b/.github/workflows/cd-sql-engine-tests.yaml
@@ -72,28 +72,9 @@ jobs:
           additional-pytest-options: ${{ env.ADDITIONAL_PYTEST_OPTIONS }}
           make-target: "test-bigquery"
 
-  databricks-cluster-tests:
+  databricks-tests:
     environment: DW_INTEGRATION_TESTS
-    name: Databricks Cluster Tests
-    if: ${{ github.event.action != 'labeled' || github.event.label.name == 'run_mf_sql_engine_tests' }}
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check-out the repo
-        uses: actions/checkout@v3
-
-      - name: Test w/ Python Python ${{ env.PYTHON_VERSION }}
-        uses: ./.github/actions/run-mf-tests
-        with:
-          python-version: ${{ env.PYTHON_VERSION }}
-          mf_sql_engine_url: ${{ secrets.MF_DATABRICKS_CLUSTER_URL }}
-          mf_sql_engine_password: ${{ secrets.MF_DATABRICKS_PWD }}
-          parallelism: ${{ env.EXTERNAL_ENGINE_TEST_PARALLELISM }}
-          additional-pytest-options: ${{ env.ADDITIONAL_PYTEST_OPTIONS }}
-          make-target: "test-databricks"
-
-  databricks-sql-warehouse-tests:
-    environment: DW_INTEGRATION_TESTS
-    name: Databricks SQL Warehouse Tests
+    name: Databricks Tests
     if: ${{ github.event.action != 'labeled' || github.event.label.name == 'run_mf_sql_engine_tests' }}
     runs-on: ubuntu-latest
     steps:
@@ -104,7 +85,7 @@ jobs:
         uses: ./.github/actions/run-mf-tests
         with:
           python-version: ${{ env.PYTHON_VERSION }}
-          mf_sql_engine_url: ${{ secrets.MF_DATABRICKS_SQL_WAREHOUSE_URL }}
+          mf_sql_engine_url: ${{ secrets.MF_DATABRICKS_URL }}
           mf_sql_engine_password: ${{ secrets.MF_DATABRICKS_PWD }}
           parallelism: ${{ env.EXTERNAL_ENGINE_TEST_PARALLELISM }}
           additional-pytest-options: ${{ env.ADDITIONAL_PYTEST_OPTIONS }}