small CI fixes

.github/workflows/build-calitp-data-analysis.yml

@@ -14,7 +14,7 @@ on:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
 
 jobs:
   check_and_build:

.github/workflows/build-calitp-data-infra.yml

@@ -14,7 +14,7 @@ on:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
 
 jobs:
   check_and_build:

.github/workflows/build-calitp-map-utils.yml

@@ -14,7 +14,7 @@ on:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
 
 jobs:
   check_and_build:

.github/workflows/build-dask-image.yml

@@ -14,7 +14,7 @@ on:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
 
 jobs:
   build_push:

.github/workflows/build-dbt.yml

@@ -14,7 +14,7 @@ on:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
 
 jobs:
   check:

.github/workflows/build-gtfs-aggregator-scraper-image.yml

@@ -14,7 +14,7 @@ on:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
 
 jobs:
   check:

.github/workflows/build-gtfs-rt-archiver-v3-image.yml

@@ -14,7 +14,7 @@ on:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
 
 jobs:
   check:

.github/workflows/build-gtfs-rt-parser-v2-image.yml

@@ -14,7 +14,7 @@ on:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
 
 jobs:
   check:

.github/workflows/build-gtfs-schedule-validator-image.yml

@@ -14,7 +14,7 @@ on:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
 
 jobs:
   check:

.github/workflows/build-jupyter-singleuser-image.yml

@@ -14,7 +14,7 @@ on:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
 
 jobs:
   build_push:

.github/workflows/lint.yml

@@ -16,3 +16,9 @@ jobs:
       - uses: crate-ci/typos@master
         with:
           files: ./docs/**
+      - uses: snok/install-poetry@v1
+      - name: mypy ci
+        working-directory: ci
+        run: |
+          poetry install
+          poetry run mypy tasks.py --check-untyped-def

apps/maps/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "calitp_map_utils"
-version = "2023.6.6"
+version = "2023.8.1"
 description = ""
 authors = ["Andrew Vaccaro <andrew.v@jarv.us>"]
 readme = "README.md"

ci/channels/prod.yaml

@@ -29,6 +29,7 @@ calitp:
       secrets:
         - jupyterhub_jupyterhub-gcloud-service-key
         - jupyterhub_jupyterhub-github-config
+      timeout: 10m0s
     - name: loki
       driver: helm
       namespace: monitoring-loki
@@ -41,8 +42,6 @@ calitp:
       helm_chart: kubernetes/apps/charts/metabase
       helm_values:
         - kubernetes/apps/values/metabase.yaml
-      secrets:
-        - metabase_service_account_key
     - name: postgresql-backup-grafana
       driver: helm
       namespace: monitoring-grafana
@@ -99,3 +98,8 @@ calitp:
       secrets:
         - sentry_sentry-secret
         - sentry_sentry-sentry-postgresql
+    - name: dask
+      driver: helm
+      namespace: dask
+      helm_name: dask
+      helm_chart: kubernetes/apps/charts/dask

ci/tasks.py

@@ -1,7 +1,7 @@
 import tempfile
 from enum import Enum
 from pathlib import Path
-from typing import List, Optional
+from typing import List, NoReturn, Optional
 
 import git
 import yaml
@@ -15,6 +15,10 @@
 }
 
 
+def _assert_never(x: NoReturn) -> NoReturn:
+    assert False, "Unhandled type: {}".format(type(x).__name__)
+
+
 class ReleaseDriver(str, Enum):
     helm = "helm"
     kustomize = "kustomize"
@@ -33,6 +37,7 @@ class Release(BaseModel):
     helm_name: Optional[str]
     helm_chart: Optional[Path]
     helm_values: List[Path] = []
+    timeout: Optional[str]
 
     # for kustomize
     kustomize_dir: Optional[Path]
@@ -128,14 +133,12 @@ def secrets(
                         f.write(secret_contents)
                     print(f"Applying {release_secret}...", flush=True)
                     result = c.run(
-                        f"kubectl apply {ns_str} -f {secret_path}", hide=hide, warn=True
+                        f"kubectl apply {ns_str} -f {secret_path}",
+                        hide=hide,
+                        warn=True,
                     )
                     if result.exited:
-                        print(
-                            f"FAILURE: Failed to apply secret {release_secret}.",
-                            flush=True,
-                        )
-                        raise Exit
+                        raise Exit(f"FAILURE: Failed to apply secret {release_secret}.")
                     print(f"Successfully applied {release_secret}.", flush=True)
                 found_secret = True
 
@@ -181,6 +184,7 @@ def diff(
                     for values_file in release.helm_values
                 ]
             )
+            assert release.helm_name is not None
             result = c.run(
                 " ".join(
                     [
@@ -251,9 +255,19 @@ def release(
                 c.run(f"kubectl create ns {release.namespace}")
                 verb = "install"
 
+            assert release.helm_name is not None
             c.run(
-                f"helm {verb} {release.helm_name} {chart_path} --namespace {release.namespace} {values_str}"
+                " ".join(
+                    [
+                        "helm",
+                        verb,
+                        release.helm_name,
+                        str(chart_path),
+                        f"--namespace {release.namespace}",
+                        values_str,
+                        f"--timeout {release.timeout}" if release.timeout else "",
+                    ]
+                )
             )
         else:
-            print(f"Encountered unknown driver: {release.driver}", flush=True)
-            raise RuntimeError
+            _assert_never(release.driver)