From 9cdf244d98f1acfdc8feffd537a692230d88d0e0 Mon Sep 17 00:00:00 2001
From: Brad Stein <Brad.Stein@gmail.com>
Date: Tue, 20 Jan 2026 10:59:51 -0300
Subject: [PATCH] jenkins: drop legacy cleanup and update triggers

---
 services/jenkins/configmap-jcasc.yaml       | 40 +++++++++++++++------
 services/jenkins/deployment.yaml            |  2 +-
 services/jenkins/kustomization.yaml         |  1 -
 services/jenkins/scripts/job_cleanup.groovy | 13 -------
 4 files changed, 31 insertions(+), 25 deletions(-)
 delete mode 100644 services/jenkins/scripts/job_cleanup.groovy

diff --git a/services/jenkins/configmap-jcasc.yaml b/services/jenkins/configmap-jcasc.yaml
index 7e6df31..ba0ac81 100644
--- a/services/jenkins/configmap-jcasc.yaml
+++ b/services/jenkins/configmap-jcasc.yaml
@@ -49,8 +49,12 @@ data:
     jobs:
       - script: |
           pipelineJob('harbor-arm-build') {
-            triggers {
-              scm('H/5 * * * *')
+            properties {
+              pipelineTriggers {
+                triggers {
+                  scm('H/5 * * * *')
+                }
+              }
             }
             definition {
               cpsScm {
@@ -83,8 +87,12 @@ data:
             }
           }
           pipelineJob('ci-demo') {
-            triggers {
-              scm('H/1 * * * *')
+            properties {
+              pipelineTriggers {
+                triggers {
+                  scm('H/1 * * * *')
+                }
+              }
             }
             definition {
               cpsScm {
@@ -102,8 +110,12 @@ data:
             }
           }
           pipelineJob('bstein-dev-home') {
-            triggers {
-              scm('H/2 * * * *')
+            properties {
+              pipelineTriggers {
+                triggers {
+                  scm('H/2 * * * *')
+                }
+              }
             }
             definition {
               cpsScm {
@@ -121,8 +133,12 @@ data:
             }
           }
           pipelineJob('ariadne') {
-            triggers {
-              scm('H/2 * * * *')
+            properties {
+              pipelineTriggers {
+                triggers {
+                  scm('H/2 * * * *')
+                }
+              }
             }
             definition {
               cpsScm {
@@ -140,8 +156,12 @@ data:
             }
           }
           pipelineJob('data-prepper') {
-            triggers {
-              scm('H/5 * * * *')
+            properties {
+              pipelineTriggers {
+                triggers {
+                  scm('H/5 * * * *')
+                }
+              }
             }
             definition {
               cpsScm {
diff --git a/services/jenkins/deployment.yaml b/services/jenkins/deployment.yaml
index c71812a..9e83686 100644
--- a/services/jenkins/deployment.yaml
+++ b/services/jenkins/deployment.yaml
@@ -41,7 +41,7 @@ spec:
           {{ with secret "kv/data/atlas/jenkins/webhook-tokens" }}
           TITAN_IAC_WEBHOOK_TOKEN={{ .Data.data.titan_iac_quality_gate }}
           {{ end }}
-        bstein.dev/restarted-at: "2026-01-20T13:45:00Z"
+        bstein.dev/restarted-at: "2026-01-20T14:05:00Z"
     spec:
       serviceAccountName: jenkins
       nodeSelector:
diff --git a/services/jenkins/kustomization.yaml b/services/jenkins/kustomization.yaml
index 987e842..acb6fb4 100644
--- a/services/jenkins/kustomization.yaml
+++ b/services/jenkins/kustomization.yaml
@@ -16,7 +16,6 @@ configMapGenerator:
   - name: jenkins-init-scripts
     namespace: jenkins
     files:
-      - job_cleanup.groovy=scripts/job_cleanup.groovy
       - theme.groovy=scripts/theme.groovy
     options:
       disableNameSuffixHash: true
diff --git a/services/jenkins/scripts/job_cleanup.groovy b/services/jenkins/scripts/job_cleanup.groovy
deleted file mode 100644
index f123c6b..0000000
--- a/services/jenkins/scripts/job_cleanup.groovy
+++ /dev/null
@@ -1,13 +0,0 @@
-import jenkins.branch.MultiBranchProject
-import jenkins.model.Jenkins
-
-def jenkins = Jenkins.instance
-if (jenkins == null) {
-  return
-}
-
-def legacy = jenkins.getItemByFullName('titan-iac-quality-gate')
-if (legacy != null && !(legacy instanceof MultiBranchProject)) {
-  legacy.delete()
-  println("Deleted legacy job titan-iac-quality-gate (non-multibranch)")
-}