Try updating tox, circle (WIP)

dbt-labs · Feb 3, 2021 · e08a23e · e08a23e
1 parent af77fd8
commit e08a23e
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -60,7 +60,7 @@ jobs:
       - store_artifacts:
           path: ./logs
 
-  integration-spark-databricks-odbc:
+  integration-spark-databricks-odbc-cluster: &databricks-odbc
     environment:
       DBT_INVOCATION_ENV: circle
       ODBC_DRIVER: Simba # TODO: move env var to Docker image
@@ -74,7 +74,18 @@ jobs:
       - checkout
       - run:
           name: Run integration tests
-          command: tox -e integration-spark-databricks-odbc-cluster,integration-spark-databricks-odbc-sql-endpoint
+          command: tox -e integration-spark-databricks-odbc-cluster
+          no_output_timeout: 1h
+      - store_artifacts:
+          path: ./logs
+
+  integration-spark-databricks-odbc-endpoint:
+    <<: *databricks-odbc
+    steps:
+      - checkout
+      - run:
+          name: Run integration tests
+          command: tox -e integration-spark-databricks-odbc-sql-endpoint
           no_output_timeout: 1h
       - store_artifacts:
           path: ./logs
@@ -90,6 +101,9 @@ workflows:
       - integration-spark-databricks-http:
           requires:
             - unit
-      - integration-spark-databricks-odbc:
+      - integration-spark-databricks-odbc-cluster:
+          requires:
+            - unit
+      - integration-spark-databricks-odbc-endpoint:
           requires:
             - unit
diff --git a/tox.ini b/tox.ini
@@ -30,6 +30,7 @@ deps =
 [testenv:integration-spark-databricks-odbc-cluster]
 basepython = python3
 commands = /bin/bash -c '{envpython} -m pytest -v test/integration/spark-databricks-odbc-cluster.dbtspec'
+           /bin/bash -c '{envpython} -m pytest -v -m profile_databricks_cluster {posargs} -n4 test/custom/*'
 passenv = DBT_DATABRICKS_HOST_NAME DBT_DATABRICKS_CLUSTER_NAME DBT_DATABRICKS_TOKEN DBT_INVOCATION_ENV ODBC_DRIVER
 deps =
     -r{toxinidir}/requirements.txt
@@ -39,6 +40,7 @@ deps =
 [testenv:integration-spark-databricks-odbc-sql-endpoint]
 basepython = python3
 commands = /bin/bash -c '{envpython} -m pytest -v test/integration/spark-databricks-odbc-sql-endpoint.dbtspec'
+           /bin/bash -c '{envpython} -m pytest -v -m profile_databricks_sql_endpoint {posargs} -n4 test/custom/*'
 passenv = DBT_DATABRICKS_HOST_NAME DBT_DATABRICKS_ENDPOINT DBT_DATABRICKS_TOKEN DBT_INVOCATION_ENV ODBC_DRIVER
 deps =
     -r{toxinidir}/requirements.txt
@@ -49,6 +51,7 @@ deps =
 [testenv:integration-spark-thrift]
 basepython = python3
 commands = /bin/bash -c '{envpython} -m pytest -v test/integration/spark-thrift.dbtspec'
+           /bin/bash -c '{envpython} -m pytest -v -m profile_apache_spark {posargs} -n4 test/custom/*'
 passenv = DBT_INVOCATION_ENV
 deps =
     -r{toxinidir}/requirements.txt