ci: test fixes

Author: sd-db

.github/workflows/integration.yml

@@ -248,6 +248,8 @@ jobs:
       DBT_DATABRICKS_UC_INITIAL_CATALOG: peco
       DBT_DATABRICKS_LOCATION_ROOT: ${{ secrets.TEST_PECO_EXTERNAL_LOCATION }}test
       TEST_PECO_UC_CLUSTER_ID: ${{ secrets.TEST_PECO_UC_CLUSTER_ID }}
+      TEST_PECO_SPOG_HOST: ${{ secrets.TEST_PECO_SPOG_HOST }}
+      TEST_PECO_SPOG_WORKSPACE_ID: ${{ secrets.TEST_PECO_SPOG_WORKSPACE_ID }}
       UV_FROZEN: "1"
     steps:
       - name: Check out repository
@@ -349,6 +351,8 @@ jobs:
       DBT_DATABRICKS_UC_INITIAL_CATALOG: peco
       DBT_DATABRICKS_LOCATION_ROOT: ${{ secrets.TEST_PECO_EXTERNAL_LOCATION }}test
       TEST_PECO_UC_CLUSTER_ID: ${{ secrets.TEST_PECO_UC_CLUSTER_ID }}
+      TEST_PECO_SPOG_HOST: ${{ secrets.TEST_PECO_SPOG_HOST }}
+      TEST_PECO_SPOG_WORKSPACE_ID: ${{ secrets.TEST_PECO_SPOG_WORKSPACE_ID }}
       UV_FROZEN: "1"
     steps:
       - name: Check out repository
@@ -448,6 +452,8 @@ jobs:
       DBT_DATABRICKS_CLIENT_SECRET: ${{ secrets.TEST_PECO_SP_SECRET }}
       TEST_PECO_CLUSTER_ID: ${{ secrets.TEST_PECO_CLUSTER_ID }}
       DBT_DATABRICKS_LOCATION_ROOT: ${{ secrets.TEST_PECO_EXTERNAL_LOCATION }}test
+      TEST_PECO_SPOG_HOST: ${{ secrets.TEST_PECO_SPOG_HOST }}
+      TEST_PECO_SPOG_WORKSPACE_ID: ${{ secrets.TEST_PECO_SPOG_WORKSPACE_ID }}
       UV_FROZEN: "1"
     steps:
       - name: Check out repository

.github/workflows/spog-integration.yml

@@ -98,6 +98,7 @@ jobs:
       DBT_DATABRICKS_LOCATION_ROOT: ${{ secrets.TEST_PECO_EXTERNAL_LOCATION }}test
       TEST_PECO_SPOG_WORKSPACE_ID: ${{ secrets.TEST_PECO_SPOG_WORKSPACE_ID }}
       TEST_PECO_UC_CLUSTER_ID: ${{ secrets.TEST_PECO_UC_CLUSTER_ID }}
+      TEST_PECO_SPOG_NATIVE: "1"
       UV_FROZEN: "1"
     steps:
       - name: Check out repository
@@ -184,6 +185,7 @@ jobs:
       DBT_DATABRICKS_LOCATION_ROOT: ${{ secrets.TEST_PECO_EXTERNAL_LOCATION }}test
       TEST_PECO_SPOG_WORKSPACE_ID: ${{ secrets.TEST_PECO_SPOG_WORKSPACE_ID }}
       TEST_PECO_UC_CLUSTER_ID: ${{ secrets.TEST_PECO_UC_CLUSTER_ID }}
+      TEST_PECO_SPOG_NATIVE: "1"
       UV_FROZEN: "1"
     steps:
       - name: Check out repository
@@ -268,7 +270,7 @@ jobs:
       DBT_DATABRICKS_LOCATION_ROOT: ${{ secrets.TEST_PECO_EXTERNAL_LOCATION }}test
       TEST_PECO_SPOG_WORKSPACE_ID: ${{ secrets.TEST_PECO_SPOG_WORKSPACE_ID }}
       TEST_PECO_CLUSTER_ID: ${{ secrets.TEST_PECO_CLUSTER_ID }}
-      TEST_PECO_UC_CLUSTER_ID: ${{ secrets.TEST_PECO_UC_CLUSTER_ID }}
+      TEST_PECO_SPOG_NATIVE: "1"
       UV_FROZEN: "1"
     steps:
       - name: Check out repository

tests/functional/adapter/spog/conftest.py

@@ -12,12 +12,16 @@
 
 
 @pytest.fixture(scope="session", autouse=True)
-def _require_spog_deps():
+def _require_spog_test_env():
     if not (connector_supports_spog() and sdk_supports_workspace_id()):
         pytest.skip(
             "SPOG functional tests require databricks-sdk and databricks-sql-connector "
             "with SPOG support installed."
         )
+    if os.getenv("TEST_PECO_SPOG_NATIVE") == "1":
+        pytest.skip(
+            "SPOG override tests are redundant on a SPOG-native profile."
+        )
 
 
 def _workspace_id() -> str:
@@ -34,7 +38,7 @@ def _spog_host() -> str:
     can still exercise SPOG routing. Falls back to DBT_DATABRICKS_HOST_NAME,
     which the SPOG-specific workflow already sets to a SPOG vanity URL.
     """
-    host = os.getenv("TEST_PECO_SPOG_HOST") or os.getenv("DBT_DATABRICKS_HOST_NAME")
+    host = os.getenv("TEST_PECO_SPOG_HOST")
     if not host:
         raise RuntimeError(
             "SPOG functional tests require TEST_PECO_SPOG_HOST or DBT_DATABRICKS_HOST_NAME."

tests/functional/adapter/spog/test_spog_connection_open.py

@@ -32,6 +32,7 @@ def test_probe_failure_run_succeeds(self, project):
             run_dbt(["run", "--select", "spog_smoke_model"], expect_pass=True)
 
 
+@pytest.mark.skip_profile("databricks_cluster", "databricks_uc_cluster")
 class TestSpogNamedCompute:
     @pytest.fixture(scope="class")
     def models(self):