Merge branch 'main' into cdash-postgres

Author: mvandenburgh

.github/workflows/custom_docker_builds.yml

@@ -25,7 +25,7 @@ jobs:
       matrix:
         include:
           - docker-image: ./images/gh-gl-sync
-            image-tags: ghcr.io/spack/ci-bridge:0.0.45
+            image-tags: ghcr.io/spack/ci-bridge:0.0.46
           - docker-image: ./images/ci-key-clear
             image-tags: ghcr.io/spack/ci-key-clear:0.0.2
           - docker-image: ./images/gitlab-stuckpods
@@ -37,15 +37,15 @@ jobs:
           - docker-image: ./images/gitlab-skipped-pipelines
             image-tags: ghcr.io/spack/gitlab-skipped-pipelines:0.0.2
           - docker-image: ./images/notary
-            image-tags: ghcr.io/spack/notary:0.0.2
+            image-tags: ghcr.io/spack/notary:0.0.3
           - docker-image: ./images/python-aws-bash
             image-tags: ghcr.io/spack/python-aws-bash:0.0.2
           - docker-image: ./images/snapshot-release-tags
             image-tags: ghcr.io/spack/snapshot-release-tags:0.0.4
           - 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.1
+            image-tags: ghcr.io/spack/django:0.5.2
           - 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/0007_jobfact_gitlab_clear_worktree.py

@@ -0,0 +1,17 @@
+# Generated by Django 5.1.5 on 2025-06-05 20:13
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("core", "0006_auto_20250121_2212"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="jobfact",
+            name="gitlab_clear_worktree",
+            field=models.PositiveIntegerField(default=0),
+        ),
+    ]

analytics/analytics/core/models/facts.py

@@ -72,6 +72,7 @@ class JobFact(models.Model):
     pod_memory_limit = models.PositiveBigIntegerField(null=True, default=None)
 
     # Gitlab section timer data
+    gitlab_clear_worktree = models.PositiveIntegerField(default=0)
     gitlab_after_script = models.PositiveIntegerField(default=0)
     gitlab_cleanup_file_variables = models.PositiveIntegerField(default=0)
     gitlab_download_artifacts = models.PositiveIntegerField(default=0)

analytics/analytics/job_processor/__init__.py

@@ -103,7 +103,7 @@ def create_job_fact(
         # small descriptive data
         name=job_input_data["build_name"],
         pod_name=pod_info.name or "",
-        job_url=f"https://gitlab.spack.io/spack/spack/-/jobs/{job_id}",
+        job_url=f"https://gitlab.spack.io/spack/spack-packages/-/jobs/{job_id}",
         # numeric
         duration=timedelta(seconds=gljob.duration),
         duration_seconds=gljob.duration,
@@ -123,6 +123,7 @@ def create_job_fact(
         pod_memory_request=pod_info.memory_request,
         pod_memory_limit=pod_info.memory_limit,
         # Section timer data
+        gitlab_clear_worktree=section_timers.get("clear_worktree", 0),
         gitlab_after_script=section_timers.get("after_script", 0),
         gitlab_cleanup_file_variables=section_timers.get("cleanup_file_variables", 0),
         gitlab_download_artifacts=section_timers.get("download_artifacts", 0),

images/gh-gl-sync/SpackCIBridge.py

@@ -252,7 +252,10 @@ def list_github_prs(self):
                                 print(f"Failed to merge PR {pull.number} ({pull.head.ref}) with latest tested "
                                       f"{self.main_branch} ({self.latest_tested_main_commit}). Skipping")
                                 self.unmergeable_shas.append(pull.head.sha)
-                                _durable_subprocess_run(["git", "merge", "--abort"])
+                                try:
+                                    _durable_subprocess_run(["git", "merge", "--abort"])
+                                except subprocess.CalledProcessError:
+                                    pass
                                 backlogged = "merge conflicts with {}".format(self.main_branch)
                                 push = False
                                 continue

images/notary/Dockerfile

@@ -3,6 +3,7 @@ MAINTAINER Chris Kotfila <[email protected]>
 
 RUN apk add --no-cache \
         bash \
+        git \
         gpg \
         gpg-agent \
         python3 \

k8s/production/custom/gh-gl-sync-packages/cron-jobs.yaml

@@ -16,7 +16,7 @@ spec:
           restartPolicy: Never
           containers:
           - name: sync
-            image: ghcr.io/spack/ci-bridge:0.0.45
+            image: ghcr.io/spack/ci-bridge:0.0.46
             imagePullPolicy: IfNotPresent
             resources:
               requests:
@@ -44,11 +44,9 @@ spec:
               - "spack/spack-packages"
               - "--pr-mirror-bucket"
               - "spack-binaries-prs"
-              # - "--main-branch"
-              # - "develop"
-              - "--disable-protected-sync"
-              - "--disable-tag-sync"
-              # - "--prereq-check"
-              # - "all-prechecks"
+              - "--main-branch"
+              - "develop"
+              - "--prereq-check"
+              - "all-prechecks"
           nodeSelector:
             spack.io/node-pool: base

k8s/production/custom/gh-gl-sync/sealed-secrets.yaml renamed to k8s/production/custom/gh-gl-sync-packages/sealed-secrets.yaml

@@ -16,7 +16,7 @@ spec:
           restartPolicy: Never
           containers:
           - name: sync
-            image: ghcr.io/spack/ci-bridge:0.0.45
+            image: ghcr.io/spack/ci-bridge:0.0.46
             imagePullPolicy: IfNotPresent
             resources:
               requests:

k8s/production/custom/gh-gl-sync/cron-jobs.yaml

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

k8s/production/custom/kokkos-sync/cron-jobs.yaml

@@ -21,7 +21,7 @@ spec:
   chart:
     spec:
       chart: gitlab
-      version: 8.11.2 # [email protected].2
+      version: 8.11.4 # [email protected].4
       sourceRef:
         kind: HelmRepository
         name: gitlab

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

@@ -180,7 +180,7 @@ spec:
               medium = "Memory"
 
       # default image
-      image: "ghcr.io/spack/notary:0.0.1"
+      image: "ghcr.io/spack/notary:0.0.3"
       imagePullPolicy: "always"
       tags: "spack,notary,aws,protected"
 

k8s/production/gitlab/release.yaml

@@ -19,10 +19,10 @@ locals {
         "project_path:${data.gitlab_project.spack.path_with_namespace}:ref_type:branch:ref:releases/v*",
         "project_path:${data.gitlab_project.spack.path_with_namespace}:ref_type:tag:ref:develop-*",
         "project_path:${data.gitlab_project.spack.path_with_namespace}:ref_type:tag:ref:v*",
-        # "project_path:${data.gitlab_project.spack_packages.path_with_namespace}:ref_type:branch:ref:develop",
-        # "project_path:${data.gitlab_project.spack_packages.path_with_namespace}:ref_type:branch:ref:releases/v*",
-        # "project_path:${data.gitlab_project.spack_packages.path_with_namespace}:ref_type:tag:ref:develop-*",
-        # "project_path:${data.gitlab_project.spack_packages.path_with_namespace}:ref_type:tag:ref:v*",
+        "project_path:${data.gitlab_project.spack_packages.path_with_namespace}:ref_type:branch:ref:develop",
+        "project_path:${data.gitlab_project.spack_packages.path_with_namespace}:ref_type:branch:ref:releases/v*",
+        "project_path:${data.gitlab_project.spack_packages.path_with_namespace}:ref_type:tag:ref:develop-*",
+        "project_path:${data.gitlab_project.spack_packages.path_with_namespace}:ref_type:tag:ref:v*",
         "project_path:${data.gitlab_project.scott_sidecar.path_with_namespace}:ref_type:branch:ref:develop",
         "project_path:${data.gitlab_project.scott_sidecar.path_with_namespace}:ref_type:branch:ref:releases/v*",
         "project_path:${data.gitlab_project.scott_sidecar.path_with_namespace}:ref_type:tag:ref:develop-*",