Merge pull request #1025 from spack/job-processor-keyerror

Ignore all extra cache=False install times

.github/workflows/custom_docker_builds.yml

@@ -42,7 +42,7 @@ jobs:
           - docker-image: ./images/cache-indexer
             image-tags: ghcr.io/spack/cache-indexer:0.0.3
           - docker-image: ./analytics
-            image-tags: ghcr.io/spack/django:0.4.0
+            image-tags: ghcr.io/spack/django:0.4.1
           - docker-image: ./images/ci-prune-buildcache
             image-tags: ghcr.io/spack/ci-prune-buildcache:0.0.4
           - docker-image: ./images/protected-publish

analytics/analytics/job_processor/build_timings.py

@@ -9,7 +9,10 @@
     TimerPhaseDimension,
 )
 from analytics.core.models.facts import JobFact, TimerFact, TimerPhaseFact
-from analytics.job_processor.artifacts import JobArtifactFileNotFound, get_job_artifacts_file
+from analytics.job_processor.artifacts import (
+    JobArtifactFileNotFound,
+    get_job_artifacts_file,
+)
 
 
 def get_timings_json(job: ProjectJob) -> list[dict]:
@@ -107,11 +110,16 @@ def create_build_timing_facts(job_fact: JobFact, gljob: ProjectJob):
     # since `install_times.json` is created using `spack` itself, there's no guarantee
     # that the file will be present.
     try:
-        data = get_timings_json(gljob)
-        timings = [t for t in data if t.get("name") and t.get("hash")]
+        timing_data = get_timings_json(gljob)
     except JobArtifactFileNotFound:
         return
 
+    # For bootstrapped packages, install times with cache=False can be present, which don't have a
+    # corresonding entry in the spec json. To filter these out, avoid all install times that are
+    # cache=False, except the package being built.
+    job_package_hash = job_fact.spec.hash
+    timings = [t for t in timing_data if t["cache"] or t["hash"] == job_package_hash]
+
     # First, ensure that all packages and specs are entered into the db. Then, fetch all timing packages
     create_packages_and_specs(gljob)
     package_mapping = get_package_mapping(timings=timings)

k8s/production/custom/webhook-handler/deployments.yaml

@@ -23,7 +23,7 @@ spec:
       serviceAccountName: webhook-handler
       containers:
         - name: webhook-handler
-          image: ghcr.io/spack/django:0.4.0
+          image: ghcr.io/spack/django:0.4.1
           imagePullPolicy: Always
           resources:
             requests:
@@ -146,7 +146,7 @@ spec:
       serviceAccountName: webhook-handler
       containers:
         - name: webhook-handler-worker
-          image: ghcr.io/spack/django:0.4.0
+          image: ghcr.io/spack/django:0.4.1
           command:
             [
               "celery",