Assign resourcePacks to project Eclipse openPASS

https://gitlab.eclipse.org/eclipsefdn/helpdesk/-/issues/7083

Author: fredg02

instances/automotive.openpass/config.jsonnet

@@ -2,7 +2,7 @@
   project+: {
     fullName: "automotive.openpass",
     displayName: "Eclipse openPASS",
-    resourcePacks: 13
+    resourcePacks: 18
   },
   jenkins+: {
     plugins+: [

instances/automotive.openpass/target/config.json

@@ -19,7 +19,9 @@
             "basic": {
                "agentWorkdir": "/home/jenkins/jenkins-agent",
                "docker": {
-                  "aliases": [ ],
+                  "aliases": [
+                     "docker.io/eclipsecbi/jiro-agent-basic-ubuntu:latest"
+                  ],
                   "context": "basic",
                   "dockerfile": "#*******************************************************************************\n# Copyright (c) 2020 Eclipse Foundation and others.\n# This program and the accompanying materials are made available\n# under the terms of the Eclipse Public License 2.0\n# which is available at http://www.eclipse.org/legal/epl-v20.html,\n# or the MIT License which is available at https://opensource.org/licenses/MIT.\n# SPDX-License-Identifier: EPL-2.0 OR MIT\n#*******************************************************************************\nFROM docker.io/eclipsecbi/jiro-agent-basic-ubuntu:spec\n\n# These environment variables will be used in the uid_entrypoint script from the parent image\nENV USER_NAME=\"jenkins\"\nENV HOME=\"/home/jenkins\"\n\nVOLUME [ \"/home/jenkins\" ]\nWORKDIR \"/home/jenkins\"\nENTRYPOINT [ \"/usr/local/bin/jenkins-agent\" ]\n\nADD \"https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3327.v868139a_d00e0/remoting-3327.v868139a_d00e0.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3327.v868139a_d00e0-8/jenkins-agent\" \"/usr/local/bin/jenkins-agent\"\n\nRUN sed -e 's/JAVA_OPTS/JAVA_OPTS \\$JENKINS_REMOTING_JAVA_OPTS/g' /usr/local/bin/jenkins-agent > /usr/local/bin/jenkins-agent.sed \\\n    && mv /usr/local/bin/jenkins-agent.sed /usr/local/bin/jenkins-agent\n\nRUN chmod 755 \"$(dirname \"/usr/share/jenkins/agent.jar\")\" \\\n  && chmod 644 \"/usr/share/jenkins/agent.jar\" \\\n  && chmod ug+rx \"/usr/local/bin/jenkins-agent\" \\\n  && chgrp 0 \"/usr/local/bin/jenkins-agent\"\n\nRUN ln -sf /bin/bash /bin/sh\n\nUSER 10001:0\n\n",
                   "image": "jiro-agent-basic-ubuntu",
@@ -115,7 +117,9 @@
             "ubuntu-2204": {
                "agentWorkdir": "/home/jenkins/jenkins-agent",
                "docker": {
-                  "aliases": [ ],
+                  "aliases": [
+                     "docker.io/eclipsecbi/jiro-agent-ubuntu-2204:latest"
+                  ],
                   "build_args": "['FROM_TAG': '22.04']",
                   "context": "ubuntu",
                   "dockerfile": "#*******************************************************************************\n# Copyright (c) 2020 Eclipse Foundation and others.\n# This program and the accompanying materials are made available\n# under the terms of the Eclipse Public License 2.0\n# which is available at http://www.eclipse.org/legal/epl-v20.html,\n# or the MIT License which is available at https://opensource.org/licenses/MIT.\n# SPDX-License-Identifier: EPL-2.0 OR MIT\n#*******************************************************************************\nFROM docker.io/eclipsecbi/jiro-agent-ubuntu-2204:spec\n\n# These environment variables will be used in the uid_entrypoint script from the parent image\nENV USER_NAME=\"jenkins\"\nENV HOME=\"/home/jenkins\"\n\nVOLUME [ \"/home/jenkins\" ]\nWORKDIR \"/home/jenkins\"\nENTRYPOINT [ \"/usr/local/bin/jenkins-agent\" ]\n\nADD \"https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3327.v868139a_d00e0/remoting-3327.v868139a_d00e0.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3327.v868139a_d00e0-8/jenkins-agent\" \"/usr/local/bin/jenkins-agent\"\n\nRUN sed -e 's/JAVA_OPTS/JAVA_OPTS \\$JENKINS_REMOTING_JAVA_OPTS/g' /usr/local/bin/jenkins-agent > /usr/local/bin/jenkins-agent.sed \\\n    && mv /usr/local/bin/jenkins-agent.sed /usr/local/bin/jenkins-agent\n\nRUN chmod 755 \"$(dirname \"/usr/share/jenkins/agent.jar\")\" \\\n  && chmod 644 \"/usr/share/jenkins/agent.jar\" \\\n  && chmod ug+rx \"/usr/local/bin/jenkins-agent\" \\\n  && chgrp 0 \"/usr/local/bin/jenkins-agent\"\n\nRUN ln -sf /bin/bash /bin/sh\n\nUSER 10001:0\n\n",
@@ -211,7 +215,9 @@
             "ubuntu-2404": {
                "agentWorkdir": "/home/jenkins/jenkins-agent",
                "docker": {
-                  "aliases": [ ],
+                  "aliases": [
+                     "docker.io/eclipsecbi/jiro-agent-ubuntu-2404:latest"
+                  ],
                   "build_args": "['FROM_TAG': '24.04']",
                   "context": "ubuntu",
                   "dockerfile": "#*******************************************************************************\n# Copyright (c) 2020 Eclipse Foundation and others.\n# This program and the accompanying materials are made available\n# under the terms of the Eclipse Public License 2.0\n# which is available at http://www.eclipse.org/legal/epl-v20.html,\n# or the MIT License which is available at https://opensource.org/licenses/MIT.\n# SPDX-License-Identifier: EPL-2.0 OR MIT\n#*******************************************************************************\nFROM docker.io/eclipsecbi/jiro-agent-ubuntu-2404:spec\n\n# These environment variables will be used in the uid_entrypoint script from the parent image\nENV USER_NAME=\"jenkins\"\nENV HOME=\"/home/jenkins\"\n\nVOLUME [ \"/home/jenkins\" ]\nWORKDIR \"/home/jenkins\"\nENTRYPOINT [ \"/usr/local/bin/jenkins-agent\" ]\n\nADD \"https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3327.v868139a_d00e0/remoting-3327.v868139a_d00e0.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3327.v868139a_d00e0-8/jenkins-agent\" \"/usr/local/bin/jenkins-agent\"\n\nRUN sed -e 's/JAVA_OPTS/JAVA_OPTS \\$JENKINS_REMOTING_JAVA_OPTS/g' /usr/local/bin/jenkins-agent > /usr/local/bin/jenkins-agent.sed \\\n    && mv /usr/local/bin/jenkins-agent.sed /usr/local/bin/jenkins-agent\n\nRUN chmod 755 \"$(dirname \"/usr/share/jenkins/agent.jar\")\" \\\n  && chmod 644 \"/usr/share/jenkins/agent.jar\" \\\n  && chmod ug+rx \"/usr/local/bin/jenkins-agent\" \\\n  && chgrp 0 \"/usr/local/bin/jenkins-agent\"\n\nRUN ln -sf /bin/bash /bin/sh\n\nUSER 10001:0\n\n",
@@ -346,7 +352,7 @@
    },
    "jenkins": {
       "agentConnectionTimeout": 180,
-      "maxConcurrency": 26,
+      "maxConcurrency": 36,
       "permissions": [
          {
             "user": {
@@ -434,6 +440,7 @@
          "authorize-project",
          "bouncycastle-api",
          "build-timeout",
+         "build-discarder",
          "cloudbees-disk-usage-simple",
          "cloudbees-folder",
          "command-launcher",
@@ -527,12 +534,12 @@
          },
          "resources": {
             "cpu": {
-               "limit": "7700m",
-               "request": "3850m"
+               "limit": "8000m",
+               "request": "4000m"
             },
             "memory": {
-               "limit": "7680Mi",
-               "request": "7680Mi"
+               "limit": "8192Mi",
+               "request": "8192Mi"
             }
          },
          "stsName": "openpass"
@@ -588,7 +595,7 @@
    "project": {
       "displayName": "Eclipse openPASS",
       "fullName": "automotive.openpass",
-      "resourcePacks": 13,
+      "resourcePacks": 18,
       "shortName": "openpass",
       "unixGroupName": "automotive.openpass"
    },

instances/automotive.openpass/target/jenkins/configuration.yml

@@ -67,7 +67,7 @@ jenkins:
   clouds:
     - kubernetes:
         name: "kubernetes"
-        containerCapStr: "26"
+        containerCapStr: "36"
         jenkinsUrl: "http://jenkins-ui.openpass.svc.cluster.local/openpass"
         jenkinsTunnel: "jenkins-discovery.openpass.svc.cluster.local:50000"
         garbageCollection:
@@ -403,7 +403,7 @@ unclassified:
   buildDiscarders:
     configuredBuildDiscarders:
       - "jobBuildDiscarder"
-      - simpleBuildDiscarder:
+      - defaultBuildDiscarder:
           discarder:
             logRotator:
               artifactNumToKeepStr: "5"
@@ -677,6 +677,8 @@ tool:
                     url: "https://download.eclipse.org/cbi/build-tools/maven-mvnd-1.0.3-linux-amd64.tar.gz"
       - name: "apache-maven-latest"
         home: "/opt/tools/apache-maven/latest"
+      - name: "apache-maven-3.9.12"
+        home: "/opt/tools/apache-maven/3.9.12"
       - name: "apache-maven-3.9.11"
         home: "/opt/tools/apache-maven/3.9.11"
       - name: "apache-maven-3.9.9"

instances/automotive.openpass/target/jenkins/plugins.log

@@ -1,133 +1,134 @@
 Resulting plugin list:
-analysis-model-api 13.17.0-931.v730d8659ea_9c
+analysis-model-api 13.18.0-935.v784ca_107400a_
 ant 520.vd082ecfb_16a_9
 antisamy-markup-formatter 173.v680e3a_b_69ff3
 apache-httpcomponents-client-4-api 4.5.14-269.vfa_2321039a_83
-apache-httpcomponents-client-5-api 5.5-170.v023de017ccd7
-asm-api 9.9-185.va_6c6b_3348b_c3
+apache-httpcomponents-client-5-api 5.6-183.ve5a_8a_b_e71e59
+asm-api 9.9.1-189.vb_5ef2964da_91
 authentication-tokens 1.144.v5ff4a_5ec5c33
 authorize-project 2.0.0
 bootstrap5-api 5.3.8-895.v4d0d8e47fea_d
 bouncycastle-api 2.30.1.82-277.v70ca_0b_877184
 branch-api 2.1268.v044a_87612da_8
-build-timeout 1.38
+build-discarder 158.vce570d01ce4c
+build-timeout 1.39
 caffeine-api 3.2.3-194.v31a_b_f7a_b_5a_81
-checks-api 373.vfe7645102093
+checks-api 402.vca_263b_f200e3
 cloudbees-disk-usage-simple 256.v20ec4eb_884f1
 cloudbees-folder 6.1073.va_7888eb_dd514
 command-launcher 123.v37cfdc92ef67
 commons-lang3-api 3.20.0-109.ve43756e2d2b_4
 commons-text-api 1.15.0-210.v7480a_da_70b_9e
 conditional-buildstep 1.5.0
 config-file-provider 1006.vc7366c201f57
-configuration-as-code 2006.v001a_2ca_6b_574
-credentials 1453.v9b_a_29777a_b_fd
-credentials-binding 702.vfe613e537e88
-data-tables-api 2.3.5-1482.vb_47a_3c19f78c
+configuration-as-code 2036.v0b_c2de701dcb_
+credentials 1480.v2246fd131e83
+credentials-binding 717.v951d49b_5f3a_a_
+data-tables-api 2.3.5-1497.v38449eb_7d5a_1
 display-url-api 2.217.va_6b_de84cc74b_
-durable-task 639.vefb_3d8372f6d
+durable-task 651.v1f5e074fc83f
 echarts-api 6.0.0-1165.vd1283a_3e37d4
-eddsa-api 0.3.0.1-19.vc432d923e5ee
+eddsa-api 0.3.0.1-29.v67e9a_1c969b_b_
 email-ext 1933.v45cec755423f
 extended-read-permission 68.vd270568a_7520
 external-monitor-job 223.vb_fddcf42c9b_3
 extra-columns 1.28
 font-awesome-api 7.1.0-882.v1dfb_771e3278
-forensics-api 3.1772.v99ca_3d83b_9fa_
+forensics-api 3.1832.va_1179842528b_
 ghprb 1.42.2
-git 5.8.1
-git-client 6.4.1
-git-parameter 460.v71e7583a_c099
+git 5.9.0
+git-client 6.5.0
+git-parameter 462.vdcf3df2ed2ca_
 github 1.45.0
 github-api 1.330-492.v3941a_032db_2a_
 github-branch-source 1917.v9ee8a_39b_3d0d
 gitlab-api 6.2.0-111.vf174d6b_8c12e
-gitlab-branch-source 736.v10e786eeea_19
-gitlab-plugin 1.9.11
+gitlab-branch-source 740.v04f287f9194d
+gitlab-plugin 1.9.13
 gson-api 2.13.2-173.va_a_092315913c
 handy-uri-templates-2-api 2.1.8-38.vcea_5d521d5f3
-hashicorp-vault-plugin 371.v884a_4dd60fb_6
+hashicorp-vault-plugin 377.vc87a_13718939
 instance-identity 203.v15e81a_1b_7a_38
 ionicons-api 94.vcc3065403257
 jackson2-api 2.20.1-423.v13951f6b_6532
 jakarta-activation-api 2.1.4-1
 jakarta-mail-api 2.1.5-1
-jakarta-xml-bind-api 4.0.6-10.v9b_7e1d1fc40b_
+jakarta-xml-bind-api 4.0.6-12.vb_1833c1231d3
 javadoc 354.vee1a_660b_4990
 javax-activation-api 1.2.0-8
-jaxb 2.3.9-133.vb_ec76a_73f706
+jaxb 2.3.9-143.v5979df3304e6
 jdk-tool 83.v417146707a_3d
 jersey3-api 3.1.11-4.v77818819c2e1
 jjwt-api 0.11.5-120.v0268cf544b_89
 jobConfigHistory 1356.ve360da_6c523a_
-joda-time-api 2.14.0-149.v1c3ce991d1b_9
+joda-time-api 2.14.0-177.vd7e9347b_e7d5
 jquery3-api 3.7.1-619.vdb_10e002501a_
 jsch 0.2.16-95.v3eecb_55fa_b_78
-json-api 20250517-173.v596efb_962a_31
+json-api 20251224-185.v0cc18490c62c
 json-path-api 2.10.0-202.va_9cc16c1e476
-jsoup 1.21.2-66.v6ea_38164b_8a_2
+jsoup 1.22.1-76.v9cdb_2456c0e3
 junit 1369.v15da_00283f06
-kubernetes 4398.vb_b_33d9e7fe23
+kubernetes 4423.vb_59f230b_ce53
 kubernetes-client-api 7.3.1-256.v788a_0b_787114
-kubernetes-credentials 206.vde31a_b_0f71a_c
-ldap 793.v754d6b_41b_ea_4
+kubernetes-credentials 207.v492f58828b_ed
+ldap 807.v7d7de30930cf
 mail-watcher-plugin 1.21
 mailer 525.v2458b_d8a_1a_71
 matrix-auth 3.2.9
 matrix-project 870.v9db_fcfc2f45b_
 maven-plugin 3.27
-metrics 4.2.37-489.vb_6db_69b_ce753
+metrics 4.2.37-494.v06f9a_939d33a_
 mina-sshd-api-common 2.16.0-167.va_269f38cc024
 mina-sshd-api-core 2.16.0-167.va_269f38cc024
 nodejs 1.6.6
 okhttp-api 4.12.0-195.vc02552c04ffd
-oss-symbols-api 424.ved751e062911
+oss-symbols-api 442.v99039087229b_
 pam-auth 1.12
 parameterized-trigger 873.v8b_e37dd8418f
-pipeline-build-step 571.v08a_fffd4b_0ce
+pipeline-build-step 584.vdb_a_2cc3a_d07a_
 pipeline-graph-analysis 245.v88f03631a_b_21
 pipeline-graph-view 661.v6003f4542123
 pipeline-groovy-lib 787.ve2fef0efdca_6
 pipeline-input-step 540.v14b_100d754dd
-pipeline-maven 1567.vb_2c3a_2116860
-pipeline-maven-api 1567.vb_2c3a_2116860
+pipeline-maven 1611.v6a_00c04177b_b_
+pipeline-maven-api 1611.v6a_00c04177b_b_
 pipeline-milestone-step 138.v78ca_76831a_43
 pipeline-model-api 2.2277.v00573e73ddf1
 pipeline-model-definition 2.2277.v00573e73ddf1
 pipeline-model-extensions 2.2277.v00573e73ddf1
-pipeline-rest-api 2.38
+pipeline-rest-api 2.39
 pipeline-stage-step 322.vecffa_99f371c
 pipeline-stage-tags-metadata 2.2277.v00573e73ddf1
-pipeline-stage-view 2.38
+pipeline-stage-view 2.39
 plain-credentials 199.v9f8e1f741799
 plugin-usage-plugin 4.10
 plugin-util-api 6.1192.v30fe6e2837ff
-prism-api 1.30.0-630.va_e19d17f83b_0
-prometheus 819.v50953a_c560dd
+prism-api 1.30.0-703.v116fb_3b_5b_b_a_a_
+prometheus 847.v8440e5c21e7c
 promoted-builds 992.va_00888f21b_74
 rebuild 338.va_0a_b_50e29397
 resource-disposer 0.25
-run-condition 243.v3c3f94e46a_8b_
+run-condition 276.v97298f3a_cd51
 scm-api 724.v7d839074eb_5c
-script-security 1385.v7d2d9ec4d909
-simple-theme-plugin 211.v5424a_5510e47
+script-security 1399.ve6a_66547f6e1
+simple-theme-plugin 230.v8b_fd91b_b_800c
 snakeyaml-api 2.5-143.v93b_c004f89de
 sonar 2.18.2
 ssh-agent 386.v36cc0c7582f0
 ssh-credentials 361.vb_f6760818e8c
-ssh-slaves 3.1085.vc64d040efa_85
+ssh-slaves 3.1096.v0b_cc466e4323
 structs 362.va_b_695ef4fdf9
 timestamper 1.30
 token-macro 477.vd4f0dc3cb_cf1
 trilead-api 2.284.v1974ea_324382
 variant 70.va_d9f17f859e0
-warnings-ng 12.9848.v5603977006f2
+warnings-ng 12.9996.va_151fb_d6d757
 workflow-aggregator 608.v67378e9d3db_1
 workflow-api 1384.vdc05a_48f535f
 workflow-basic-steps 1098.v808b_fd7f8cf4
-workflow-cps 4238.va_6fb_65c1f699
+workflow-cps 4255.vd9c37f80fd8a_
 workflow-durable-task-step 1464.v2d3f5c68f84c
-workflow-job 1559.va_a_533730b_ea_d
+workflow-job 1571.vb_423c255d6d9
 workflow-multibranch 821.vc3b_4ea_780798
 workflow-scm-step 466.va_d69e602552b_
 workflow-step-api 710.v3e456cc85233

instances/automotive.openpass/target/k8s/configmap-jenkins-config.yml

@@ -90,7 +90,7 @@ data:
       clouds:
         - kubernetes:
             name: "kubernetes"
-            containerCapStr: "26"
+            containerCapStr: "36"
             jenkinsUrl: "http://jenkins-ui.openpass.svc.cluster.local/openpass"
             jenkinsTunnel: "jenkins-discovery.openpass.svc.cluster.local:50000"
             garbageCollection:
@@ -426,7 +426,7 @@ data:
       buildDiscarders:
         configuredBuildDiscarders:
           - "jobBuildDiscarder"
-          - simpleBuildDiscarder:
+          - defaultBuildDiscarder:
               discarder:
                 logRotator:
                   artifactNumToKeepStr: "5"
@@ -700,6 +700,8 @@ data:
                         url: "https://download.eclipse.org/cbi/build-tools/maven-mvnd-1.0.3-linux-amd64.tar.gz"
           - name: "apache-maven-latest"
             home: "/opt/tools/apache-maven/latest"
+          - name: "apache-maven-3.9.12"
+            home: "/opt/tools/apache-maven/3.9.12"
           - name: "apache-maven-3.9.11"
             home: "/opt/tools/apache-maven/3.9.11"
           - name: "apache-maven-3.9.9"

instances/automotive.openpass/target/k8s/resource-quotas.json

@@ -11,11 +11,11 @@
    },
    "spec": {
       "hard": {
-         "limits.cpu": "67500m",
-         "limits.memory": "127488Mi",
-         "pods": 27,
-         "requests.cpu": "35050m",
-         "requests.memory": "127488Mi"
+         "limits.cpu": "90800m",
+         "limits.memory": "174080Mi",
+         "pods": 37,
+         "requests.cpu": "47200m",
+         "requests.memory": "174080Mi"
       }
    }
 }

instances/automotive.openpass/target/k8s/statefulset.json

@@ -112,11 +112,11 @@
                   },
                   "resources": {
                      "limits": {
-                        "cpu": "7700m",
-                        "memory": "7680Mi"
+                        "cpu": "8000m",
+                        "memory": "8192Mi"
                      },
                      "requests": {
-                        "cpu": "3850m"
+                        "cpu": "4000m"
                      }
                   },
                   "securityContext": {