Merge pull request #1164 from spack/p-ci-builds

Replace use of ci_builds with p_ci_builds

Author: jjnesbitt

.github/workflows/custom_docker_builds.yml

@@ -45,7 +45,7 @@ jobs:
           - docker-image: ./images/cache-indexer
             image-tags: ghcr.io/spack/cache-indexer:0.0.6
           - docker-image: ./analytics
-            image-tags: ghcr.io/spack/django:0.5.3
+            image-tags: ghcr.io/spack/django:0.5.4
           - docker-image: ./images/ci-prune-buildcache
             image-tags: ghcr.io/spack/ci-prune-buildcache:0.0.4
           - docker-image: ./images/protected-publish

analytics/analytics/core/migrations/0003_jobdatadimension_gitlab_failure_reason_and_more.py

@@ -19,7 +19,7 @@ def migrate_exit_codes(apps: Apps, schema_editor: BaseDatabaseSchemaEditor) -> N
         failed_jobs.values_list("job_id", flat=True).iterator(chunk_size=BATCH_SIZE), BATCH_SIZE
     ):
         with connections["gitlab"].cursor() as cursor:
-            QUERY = "SELECT build_id, exit_code FROM public.ci_builds_metadata WHERE build_id IN %s"
+            QUERY = "SELECT build_id, exit_code FROM public.p_ci_builds_metadata WHERE build_id IN %s"
             cursor.execute(QUERY, [tuple(job_ids)])
             rows = cursor.fetchall()
 
@@ -91,7 +91,7 @@ def migrate_failure_reasons(apps: Apps, schema_editor: BaseDatabaseSchemaEditor)
         failed_jobs.values_list("job_id", flat=True).iterator(chunk_size=BATCH_SIZE), BATCH_SIZE
     ):
         with connections["gitlab"].cursor() as cursor:
-            QUERY = "SELECT id, failure_reason FROM public.ci_builds WHERE id IN %s"
+            QUERY = "SELECT id, failure_reason FROM public.p_ci_builds WHERE id IN %s"
             cursor.execute(QUERY, [tuple(job_ids)])
             rows = cursor.fetchall()
 

analytics/analytics/job_processor/utils.py

@@ -34,7 +34,7 @@ def get_job_retry_data(
         cursor.execute(
             """
             SELECT COUNT(*)
-            FROM ci_builds
+            FROM p_ci_builds
             WHERE id < %(job_id)s
             AND commit_id = %(commit_id)s
             AND name = %(job_name)s
@@ -46,7 +46,7 @@ def get_job_retry_data(
         cursor.execute(
             """
             SELECT bm.config_options->>'retry'
-            FROM ci_builds_metadata bm
+            FROM p_ci_builds_metadata bm
             WHERE bm.build_id = %(job_id)s
             """,
             {"job_id": job_id},
@@ -94,7 +94,7 @@ def get_job_exit_code(job_id: int) -> int | None:
         cursor.execute(
             """
             SELECT exit_code
-            FROM ci_builds_metadata
+            FROM p_ci_builds_metadata
             WHERE build_id = %(job_id)s
             """,
             {"job_id": job_id},

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.5.3
+          image: ghcr.io/spack/django:0.5.4
           imagePullPolicy: Always
           resources:
             requests:
@@ -146,7 +146,7 @@ spec:
       serviceAccountName: webhook-handler
       containers:
         - name: webhook-handler-worker
-          image: ghcr.io/spack/django:0.5.3
+          image: ghcr.io/spack/django:0.5.4
           command:
             [
               "celery",