feat: migrate foundation-internal.webdev to jenkins 2.426.2

Signed-off-by: sebastien.heurtematte <[email protected]>
eclipse-cbi · Jan 22, 2024 · 3b594bc · 3b594bc
1 parent 02554fe
commit 3b594bc
Show file tree

Hide file tree

Showing 9 changed files with 62 additions and 148 deletions.
diff --git a/instances/foundation-internal.webdev/config.jsonnet b/instances/foundation-internal.webdev/config.jsonnet
@@ -11,12 +11,10 @@ local permissionsTemplates = import '../../templates/permissions.libsonnet';
     prefix: "/ci/"+ $.project.shortName,
   },
   jenkins+: {
-    version: "2.426.1",
     staticAgentCount: 8, // fake higher number of staticAgent to increase controller's resources
     permissions+:
       // https://gitlab.eclipse.org/eclipsefdn/infrazilla/-/issues/1056
       permissionsTemplates.user("anonymous", ["Overall/Read", "Job/Discover"]) +
-      permissionsTemplates.group($.project.unixGroupName, permissionsTemplates.committerPermissionsList + ["Gerrit/ManualTrigger", "Gerrit/Retrigger",]) +
       permissionsTemplates.group("admins", ["Overall/Administer"])
     ,
     plugins+: [

diff --git a/instances/foundation-internal.webdev/target/Dockerfile b/instances/foundation-internal.webdev/target/Dockerfile
@@ -1,4 +1,4 @@
-FROM docker.io/eclipsecbi/jiro-master:2.426.1
+FROM docker.io/eclipsecbi/jiro-master:2.426.2
 
 EXPOSE 8080
 EXPOSE 50000

diff --git a/instances/foundation-internal.webdev/target/config.json b/instances/foundation-internal.webdev/target/config.json
diff --git a/instances/foundation-internal.webdev/target/jenkins/configuration.yml b/instances/foundation-internal.webdev/target/jenkins/configuration.yml
@@ -49,30 +49,6 @@ jenkins:
               - View/Create
               - View/Delete
               - View/Read
-        - group:
-            name: foundation-internal.webdev
-            permissions:
-              - Agent/Build
-              - Credentials/View
-              - Job/Build
-              - Job/Cancel
-              - Job/Configure
-              - Job/Create
-              - Job/Delete
-              - Job/Move
-              - Job/Read
-              - Job/Workspace
-              - Overall/Read
-              - Run/Delete
-              - Run/Replay
-              - Run/Update
-              - SCM/Tag
-              - View/Configure
-              - View/Create
-              - View/Delete
-              - View/Read
-              - Gerrit/ManualTrigger
-              - Gerrit/Retrigger
         - user:
             name: anonymous
             permissions:
@@ -620,6 +596,8 @@ tool:
         home: "/opt/tools/java/openjdk/latest"
       - name: "openjdk-ea-latest"
         home: "/opt/tools/java/openjdk/ea-latest"
+      - name: "openjdk-jdk22-latest"
+        home: "/opt/tools/java/openjdk/jdk-22/latest"
       - name: "openjdk-jdk21-latest"
         home: "/opt/tools/java/openjdk/jdk-21/latest"
       - name: "openjdk-jdk20-latest"
@@ -716,6 +694,12 @@ tool:
         home: "/opt/tools/java/ibm/latest"
       - name: "semeru-latest"
         home: "/opt/tools/java/semeru/latest"
+      - name: "semeru-jdk21-latest"
+        home: "/opt/tools/java/semeru/jdk-21/latest"
+      - name: "semeru-jdk20-latest"
+        home: "/opt/tools/java/semeru/jdk-20/latest"
+      - name: "semeru-jdk19-latest"
+        home: "/opt/tools/java/semeru/jdk-19/latest"
       - name: "semeru-jdk18-latest"
         home: "/opt/tools/java/semeru/jdk-18/latest"
       - name: "semeru-jdk17-latest"

diff --git a/instances/foundation-internal.webdev/target/jenkins/partials/permissions.hbs b/instances/foundation-internal.webdev/target/jenkins/partials/permissions.hbs
@@ -28,30 +28,6 @@
       - View/Create
       - View/Delete
       - View/Read
-- group:
-    name: foundation-internal.webdev
-    permissions:
-      - Agent/Build
-      - Credentials/View
-      - Job/Build
-      - Job/Cancel
-      - Job/Configure
-      - Job/Create
-      - Job/Delete
-      - Job/Move
-      - Job/Read
-      - Job/Workspace
-      - Overall/Read
-      - Run/Delete
-      - Run/Replay
-      - Run/Update
-      - SCM/Tag
-      - View/Configure
-      - View/Create
-      - View/Delete
-      - View/Read
-      - Gerrit/ManualTrigger
-      - Gerrit/Retrigger
 - user:
     name: anonymous
     permissions:

diff --git a/instances/foundation-internal.webdev/target/jenkins/plugins.log b/instances/foundation-internal.webdev/target/jenkins/plugins.log
@@ -1,5 +1,5 @@
 Resulting plugin list:
-analysis-model-api 11.14.0
+analysis-model-api 11.15.0
 ant 497.v94e7d9fffa_b_9
 antisamy-markup-formatter 162.v0e6ec0fcfcf6
 apache-httpcomponents-client-4-api 4.5.14-208.v438351942757
@@ -16,29 +16,29 @@ command-launcher 107.v773860566e2e
 commons-lang3-api 3.13.0-62.v7d18e55f51e2
 commons-text-api 1.11.0-95.v22a_d30ee5d36
 config-file-provider 959.vcff671a_4518b_
-configuration-as-code 1763.vb_fe9c1b_83f7b
+configuration-as-code 1775.v810dc950b_514
 credentials 1311.vcf0a_900b_37c2
-credentials-binding 642.v737c34dea_6c2
+credentials-binding 657.v2b_19db_7d6e6d
 data-tables-api 1.13.8-2
 disable-failed-job 1.15
 display-url-api 2.200.vb_9327d658781
 docker-commons 439.va_3cb_0a_6a_fb_29
 docker-workflow 572.v950f58993843
 durable-task 543.v262f6a_803410
 echarts-api 5.4.3-2
-email-ext 2.103
+email-ext 2.104
 extended-read-permission 53.v6499940139e5
 external-monitor-job 215.v2e88e894db_f8
 extra-columns 1.26
-font-awesome-api 6.5.1-1
+font-awesome-api 6.5.1-2
 forensics-api 2.3.0
 ghprb 1.42.2
 git 5.2.1
 git-client 4.6.0
 git-parameter 0.9.19
 github 1.37.3.1
 github-api 1.318-461.v7a_c09c9fa_d63
-github-branch-source 1767.va_7d01ea_c7256
+github-branch-source 1772.va_69eda_d018d4
 gitlab-api 5.3.0-91.v1f9a_fda_d654f
 gitlab-branch-source 684.vea_fa_7c1e2fe3
 gitlab-plugin 1.8.0
@@ -56,13 +56,13 @@ jdk-tool 73.vddf737284550
 jersey2-api 2.41-133.va_03323b_a_1396
 jjwt-api 0.11.5-77.v646c772fddb_0
 jobConfigHistory 1229.v3039470161a_d
-joda-time-api 2.12.5-5.v5495a_235fedf
+joda-time-api 2.12.6-21.vca_fd74418fb_7
 jquery3-api 3.7.1-1
 jsch 0.2.16-86.v42e010d9484b_
 json-api 20231013-17.v1c97069404b_e
 json-path-api 2.8.0-21.v8b_7dc8b_1037b_
-junit 1252.vfc2e5efa_294f
-kubernetes 4174.v4230d0ccd951
+junit 1256.v002534a_5f33e
+kubernetes 4179.v3b_88431df708
 kubernetes-cli 1.12.1
 kubernetes-client-api 6.9.2-239.ve49a_3f285167
 kubernetes-credentials 0.11
@@ -73,27 +73,27 @@ matrix-auth 3.2.1
 matrix-project 822.v01b_8c85d16d2
 maven-plugin 3.23
 metrics 4.2.18-442.v02e107157925
-mina-sshd-api-common 2.11.0-86.v836f585d47fa_
-mina-sshd-api-core 2.11.0-86.v836f585d47fa_
+mina-sshd-api-common 2.12.0-90.v9f7fb_9fa_3d3b_
+mina-sshd-api-core 2.12.0-90.v9f7fb_9fa_3d3b_
 okhttp-api 4.11.0-157.v6852a_a_fa_ec11
-openshift-client 1.1.0.420.v8817277c1990
+openshift-client 1.1.0.424.v829cb_ccf8798
 pam-auth 1.10
 parameterized-trigger 787.v665fcf2a_830b_
 pipeline-build-step 540.vb_e8849e1a_b_d8
 pipeline-github 2.8-159.09e4403bc62f
 pipeline-graph-analysis 202.va_d268e64deb_3
-pipeline-graph-view 205.vb_8e3a_b_51f12e
-pipeline-groovy-lib 689.veec561a_dee13
+pipeline-graph-view 214.v6e2833d3fea_9
+pipeline-groovy-lib 700.v0e341fa_57d53
 pipeline-input-step 477.v339683a_8d55e
 pipeline-maven 1368.vfb_8509d7b_869
 pipeline-maven-api 1368.vfb_8509d7b_869
 pipeline-milestone-step 111.v449306f708b_7
-pipeline-model-api 2.2168.vf921b_4e72c73
-pipeline-model-definition 2.2168.vf921b_4e72c73
-pipeline-model-extensions 2.2168.vf921b_4e72c73
+pipeline-model-api 2.2169.vee7cd0efc13e
+pipeline-model-definition 2.2169.vee7cd0efc13e
+pipeline-model-extensions 2.2169.vee7cd0efc13e
 pipeline-rest-api 2.34
 pipeline-stage-step 305.ve96d0205c1c6
-pipeline-stage-tags-metadata 2.2168.vf921b_4e72c73
+pipeline-stage-tags-metadata 2.2169.vee7cd0efc13e
 pipeline-stage-view 2.34
 plain-credentials 143.v1b_df8b_d3b_e48
 plugin-util-api 3.8.0
@@ -106,25 +106,25 @@ script-security 1313.v7a_6067dc7087
 simple-theme-plugin 176.v39740c03a_a_f5
 slack 684.v833089650554
 snakeyaml-api 2.2-111.vc6598e30cc65
-sonar 2.17
+sonar 2.17.1
 ssh-agent 346.vda_a_c4f2c8e50
 ssh-credentials 308.ve4497b_ccd8f4
-ssh-slaves 2.947.v64ee6b_f87b_c1
-structs 325.vcb_307d2a_2782
+ssh-slaves 2.948.vb_8050d697fec
+structs 337.v1b_04ea_4df7c8
 timestamper 1.26
 token-macro 400.v35420b_922dcb_
 trilead-api 2.133.vfb_8a_7b_9c5dd1
 variant 60.v7290fc0eb_b_cd
-warnings-ng 10.5.3
+warnings-ng 10.7.0
 workflow-aggregator 596.v8c21c963d92d
 workflow-api 1283.v99c10937efcb_
 workflow-basic-steps 1042.ve7b_140c4a_e0c
 workflow-cps 3837.v305192405b_c0
 workflow-durable-task-step 1313.vcb_970b_d2a_fb_3
 workflow-job 1385.vb_58b_86ea_fff1
-workflow-multibranch 770.v1a_d0708dd1f6
+workflow-multibranch 773.vc4fe1378f1d5
 workflow-scm-step 415.v434365564324
-workflow-step-api 639.v6eca_cd8c04a_a_
+workflow-step-api 657.v03b_e8115821b_
 workflow-support 865.v43e78cc44e0d
 ws-cleanup 0.45
 xvnc 1.28

diff --git a/instances/foundation-internal.webdev/target/k8s/configmap-jenkins-config.yml b/instances/foundation-internal.webdev/target/k8s/configmap-jenkins-config.yml
@@ -14,8 +14,8 @@ metadata:
     org.eclipse.cbi.jiro/project.fullName: "foundation-internal.webdev"
     org.eclipse.cbi.jiro/kind: "master"
   annotations:
-    org.eclipse.cbi.jiro/jenkins.version: "2.426.1"
-    org.eclipse.cbi.jiro/jenkins.actualVersion: "2.426.1"
+    org.eclipse.cbi.jiro/jenkins.version: "latest"
+    org.eclipse.cbi.jiro/jenkins.actualVersion: "2.426.2"
     org.eclipse.cbi.jiro/kubernetes.master.namespace: "foundation-internal-webdev"
   namespace: "foundation-internal-webdev"
   name: jenkins-config
@@ -72,30 +72,6 @@ data:
                   - View/Create
                   - View/Delete
                   - View/Read
-            - group:
-                name: foundation-internal.webdev
-                permissions:
-                  - Agent/Build
-                  - Credentials/View
-                  - Job/Build
-                  - Job/Cancel
-                  - Job/Configure
-                  - Job/Create
-                  - Job/Delete
-                  - Job/Move
-                  - Job/Read
-                  - Job/Workspace
-                  - Overall/Read
-                  - Run/Delete
-                  - Run/Replay
-                  - Run/Update
-                  - SCM/Tag
-                  - View/Configure
-                  - View/Create
-                  - View/Delete
-                  - View/Read
-                  - Gerrit/ManualTrigger
-                  - Gerrit/Retrigger
             - user:
                 name: anonymous
                 permissions:
@@ -643,6 +619,8 @@ data:
             home: "/opt/tools/java/openjdk/latest"
           - name: "openjdk-ea-latest"
             home: "/opt/tools/java/openjdk/ea-latest"
+          - name: "openjdk-jdk22-latest"
+            home: "/opt/tools/java/openjdk/jdk-22/latest"
           - name: "openjdk-jdk21-latest"
             home: "/opt/tools/java/openjdk/jdk-21/latest"
           - name: "openjdk-jdk20-latest"
@@ -739,6 +717,12 @@ data:
             home: "/opt/tools/java/ibm/latest"
           - name: "semeru-latest"
             home: "/opt/tools/java/semeru/latest"
+          - name: "semeru-jdk21-latest"
+            home: "/opt/tools/java/semeru/jdk-21/latest"
+          - name: "semeru-jdk20-latest"
+            home: "/opt/tools/java/semeru/jdk-20/latest"
+          - name: "semeru-jdk19-latest"
+            home: "/opt/tools/java/semeru/jdk-19/latest"
           - name: "semeru-jdk18-latest"
             home: "/opt/tools/java/semeru/jdk-18/latest"
           - name: "semeru-jdk17-latest"