Upgrade OMR JIPP to latest Jenkins LTS

eclipse-cbi · Dec 11, 2024 · 88d9a96 · 88d9a96
1 parent 9fc7888
commit 88d9a96
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 10 deletions.
diff --git a/instances/technology.omr/target/config.json b/instances/technology.omr/target/config.json
@@ -491,8 +491,8 @@
       "id": "2.479.2",
       "key_fingerprint": "5BA31D57EF5975CA",
       "plugin_manager": {
-         "jar": "https://github.com/jenkinsci/plugin-installation-manager-tool/releases/download/2.13.0/jenkins-plugin-manager-2.13.0.jar",
-         "version": "2.13.0"
+         "jar": "https://github.com/jenkinsci/plugin-installation-manager-tool/releases/download/2.13.2/jenkins-plugin-manager-2.13.2.jar",
+         "version": "2.13.2"
       },
       "pluginroot": "/var/cache/jenkins/plugins",
       "plugins": [

diff --git a/instances/technology.omr/target/jenkins/configuration.yml b/instances/technology.omr/target/jenkins/configuration.yml
@@ -120,6 +120,8 @@ jenkins:
         containerCapStr: "2"
         jenkinsUrl: "http://jenkins-ui.omr.svc.cluster.local/omr"
         jenkinsTunnel: "jenkins-discovery.omr.svc.cluster.local:50000"
+        garbageCollection:
+          timeout: 300
         maxRequestsPerHostStr: "32"
         namespace: "omr"
         podRetention: "never"

diff --git a/instances/technology.omr/target/jenkins/plugins.log b/instances/technology.omr/target/jenkins/plugins.log
@@ -15,13 +15,13 @@ caffeine-api 3.1.8-133.v17b_1ff2e0599
 checks-api 2.2.1
 cloud-stats 336.v788e4055508b_
 cloudbees-disk-usage-simple 232.v713eeed2e1f4
-cloudbees-folder 6.959.v4ed5cc9e2dd4
+cloudbees-folder 6.969.v7d22c6eb_fde1
 command-launcher 116.vd85919c54a_d6
 commons-lang3-api 3.17.0-84.vb_b_938040b_078
 commons-text-api 1.12.0-129.v99a_50df237f7
 config-file-provider 980.v88956a_a_5d6a_d
-configuration-as-code 1897.v79281e066ea_7
-credentials 1389.vd7a_b_f5fa_50a_2
+configuration-as-code 1903.v004d55388f30
+credentials 1393.v6017143c1763
 credentials-binding 687.v619cb_15e923f
 data-tables-api 2.1.8-1
 display-url-api 2.209.v582ed814ff2f
@@ -73,8 +73,8 @@ jquery3-api 3.7.1-2
 jsch 0.2.16-86.v42e010d9484b_
 json-api 20240303-101.v7a_8666713110
 json-path-api 2.9.0-118.v7f23ed82a_8b_8
-junit 1309.v0078b_fecd6ed
-kubernetes 4296.v20a_7e4d77cf6
+junit 1311.v39e1716e4eb_e
+kubernetes 4302.va_756e4b_67715
 kubernetes-client-api 6.10.0-240.v57880ce8b_0b_2
 kubernetes-credentials 190.v03c305394deb_
 ldap 770.vb_455e934581a_
@@ -106,7 +106,7 @@ pipeline-stage-view 2.34
 plain-credentials 183.va_de8f1dd5a_2b_
 plugin-util-api 5.1.0
 prism-api 1.29.0-18
-prometheus 795.v995762102f28
+prometheus 801.v98e119d8eeda_
 promoted-builds 965.vcda_c6a_e0998f
 rebuild 332.va_1ee476d8f6d
 resource-disposer 0.25
@@ -127,9 +127,9 @@ warnings-ng 11.12.0
 workflow-aggregator 600.vb_57cdd26fdd7
 workflow-api 1336.vee415d95c521
 workflow-basic-steps 1058.vcb_fc1e3a_21a_9
-workflow-cps 3996.va_f5c1799f978
+workflow-cps 4000.v5198556e9cea_
 workflow-durable-task-step 1398.vf6c9e89e5988
-workflow-job 1468.vcf4f5ee92395
+workflow-job 1472.ve4d5eca_143c4
 workflow-multibranch 795.ve0cb_1f45ca_9a_
 workflow-scm-step 427.v4ca_6512e7df1
 workflow-step-api 678.v3ee58b_469476

diff --git a/instances/technology.omr/target/k8s/configmap-jenkins-config.yml b/instances/technology.omr/target/k8s/configmap-jenkins-config.yml
@@ -143,6 +143,8 @@ data:
             containerCapStr: "2"
             jenkinsUrl: "http://jenkins-ui.omr.svc.cluster.local/omr"
             jenkinsTunnel: "jenkins-discovery.omr.svc.cluster.local:50000"
+            garbageCollection:
+              timeout: 300
             maxRequestsPerHostStr: "32"
             namespace: "omr"
             podRetention: "never"