From 7171e5a9ea42d28e1f2e3f78707b9ecc5b2a4a09 Mon Sep 17 00:00:00 2001 From: Brad Stein Date: Mon, 19 Jan 2026 22:33:34 -0300 Subject: [PATCH] fix: unblock keycloak and refresh glue checks --- ci/tests/glue/config.yaml | 9 +++++++++ ci/tests/glue/test_glue_metrics.py | 19 +++++++++++++++++++ services/jenkins/configmap-jcasc.yaml | 2 +- services/keycloak/realm-settings-job.yaml | 2 +- 4 files changed, 30 insertions(+), 2 deletions(-) diff --git a/ci/tests/glue/config.yaml b/ci/tests/glue/config.yaml index 8adf4ca..16b656c 100644 --- a/ci/tests/glue/config.yaml +++ b/ci/tests/glue/config.yaml @@ -1,7 +1,16 @@ max_success_age_hours: 48 allow_suspended: + - bstein-dev-home/vaultwarden-cred-sync - comms/othrys-room-reset - comms/pin-othrys-invite - comms/seed-othrys-room - finance/firefly-user-sync + - health/wger-admin-ensure - health/wger-user-sync + - mailu-mailserver/mailu-sync-nightly + - nextcloud/nextcloud-mail-sync +ariadne_schedule_tasks: + - schedule.mailu_sync + - schedule.nextcloud_sync + - schedule.vaultwarden_sync + - schedule.wger_admin diff --git a/ci/tests/glue/test_glue_metrics.py b/ci/tests/glue/test_glue_metrics.py index 16b01c7..52ec0be 100644 --- a/ci/tests/glue/test_glue_metrics.py +++ b/ci/tests/glue/test_glue_metrics.py @@ -1,11 +1,19 @@ from __future__ import annotations import os +from pathlib import Path import requests +import yaml VM_URL = os.environ.get("VM_URL", "http://victoria-metrics-single-server:8428").rstrip("/") +CONFIG_PATH = Path(__file__).with_name("config.yaml") + + +def _load_config() -> dict: + with CONFIG_PATH.open("r", encoding="utf-8") as handle: + return yaml.safe_load(handle) or {} def _query(promql: str) -> list[dict]: @@ -27,3 +35,14 @@ def test_glue_metrics_success_join(): ) series = _query(query) assert series, "No glue cronjob last success series found" + + +def test_ariadne_schedule_metrics_present(): + cfg = _load_config() + expected = cfg.get("ariadne_schedule_tasks", []) + if not expected: + return + series = _query("ariadne_schedule_next_run_timestamp_seconds") + tasks = {item.get("metric", {}).get("task") for item in series} + missing = [task for task in expected if task not in tasks] + assert not missing, f"Missing Ariadne schedule metrics for: {', '.join(missing)}" diff --git a/services/jenkins/configmap-jcasc.yaml b/services/jenkins/configmap-jcasc.yaml index ac26350..25dd748 100644 --- a/services/jenkins/configmap-jcasc.yaml +++ b/services/jenkins/configmap-jcasc.yaml @@ -151,7 +151,7 @@ data: url('https://scm.bstein.dev/bstein/titan-iac.git') credentials('gitea-pat') } - branches('*/feature/vault-consumption') + branches('*/main') } } scriptPath('ci/Jenkinsfile.titan-iac') diff --git a/services/keycloak/realm-settings-job.yaml b/services/keycloak/realm-settings-job.yaml index a0b36ec..fdee377 100644 --- a/services/keycloak/realm-settings-job.yaml +++ b/services/keycloak/realm-settings-job.yaml @@ -2,7 +2,7 @@ apiVersion: batch/v1 kind: Job metadata: - name: keycloak-realm-settings-32 + name: keycloak-realm-settings-33 namespace: sso spec: backoffLimit: 0