feat: add develocity to glassfish instance

Related to https://gitlab.eclipse.org/eclipsefdn/helpdesk/-/issues/5546 Signed-off-by: sebastien.heurtematte <[email protected]>
eclipse-cbi · Jan 20, 2025 · f8e2e76 · f8e2e76
1 parent 4c9f32e
commit f8e2e76
Show file tree

Hide file tree

Showing 7 changed files with 99 additions and 35 deletions.
diff --git a/instances/ee4j.glassfish/config.jsonnet b/instances/ee4j.glassfish/config.jsonnet
@@ -10,10 +10,14 @@
     plugins+: [
       "copyartifact",
       "view-job-filters",
+      "gradle",
     ],
   },
   seLinuxLevel: "s0:c40,c35",
   storage: {
     quota: "250Gi"
+  },
+  develocity+: {
+    generate: true,
   }
 }
diff --git a/instances/ee4j.glassfish/target/config.json b/instances/ee4j.glassfish/target/config.json
@@ -322,6 +322,9 @@
       "uiPort": 8080,
       "url": "https://ci.eclipse.org/glassfish"
    },
+   "develocity": {
+      "generate": true
+   },
    "docker": {
       "master": {
          "dockerfile": "FROM docker.io/eclipsecbi/jiro-master:2.479.2\n\nEXPOSE 8080\nEXPOSE 50000\n\nCOPY jenkins/ref/plugins /usr/share/jenkins/ref/plugins\n\nRUN mkdir -p /usr/share/jenkins/ref/userContent/theme/\nCOPY jenkins/quicksilver-light.css.override /usr/share/jenkins/ref/userContent/theme/\nCOPY jenkins/title.js /usr/share/jenkins/ref/userContent/theme/\n\nUSER 10001\n",
@@ -403,7 +406,8 @@
       "plugins": [
          "jacoco",
          "copyartifact",
-         "view-job-filters"
+         "view-job-filters",
+         "gradle"
       ],
       "pluginsForceUpgrade": true,
       "staticAgentCount": 0,
@@ -424,8 +428,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/ee4j.glassfish/target/jenkins/configuration.yml b/instances/ee4j.glassfish/target/jenkins/configuration.yml
@@ -73,6 +73,8 @@ jenkins:
         containerCapStr: "34"
         jenkinsUrl: "http://jenkins-ui.glassfish.svc.cluster.local/glassfish"
         jenkinsTunnel: "jenkins-discovery.glassfish.svc.cluster.local:50000"
+        garbageCollection:
+          timeout: 300
         maxRequestsPerHostStr: "32"
         namespace: "glassfish"
         podRetention: "never"
@@ -126,6 +128,9 @@ jenkins:
               - emptyDirVolume:
                   memory: false
                   mountPath: "/home/jenkins/.m2/wrapper"
+              - emptyDirVolume:
+                  memory: false
+                  mountPath: "/home/jenkins/.m2/.develocity"
             workspaceVolume:
               emptyDirWorkspaceVolume:
                 memory: false
@@ -217,6 +222,9 @@ jenkins:
               - emptyDirVolume:
                   memory: false
                   mountPath: "/home/jenkins/.m2/wrapper"
+              - emptyDirVolume:
+                  memory: false
+                  mountPath: "/home/jenkins/.m2/.develocity"
             workspaceVolume:
               emptyDirWorkspaceVolume:
                 memory: false
@@ -308,6 +316,9 @@ jenkins:
               - emptyDirVolume:
                   memory: false
                   mountPath: "/home/jenkins/.m2/wrapper"
+              - emptyDirVolume:
+                  memory: false
+                  mountPath: "/home/jenkins/.m2/.develocity"
             workspaceVolume:
               emptyDirWorkspaceVolume:
                 memory: false
@@ -437,6 +448,13 @@ unclassified:
     showBuildBadges: "never"
     showChangeReasonCommentWindow: false
     skipDuplicateHistory: true
+  hashicorpVault:
+    configuration:
+      disableChildPoliciesOverride: false
+      engineVersion: 2
+      timeout: 60
+      vaultCredentialId: "secretsmanager-approle"
+      vaultUrl: "https://secretsmanager.eclipse.org"
 tool:
   jdk:
     installations:
@@ -522,6 +540,8 @@ tool:
         home: "/opt/tools/java/adoptopenjdk/openj9-jdk-8/latest"
       - name: "temurin-latest"
         home: "/opt/tools/java/temurin/latest"
+      - name: "temurin-jdk23-latest"
+        home: "/opt/tools/java/temurin/jdk-23/latest"
       - name: "temurin-jdk22-latest"
         home: "/opt/tools/java/temurin/jdk-22/latest"
       - name: "temurin-jdk21-latest"

diff --git a/instances/ee4j.glassfish/target/jenkins/plugins-list.txt b/instances/ee4j.glassfish/target/jenkins/plugins-list.txt
@@ -1,4 +1,5 @@
 # GENERATED FILE - DO NOT EDIT
 copyartifact
+gradle
 jacoco
 view-job-filters
diff --git a/instances/ee4j.glassfish/target/jenkins/plugins.log b/instances/ee4j.glassfish/target/jenkins/plugins.log
@@ -3,47 +3,48 @@ analysis-model-api 12.9.1
 ant 511.v0a_a_1a_334f41b_
 antisamy-markup-formatter 162.v0e6ec0fcfcf6
 apache-httpcomponents-client-4-api 4.5.14-208.v438351942757
-apache-httpcomponents-client-5-api 5.4-124.v31e2987e48f4
+apache-httpcomponents-client-5-api 5.4-135.v4da_349961256
 asm-api 9.7.1-97.v4cc844130d97
 authentication-tokens 1.119.v50285141b_7e1
 authorize-project 1.8.1
 bootstrap5-api 5.3.3-1
-bouncycastle-api 2.30.1.78.1-248.ve27176eb_46cb_
-branch-api 2.1200.v4b_a_3da_2eb_db_4
+bouncycastle-api 2.30.1.80-256.vf98926042a_9b_
+branch-api 2.1208.vf528356feca_4
 build-timeout 1.33
 caffeine-api 3.1.8-133.v17b_1ff2e0599
 checks-api 2.2.1
 cloudbees-disk-usage-simple 232.v713eeed2e1f4
-cloudbees-folder 6.959.v4ed5cc9e2dd4
+cloudbees-folder 6.976.v4dc79fb_c458d
 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
-copyartifact 757.v05365583a_455
-credentials 1389.vd7a_b_f5fa_50a_2
+configuration-as-code 1915.vcdd0a_d0d2625
+copyartifact 761.vea_2b_25523e84
+credentials 1405.vb_cda_74a_f8974
 credentials-binding 687.v619cb_15e923f
 data-tables-api 2.1.8-1
 display-url-api 2.209.v582ed814ff2f
 durable-task 581.v299a_5609d767
-echarts-api 5.5.1-4
+echarts-api 5.5.1-5
 eddsa-api 0.3.0-4.v84c6f0f4969e
-email-ext 1861.vdb_d991590994
-extended-read-permission 53.v6499940139e5
+email-ext 1866.v14fa_6d201654
+extended-read-permission 61.vf24570ff3b_e9
 external-monitor-job 215.v2e88e894db_f8
 extra-columns 1.27
 font-awesome-api 6.6.0-2
-forensics-api 2.6.0
+forensics-api 2.7.0
 ghprb 1.42.2
-git 5.6.0
-git-client 6.1.0
+git 5.7.0
+git-client 6.1.1
 git-parameter 0.10.0
 github 1.40.0
 github-api 1.321-478.vc9ce627ce001
-github-branch-source 1807.v50351eb_7dd13
+github-branch-source 1809.v088b_5f22c768
 gitlab-api 5.6.0-97.v6603a_83f8690
 gitlab-branch-source 715.v4c830b_ca_ef95
 gitlab-plugin 1.9.6
+gradle 2.14
 gson-api 2.11.0-85.v1f4e87273c33
 handy-uri-templates-2-api 2.1.8-30.v7e777411b_148
 hashicorp-vault-plugin 371.v884a_4dd60fb_6
@@ -59,14 +60,14 @@ jaxb 2.3.9-1
 jdk-tool 80.v8a_dee33ed6f0
 jersey2-api 2.44-151.v6df377fff741
 jjwt-api 0.11.5-112.ve82dfb_224b_a_d
-jobConfigHistory 1283.veb_dfb_00b_5ec0
+jobConfigHistory 1294.v961a_b_707546a_
 joda-time-api 2.13.0-93.v9934da_29b_a_e9
 jquery3-api 3.7.1-2
 jsch 0.2.16-86.v42e010d9484b_
-json-api 20240303-101.v7a_8666713110
+json-api 20250107-125.v28b_a_ffa_eb_f01
 json-path-api 2.9.0-118.v7f23ed82a_8b_8
-junit 1309.v0078b_fecd6ed
-kubernetes 4296.v20a_7e4d77cf6
+junit 1312.v1a_235a_b_94a_31
+kubernetes 4306.vc91e951ea_eb_d
 kubernetes-client-api 6.10.0-240.v57880ce8b_0b_2
 kubernetes-credentials 190.v03c305394deb_
 ldap 770.vb_455e934581a_
@@ -75,16 +76,16 @@ matrix-auth 3.2.3
 matrix-project 840.v812f627cb_578
 maven-plugin 3.24
 metrics 4.2.21-458.vcf496cb_839e4
-mina-sshd-api-common 2.14.0-133.vcc091215a_358
-mina-sshd-api-core 2.14.0-133.vcc091215a_358
-okhttp-api 4.11.0-181.v1de5b_83857df
+mina-sshd-api-common 2.14.0-138.v6341ee58e1df
+mina-sshd-api-core 2.14.0-138.v6341ee58e1df
+okhttp-api 4.11.0-183.va_87fc7a_89810
 pam-auth 1.11
 parameterized-trigger 806.vf6fff3e28c3e
 pipeline-build-step 540.vb_e8849e1a_b_d8
 pipeline-graph-analysis 216.vfd8b_ece330ca_
-pipeline-graph-view 382.vb_9a_27b_7b_ea_71
-pipeline-groovy-lib 744.v5b_556ee7c253
-pipeline-input-step 495.ve9c153f6067b_
+pipeline-graph-view 401.v99b_6582132f4
+pipeline-groovy-lib 749.v70084559234a_
+pipeline-input-step 508.v584c0e9a_2177
 pipeline-maven 1469.ve15ca_a_b_90b_44
 pipeline-maven-api 1469.ve15ca_a_b_90b_44
 pipeline-milestone-step 119.vdfdc43fc3b_9a_
@@ -98,18 +99,18 @@ 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
-scm-api 698.v8e3b_c788f0a_6
+scm-api 703.v72ff4b_259600
 script-security 1369.v9b_98a_4e95b_2d
 simple-theme-plugin 196.v96d9592f4efa_
 snakeyaml-api 2.3-123.v13484c65210a_
 sonar 2.17.3
 ssh-agent 376.v8933585c69d3
 ssh-credentials 349.vb_8b_6b_9709f5b_
-ssh-slaves 2.973.v0fa_8c0dea_f9f
+ssh-slaves 3.1021.va_cc11b_de26a_e
 structs 338.v848422169819
 timestamper 1.28
 token-macro 400.v35420b_922dcb_
@@ -118,15 +119,15 @@ variant 60.v7290fc0eb_b_cd
 view-job-filters 392.v2c0a_4dd46909
 warnings-ng 11.12.0
 workflow-aggregator 600.vb_57cdd26fdd7
-workflow-api 1336.vee415d95c521
+workflow-api 1358.vfb_5780da_64cb_
 workflow-basic-steps 1058.vcb_fc1e3a_21a_9
-workflow-cps 3996.va_f5c1799f978
-workflow-durable-task-step 1398.vf6c9e89e5988
-workflow-job 1468.vcf4f5ee92395
+workflow-cps 4009.v0089238351a_9
+workflow-durable-task-step 1400.v7a_fd50a_091de
+workflow-job 1498.v33a_0c6f3a_4b_4
 workflow-multibranch 795.ve0cb_1f45ca_9a_
 workflow-scm-step 427.v4ca_6512e7df1
 workflow-step-api 678.v3ee58b_469476
-workflow-support 936.v9fa_77211ca_e1
+workflow-support 943.v8b_0d01a_7b_a_08
 ws-cleanup 0.48
 xvnc 1.28
 
diff --git a/instances/ee4j.glassfish/target/jenkins/title.js b/instances/ee4j.glassfish/target/jenkins/title.js
@@ -1 +1,15 @@
 document.title = "Eclipse Glassfish - " + document.title;
+document.addEventListener('DOMContentLoaded', function() {
+    let header = document.querySelector('.page-header__brand');
+    if (header) {
+        let newLink = document.createElement('a');
+        newLink.href = 'https://github.com/eclipse-cbi/jiro/blob/master/instances/ee4j.glassfish/target/config.json';
+        newLink.textContent = 'JCasC Source';
+        newLink.style = 'color: white; border-left: 1px solid white; padding-left: 1em; font-size: 1.1em; position: relative; top: 0.2em; left: -1.6em;';
+        newLink.target = '_blank';
+        newLink.title = 'JIRO JCasC Configuration as Code';
+        header.appendChild(newLink);
+    } else {
+        console.log('Element with class "header" not found.');
+    }
+});
diff --git a/instances/ee4j.glassfish/target/k8s/configmap-jenkins-config.yml b/instances/ee4j.glassfish/target/k8s/configmap-jenkins-config.yml
@@ -96,6 +96,8 @@ data:
             containerCapStr: "34"
             jenkinsUrl: "http://jenkins-ui.glassfish.svc.cluster.local/glassfish"
             jenkinsTunnel: "jenkins-discovery.glassfish.svc.cluster.local:50000"
+            garbageCollection:
+              timeout: 300
             maxRequestsPerHostStr: "32"
             namespace: "glassfish"
             podRetention: "never"
@@ -149,6 +151,9 @@ data:
                   - emptyDirVolume:
                       memory: false
                       mountPath: "/home/jenkins/.m2/wrapper"
+                  - emptyDirVolume:
+                      memory: false
+                      mountPath: "/home/jenkins/.m2/.develocity"
                 workspaceVolume:
                   emptyDirWorkspaceVolume:
                     memory: false
@@ -240,6 +245,9 @@ data:
                   - emptyDirVolume:
                       memory: false
                       mountPath: "/home/jenkins/.m2/wrapper"
+                  - emptyDirVolume:
+                      memory: false
+                      mountPath: "/home/jenkins/.m2/.develocity"
                 workspaceVolume:
                   emptyDirWorkspaceVolume:
                     memory: false
@@ -331,6 +339,9 @@ data:
                   - emptyDirVolume:
                       memory: false
                       mountPath: "/home/jenkins/.m2/wrapper"
+                  - emptyDirVolume:
+                      memory: false
+                      mountPath: "/home/jenkins/.m2/.develocity"
                 workspaceVolume:
                   emptyDirWorkspaceVolume:
                     memory: false
@@ -460,6 +471,13 @@ data:
         showBuildBadges: "never"
         showChangeReasonCommentWindow: false
         skipDuplicateHistory: true
+      hashicorpVault:
+        configuration:
+          disableChildPoliciesOverride: false
+          engineVersion: 2
+          timeout: 60
+          vaultCredentialId: "secretsmanager-approle"
+          vaultUrl: "https://secretsmanager.eclipse.org"
     tool:
       jdk:
         installations:
@@ -545,6 +563,8 @@ data:
             home: "/opt/tools/java/adoptopenjdk/openj9-jdk-8/latest"
           - name: "temurin-latest"
             home: "/opt/tools/java/temurin/latest"
+          - name: "temurin-jdk23-latest"
+            home: "/opt/tools/java/temurin/jdk-23/latest"
           - name: "temurin-jdk22-latest"
             home: "/opt/tools/java/temurin/jdk-22/latest"
           - name: "temurin-jdk21-latest"