From 5effce414b239094adf294121b8ee5206b71d8c3 Mon Sep 17 00:00:00 2001 From: Frederic Gurr Date: Thu, 5 Dec 2024 18:42:52 +0100 Subject: [PATCH] Jenkins LTS upgrade follow-up --- instances/ecd.theia/jenkins/configuration.yml | 2 +- .../target/jenkins/configuration.yml | 2 +- .../target/k8s/configmap-jenkins-config.yml | 2 +- .../jenkins/configuration.yml | 8 +- .../eclipse.platform.releng/target/Dockerfile | 2 +- .../target/jenkins/configuration.yml | 10 +- .../target/jenkins/plugins.log | 78 ++-- .../target/k8s/configmap-jenkins-config.yml | 10 +- instances/iot.zenoh/target/Dockerfile | 2 +- instances/iot.zenoh/target/config.json | 369 ++---------------- .../target/jenkins/configuration.yml | 287 +------------- .../iot.zenoh/target/jenkins/plugins.log | 121 +++--- .../target/k8s/configmap-jenkins-config.yml | 289 +------------- .../iot.zenoh/target/k8s/statefulset.json | 4 +- instances/technology.justj/target/Dockerfile | 2 +- instances/technology.justj/target/config.json | 369 ++---------------- .../target/jenkins/configuration.yml | 285 +------------- .../target/jenkins/plugins.log | 85 ++-- .../target/k8s/configmap-jenkins-config.yml | 297 +------------- .../target/k8s/statefulset.json | 4 +- 20 files changed, 283 insertions(+), 1945 deletions(-) diff --git a/instances/ecd.theia/jenkins/configuration.yml b/instances/ecd.theia/jenkins/configuration.yml index 336423cea..12262bebc 100644 --- a/instances/ecd.theia/jenkins/configuration.yml +++ b/instances/ecd.theia/jenkins/configuration.yml @@ -44,7 +44,7 @@ jenkins: - envVars: env: - key: "Path" - value: "C:\\tools\\cygwin\\bin;C:\\Users\\genie.theia\\AppData\\Roaming\\npm;C:\\Program Files\\nodejs;$Path" + value: "C:\\Program Files\\Git\\bin;C:\\tools\\cygwin\\bin;C:\\Users\\genie.theia\\AppData\\Roaming\\npm;C:\\Program Files\\nodejs;$Path" - watcher: offlineAddresses: "releng@eclipse.org" onlineAddresses: "releng@eclipse.org" diff --git a/instances/ecd.theia/target/jenkins/configuration.yml b/instances/ecd.theia/target/jenkins/configuration.yml index c84073a58..56420cf2c 100644 --- a/instances/ecd.theia/target/jenkins/configuration.yml +++ b/instances/ecd.theia/target/jenkins/configuration.yml @@ -397,7 +397,7 @@ jenkins: - envVars: env: - key: "Path" - value: "C:\\tools\\cygwin\\bin;C:\\Users\\genie.theia\\AppData\\Roaming\\npm;C:\\Program Files\\nodejs;$Path" + value: "C:\\Program Files\\Git\\bin;C:\\tools\\cygwin\\bin;C:\\Users\\genie.theia\\AppData\\Roaming\\npm;C:\\Program Files\\nodejs;$Path" - watcher: offlineAddresses: "releng@eclipse.org" onlineAddresses: "releng@eclipse.org" diff --git a/instances/ecd.theia/target/k8s/configmap-jenkins-config.yml b/instances/ecd.theia/target/k8s/configmap-jenkins-config.yml index 143f5622b..5ce07b235 100644 --- a/instances/ecd.theia/target/k8s/configmap-jenkins-config.yml +++ b/instances/ecd.theia/target/k8s/configmap-jenkins-config.yml @@ -420,7 +420,7 @@ data: - envVars: env: - key: "Path" - value: "C:\\tools\\cygwin\\bin;C:\\Users\\genie.theia\\AppData\\Roaming\\npm;C:\\Program Files\\nodejs;$Path" + value: "C:\\Program Files\\Git\\bin;C:\\tools\\cygwin\\bin;C:\\Users\\genie.theia\\AppData\\Roaming\\npm;C:\\Program Files\\nodejs;$Path" - watcher: offlineAddresses: "releng@eclipse.org" onlineAddresses: "releng@eclipse.org" diff --git a/instances/eclipse.platform.releng/jenkins/configuration.yml b/instances/eclipse.platform.releng/jenkins/configuration.yml index 31a32c473..9a4aa14f5 100644 --- a/instances/eclipse.platform.releng/jenkins/configuration.yml +++ b/instances/eclipse.platform.releng/jenkins/configuration.yml @@ -37,7 +37,7 @@ jenkins: host: "13.68.249.87" port: "22" credentialsId: "rs68g-win10-ssh" - javaPath: "\"C:\\Program Files\\AdoptOpenJDK\\jdk-11.0.11.9-hotspot\\bin\\java.exe\"" + javaPath: "C:\\Program Files\\Eclipse Adoptium\\jdk-21.0.5.11-hotspot\\bin\\java.exe" sshHostKeyVerificationStrategy: manuallyProvidedKeyVerificationStrategy: key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDAkHWAKiWv/T3uaCBj8RdbPR4BW3GBdb5Digq4lpwnFc5xCLCZ/Wke6GBEBlai+zJndjm5sNYgKAAGUOFvW1t0ZCFxgS+uZ+tu2eyDoGyCAvS+XzbzN4pEGf3x/2GJE2aWoesrdx/Uhc/8J3cZG04Fy1SsllW36j4e/20PnZaCtPRBuU/9ZlX4pUDKIUDV+7ejOTTViAzxV0IqUQagiKLv1rxgkRQRgy49+oszYbTFmO7Sqy8L20sSRpSjO0eym6CTpbdjJSm70ZjlJNFocwREmlISNtdPPzY56NWQKf6qpzTlw94zZGVV/0WNdapn3pWS3OLIttVB1C1f1nHBdwvmooFgFiTJzfWaqY9wZFy+jNDi8BHHauLYySIh2PT65XWltnnJcwPM/87nk0hESuBglq3580mGbqoqYmoYhVOsJgn0r0HOHoCsfrUkk9EbUzuUh4TmbR9d6c+zrXe/p6XW8MNNoD1FC+IpruUiEIK9sJ25LAdeXP0hupL9SbddlCc=" @@ -47,7 +47,7 @@ jenkins: - key: "JAVA_HOME" value: 'C:\Program Files\AdoptOpenJDK\jdk-11.0.11.9-hotspot' - key: "PATH" - value: 'C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\ProgramData\GooGet;C:\Users\SSHD\AppData\Local\Microsoft\WindowsApps;C:\ProgramData\chocolatey\bin' + value: 'C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\ProgramData\GooGet;C:\Users\SSHD\AppData\Local\Microsoft\WindowsApps;C:\ProgramData\chocolatey\bin;C:\Program Files\Git\bin' - key: "VS90_HOME" value: 'C:\Program Files (x86)\Microsoft Visual Studio\2019' - key: "VS90COMNTOOLS" @@ -60,7 +60,7 @@ jenkins: key: "hudson.tasks.Ant$AntInstallation$DescriptorImpl@apache-ant-1.9.6" - home: 'C:\Program Files\AdoptOpenJDK\jdk-11.0.11.9-hotspot' key: "hudson.model.JDK$DescriptorImpl@openjdk-jdk11-latest" - - home: 'C:\tools\cygwin\bin\git' + - home: 'C:\Program Files\Git\bin\git' key: "hudson.plugins.git.GitTool$DescriptorImpl@Default" - permanent: name: "zyt5z-centos83" @@ -221,6 +221,8 @@ jenkins: locations: - home: "C:\\ProgramData\\chocolatey\\lib\\ant\\tools\\apache-ant-1.10.13" key: "hudson.tasks.Ant$AntInstallation$DescriptorImpl@apache-ant-latest" + - home: 'C:\Program Files\Git\bin\git' + key: "hudson.plugins.git.GitTool$DescriptorImpl@Default" remoteFS: "C:\\Users\\genie.releng\\" retentionStrategy: "always" - permanent: diff --git a/instances/eclipse.platform.releng/target/Dockerfile b/instances/eclipse.platform.releng/target/Dockerfile index 6ac7efccc..ae5857e83 100644 --- a/instances/eclipse.platform.releng/target/Dockerfile +++ b/instances/eclipse.platform.releng/target/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.io/eclipsecbi/jiro-master:2.462.3 +FROM docker.io/eclipsecbi/jiro-master:2.479.2 EXPOSE 8080 EXPOSE 50000 diff --git a/instances/eclipse.platform.releng/target/jenkins/configuration.yml b/instances/eclipse.platform.releng/target/jenkins/configuration.yml index e6463a11d..6a2d92c59 100644 --- a/instances/eclipse.platform.releng/target/jenkins/configuration.yml +++ b/instances/eclipse.platform.releng/target/jenkins/configuration.yml @@ -83,6 +83,8 @@ jenkins: containerCapStr: "10" jenkinsUrl: "http://jenkins-ui.releng.svc.cluster.local/releng" jenkinsTunnel: "jenkins-discovery.releng.svc.cluster.local:50000" + garbageCollection: + timeout: 300 maxRequestsPerHostStr: "32" namespace: "releng" podRetention: "never" @@ -434,7 +436,7 @@ jenkins: host: "13.68.249.87" port: "22" credentialsId: "rs68g-win10-ssh" - javaPath: "\"C:\\Program Files\\AdoptOpenJDK\\jdk-11.0.11.9-hotspot\\bin\\java.exe\"" + javaPath: "C:\\Program Files\\Eclipse Adoptium\\jdk-21.0.5.11-hotspot\\bin\\java.exe" sshHostKeyVerificationStrategy: manuallyProvidedKeyVerificationStrategy: key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDAkHWAKiWv/T3uaCBj8RdbPR4BW3GBdb5Digq4lpwnFc5xCLCZ/Wke6GBEBlai+zJndjm5sNYgKAAGUOFvW1t0ZCFxgS+uZ+tu2eyDoGyCAvS+XzbzN4pEGf3x/2GJE2aWoesrdx/Uhc/8J3cZG04Fy1SsllW36j4e/20PnZaCtPRBuU/9ZlX4pUDKIUDV+7ejOTTViAzxV0IqUQagiKLv1rxgkRQRgy49+oszYbTFmO7Sqy8L20sSRpSjO0eym6CTpbdjJSm70ZjlJNFocwREmlISNtdPPzY56NWQKf6qpzTlw94zZGVV/0WNdapn3pWS3OLIttVB1C1f1nHBdwvmooFgFiTJzfWaqY9wZFy+jNDi8BHHauLYySIh2PT65XWltnnJcwPM/87nk0hESuBglq3580mGbqoqYmoYhVOsJgn0r0HOHoCsfrUkk9EbUzuUh4TmbR9d6c+zrXe/p6XW8MNNoD1FC+IpruUiEIK9sJ25LAdeXP0hupL9SbddlCc=" @@ -444,7 +446,7 @@ jenkins: - key: "JAVA_HOME" value: 'C:\Program Files\AdoptOpenJDK\jdk-11.0.11.9-hotspot' - key: "PATH" - value: 'C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\ProgramData\GooGet;C:\Users\SSHD\AppData\Local\Microsoft\WindowsApps;C:\ProgramData\chocolatey\bin' + value: 'C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\ProgramData\GooGet;C:\Users\SSHD\AppData\Local\Microsoft\WindowsApps;C:\ProgramData\chocolatey\bin;C:\Program Files\Git\bin' - key: "VS90_HOME" value: 'C:\Program Files (x86)\Microsoft Visual Studio\2019' - key: "VS90COMNTOOLS" @@ -457,7 +459,7 @@ jenkins: key: "hudson.tasks.Ant$AntInstallation$DescriptorImpl@apache-ant-1.9.6" - home: 'C:\Program Files\AdoptOpenJDK\jdk-11.0.11.9-hotspot' key: "hudson.model.JDK$DescriptorImpl@openjdk-jdk11-latest" - - home: 'C:\tools\cygwin\bin\git' + - home: 'C:\Program Files\Git\bin\git' key: "hudson.plugins.git.GitTool$DescriptorImpl@Default" - permanent: name: "zyt5z-centos83" @@ -618,6 +620,8 @@ jenkins: locations: - home: "C:\\ProgramData\\chocolatey\\lib\\ant\\tools\\apache-ant-1.10.13" key: "hudson.tasks.Ant$AntInstallation$DescriptorImpl@apache-ant-latest" + - home: 'C:\Program Files\Git\bin\git' + key: "hudson.plugins.git.GitTool$DescriptorImpl@Default" remoteFS: "C:\\Users\\genie.releng\\" retentionStrategy: "always" - permanent: diff --git a/instances/eclipse.platform.releng/target/jenkins/plugins.log b/instances/eclipse.platform.releng/target/jenkins/plugins.log index 39f27b81b..6bd0ecada 100644 --- a/instances/eclipse.platform.releng/target/jenkins/plugins.log +++ b/instances/eclipse.platform.releng/target/jenkins/plugins.log @@ -14,39 +14,39 @@ 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.955.v81e2a_35c08d3 -command-launcher 115.vd8b_301cc15d0 +cloudbees-folder 6.963.v6edc0fc71472 +command-launcher 116.vd85919c54a_d6 commons-compress-api 1.26.1-2 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 1873.vea_5814ca_9c93 -credentials 1384.vf0a_2ed06f9c6 -credentials-binding 681.vf91669a_32e45 +configuration-as-code 1897.v79281e066ea_7 +credentials 1389.vd7a_b_f5fa_50a_2 +credentials-binding 687.v619cb_15e923f data-tables-api 2.1.8-1 -display-url-api 2.204.vf6fddd8a_8b_e9 -durable-task 577.v2a_8a_4b_7c0247 +display-url-api 2.209.v582ed814ff2f +durable-task 581.v299a_5609d767 echarts-api 5.5.1-4 eddsa-api 0.3.0-4.v84c6f0f4969e -email-ext 1849.v6dd03b_f6e423 +email-ext 1861.vdb_d991590994 extended-read-permission 53.v6499940139e5 external-monitor-job 215.v2e88e894db_f8 -extra-columns 1.26 +extra-columns 1.27 font-awesome-api 6.6.0-2 forensics-api 2.6.0 gerrit-code-review 0.4.9 ghprb 1.42.2 -git 5.5.2 -git-client 5.0.0 +git 5.6.0 +git-client 6.1.0 git-forensics 2.2.1 git-parameter 0.10.0 github 1.40.0 -github-api 1.321-468.v6a_9f5f2d5a_7e +github-api 1.321-478.vc9ce627ce001 github-branch-source 1807.v50351eb_7dd13 github-checks 589.v845136f916cd gitlab-api 5.6.0-97.v6603a_83f8690 -gitlab-branch-source 714.v45a_1ef5eb_247 -gitlab-plugin 1.8.2 +gitlab-branch-source 715.v4c830b_ca_ef95 +gitlab-plugin 1.9.6 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 @@ -61,7 +61,7 @@ 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 -job-dsl 1.89 +job-dsl 1.90 jobConfigHistory 1283.veb_dfb_00b_5ec0 joda-time-api 2.13.0-93.v9934da_29b_a_e9 jquery3-api 3.7.1-2 @@ -72,65 +72,65 @@ junit 1309.v0078b_fecd6ed kubernetes 4296.v20a_7e4d77cf6 kubernetes-client-api 6.10.0-240.v57880ce8b_0b_2 kubernetes-credentials 190.v03c305394deb_ -ldap 725.v3cb_b_711b_1a_ef +ldap 770.vb_455e934581a_ mail-watcher-plugin 1.19 -mailer 488.v0c9639c1a_eb_3 +mailer 489.vd4b_25144138f matrix-auth 3.2.3 -matrix-project 839.vff91cd7e3a_b_2 +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-172.vda_da_1feeb_c6e +okhttp-api 4.11.0-181.v1de5b_83857df 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 340.v28cecee8b_25f +pipeline-graph-view 382.vb_9a_27b_7b_ea_71 pipeline-groovy-lib 744.v5b_556ee7c253 pipeline-input-step 495.ve9c153f6067b_ -pipeline-maven 1457.vf7a_de13b_c0d4 -pipeline-maven-api 1457.vf7a_de13b_c0d4 +pipeline-maven 1469.ve15ca_a_b_90b_44 +pipeline-maven-api 1469.ve15ca_a_b_90b_44 pipeline-milestone-step 119.vdfdc43fc3b_9a_ -pipeline-model-api 2.2214.vb_b_34b_2ea_9b_83 -pipeline-model-definition 2.2214.vb_b_34b_2ea_9b_83 -pipeline-model-extensions 2.2214.vb_b_34b_2ea_9b_83 +pipeline-model-api 2.2218.v56d0cda_37c72 +pipeline-model-definition 2.2218.v56d0cda_37c72 +pipeline-model-extensions 2.2218.v56d0cda_37c72 pipeline-rest-api 2.34 pipeline-stage-step 312.v8cd10304c27a_ -pipeline-stage-tags-metadata 2.2214.vb_b_34b_2ea_9b_83 +pipeline-stage-tags-metadata 2.2218.v56d0cda_37c72 pipeline-stage-view 2.34 pipeline-utility-steps 2.18.0 plain-credentials 183.va_de8f1dd5a_2b_ plugin-util-api 5.1.0 -prism-api 1.29.0-17 +prism-api 1.29.0-18 prometheus 795.v995762102f28 promoted-builds 965.vcda_c6a_e0998f rebuild 332.va_1ee476d8f6d -resource-disposer 0.24 -scm-api 696.v778d637b_a_762 -script-security 1367.vdf2fc45f229c +resource-disposer 0.25 +scm-api 698.v8e3b_c788f0a_6 +script-security 1369.v9b_98a_4e95b_2d simple-theme-plugin 196.v96d9592f4efa_ snakeyaml-api 2.3-123.v13484c65210a_ -sonar 2.17.2 +sonar 2.17.3 ssh-agent 376.v8933585c69d3 -ssh-credentials 343.v884f71d78167 +ssh-credentials 349.vb_8b_6b_9709f5b_ ssh-slaves 2.973.v0fa_8c0dea_f9f structs 338.v848422169819 -timestamper 1.27 +timestamper 1.28 token-macro 400.v35420b_922dcb_ trilead-api 2.147.vb_73cc728a_32e variant 60.v7290fc0eb_b_cd -warnings-ng 11.10.0 +warnings-ng 11.12.0 workflow-aggregator 600.vb_57cdd26fdd7 workflow-api 1336.vee415d95c521 workflow-basic-steps 1058.vcb_fc1e3a_21a_9 -workflow-cps 3990.vd281dd77a_388 -workflow-durable-task-step 1378.v6a_3e903058a_3 -workflow-job 1436.vfa_244484591f +workflow-cps 4000.v5198556e9cea_ +workflow-durable-task-step 1398.vf6c9e89e5988 +workflow-job 1472.ve4d5eca_143c4 workflow-multibranch 795.ve0cb_1f45ca_9a_ workflow-scm-step 427.v4ca_6512e7df1 workflow-step-api 678.v3ee58b_469476 -workflow-support 932.vb_555de1b_a_b_94 -ws-cleanup 0.47 +workflow-support 936.v9fa_77211ca_e1 +ws-cleanup 0.48 xvnc 1.28 diff --git a/instances/eclipse.platform.releng/target/k8s/configmap-jenkins-config.yml b/instances/eclipse.platform.releng/target/k8s/configmap-jenkins-config.yml index 1051f8e08..6020f4b98 100644 --- a/instances/eclipse.platform.releng/target/k8s/configmap-jenkins-config.yml +++ b/instances/eclipse.platform.releng/target/k8s/configmap-jenkins-config.yml @@ -106,6 +106,8 @@ data: containerCapStr: "10" jenkinsUrl: "http://jenkins-ui.releng.svc.cluster.local/releng" jenkinsTunnel: "jenkins-discovery.releng.svc.cluster.local:50000" + garbageCollection: + timeout: 300 maxRequestsPerHostStr: "32" namespace: "releng" podRetention: "never" @@ -457,7 +459,7 @@ data: host: "13.68.249.87" port: "22" credentialsId: "rs68g-win10-ssh" - javaPath: "\"C:\\Program Files\\AdoptOpenJDK\\jdk-11.0.11.9-hotspot\\bin\\java.exe\"" + javaPath: "C:\\Program Files\\Eclipse Adoptium\\jdk-21.0.5.11-hotspot\\bin\\java.exe" sshHostKeyVerificationStrategy: manuallyProvidedKeyVerificationStrategy: key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDAkHWAKiWv/T3uaCBj8RdbPR4BW3GBdb5Digq4lpwnFc5xCLCZ/Wke6GBEBlai+zJndjm5sNYgKAAGUOFvW1t0ZCFxgS+uZ+tu2eyDoGyCAvS+XzbzN4pEGf3x/2GJE2aWoesrdx/Uhc/8J3cZG04Fy1SsllW36j4e/20PnZaCtPRBuU/9ZlX4pUDKIUDV+7ejOTTViAzxV0IqUQagiKLv1rxgkRQRgy49+oszYbTFmO7Sqy8L20sSRpSjO0eym6CTpbdjJSm70ZjlJNFocwREmlISNtdPPzY56NWQKf6qpzTlw94zZGVV/0WNdapn3pWS3OLIttVB1C1f1nHBdwvmooFgFiTJzfWaqY9wZFy+jNDi8BHHauLYySIh2PT65XWltnnJcwPM/87nk0hESuBglq3580mGbqoqYmoYhVOsJgn0r0HOHoCsfrUkk9EbUzuUh4TmbR9d6c+zrXe/p6XW8MNNoD1FC+IpruUiEIK9sJ25LAdeXP0hupL9SbddlCc=" @@ -467,7 +469,7 @@ data: - key: "JAVA_HOME" value: 'C:\Program Files\AdoptOpenJDK\jdk-11.0.11.9-hotspot' - key: "PATH" - value: 'C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\ProgramData\GooGet;C:\Users\SSHD\AppData\Local\Microsoft\WindowsApps;C:\ProgramData\chocolatey\bin' + value: 'C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\ProgramData\GooGet;C:\Users\SSHD\AppData\Local\Microsoft\WindowsApps;C:\ProgramData\chocolatey\bin;C:\Program Files\Git\bin' - key: "VS90_HOME" value: 'C:\Program Files (x86)\Microsoft Visual Studio\2019' - key: "VS90COMNTOOLS" @@ -480,7 +482,7 @@ data: key: "hudson.tasks.Ant$AntInstallation$DescriptorImpl@apache-ant-1.9.6" - home: 'C:\Program Files\AdoptOpenJDK\jdk-11.0.11.9-hotspot' key: "hudson.model.JDK$DescriptorImpl@openjdk-jdk11-latest" - - home: 'C:\tools\cygwin\bin\git' + - home: 'C:\Program Files\Git\bin\git' key: "hudson.plugins.git.GitTool$DescriptorImpl@Default" - permanent: name: "zyt5z-centos83" @@ -641,6 +643,8 @@ data: locations: - home: "C:\\ProgramData\\chocolatey\\lib\\ant\\tools\\apache-ant-1.10.13" key: "hudson.tasks.Ant$AntInstallation$DescriptorImpl@apache-ant-latest" + - home: 'C:\Program Files\Git\bin\git' + key: "hudson.plugins.git.GitTool$DescriptorImpl@Default" remoteFS: "C:\\Users\\genie.releng\\" retentionStrategy: "always" - permanent: diff --git a/instances/iot.zenoh/target/Dockerfile b/instances/iot.zenoh/target/Dockerfile index 6ac7efccc..ae5857e83 100644 --- a/instances/iot.zenoh/target/Dockerfile +++ b/instances/iot.zenoh/target/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.io/eclipsecbi/jiro-master:2.462.3 +FROM docker.io/eclipsecbi/jiro-master:2.479.2 EXPOSE 8080 EXPOSE 50000 diff --git a/instances/iot.zenoh/target/config.json b/instances/iot.zenoh/target/config.json index acd38e9a8..bf1d75b82 100644 --- a/instances/iot.zenoh/target/config.json +++ b/instances/iot.zenoh/target/config.json @@ -19,112 +19,13 @@ "basic": { "agentWorkdir": "/home/jenkins/jenkins-agent", "docker": { - "aliases": [ - "docker.io/eclipsecbi/jiro-agent-basic:latest" - ], + "aliases": [ ], "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: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 [ \"uid_entrypoint\", \"/usr/local/bin/jenkins-agent\" ]\n\nADD \"https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3248.3250.v3277a_8e88c9b_/remoting-3248.3250.v3277a_8e88c9b_.jar\" \"/usr/share/jenkins/agent.jar\" \nADD \"https://github.com/jenkinsci/docker-agent/raw/3248.3250.v3277a_8e88c9b_-1/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\nUSER 10001:0\n", - "image": "jiro-agent-basic", - "registry": "docker.io", - "repository": "eclipsecbi", - "tag": "remoting-3248.3250.v3277a_8e88c9b_" - }, - "env": { - "JAVA_TOOL_OPTIONS": [ ], - "JENKINS_REMOTING_JAVA_OPTS": [ - "-showversion", - "-XshowSettings:vm", - "-Xmx256m", - "-Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true", - "-Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true" - ], - "OPENJ9_JAVA_OPTIONS": [ - "-XX:+IgnoreUnrecognizedVMOptions", - "-XX:+IdleTuningCompactOnIdle", - "-XX:+IdleTuningGcOnIdle" - ], - "_JAVA_OPTIONS": [ ] - }, - "home": "/home/jenkins", - "kubernetes": { - "inheritYamlMergeStrategy": true, - "resources": { - "cpu": { - "limit": "2000m", - "request": "1000m" - }, - "memory": { - "limit": "4096Mi", - "request": "4096Mi" - } - }, - "volumes": [ - { - "mounts": [ - { - "mountPath": "/home/jenkins/.m2/settings-security.xml", - "subPath": "settings-security.xml" - }, - { - "mountPath": "/home/jenkins/.m2/settings.xml", - "subPath": "settings.xml" - } - ], - "name": "m2-secret-dir", - "secret": { - "name": "m2-secret-dir" - } - }, - { - "configMap": { - "name": "m2-dir" - }, - "mounts": [ - { - "mountPath": "/home/jenkins/.m2/toolchains.xml", - "subPath": "toolchains.xml" - }, - { - "mountPath": "/home/jenkins/.mavenrc", - "subPath": ".mavenrc" - } - ], - "name": "m2-dir" - } - ], - "yamlMergeStrategy": "merge" - }, - "labels": [ - "basic" - ], - "maxHeap": "256m", - "mode": "NORMAL", - "name": "basic", - "remoting": { - "jar": "/usr/share/jenkins/agent.jar", - "startupScript": { - "name": "jenkins-agent", - "url": "https://github.com/jenkinsci/docker-agent/raw/3248.3250.v3277a_8e88c9b_-1/jenkins-agent", - "version": "3248.3250.v3277a_8e88c9b_-1" - }, - "url": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3248.3250.v3277a_8e88c9b_/remoting-3248.3250.v3277a_8e88c9b_.jar", - "version": "3248.3250.v3277a_8e88c9b_" - }, - "startupScript": "/usr/local/bin/jenkins-agent", - "username": "jenkins" - }, - "basic-ubuntu": { - "agentWorkdir": "/home/jenkins/jenkins-agent", - "docker": { - "aliases": [ - "docker.io/eclipsecbi/jiro-agent-basic-ubuntu:latest" - ], - "context": "basic-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-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/3248.3250.v3277a_8e88c9b_/remoting-3248.3250.v3277a_8e88c9b_.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3248.3250.v3277a_8e88c9b_-1/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", + "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/3261.v9c670a_4748a_9/remoting-3261.v9c670a_4748a_9.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3261.v9c670a_4748a_9-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", "registry": "docker.io", "repository": "eclipsecbi", - "tag": "remoting-3248.3250.v3277a_8e88c9b_" + "tag": "remoting-3261.v9c670a_4748a_9" }, "env": { "JAVA_TOOL_OPTIONS": [ ], @@ -192,217 +93,21 @@ "yamlMergeStrategy": "merge" }, "labels": [ + "basic", "basic-ubuntu" ], "maxHeap": "256m", - "mode": "EXCLUSIVE", - "name": "basic-ubuntu", - "remoting": { - "jar": "/usr/share/jenkins/agent.jar", - "startupScript": { - "name": "jenkins-agent", - "url": "https://github.com/jenkinsci/docker-agent/raw/3248.3250.v3277a_8e88c9b_-1/jenkins-agent", - "version": "3248.3250.v3277a_8e88c9b_-1" - }, - "url": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3248.3250.v3277a_8e88c9b_/remoting-3248.3250.v3277a_8e88c9b_.jar", - "version": "3248.3250.v3277a_8e88c9b_" - }, - "startupScript": "/usr/local/bin/jenkins-agent", - "username": "jenkins" - }, - "centos-7": { - "agentWorkdir": "/home/jenkins/jenkins-agent", - "docker": { - "aliases": [ - "docker.io/eclipsecbi/jiro-agent-centos-7:latest" - ], - "context": "centos-7", - "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-centos-7: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/3248.3250.v3277a_8e88c9b_/remoting-3248.3250.v3277a_8e88c9b_.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3248.3250.v3277a_8e88c9b_-1/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\nUSER 10001:0\n", - "image": "jiro-agent-centos-7", - "registry": "docker.io", - "repository": "eclipsecbi", - "tag": "remoting-3248.3250.v3277a_8e88c9b_" - }, - "env": { - "JAVA_TOOL_OPTIONS": [ ], - "JENKINS_REMOTING_JAVA_OPTS": [ - "-showversion", - "-XshowSettings:vm", - "-Xmx256m", - "-Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true", - "-Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true" - ], - "OPENJ9_JAVA_OPTIONS": [ - "-XX:+IgnoreUnrecognizedVMOptions", - "-XX:+IdleTuningCompactOnIdle", - "-XX:+IdleTuningGcOnIdle" - ], - "_JAVA_OPTIONS": [ ] - }, - "home": "/home/jenkins", - "kubernetes": { - "inheritYamlMergeStrategy": true, - "resources": { - "cpu": { - "limit": "2000m", - "request": "1000m" - }, - "memory": { - "limit": "4096Mi", - "request": "4096Mi" - } - }, - "volumes": [ - { - "mounts": [ - { - "mountPath": "/home/jenkins/.m2/settings-security.xml", - "subPath": "settings-security.xml" - }, - { - "mountPath": "/home/jenkins/.m2/settings.xml", - "subPath": "settings.xml" - } - ], - "name": "m2-secret-dir", - "secret": { - "name": "m2-secret-dir" - } - }, - { - "configMap": { - "name": "m2-dir" - }, - "mounts": [ - { - "mountPath": "/home/jenkins/.m2/toolchains.xml", - "subPath": "toolchains.xml" - }, - { - "mountPath": "/home/jenkins/.mavenrc", - "subPath": ".mavenrc" - } - ], - "name": "m2-dir" - } - ], - "yamlMergeStrategy": "merge" - }, - "labels": [ - "migration", - "jipp-migration", - "centos-7" - ], - "maxHeap": "256m", - "mode": "EXCLUSIVE", - "name": "centos-7", - "remoting": { - "jar": "/usr/share/jenkins/agent.jar", - "startupScript": { - "name": "jenkins-agent", - "url": "https://github.com/jenkinsci/docker-agent/raw/3248.3250.v3277a_8e88c9b_-1/jenkins-agent", - "version": "3248.3250.v3277a_8e88c9b_-1" - }, - "url": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3248.3250.v3277a_8e88c9b_/remoting-3248.3250.v3277a_8e88c9b_.jar", - "version": "3248.3250.v3277a_8e88c9b_" - }, - "startupScript": "/usr/local/bin/jenkins-agent", - "username": "jenkins" - }, - "centos-8": { - "agentWorkdir": "/home/jenkins/jenkins-agent", - "docker": { - "aliases": [ - "docker.io/eclipsecbi/jiro-agent-centos-8:latest" - ], - "context": "centos-8", - "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-centos-8: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/3248.3250.v3277a_8e88c9b_/remoting-3248.3250.v3277a_8e88c9b_.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3248.3250.v3277a_8e88c9b_-1/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\nUSER 10001:0\n", - "image": "jiro-agent-centos-8", - "registry": "docker.io", - "repository": "eclipsecbi", - "tag": "remoting-3248.3250.v3277a_8e88c9b_" - }, - "env": { - "JAVA_TOOL_OPTIONS": [ ], - "JENKINS_REMOTING_JAVA_OPTS": [ - "-showversion", - "-XshowSettings:vm", - "-Xmx256m", - "-Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true", - "-Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true" - ], - "OPENJ9_JAVA_OPTIONS": [ - "-XX:+IgnoreUnrecognizedVMOptions", - "-XX:+IdleTuningCompactOnIdle", - "-XX:+IdleTuningGcOnIdle" - ], - "_JAVA_OPTIONS": [ ] - }, - "home": "/home/jenkins", - "kubernetes": { - "inheritYamlMergeStrategy": true, - "resources": { - "cpu": { - "limit": "2000m", - "request": "1000m" - }, - "memory": { - "limit": "4096Mi", - "request": "4096Mi" - } - }, - "volumes": [ - { - "mounts": [ - { - "mountPath": "/home/jenkins/.m2/settings-security.xml", - "subPath": "settings-security.xml" - }, - { - "mountPath": "/home/jenkins/.m2/settings.xml", - "subPath": "settings.xml" - } - ], - "name": "m2-secret-dir", - "secret": { - "name": "m2-secret-dir" - } - }, - { - "configMap": { - "name": "m2-dir" - }, - "mounts": [ - { - "mountPath": "/home/jenkins/.m2/toolchains.xml", - "subPath": "toolchains.xml" - }, - { - "mountPath": "/home/jenkins/.mavenrc", - "subPath": ".mavenrc" - } - ], - "name": "m2-dir" - } - ], - "yamlMergeStrategy": "merge" - }, - "labels": [ - "centos-latest", - "centos-8" - ], - "maxHeap": "256m", - "mode": "EXCLUSIVE", - "name": "centos-8", + "mode": "NORMAL", + "name": "basic", "remoting": { "jar": "/usr/share/jenkins/agent.jar", "startupScript": { "name": "jenkins-agent", - "url": "https://github.com/jenkinsci/docker-agent/raw/3248.3250.v3277a_8e88c9b_-1/jenkins-agent", - "version": "3248.3250.v3277a_8e88c9b_-1" + "url": "https://github.com/jenkinsci/docker-agent/raw/3261.v9c670a_4748a_9-8/jenkins-agent", + "version": "3261.v9c670a_4748a_9-8" }, - "url": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3248.3250.v3277a_8e88c9b_/remoting-3248.3250.v3277a_8e88c9b_.jar", - "version": "3248.3250.v3277a_8e88c9b_" + "url": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3261.v9c670a_4748a_9/remoting-3261.v9c670a_4748a_9.jar", + "version": "3261.v9c670a_4748a_9" }, "startupScript": "/usr/local/bin/jenkins-agent", "username": "jenkins" @@ -410,16 +115,14 @@ "ubuntu-2204": { "agentWorkdir": "/home/jenkins/jenkins-agent", "docker": { - "aliases": [ - "docker.io/eclipsecbi/jiro-agent-ubuntu-2204:latest" - ], + "aliases": [ ], "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/3248.3250.v3277a_8e88c9b_/remoting-3248.3250.v3277a_8e88c9b_.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3248.3250.v3277a_8e88c9b_-1/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", + "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/3261.v9c670a_4748a_9/remoting-3261.v9c670a_4748a_9.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3261.v9c670a_4748a_9-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-ubuntu-2204", "registry": "docker.io", "repository": "eclipsecbi", - "tag": "remoting-3248.3250.v3277a_8e88c9b_" + "tag": "remoting-3261.v9c670a_4748a_9" }, "env": { "JAVA_TOOL_OPTIONS": [ ], @@ -496,11 +199,11 @@ "jar": "/usr/share/jenkins/agent.jar", "startupScript": { "name": "jenkins-agent", - "url": "https://github.com/jenkinsci/docker-agent/raw/3248.3250.v3277a_8e88c9b_-1/jenkins-agent", - "version": "3248.3250.v3277a_8e88c9b_-1" + "url": "https://github.com/jenkinsci/docker-agent/raw/3261.v9c670a_4748a_9-8/jenkins-agent", + "version": "3261.v9c670a_4748a_9-8" }, - "url": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3248.3250.v3277a_8e88c9b_/remoting-3248.3250.v3277a_8e88c9b_.jar", - "version": "3248.3250.v3277a_8e88c9b_" + "url": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3261.v9c670a_4748a_9/remoting-3261.v9c670a_4748a_9.jar", + "version": "3261.v9c670a_4748a_9" }, "startupScript": "/usr/local/bin/jenkins-agent", "username": "jenkins" @@ -508,16 +211,14 @@ "ubuntu-2404": { "agentWorkdir": "/home/jenkins/jenkins-agent", "docker": { - "aliases": [ - "docker.io/eclipsecbi/jiro-agent-ubuntu-2404:latest" - ], + "aliases": [ ], "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/3248.3250.v3277a_8e88c9b_/remoting-3248.3250.v3277a_8e88c9b_.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3248.3250.v3277a_8e88c9b_-1/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", + "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/3261.v9c670a_4748a_9/remoting-3261.v9c670a_4748a_9.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3261.v9c670a_4748a_9-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-ubuntu-2404", "registry": "docker.io", "repository": "eclipsecbi", - "tag": "remoting-3248.3250.v3277a_8e88c9b_" + "tag": "remoting-3261.v9c670a_4748a_9" }, "env": { "JAVA_TOOL_OPTIONS": [ ], @@ -586,7 +287,12 @@ }, "labels": [ "ubuntu-latest", - "ubuntu-2404" + "ubuntu-2404", + "migration", + "jipp-migration", + "centos-7", + "centos-8", + "centos-latest" ], "maxHeap": "256m", "mode": "EXCLUSIVE", @@ -595,11 +301,11 @@ "jar": "/usr/share/jenkins/agent.jar", "startupScript": { "name": "jenkins-agent", - "url": "https://github.com/jenkinsci/docker-agent/raw/3248.3250.v3277a_8e88c9b_-1/jenkins-agent", - "version": "3248.3250.v3277a_8e88c9b_-1" + "url": "https://github.com/jenkinsci/docker-agent/raw/3261.v9c670a_4748a_9-8/jenkins-agent", + "version": "3261.v9c670a_4748a_9-8" }, - "url": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3248.3250.v3277a_8e88c9b_/remoting-3248.3250.v3277a_8e88c9b_.jar", - "version": "3248.3250.v3277a_8e88c9b_" + "url": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3261.v9c670a_4748a_9/remoting-3261.v9c670a_4748a_9.jar", + "version": "3261.v9c670a_4748a_9" }, "startupScript": "/usr/local/bin/jenkins-agent", "username": "jenkins" @@ -618,11 +324,11 @@ }, "docker": { "master": { - "dockerfile": "FROM docker.io/eclipsecbi/jiro-master:2.462.3\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.css.override /usr/share/jenkins/ref/userContent/theme/\nCOPY jenkins/title.js /usr/share/jenkins/ref/userContent/theme/\n\nUSER 10001\n", + "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.css.override /usr/share/jenkins/ref/userContent/theme/\nCOPY jenkins/title.js /usr/share/jenkins/ref/userContent/theme/\n\nUSER 10001\n", "image": "iot.zenoh", "registry": "docker.io", "repository": "eclipsecbijenkins", - "tag": "2.462.3" + "tag": "2.479.2" } }, "gradle": { @@ -709,11 +415,11 @@ "image": "jiro-master", "registry": "docker.io", "repository": "eclipsecbi", - "tag": "2.462.3" + "tag": "2.479.2" }, "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 eclipsecbi/semeru-ubuntu-coreutils:openjdk17-jammy\n\n# These environment variables will be used in the uid_entrypoint script from the parent image\nENV USER_NAME=\"jenkins\"\nENV HOME=\"/var/jenkins\"\n\n# jenkins version being bundled in this docker image\nENV JENKINS_HOME=\"/var/jenkins\"\nENV JENKINS_WAR=\"/usr/share/jenkins/jenkins.war\"\nENV COPY_REFERENCE_FILE_LOG=\"/var/jenkins/copy_reference_file.log\"\nENV REF=\"/usr/share/jenkins/ref\"\n\nVOLUME [ \"/var/jenkins\", \"/var/cache/jenkins/war\", \"/var/cache/jenkins/plugins\" ]\nWORKDIR \"/var/jenkins\"\n\nENTRYPOINT [\"/usr/bin/dumb-init\", \"--\", \"/usr/local/bin/jenkins.sh\"]\n\nRUN mkdir -p $(dirname \"/usr/share/jenkins/jenkins.war\") && mkdir -p \"/usr/share/jenkins/ref\"\n\nCOPY scripts/* /usr/local/bin/\nRUN chmod ug+x /usr/local/bin/*\n\nCOPY war/jenkins.war \"/usr/share/jenkins/jenkins.war\"\nCOPY ref/ \"/usr/share/jenkins/ref/\"\n", "home": "/var/jenkins", - "id": "2.462.3", + "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", @@ -755,6 +461,7 @@ "parameterized-trigger", "pipeline-maven", "pipeline-stage-view", + "pipeline-graph-view", "prometheus", "promoted-builds", "rebuild", @@ -771,7 +478,7 @@ "pubkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\n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\nMetBbjkOnNXyWrP3SAPwqQMMg/vNa+mJIjoNByw=\n=sdsH\n-----END PGP PUBLIC KEY BLOCK-----\n", "ref": "/usr/share/jenkins/ref", "remoting": { - "version": "3248.3250.v3277a_8e88c9b_" + "version": "3261.v9c670a_4748a_9" }, "scripts": { "jenkins": "https://github.com/jenkinsci/docker/raw/master/jenkins.sh", @@ -779,9 +486,9 @@ }, "updateCenter": "https://updates.jenkins.io", "username": "jenkins", - "version": "2.462.3", + "version": "2.479.2", "war": "/usr/share/jenkins/jenkins.war", - "warBaseUrl": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/jenkins-war/2.462.3", + "warBaseUrl": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/jenkins-war/2.479.2", "webroot": "/var/cache/jenkins/war" }, "kubernetes": { diff --git a/instances/iot.zenoh/target/jenkins/configuration.yml b/instances/iot.zenoh/target/jenkins/configuration.yml index a6c9f3f2a..69cabc46a 100644 --- a/instances/iot.zenoh/target/jenkins/configuration.yml +++ b/instances/iot.zenoh/target/jenkins/configuration.yml @@ -79,10 +79,10 @@ jenkins: templates: - name: "basic" namespace: "zenoh" - label: "basic" + label: "basic basic-ubuntu" containers: - name: "jnlp" - image: docker.io/eclipsecbi/jiro-agent-basic:remoting-3248.3250.v3277a_8e88c9b_ + image: docker.io/eclipsecbi/jiro-agent-basic-ubuntu:remoting-3261.v9c670a_4748a_9 alwaysPullImage: true livenessProbe: failureThreshold: 0 @@ -168,285 +168,12 @@ jenkins: name: m2-dir inheritYamlMergeStrategy: "true" yamlMergeStrategy: "merge" - - name: "basic-ubuntu" - namespace: "zenoh" - label: "basic-ubuntu" - containers: - - name: "jnlp" - image: docker.io/eclipsecbi/jiro-agent-basic-ubuntu:remoting-3248.3250.v3277a_8e88c9b_ - alwaysPullImage: true - livenessProbe: - failureThreshold: 0 - initialDelaySeconds: 0 - periodSeconds: 0 - successThreshold: 0 - timeoutSeconds: 0 - ttyEnabled: true - command: "" - args: "" - instanceCap: -1 - nodeUsageMode: EXCLUSIVE - envVars: - - envVar: - key: "JAVA_TOOL_OPTIONS" - value: "" - - envVar: - key: "JENKINS_REMOTING_JAVA_OPTS" - value: "-showversion -XshowSettings:vm -Xmx256m -Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true -Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true" - - envVar: - key: "OPENJ9_JAVA_OPTIONS" - value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" - - envVar: - key: "_JAVA_OPTIONS" - value: "" - volumes: - - persistentVolumeClaim: - claimName: "tools-claim-jiro-zenoh" - mountPath: "/opt/tools" - readOnly: true - - configMapVolume: - configMapName: "known-hosts" - mountPath: "/home/jenkins/.ssh/" - subPath: "." - - emptyDirVolume: - memory: false - mountPath: "/home/jenkins/" - - emptyDirVolume: - memory: false - mountPath: "/home/jenkins/.m2/repository" - - emptyDirVolume: - memory: false - mountPath: "/home/jenkins/.m2/wrapper" - workspaceVolume: - emptyDirWorkspaceVolume: - memory: false - yaml: | - apiVersion: v1 - kind: Pod - spec: - containers: - - name: jnlp - resources: - limits: - cpu: "2000m" - memory: "4096Mi" - requests: - cpu: "1000m" - memory: "4096Mi" - volumeMounts: - - name: m2-secret-dir - mountPath: /home/jenkins/.m2/settings-security.xml - subPath: settings-security.xml - readOnly: true - - name: m2-secret-dir - mountPath: /home/jenkins/.m2/settings.xml - subPath: settings.xml - readOnly: true - - name: m2-dir - mountPath: /home/jenkins/.m2/toolchains.xml - subPath: toolchains.xml - readOnly: true - - name: m2-dir - mountPath: /home/jenkins/.mavenrc - subPath: .mavenrc - readOnly: true - volumes: - - name: m2-secret-dir - secret: - secretName: m2-secret-dir - - name: m2-dir - configMap: - name: m2-dir - inheritYamlMergeStrategy: "true" - yamlMergeStrategy: "merge" - - name: "centos-7" - namespace: "zenoh" - label: "migration jipp-migration centos-7" - containers: - - name: "jnlp" - image: docker.io/eclipsecbi/jiro-agent-centos-7:remoting-3248.3250.v3277a_8e88c9b_ - alwaysPullImage: true - livenessProbe: - failureThreshold: 0 - initialDelaySeconds: 0 - periodSeconds: 0 - successThreshold: 0 - timeoutSeconds: 0 - ttyEnabled: true - command: "" - args: "" - instanceCap: -1 - nodeUsageMode: EXCLUSIVE - envVars: - - envVar: - key: "JAVA_TOOL_OPTIONS" - value: "" - - envVar: - key: "JENKINS_REMOTING_JAVA_OPTS" - value: "-showversion -XshowSettings:vm -Xmx256m -Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true -Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true" - - envVar: - key: "OPENJ9_JAVA_OPTIONS" - value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" - - envVar: - key: "_JAVA_OPTIONS" - value: "" - volumes: - - persistentVolumeClaim: - claimName: "tools-claim-jiro-zenoh" - mountPath: "/opt/tools" - readOnly: true - - configMapVolume: - configMapName: "known-hosts" - mountPath: "/home/jenkins/.ssh/" - subPath: "." - - emptyDirVolume: - memory: false - mountPath: "/home/jenkins/" - - emptyDirVolume: - memory: false - mountPath: "/home/jenkins/.m2/repository" - - emptyDirVolume: - memory: false - mountPath: "/home/jenkins/.m2/wrapper" - workspaceVolume: - emptyDirWorkspaceVolume: - memory: false - yaml: | - apiVersion: v1 - kind: Pod - spec: - containers: - - name: jnlp - resources: - limits: - cpu: "2000m" - memory: "4096Mi" - requests: - cpu: "1000m" - memory: "4096Mi" - volumeMounts: - - name: m2-secret-dir - mountPath: /home/jenkins/.m2/settings-security.xml - subPath: settings-security.xml - readOnly: true - - name: m2-secret-dir - mountPath: /home/jenkins/.m2/settings.xml - subPath: settings.xml - readOnly: true - - name: m2-dir - mountPath: /home/jenkins/.m2/toolchains.xml - subPath: toolchains.xml - readOnly: true - - name: m2-dir - mountPath: /home/jenkins/.mavenrc - subPath: .mavenrc - readOnly: true - volumes: - - name: m2-secret-dir - secret: - secretName: m2-secret-dir - - name: m2-dir - configMap: - name: m2-dir - inheritYamlMergeStrategy: "true" - yamlMergeStrategy: "merge" - - name: "centos-8" - namespace: "zenoh" - label: "centos-latest centos-8" - containers: - - name: "jnlp" - image: docker.io/eclipsecbi/jiro-agent-centos-8:remoting-3248.3250.v3277a_8e88c9b_ - alwaysPullImage: true - livenessProbe: - failureThreshold: 0 - initialDelaySeconds: 0 - periodSeconds: 0 - successThreshold: 0 - timeoutSeconds: 0 - ttyEnabled: true - command: "" - args: "" - instanceCap: -1 - nodeUsageMode: EXCLUSIVE - envVars: - - envVar: - key: "JAVA_TOOL_OPTIONS" - value: "" - - envVar: - key: "JENKINS_REMOTING_JAVA_OPTS" - value: "-showversion -XshowSettings:vm -Xmx256m -Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true -Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true" - - envVar: - key: "OPENJ9_JAVA_OPTIONS" - value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" - - envVar: - key: "_JAVA_OPTIONS" - value: "" - volumes: - - persistentVolumeClaim: - claimName: "tools-claim-jiro-zenoh" - mountPath: "/opt/tools" - readOnly: true - - configMapVolume: - configMapName: "known-hosts" - mountPath: "/home/jenkins/.ssh/" - subPath: "." - - emptyDirVolume: - memory: false - mountPath: "/home/jenkins/" - - emptyDirVolume: - memory: false - mountPath: "/home/jenkins/.m2/repository" - - emptyDirVolume: - memory: false - mountPath: "/home/jenkins/.m2/wrapper" - workspaceVolume: - emptyDirWorkspaceVolume: - memory: false - yaml: | - apiVersion: v1 - kind: Pod - spec: - containers: - - name: jnlp - resources: - limits: - cpu: "2000m" - memory: "4096Mi" - requests: - cpu: "1000m" - memory: "4096Mi" - volumeMounts: - - name: m2-secret-dir - mountPath: /home/jenkins/.m2/settings-security.xml - subPath: settings-security.xml - readOnly: true - - name: m2-secret-dir - mountPath: /home/jenkins/.m2/settings.xml - subPath: settings.xml - readOnly: true - - name: m2-dir - mountPath: /home/jenkins/.m2/toolchains.xml - subPath: toolchains.xml - readOnly: true - - name: m2-dir - mountPath: /home/jenkins/.mavenrc - subPath: .mavenrc - readOnly: true - volumes: - - name: m2-secret-dir - secret: - secretName: m2-secret-dir - - name: m2-dir - configMap: - name: m2-dir - inheritYamlMergeStrategy: "true" - yamlMergeStrategy: "merge" - name: "ubuntu-2204" namespace: "zenoh" label: "ubuntu-2204" containers: - name: "jnlp" - image: docker.io/eclipsecbi/jiro-agent-ubuntu-2204:remoting-3248.3250.v3277a_8e88c9b_ + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2204:remoting-3261.v9c670a_4748a_9 alwaysPullImage: true livenessProbe: failureThreshold: 0 @@ -534,10 +261,10 @@ jenkins: yamlMergeStrategy: "merge" - name: "ubuntu-2404" namespace: "zenoh" - label: "ubuntu-latest ubuntu-2404" + label: "ubuntu-latest ubuntu-2404 migration jipp-migration centos-7 centos-8 centos-latest" containers: - name: "jnlp" - image: docker.io/eclipsecbi/jiro-agent-ubuntu-2404:remoting-3248.3250.v3277a_8e88c9b_ + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2404:remoting-3261.v9c670a_4748a_9 alwaysPullImage: true livenessProbe: failureThreshold: 0 @@ -733,7 +460,7 @@ unclassified: createAccountBasedOnEmail: true useExistingAccountWithSameEmail: true jobConfigHistory: - excludePattern: "queue\\.xml|nodeMonitors\\.xml|UpdateCenter\\.xml|global-build-stats|LockableResourcesManager\\.xml|MilestoneStep\\.xml" + excludePattern: "queue\\.xml|nodeMonitors\\.xml|UpdateCenter\\.xml|global-build-stats|LockableResourcesManager\\.xml|MilestoneStep\\.xml|hudson.plugins.xvnc.Xvnc\\.xml" maxDaysToKeepEntries: "60" maxEntriesPerPage: "12" maxHistoryEntries: "500" @@ -874,7 +601,7 @@ tool: - installSource: installers: - antFromApache: - id: "1.10.12" + id: "1.10.15" maven: installations: - name: "apache-maven-latest" diff --git a/instances/iot.zenoh/target/jenkins/plugins.log b/instances/iot.zenoh/target/jenkins/plugins.log index b8833670a..a8d5ef2cb 100644 --- a/instances/iot.zenoh/target/jenkins/plugins.log +++ b/instances/iot.zenoh/target/jenkins/plugins.log @@ -1,52 +1,52 @@ Resulting plugin list: -analysis-model-api 12.9.0 +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-118.v199115451c4d -asm-api 9.7.1-95.v9f552033802a_ +apache-httpcomponents-client-5-api 5.4-124.v31e2987e48f4 +asm-api 9.7.1-97.v4cc844130d97 authentication-tokens 1.119.v50285141b_7e1 -authorize-project 1.7.2 +authorize-project 1.8.1 bootstrap5-api 5.3.3-1 bouncycastle-api 2.30.1.78.1-248.ve27176eb_46cb_ -branch-api 2.1178.v969d9eb_c728e +branch-api 2.1200.v4b_a_3da_2eb_db_4 build-timeout 1.33 caffeine-api 3.1.8-133.v17b_1ff2e0599 checks-api 2.2.1 -cloudbees-disk-usage-simple 203.v3f46a_7462b_1a_ -cloudbees-folder 6.955.v81e2a_35c08d3 -command-launcher 115.vd8b_301cc15d0 +cloudbees-disk-usage-simple 232.v713eeed2e1f4 +cloudbees-folder 6.959.v4ed5cc9e2dd4 +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 978.v8e85886ffdc4 -configuration-as-code 1850.va_a_8c31d3158b_ -credentials 1384.vf0a_2ed06f9c6 -credentials-binding 681.vf91669a_32e45 +config-file-provider 980.v88956a_a_5d6a_d +configuration-as-code 1897.v79281e066ea_7 +credentials 1389.vd7a_b_f5fa_50a_2 +credentials-binding 687.v619cb_15e923f data-tables-api 2.1.8-1 -display-url-api 2.204.vf6fddd8a_8b_e9 -durable-task 577.v2a_8a_4b_7c0247 -echarts-api 5.5.1-1 +display-url-api 2.209.v582ed814ff2f +durable-task 581.v299a_5609d767 +echarts-api 5.5.1-4 eddsa-api 0.3.0-4.v84c6f0f4969e -email-ext 1844.v3ea_a_b_842374a_ +email-ext 1861.vdb_d991590994 embeddable-build-status 487.va_0ef04c898a_2 extended-read-permission 53.v6499940139e5 external-monitor-job 215.v2e88e894db_f8 -extra-columns 1.26 +extra-columns 1.27 font-awesome-api 6.6.0-2 forensics-api 2.6.0 ghprb 1.42.2 -git 5.5.2 -git-client 5.0.0 -git-parameter 0.9.19 +git 5.6.0 +git-client 6.1.0 +git-parameter 0.10.0 github 1.40.0 -github-api 1.321-468.v6a_9f5f2d5a_7e -github-branch-source 1797.v86fdb_4d57d43 +github-api 1.321-478.vc9ce627ce001 +github-branch-source 1807.v50351eb_7dd13 gitlab-api 5.6.0-97.v6603a_83f8690 -gitlab-branch-source 710.v6f19df32544b_ -gitlab-plugin 1.8.1 -gson-api 2.11.0-41.v019fcf6125dc +gitlab-branch-source 715.v4c830b_ca_ef95 +gitlab-plugin 1.9.6 +gson-api 2.11.0-85.v1f4e87273c33 handy-uri-templates-2-api 2.1.8-30.v7e777411b_148 -hashicorp-vault-plugin 370.v946b_53544a_30 +hashicorp-vault-plugin 371.v884a_4dd60fb_6 instance-identity 201.vd2a_b_5a_468a_a_6 ionicons-api 74.v93d5eb_813d5f jackson2-api 2.17.0-379.v02de8ec9f64c @@ -58,72 +58,73 @@ 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 1268.v75ce751da_911 -joda-time-api 2.13.0-85.vb_64d1c2921f1 +jobConfigHistory 1283.veb_dfb_00b_5ec0 +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-41.v94e11e6de726 -json-path-api 2.9.0-58.v62e3e85b_a_655 -junit 1304.vc85a_b_ca_96613 -kubernetes 4290.v93ea_4b_b_26a_61 +json-api 20240303-101.v7a_8666713110 +json-path-api 2.9.0-118.v7f23ed82a_8b_8 +junit 1309.v0078b_fecd6ed +kubernetes 4296.v20a_7e4d77cf6 kubernetes-client-api 6.10.0-240.v57880ce8b_0b_2 kubernetes-credentials 190.v03c305394deb_ -ldap 725.v3cb_b_711b_1a_ef -mailer 488.v0c9639c1a_eb_3 -matrix-auth 3.2.2 -matrix-project 839.vff91cd7e3a_b_2 -maven-plugin 3.23 -metrics 4.2.21-451.vd51df8df52ec +ldap 770.vb_455e934581a_ +mailer 489.vd4b_25144138f +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-172.vda_da_1feeb_c6e +okhttp-api 4.11.0-181.v1de5b_83857df pam-auth 1.11 parameterized-trigger 806.vf6fff3e28c3e pipeline-build-step 540.vb_e8849e1a_b_d8 pipeline-graph-analysis 216.vfd8b_ece330ca_ -pipeline-groovy-lib 730.ve57b_34648c63 +pipeline-graph-view 382.vb_9a_27b_7b_ea_71 +pipeline-groovy-lib 744.v5b_556ee7c253 pipeline-input-step 495.ve9c153f6067b_ -pipeline-maven 1457.vf7a_de13b_c0d4 -pipeline-maven-api 1457.vf7a_de13b_c0d4 +pipeline-maven 1469.ve15ca_a_b_90b_44 +pipeline-maven-api 1469.ve15ca_a_b_90b_44 pipeline-milestone-step 119.vdfdc43fc3b_9a_ -pipeline-model-api 2.2214.vb_b_34b_2ea_9b_83 -pipeline-model-definition 2.2214.vb_b_34b_2ea_9b_83 -pipeline-model-extensions 2.2214.vb_b_34b_2ea_9b_83 +pipeline-model-api 2.2218.v56d0cda_37c72 +pipeline-model-definition 2.2218.v56d0cda_37c72 +pipeline-model-extensions 2.2218.v56d0cda_37c72 pipeline-rest-api 2.34 pipeline-stage-step 312.v8cd10304c27a_ -pipeline-stage-tags-metadata 2.2214.vb_b_34b_2ea_9b_83 +pipeline-stage-tags-metadata 2.2218.v56d0cda_37c72 pipeline-stage-view 2.34 plain-credentials 183.va_de8f1dd5a_2b_ plugin-util-api 5.1.0 -prism-api 1.29.0-17 -prometheus 787.v52e8f47488fc +prism-api 1.29.0-18 +prometheus 795.v995762102f28 promoted-builds 965.vcda_c6a_e0998f rebuild 332.va_1ee476d8f6d -resource-disposer 0.24 -scm-api 696.v778d637b_a_762 -script-security 1362.v67dc1f0e1b_b_3 +resource-disposer 0.25 +scm-api 698.v8e3b_c788f0a_6 +script-security 1369.v9b_98a_4e95b_2d simple-theme-plugin 196.v96d9592f4efa_ snakeyaml-api 2.3-123.v13484c65210a_ -sonar 2.17.2 +sonar 2.17.3 ssh-agent 376.v8933585c69d3 -ssh-credentials 343.v884f71d78167 +ssh-credentials 349.vb_8b_6b_9709f5b_ ssh-slaves 2.973.v0fa_8c0dea_f9f structs 338.v848422169819 -timestamper 1.27 +timestamper 1.28 token-macro 400.v35420b_922dcb_ trilead-api 2.147.vb_73cc728a_32e variant 60.v7290fc0eb_b_cd -warnings-ng 11.9.0 +warnings-ng 11.12.0 workflow-aggregator 600.vb_57cdd26fdd7 workflow-api 1336.vee415d95c521 workflow-basic-steps 1058.vcb_fc1e3a_21a_9 -workflow-cps 3969.vdc9d3a_efcc6a_ -workflow-durable-task-step 1371.vb_7cec8f3b_95e -workflow-job 1436.vfa_244484591f +workflow-cps 3996.va_f5c1799f978 +workflow-durable-task-step 1398.vf6c9e89e5988 +workflow-job 1468.vcf4f5ee92395 workflow-multibranch 795.ve0cb_1f45ca_9a_ workflow-scm-step 427.v4ca_6512e7df1 workflow-step-api 678.v3ee58b_469476 -workflow-support 926.v9f4f9b_b_98c19 -ws-cleanup 0.47 +workflow-support 936.v9fa_77211ca_e1 +ws-cleanup 0.48 xvnc 1.28 diff --git a/instances/iot.zenoh/target/k8s/configmap-jenkins-config.yml b/instances/iot.zenoh/target/k8s/configmap-jenkins-config.yml index aae326669..780cc4ad6 100644 --- a/instances/iot.zenoh/target/k8s/configmap-jenkins-config.yml +++ b/instances/iot.zenoh/target/k8s/configmap-jenkins-config.yml @@ -15,7 +15,7 @@ metadata: org.eclipse.cbi.jiro/kind: "master" annotations: org.eclipse.cbi.jiro/jenkins.version: "latest" - org.eclipse.cbi.jiro/jenkins.actualVersion: "2.462.3" + org.eclipse.cbi.jiro/jenkins.actualVersion: "2.479.2" org.eclipse.cbi.jiro/kubernetes.master.namespace: "zenoh" namespace: "zenoh" name: jenkins-config @@ -102,10 +102,10 @@ data: templates: - name: "basic" namespace: "zenoh" - label: "basic" + label: "basic basic-ubuntu" containers: - name: "jnlp" - image: docker.io/eclipsecbi/jiro-agent-basic:remoting-3248.3250.v3277a_8e88c9b_ + image: docker.io/eclipsecbi/jiro-agent-basic-ubuntu:remoting-3261.v9c670a_4748a_9 alwaysPullImage: true livenessProbe: failureThreshold: 0 @@ -191,285 +191,12 @@ data: name: m2-dir inheritYamlMergeStrategy: "true" yamlMergeStrategy: "merge" - - name: "basic-ubuntu" - namespace: "zenoh" - label: "basic-ubuntu" - containers: - - name: "jnlp" - image: docker.io/eclipsecbi/jiro-agent-basic-ubuntu:remoting-3248.3250.v3277a_8e88c9b_ - alwaysPullImage: true - livenessProbe: - failureThreshold: 0 - initialDelaySeconds: 0 - periodSeconds: 0 - successThreshold: 0 - timeoutSeconds: 0 - ttyEnabled: true - command: "" - args: "" - instanceCap: -1 - nodeUsageMode: EXCLUSIVE - envVars: - - envVar: - key: "JAVA_TOOL_OPTIONS" - value: "" - - envVar: - key: "JENKINS_REMOTING_JAVA_OPTS" - value: "-showversion -XshowSettings:vm -Xmx256m -Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true -Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true" - - envVar: - key: "OPENJ9_JAVA_OPTIONS" - value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" - - envVar: - key: "_JAVA_OPTIONS" - value: "" - volumes: - - persistentVolumeClaim: - claimName: "tools-claim-jiro-zenoh" - mountPath: "/opt/tools" - readOnly: true - - configMapVolume: - configMapName: "known-hosts" - mountPath: "/home/jenkins/.ssh/" - subPath: "." - - emptyDirVolume: - memory: false - mountPath: "/home/jenkins/" - - emptyDirVolume: - memory: false - mountPath: "/home/jenkins/.m2/repository" - - emptyDirVolume: - memory: false - mountPath: "/home/jenkins/.m2/wrapper" - workspaceVolume: - emptyDirWorkspaceVolume: - memory: false - yaml: | - apiVersion: v1 - kind: Pod - spec: - containers: - - name: jnlp - resources: - limits: - cpu: "2000m" - memory: "4096Mi" - requests: - cpu: "1000m" - memory: "4096Mi" - volumeMounts: - - name: m2-secret-dir - mountPath: /home/jenkins/.m2/settings-security.xml - subPath: settings-security.xml - readOnly: true - - name: m2-secret-dir - mountPath: /home/jenkins/.m2/settings.xml - subPath: settings.xml - readOnly: true - - name: m2-dir - mountPath: /home/jenkins/.m2/toolchains.xml - subPath: toolchains.xml - readOnly: true - - name: m2-dir - mountPath: /home/jenkins/.mavenrc - subPath: .mavenrc - readOnly: true - volumes: - - name: m2-secret-dir - secret: - secretName: m2-secret-dir - - name: m2-dir - configMap: - name: m2-dir - inheritYamlMergeStrategy: "true" - yamlMergeStrategy: "merge" - - name: "centos-7" - namespace: "zenoh" - label: "migration jipp-migration centos-7" - containers: - - name: "jnlp" - image: docker.io/eclipsecbi/jiro-agent-centos-7:remoting-3248.3250.v3277a_8e88c9b_ - alwaysPullImage: true - livenessProbe: - failureThreshold: 0 - initialDelaySeconds: 0 - periodSeconds: 0 - successThreshold: 0 - timeoutSeconds: 0 - ttyEnabled: true - command: "" - args: "" - instanceCap: -1 - nodeUsageMode: EXCLUSIVE - envVars: - - envVar: - key: "JAVA_TOOL_OPTIONS" - value: "" - - envVar: - key: "JENKINS_REMOTING_JAVA_OPTS" - value: "-showversion -XshowSettings:vm -Xmx256m -Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true -Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true" - - envVar: - key: "OPENJ9_JAVA_OPTIONS" - value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" - - envVar: - key: "_JAVA_OPTIONS" - value: "" - volumes: - - persistentVolumeClaim: - claimName: "tools-claim-jiro-zenoh" - mountPath: "/opt/tools" - readOnly: true - - configMapVolume: - configMapName: "known-hosts" - mountPath: "/home/jenkins/.ssh/" - subPath: "." - - emptyDirVolume: - memory: false - mountPath: "/home/jenkins/" - - emptyDirVolume: - memory: false - mountPath: "/home/jenkins/.m2/repository" - - emptyDirVolume: - memory: false - mountPath: "/home/jenkins/.m2/wrapper" - workspaceVolume: - emptyDirWorkspaceVolume: - memory: false - yaml: | - apiVersion: v1 - kind: Pod - spec: - containers: - - name: jnlp - resources: - limits: - cpu: "2000m" - memory: "4096Mi" - requests: - cpu: "1000m" - memory: "4096Mi" - volumeMounts: - - name: m2-secret-dir - mountPath: /home/jenkins/.m2/settings-security.xml - subPath: settings-security.xml - readOnly: true - - name: m2-secret-dir - mountPath: /home/jenkins/.m2/settings.xml - subPath: settings.xml - readOnly: true - - name: m2-dir - mountPath: /home/jenkins/.m2/toolchains.xml - subPath: toolchains.xml - readOnly: true - - name: m2-dir - mountPath: /home/jenkins/.mavenrc - subPath: .mavenrc - readOnly: true - volumes: - - name: m2-secret-dir - secret: - secretName: m2-secret-dir - - name: m2-dir - configMap: - name: m2-dir - inheritYamlMergeStrategy: "true" - yamlMergeStrategy: "merge" - - name: "centos-8" - namespace: "zenoh" - label: "centos-latest centos-8" - containers: - - name: "jnlp" - image: docker.io/eclipsecbi/jiro-agent-centos-8:remoting-3248.3250.v3277a_8e88c9b_ - alwaysPullImage: true - livenessProbe: - failureThreshold: 0 - initialDelaySeconds: 0 - periodSeconds: 0 - successThreshold: 0 - timeoutSeconds: 0 - ttyEnabled: true - command: "" - args: "" - instanceCap: -1 - nodeUsageMode: EXCLUSIVE - envVars: - - envVar: - key: "JAVA_TOOL_OPTIONS" - value: "" - - envVar: - key: "JENKINS_REMOTING_JAVA_OPTS" - value: "-showversion -XshowSettings:vm -Xmx256m -Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true -Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true" - - envVar: - key: "OPENJ9_JAVA_OPTIONS" - value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" - - envVar: - key: "_JAVA_OPTIONS" - value: "" - volumes: - - persistentVolumeClaim: - claimName: "tools-claim-jiro-zenoh" - mountPath: "/opt/tools" - readOnly: true - - configMapVolume: - configMapName: "known-hosts" - mountPath: "/home/jenkins/.ssh/" - subPath: "." - - emptyDirVolume: - memory: false - mountPath: "/home/jenkins/" - - emptyDirVolume: - memory: false - mountPath: "/home/jenkins/.m2/repository" - - emptyDirVolume: - memory: false - mountPath: "/home/jenkins/.m2/wrapper" - workspaceVolume: - emptyDirWorkspaceVolume: - memory: false - yaml: | - apiVersion: v1 - kind: Pod - spec: - containers: - - name: jnlp - resources: - limits: - cpu: "2000m" - memory: "4096Mi" - requests: - cpu: "1000m" - memory: "4096Mi" - volumeMounts: - - name: m2-secret-dir - mountPath: /home/jenkins/.m2/settings-security.xml - subPath: settings-security.xml - readOnly: true - - name: m2-secret-dir - mountPath: /home/jenkins/.m2/settings.xml - subPath: settings.xml - readOnly: true - - name: m2-dir - mountPath: /home/jenkins/.m2/toolchains.xml - subPath: toolchains.xml - readOnly: true - - name: m2-dir - mountPath: /home/jenkins/.mavenrc - subPath: .mavenrc - readOnly: true - volumes: - - name: m2-secret-dir - secret: - secretName: m2-secret-dir - - name: m2-dir - configMap: - name: m2-dir - inheritYamlMergeStrategy: "true" - yamlMergeStrategy: "merge" - name: "ubuntu-2204" namespace: "zenoh" label: "ubuntu-2204" containers: - name: "jnlp" - image: docker.io/eclipsecbi/jiro-agent-ubuntu-2204:remoting-3248.3250.v3277a_8e88c9b_ + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2204:remoting-3261.v9c670a_4748a_9 alwaysPullImage: true livenessProbe: failureThreshold: 0 @@ -557,10 +284,10 @@ data: yamlMergeStrategy: "merge" - name: "ubuntu-2404" namespace: "zenoh" - label: "ubuntu-latest ubuntu-2404" + label: "ubuntu-latest ubuntu-2404 migration jipp-migration centos-7 centos-8 centos-latest" containers: - name: "jnlp" - image: docker.io/eclipsecbi/jiro-agent-ubuntu-2404:remoting-3248.3250.v3277a_8e88c9b_ + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2404:remoting-3261.v9c670a_4748a_9 alwaysPullImage: true livenessProbe: failureThreshold: 0 @@ -756,7 +483,7 @@ data: createAccountBasedOnEmail: true useExistingAccountWithSameEmail: true jobConfigHistory: - excludePattern: "queue\\.xml|nodeMonitors\\.xml|UpdateCenter\\.xml|global-build-stats|LockableResourcesManager\\.xml|MilestoneStep\\.xml" + excludePattern: "queue\\.xml|nodeMonitors\\.xml|UpdateCenter\\.xml|global-build-stats|LockableResourcesManager\\.xml|MilestoneStep\\.xml|hudson.plugins.xvnc.Xvnc\\.xml" maxDaysToKeepEntries: "60" maxEntriesPerPage: "12" maxHistoryEntries: "500" @@ -897,7 +624,7 @@ data: - installSource: installers: - antFromApache: - id: "1.10.12" + id: "1.10.15" maven: installations: - name: "apache-maven-latest" diff --git a/instances/iot.zenoh/target/k8s/statefulset.json b/instances/iot.zenoh/target/k8s/statefulset.json index a648e797a..a7b1b28d7 100644 --- a/instances/iot.zenoh/target/k8s/statefulset.json +++ b/instances/iot.zenoh/target/k8s/statefulset.json @@ -51,7 +51,7 @@ "env": [ { "name": "JAVA_OPTS", - "value": "-showversion -XshowSettings:vm -XX:+AlwaysPreTouch -XX:+ParallelRefProcEnabled -XX:+DisableExplicitGC -Duser.timezone=America/Toronto -Dhudson.footerURL=https://ci.eclipse.org -Dhudson.model.UsageStatistics.disabled=true -Dhudson.lifecycle=hudson.lifecycle.ExitLifecycle -Djenkins.model.Jenkins.exitCodeOnRestart=0 -Djenkins.model.Jenkins.slaveAgentPort=50000 -Djenkins.model.Jenkins.slaveAgentPortEnforce=true -Djenkins.slaves.JnlpSlaveAgentProtocol3.enabled=false -Djenkins.install.runSetupWizard=false -Djenkins.ui.refresh=true -Djenkins.security.ManagePermission=true -Dorg.jenkinsci.plugins.durabletask.BourneShellScript.HEARTBEAT_CHECK_INTERVAL=7200 -DexecutableWar.jetty.disableCustomSessionIdCookieName=false -DexecutableWar.jetty.sessionIdCookieName=JSESSIONID.zenoh -Dcasc.jenkins.config=/etc/jenkins/jenkins.yaml -Dio.jenkins.plugins.casc.ConfigurationAsCode.initialDelay=5000 -Dorg.csanchez.jenkins.plugins.kubernetes.pipeline.PodTemplateStepExecution.defaultImage=docker.io/eclipsecbi/jiro-agent-basic:remoting-3248.3250.v3277a_8e88c9b_ -Dorg.csanchez.jenkins.plugins.kubernetes.PodTemplate.connectionTimeout=180 -Dkubernetes.websocket.ping.interval=30000" + "value": "-showversion -XshowSettings:vm -XX:+AlwaysPreTouch -XX:+ParallelRefProcEnabled -XX:+DisableExplicitGC -Duser.timezone=America/Toronto -Dhudson.footerURL=https://ci.eclipse.org -Dhudson.model.UsageStatistics.disabled=true -Dhudson.lifecycle=hudson.lifecycle.ExitLifecycle -Djenkins.model.Jenkins.exitCodeOnRestart=0 -Djenkins.model.Jenkins.slaveAgentPort=50000 -Djenkins.model.Jenkins.slaveAgentPortEnforce=true -Djenkins.slaves.JnlpSlaveAgentProtocol3.enabled=false -Djenkins.install.runSetupWizard=false -Djenkins.ui.refresh=true -Djenkins.security.ManagePermission=true -Dorg.jenkinsci.plugins.durabletask.BourneShellScript.HEARTBEAT_CHECK_INTERVAL=7200 -DexecutableWar.jetty.disableCustomSessionIdCookieName=false -DexecutableWar.jetty.sessionIdCookieName=JSESSIONID.zenoh -Dcasc.jenkins.config=/etc/jenkins/jenkins.yaml -Dio.jenkins.plugins.casc.ConfigurationAsCode.initialDelay=5000 -Dorg.csanchez.jenkins.plugins.kubernetes.pipeline.PodTemplateStepExecution.defaultImage=docker.io/eclipsecbi/jiro-agent-basic-ubuntu:remoting-3261.v9c670a_4748a_9 -Dorg.csanchez.jenkins.plugins.kubernetes.PodTemplate.connectionTimeout=180 -Dkubernetes.websocket.ping.interval=30000" }, { "name": "JENKINS_OPTS", @@ -66,7 +66,7 @@ "value": "true" } ], - "image": "docker.io/eclipsecbijenkins/iot.zenoh:2.462.3", + "image": "docker.io/eclipsecbijenkins/iot.zenoh:2.479.2", "imagePullPolicy": "Always", "lifecycle": { "preStop": { diff --git a/instances/technology.justj/target/Dockerfile b/instances/technology.justj/target/Dockerfile index 6ac7efccc..ae5857e83 100644 --- a/instances/technology.justj/target/Dockerfile +++ b/instances/technology.justj/target/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.io/eclipsecbi/jiro-master:2.462.3 +FROM docker.io/eclipsecbi/jiro-master:2.479.2 EXPOSE 8080 EXPOSE 50000 diff --git a/instances/technology.justj/target/config.json b/instances/technology.justj/target/config.json index d509f9629..5800540aa 100644 --- a/instances/technology.justj/target/config.json +++ b/instances/technology.justj/target/config.json @@ -19,112 +19,13 @@ "basic": { "agentWorkdir": "/home/jenkins/jenkins-agent", "docker": { - "aliases": [ - "docker.io/eclipsecbi/jiro-agent-basic:latest" - ], + "aliases": [ ], "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: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 [ \"uid_entrypoint\", \"/usr/local/bin/jenkins-agent\" ]\n\nADD \"https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3248.3250.v3277a_8e88c9b_/remoting-3248.3250.v3277a_8e88c9b_.jar\" \"/usr/share/jenkins/agent.jar\" \nADD \"https://github.com/jenkinsci/docker-agent/raw/3248.3250.v3277a_8e88c9b_-1/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\nUSER 10001:0\n", - "image": "jiro-agent-basic", - "registry": "docker.io", - "repository": "eclipsecbi", - "tag": "remoting-3248.3250.v3277a_8e88c9b_" - }, - "env": { - "JAVA_TOOL_OPTIONS": [ ], - "JENKINS_REMOTING_JAVA_OPTS": [ - "-showversion", - "-XshowSettings:vm", - "-Xmx256m", - "-Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true", - "-Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true" - ], - "OPENJ9_JAVA_OPTIONS": [ - "-XX:+IgnoreUnrecognizedVMOptions", - "-XX:+IdleTuningCompactOnIdle", - "-XX:+IdleTuningGcOnIdle" - ], - "_JAVA_OPTIONS": [ ] - }, - "home": "/home/jenkins", - "kubernetes": { - "inheritYamlMergeStrategy": true, - "resources": { - "cpu": { - "limit": "2000m", - "request": "1000m" - }, - "memory": { - "limit": "4096Mi", - "request": "4096Mi" - } - }, - "volumes": [ - { - "mounts": [ - { - "mountPath": "/home/jenkins/.m2/settings-security.xml", - "subPath": "settings-security.xml" - }, - { - "mountPath": "/home/jenkins/.m2/settings.xml", - "subPath": "settings.xml" - } - ], - "name": "m2-secret-dir", - "secret": { - "name": "m2-secret-dir" - } - }, - { - "configMap": { - "name": "m2-dir" - }, - "mounts": [ - { - "mountPath": "/home/jenkins/.m2/toolchains.xml", - "subPath": "toolchains.xml" - }, - { - "mountPath": "/home/jenkins/.mavenrc", - "subPath": ".mavenrc" - } - ], - "name": "m2-dir" - } - ], - "yamlMergeStrategy": "merge" - }, - "labels": [ - "basic" - ], - "maxHeap": "256m", - "mode": "NORMAL", - "name": "basic", - "remoting": { - "jar": "/usr/share/jenkins/agent.jar", - "startupScript": { - "name": "jenkins-agent", - "url": "https://github.com/jenkinsci/docker-agent/raw/3248.3250.v3277a_8e88c9b_-1/jenkins-agent", - "version": "3248.3250.v3277a_8e88c9b_-1" - }, - "url": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3248.3250.v3277a_8e88c9b_/remoting-3248.3250.v3277a_8e88c9b_.jar", - "version": "3248.3250.v3277a_8e88c9b_" - }, - "startupScript": "/usr/local/bin/jenkins-agent", - "username": "jenkins" - }, - "basic-ubuntu": { - "agentWorkdir": "/home/jenkins/jenkins-agent", - "docker": { - "aliases": [ - "docker.io/eclipsecbi/jiro-agent-basic-ubuntu:latest" - ], - "context": "basic-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-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/3248.3250.v3277a_8e88c9b_/remoting-3248.3250.v3277a_8e88c9b_.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3248.3250.v3277a_8e88c9b_-1/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", + "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/3261.v9c670a_4748a_9/remoting-3261.v9c670a_4748a_9.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3261.v9c670a_4748a_9-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", "registry": "docker.io", "repository": "eclipsecbi", - "tag": "remoting-3248.3250.v3277a_8e88c9b_" + "tag": "remoting-3261.v9c670a_4748a_9" }, "env": { "JAVA_TOOL_OPTIONS": [ ], @@ -192,217 +93,21 @@ "yamlMergeStrategy": "merge" }, "labels": [ + "basic", "basic-ubuntu" ], "maxHeap": "256m", - "mode": "EXCLUSIVE", - "name": "basic-ubuntu", - "remoting": { - "jar": "/usr/share/jenkins/agent.jar", - "startupScript": { - "name": "jenkins-agent", - "url": "https://github.com/jenkinsci/docker-agent/raw/3248.3250.v3277a_8e88c9b_-1/jenkins-agent", - "version": "3248.3250.v3277a_8e88c9b_-1" - }, - "url": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3248.3250.v3277a_8e88c9b_/remoting-3248.3250.v3277a_8e88c9b_.jar", - "version": "3248.3250.v3277a_8e88c9b_" - }, - "startupScript": "/usr/local/bin/jenkins-agent", - "username": "jenkins" - }, - "centos-7": { - "agentWorkdir": "/home/jenkins/jenkins-agent", - "docker": { - "aliases": [ - "docker.io/eclipsecbi/jiro-agent-centos-7:latest" - ], - "context": "centos-7", - "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-centos-7: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/3248.3250.v3277a_8e88c9b_/remoting-3248.3250.v3277a_8e88c9b_.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3248.3250.v3277a_8e88c9b_-1/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\nUSER 10001:0\n", - "image": "jiro-agent-centos-7", - "registry": "docker.io", - "repository": "eclipsecbi", - "tag": "remoting-3248.3250.v3277a_8e88c9b_" - }, - "env": { - "JAVA_TOOL_OPTIONS": [ ], - "JENKINS_REMOTING_JAVA_OPTS": [ - "-showversion", - "-XshowSettings:vm", - "-Xmx256m", - "-Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true", - "-Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true" - ], - "OPENJ9_JAVA_OPTIONS": [ - "-XX:+IgnoreUnrecognizedVMOptions", - "-XX:+IdleTuningCompactOnIdle", - "-XX:+IdleTuningGcOnIdle" - ], - "_JAVA_OPTIONS": [ ] - }, - "home": "/home/jenkins", - "kubernetes": { - "inheritYamlMergeStrategy": true, - "resources": { - "cpu": { - "limit": "2000m", - "request": "1000m" - }, - "memory": { - "limit": "4096Mi", - "request": "4096Mi" - } - }, - "volumes": [ - { - "mounts": [ - { - "mountPath": "/home/jenkins/.m2/settings-security.xml", - "subPath": "settings-security.xml" - }, - { - "mountPath": "/home/jenkins/.m2/settings.xml", - "subPath": "settings.xml" - } - ], - "name": "m2-secret-dir", - "secret": { - "name": "m2-secret-dir" - } - }, - { - "configMap": { - "name": "m2-dir" - }, - "mounts": [ - { - "mountPath": "/home/jenkins/.m2/toolchains.xml", - "subPath": "toolchains.xml" - }, - { - "mountPath": "/home/jenkins/.mavenrc", - "subPath": ".mavenrc" - } - ], - "name": "m2-dir" - } - ], - "yamlMergeStrategy": "merge" - }, - "labels": [ - "migration", - "jipp-migration", - "centos-7" - ], - "maxHeap": "256m", - "mode": "EXCLUSIVE", - "name": "centos-7", - "remoting": { - "jar": "/usr/share/jenkins/agent.jar", - "startupScript": { - "name": "jenkins-agent", - "url": "https://github.com/jenkinsci/docker-agent/raw/3248.3250.v3277a_8e88c9b_-1/jenkins-agent", - "version": "3248.3250.v3277a_8e88c9b_-1" - }, - "url": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3248.3250.v3277a_8e88c9b_/remoting-3248.3250.v3277a_8e88c9b_.jar", - "version": "3248.3250.v3277a_8e88c9b_" - }, - "startupScript": "/usr/local/bin/jenkins-agent", - "username": "jenkins" - }, - "centos-8": { - "agentWorkdir": "/home/jenkins/jenkins-agent", - "docker": { - "aliases": [ - "docker.io/eclipsecbi/jiro-agent-centos-8:latest" - ], - "context": "centos-8", - "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-centos-8: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/3248.3250.v3277a_8e88c9b_/remoting-3248.3250.v3277a_8e88c9b_.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3248.3250.v3277a_8e88c9b_-1/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\nUSER 10001:0\n", - "image": "jiro-agent-centos-8", - "registry": "docker.io", - "repository": "eclipsecbi", - "tag": "remoting-3248.3250.v3277a_8e88c9b_" - }, - "env": { - "JAVA_TOOL_OPTIONS": [ ], - "JENKINS_REMOTING_JAVA_OPTS": [ - "-showversion", - "-XshowSettings:vm", - "-Xmx256m", - "-Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true", - "-Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true" - ], - "OPENJ9_JAVA_OPTIONS": [ - "-XX:+IgnoreUnrecognizedVMOptions", - "-XX:+IdleTuningCompactOnIdle", - "-XX:+IdleTuningGcOnIdle" - ], - "_JAVA_OPTIONS": [ ] - }, - "home": "/home/jenkins", - "kubernetes": { - "inheritYamlMergeStrategy": true, - "resources": { - "cpu": { - "limit": "2000m", - "request": "1000m" - }, - "memory": { - "limit": "4096Mi", - "request": "4096Mi" - } - }, - "volumes": [ - { - "mounts": [ - { - "mountPath": "/home/jenkins/.m2/settings-security.xml", - "subPath": "settings-security.xml" - }, - { - "mountPath": "/home/jenkins/.m2/settings.xml", - "subPath": "settings.xml" - } - ], - "name": "m2-secret-dir", - "secret": { - "name": "m2-secret-dir" - } - }, - { - "configMap": { - "name": "m2-dir" - }, - "mounts": [ - { - "mountPath": "/home/jenkins/.m2/toolchains.xml", - "subPath": "toolchains.xml" - }, - { - "mountPath": "/home/jenkins/.mavenrc", - "subPath": ".mavenrc" - } - ], - "name": "m2-dir" - } - ], - "yamlMergeStrategy": "merge" - }, - "labels": [ - "centos-latest", - "centos-8" - ], - "maxHeap": "256m", - "mode": "EXCLUSIVE", - "name": "centos-8", + "mode": "NORMAL", + "name": "basic", "remoting": { "jar": "/usr/share/jenkins/agent.jar", "startupScript": { "name": "jenkins-agent", - "url": "https://github.com/jenkinsci/docker-agent/raw/3248.3250.v3277a_8e88c9b_-1/jenkins-agent", - "version": "3248.3250.v3277a_8e88c9b_-1" + "url": "https://github.com/jenkinsci/docker-agent/raw/3261.v9c670a_4748a_9-8/jenkins-agent", + "version": "3261.v9c670a_4748a_9-8" }, - "url": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3248.3250.v3277a_8e88c9b_/remoting-3248.3250.v3277a_8e88c9b_.jar", - "version": "3248.3250.v3277a_8e88c9b_" + "url": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3261.v9c670a_4748a_9/remoting-3261.v9c670a_4748a_9.jar", + "version": "3261.v9c670a_4748a_9" }, "startupScript": "/usr/local/bin/jenkins-agent", "username": "jenkins" @@ -410,16 +115,14 @@ "ubuntu-2204": { "agentWorkdir": "/home/jenkins/jenkins-agent", "docker": { - "aliases": [ - "docker.io/eclipsecbi/jiro-agent-ubuntu-2204:latest" - ], + "aliases": [ ], "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/3248.3250.v3277a_8e88c9b_/remoting-3248.3250.v3277a_8e88c9b_.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3248.3250.v3277a_8e88c9b_-1/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", + "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/3261.v9c670a_4748a_9/remoting-3261.v9c670a_4748a_9.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3261.v9c670a_4748a_9-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-ubuntu-2204", "registry": "docker.io", "repository": "eclipsecbi", - "tag": "remoting-3248.3250.v3277a_8e88c9b_" + "tag": "remoting-3261.v9c670a_4748a_9" }, "env": { "JAVA_TOOL_OPTIONS": [ ], @@ -496,11 +199,11 @@ "jar": "/usr/share/jenkins/agent.jar", "startupScript": { "name": "jenkins-agent", - "url": "https://github.com/jenkinsci/docker-agent/raw/3248.3250.v3277a_8e88c9b_-1/jenkins-agent", - "version": "3248.3250.v3277a_8e88c9b_-1" + "url": "https://github.com/jenkinsci/docker-agent/raw/3261.v9c670a_4748a_9-8/jenkins-agent", + "version": "3261.v9c670a_4748a_9-8" }, - "url": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3248.3250.v3277a_8e88c9b_/remoting-3248.3250.v3277a_8e88c9b_.jar", - "version": "3248.3250.v3277a_8e88c9b_" + "url": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3261.v9c670a_4748a_9/remoting-3261.v9c670a_4748a_9.jar", + "version": "3261.v9c670a_4748a_9" }, "startupScript": "/usr/local/bin/jenkins-agent", "username": "jenkins" @@ -508,16 +211,14 @@ "ubuntu-2404": { "agentWorkdir": "/home/jenkins/jenkins-agent", "docker": { - "aliases": [ - "docker.io/eclipsecbi/jiro-agent-ubuntu-2404:latest" - ], + "aliases": [ ], "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/3248.3250.v3277a_8e88c9b_/remoting-3248.3250.v3277a_8e88c9b_.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3248.3250.v3277a_8e88c9b_-1/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", + "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/3261.v9c670a_4748a_9/remoting-3261.v9c670a_4748a_9.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3261.v9c670a_4748a_9-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-ubuntu-2404", "registry": "docker.io", "repository": "eclipsecbi", - "tag": "remoting-3248.3250.v3277a_8e88c9b_" + "tag": "remoting-3261.v9c670a_4748a_9" }, "env": { "JAVA_TOOL_OPTIONS": [ ], @@ -586,7 +287,12 @@ }, "labels": [ "ubuntu-latest", - "ubuntu-2404" + "ubuntu-2404", + "migration", + "jipp-migration", + "centos-7", + "centos-8", + "centos-latest" ], "maxHeap": "256m", "mode": "EXCLUSIVE", @@ -595,11 +301,11 @@ "jar": "/usr/share/jenkins/agent.jar", "startupScript": { "name": "jenkins-agent", - "url": "https://github.com/jenkinsci/docker-agent/raw/3248.3250.v3277a_8e88c9b_-1/jenkins-agent", - "version": "3248.3250.v3277a_8e88c9b_-1" + "url": "https://github.com/jenkinsci/docker-agent/raw/3261.v9c670a_4748a_9-8/jenkins-agent", + "version": "3261.v9c670a_4748a_9-8" }, - "url": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3248.3250.v3277a_8e88c9b_/remoting-3248.3250.v3277a_8e88c9b_.jar", - "version": "3248.3250.v3277a_8e88c9b_" + "url": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3261.v9c670a_4748a_9/remoting-3261.v9c670a_4748a_9.jar", + "version": "3261.v9c670a_4748a_9" }, "startupScript": "/usr/local/bin/jenkins-agent", "username": "jenkins" @@ -618,11 +324,11 @@ }, "docker": { "master": { - "dockerfile": "FROM docker.io/eclipsecbi/jiro-master:2.462.3\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.css.override /usr/share/jenkins/ref/userContent/theme/\nCOPY jenkins/title.js /usr/share/jenkins/ref/userContent/theme/\n\nUSER 10001\n", + "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.css.override /usr/share/jenkins/ref/userContent/theme/\nCOPY jenkins/title.js /usr/share/jenkins/ref/userContent/theme/\n\nUSER 10001\n", "image": "technology.justj", "registry": "docker.io", "repository": "eclipsecbijenkins", - "tag": "2.462.3" + "tag": "2.479.2" } }, "gradle": { @@ -719,11 +425,11 @@ "image": "jiro-master", "registry": "docker.io", "repository": "eclipsecbi", - "tag": "2.462.3" + "tag": "2.479.2" }, "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 eclipsecbi/semeru-ubuntu-coreutils:openjdk17-jammy\n\n# These environment variables will be used in the uid_entrypoint script from the parent image\nENV USER_NAME=\"jenkins\"\nENV HOME=\"/var/jenkins\"\n\n# jenkins version being bundled in this docker image\nENV JENKINS_HOME=\"/var/jenkins\"\nENV JENKINS_WAR=\"/usr/share/jenkins/jenkins.war\"\nENV COPY_REFERENCE_FILE_LOG=\"/var/jenkins/copy_reference_file.log\"\nENV REF=\"/usr/share/jenkins/ref\"\n\nVOLUME [ \"/var/jenkins\", \"/var/cache/jenkins/war\", \"/var/cache/jenkins/plugins\" ]\nWORKDIR \"/var/jenkins\"\n\nENTRYPOINT [\"/usr/bin/dumb-init\", \"--\", \"/usr/local/bin/jenkins.sh\"]\n\nRUN mkdir -p $(dirname \"/usr/share/jenkins/jenkins.war\") && mkdir -p \"/usr/share/jenkins/ref\"\n\nCOPY scripts/* /usr/local/bin/\nRUN chmod ug+x /usr/local/bin/*\n\nCOPY war/jenkins.war \"/usr/share/jenkins/jenkins.war\"\nCOPY ref/ \"/usr/share/jenkins/ref/\"\n", "home": "/var/jenkins", - "id": "2.462.3", + "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", @@ -765,6 +471,7 @@ "parameterized-trigger", "pipeline-maven", "pipeline-stage-view", + "pipeline-graph-view", "prometheus", "promoted-builds", "rebuild", @@ -781,7 +488,7 @@ "pubkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\n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\nMetBbjkOnNXyWrP3SAPwqQMMg/vNa+mJIjoNByw=\n=sdsH\n-----END PGP PUBLIC KEY BLOCK-----\n", "ref": "/usr/share/jenkins/ref", "remoting": { - "version": "3248.3250.v3277a_8e88c9b_" + "version": "3261.v9c670a_4748a_9" }, "scripts": { "jenkins": "https://github.com/jenkinsci/docker/raw/master/jenkins.sh", @@ -789,9 +496,9 @@ }, "updateCenter": "https://updates.jenkins.io", "username": "jenkins", - "version": "2.462.3", + "version": "2.479.2", "war": "/usr/share/jenkins/jenkins.war", - "warBaseUrl": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/jenkins-war/2.462.3", + "warBaseUrl": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/jenkins-war/2.479.2", "webroot": "/var/cache/jenkins/war" }, "kubernetes": { diff --git a/instances/technology.justj/target/jenkins/configuration.yml b/instances/technology.justj/target/jenkins/configuration.yml index a606dfa9c..6626ff0f2 100644 --- a/instances/technology.justj/target/jenkins/configuration.yml +++ b/instances/technology.justj/target/jenkins/configuration.yml @@ -78,16 +78,18 @@ jenkins: containerCapStr: "2" jenkinsUrl: "http://jenkins-ui.justj.svc.cluster.local/justj" jenkinsTunnel: "jenkins-discovery.justj.svc.cluster.local:50000" + garbageCollection: + timeout: 300 maxRequestsPerHostStr: "32" namespace: "justj" podRetention: "never" templates: - name: "basic" namespace: "justj" - label: "basic" + label: "basic basic-ubuntu" containers: - name: "jnlp" - image: docker.io/eclipsecbi/jiro-agent-basic:remoting-3248.3250.v3277a_8e88c9b_ + image: docker.io/eclipsecbi/jiro-agent-basic-ubuntu:remoting-3261.v9c670a_4748a_9 alwaysPullImage: true livenessProbe: failureThreshold: 0 @@ -173,285 +175,12 @@ jenkins: name: m2-dir inheritYamlMergeStrategy: "true" yamlMergeStrategy: "merge" - - name: "basic-ubuntu" - namespace: "justj" - label: "basic-ubuntu" - containers: - - name: "jnlp" - image: docker.io/eclipsecbi/jiro-agent-basic-ubuntu:remoting-3248.3250.v3277a_8e88c9b_ - alwaysPullImage: true - livenessProbe: - failureThreshold: 0 - initialDelaySeconds: 0 - periodSeconds: 0 - successThreshold: 0 - timeoutSeconds: 0 - ttyEnabled: true - command: "" - args: "" - instanceCap: -1 - nodeUsageMode: EXCLUSIVE - envVars: - - envVar: - key: "JAVA_TOOL_OPTIONS" - value: "" - - envVar: - key: "JENKINS_REMOTING_JAVA_OPTS" - value: "-showversion -XshowSettings:vm -Xmx256m -Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true -Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true" - - envVar: - key: "OPENJ9_JAVA_OPTIONS" - value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" - - envVar: - key: "_JAVA_OPTIONS" - value: "" - volumes: - - persistentVolumeClaim: - claimName: "tools-claim-jiro-justj" - mountPath: "/opt/tools" - readOnly: true - - configMapVolume: - configMapName: "known-hosts" - mountPath: "/home/jenkins/.ssh/" - subPath: "." - - emptyDirVolume: - memory: false - mountPath: "/home/jenkins/" - - emptyDirVolume: - memory: false - mountPath: "/home/jenkins/.m2/repository" - - emptyDirVolume: - memory: false - mountPath: "/home/jenkins/.m2/wrapper" - workspaceVolume: - emptyDirWorkspaceVolume: - memory: false - yaml: | - apiVersion: v1 - kind: Pod - spec: - containers: - - name: jnlp - resources: - limits: - cpu: "2000m" - memory: "4096Mi" - requests: - cpu: "1000m" - memory: "4096Mi" - volumeMounts: - - name: m2-secret-dir - mountPath: /home/jenkins/.m2/settings-security.xml - subPath: settings-security.xml - readOnly: true - - name: m2-secret-dir - mountPath: /home/jenkins/.m2/settings.xml - subPath: settings.xml - readOnly: true - - name: m2-dir - mountPath: /home/jenkins/.m2/toolchains.xml - subPath: toolchains.xml - readOnly: true - - name: m2-dir - mountPath: /home/jenkins/.mavenrc - subPath: .mavenrc - readOnly: true - volumes: - - name: m2-secret-dir - secret: - secretName: m2-secret-dir - - name: m2-dir - configMap: - name: m2-dir - inheritYamlMergeStrategy: "true" - yamlMergeStrategy: "merge" - - name: "centos-7" - namespace: "justj" - label: "migration jipp-migration centos-7" - containers: - - name: "jnlp" - image: docker.io/eclipsecbi/jiro-agent-centos-7:remoting-3248.3250.v3277a_8e88c9b_ - alwaysPullImage: true - livenessProbe: - failureThreshold: 0 - initialDelaySeconds: 0 - periodSeconds: 0 - successThreshold: 0 - timeoutSeconds: 0 - ttyEnabled: true - command: "" - args: "" - instanceCap: -1 - nodeUsageMode: EXCLUSIVE - envVars: - - envVar: - key: "JAVA_TOOL_OPTIONS" - value: "" - - envVar: - key: "JENKINS_REMOTING_JAVA_OPTS" - value: "-showversion -XshowSettings:vm -Xmx256m -Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true -Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true" - - envVar: - key: "OPENJ9_JAVA_OPTIONS" - value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" - - envVar: - key: "_JAVA_OPTIONS" - value: "" - volumes: - - persistentVolumeClaim: - claimName: "tools-claim-jiro-justj" - mountPath: "/opt/tools" - readOnly: true - - configMapVolume: - configMapName: "known-hosts" - mountPath: "/home/jenkins/.ssh/" - subPath: "." - - emptyDirVolume: - memory: false - mountPath: "/home/jenkins/" - - emptyDirVolume: - memory: false - mountPath: "/home/jenkins/.m2/repository" - - emptyDirVolume: - memory: false - mountPath: "/home/jenkins/.m2/wrapper" - workspaceVolume: - emptyDirWorkspaceVolume: - memory: false - yaml: | - apiVersion: v1 - kind: Pod - spec: - containers: - - name: jnlp - resources: - limits: - cpu: "2000m" - memory: "4096Mi" - requests: - cpu: "1000m" - memory: "4096Mi" - volumeMounts: - - name: m2-secret-dir - mountPath: /home/jenkins/.m2/settings-security.xml - subPath: settings-security.xml - readOnly: true - - name: m2-secret-dir - mountPath: /home/jenkins/.m2/settings.xml - subPath: settings.xml - readOnly: true - - name: m2-dir - mountPath: /home/jenkins/.m2/toolchains.xml - subPath: toolchains.xml - readOnly: true - - name: m2-dir - mountPath: /home/jenkins/.mavenrc - subPath: .mavenrc - readOnly: true - volumes: - - name: m2-secret-dir - secret: - secretName: m2-secret-dir - - name: m2-dir - configMap: - name: m2-dir - inheritYamlMergeStrategy: "true" - yamlMergeStrategy: "merge" - - name: "centos-8" - namespace: "justj" - label: "centos-latest centos-8" - containers: - - name: "jnlp" - image: docker.io/eclipsecbi/jiro-agent-centos-8:remoting-3248.3250.v3277a_8e88c9b_ - alwaysPullImage: true - livenessProbe: - failureThreshold: 0 - initialDelaySeconds: 0 - periodSeconds: 0 - successThreshold: 0 - timeoutSeconds: 0 - ttyEnabled: true - command: "" - args: "" - instanceCap: -1 - nodeUsageMode: EXCLUSIVE - envVars: - - envVar: - key: "JAVA_TOOL_OPTIONS" - value: "" - - envVar: - key: "JENKINS_REMOTING_JAVA_OPTS" - value: "-showversion -XshowSettings:vm -Xmx256m -Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true -Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true" - - envVar: - key: "OPENJ9_JAVA_OPTIONS" - value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" - - envVar: - key: "_JAVA_OPTIONS" - value: "" - volumes: - - persistentVolumeClaim: - claimName: "tools-claim-jiro-justj" - mountPath: "/opt/tools" - readOnly: true - - configMapVolume: - configMapName: "known-hosts" - mountPath: "/home/jenkins/.ssh/" - subPath: "." - - emptyDirVolume: - memory: false - mountPath: "/home/jenkins/" - - emptyDirVolume: - memory: false - mountPath: "/home/jenkins/.m2/repository" - - emptyDirVolume: - memory: false - mountPath: "/home/jenkins/.m2/wrapper" - workspaceVolume: - emptyDirWorkspaceVolume: - memory: false - yaml: | - apiVersion: v1 - kind: Pod - spec: - containers: - - name: jnlp - resources: - limits: - cpu: "2000m" - memory: "4096Mi" - requests: - cpu: "1000m" - memory: "4096Mi" - volumeMounts: - - name: m2-secret-dir - mountPath: /home/jenkins/.m2/settings-security.xml - subPath: settings-security.xml - readOnly: true - - name: m2-secret-dir - mountPath: /home/jenkins/.m2/settings.xml - subPath: settings.xml - readOnly: true - - name: m2-dir - mountPath: /home/jenkins/.m2/toolchains.xml - subPath: toolchains.xml - readOnly: true - - name: m2-dir - mountPath: /home/jenkins/.mavenrc - subPath: .mavenrc - readOnly: true - volumes: - - name: m2-secret-dir - secret: - secretName: m2-secret-dir - - name: m2-dir - configMap: - name: m2-dir - inheritYamlMergeStrategy: "true" - yamlMergeStrategy: "merge" - name: "ubuntu-2204" namespace: "justj" label: "ubuntu-2204" containers: - name: "jnlp" - image: docker.io/eclipsecbi/jiro-agent-ubuntu-2204:remoting-3248.3250.v3277a_8e88c9b_ + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2204:remoting-3261.v9c670a_4748a_9 alwaysPullImage: true livenessProbe: failureThreshold: 0 @@ -539,10 +268,10 @@ jenkins: yamlMergeStrategy: "merge" - name: "ubuntu-2404" namespace: "justj" - label: "ubuntu-latest ubuntu-2404" + label: "ubuntu-latest ubuntu-2404 migration jipp-migration centos-7 centos-8 centos-latest" containers: - name: "jnlp" - image: docker.io/eclipsecbi/jiro-agent-ubuntu-2404:remoting-3248.3250.v3277a_8e88c9b_ + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2404:remoting-3261.v9c670a_4748a_9 alwaysPullImage: true livenessProbe: failureThreshold: 0 diff --git a/instances/technology.justj/target/jenkins/plugins.log b/instances/technology.justj/target/jenkins/plugins.log index 86db8ed88..ccf693a61 100644 --- a/instances/technology.justj/target/jenkins/plugins.log +++ b/instances/technology.justj/target/jenkins/plugins.log @@ -1,5 +1,5 @@ Resulting plugin list: -analysis-model-api 12.9.0 +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 @@ -9,41 +9,41 @@ 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.1197.vfa_d0c47c267d +branch-api 2.1200.v4b_a_3da_2eb_db_4 build-timeout 1.33 build-with-parameters 76.v9382db_f78962 caffeine-api 3.1.8-133.v17b_1ff2e0599 checks-api 2.2.1 -cloudbees-disk-usage-simple 205.v47f4ee8803d1 -cloudbees-folder 6.955.v81e2a_35c08d3 -command-launcher 115.vd8b_301cc15d0 +cloudbees-disk-usage-simple 232.v713eeed2e1f4 +cloudbees-folder 6.963.v6edc0fc71472 +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 1873.vea_5814ca_9c93 -credentials 1384.vf0a_2ed06f9c6 -credentials-binding 681.vf91669a_32e45 +configuration-as-code 1903.v004d55388f30 +credentials 1389.vd7a_b_f5fa_50a_2 +credentials-binding 687.v619cb_15e923f data-tables-api 2.1.8-1 -display-url-api 2.204.vf6fddd8a_8b_e9 -durable-task 577.v2a_8a_4b_7c0247 +display-url-api 2.209.v582ed814ff2f +durable-task 581.v299a_5609d767 echarts-api 5.5.1-4 eddsa-api 0.3.0-4.v84c6f0f4969e -email-ext 1844.v3ea_a_b_842374a_ +email-ext 1861.vdb_d991590994 extended-read-permission 53.v6499940139e5 external-monitor-job 215.v2e88e894db_f8 -extra-columns 1.26 +extra-columns 1.27 font-awesome-api 6.6.0-2 forensics-api 2.6.0 ghprb 1.42.2 -git 5.5.2 -git-client 5.0.0 +git 5.6.0 +git-client 6.1.0 git-parameter 0.10.0 github 1.40.0 -github-api 1.321-468.v6a_9f5f2d5a_7e +github-api 1.321-478.vc9ce627ce001 github-branch-source 1807.v50351eb_7dd13 gitlab-api 5.6.0-97.v6603a_83f8690 -gitlab-branch-source 711.v41fb_c8b_2b_7a_e -gitlab-plugin 1.8.2 +gitlab-branch-source 715.v4c830b_ca_ef95 +gitlab-plugin 1.9.6 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 @@ -64,67 +64,68 @@ 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 4295.v7fa_01b_309c95 +junit 1311.v39e1716e4eb_e +kubernetes 4300.vd82c5692b_3a_e kubernetes-client-api 6.10.0-240.v57880ce8b_0b_2 kubernetes-credentials 190.v03c305394deb_ -ldap 725.v3cb_b_711b_1a_ef +ldap 770.vb_455e934581a_ mail-watcher-plugin 1.19 -mailer 488.v0c9639c1a_eb_3 +mailer 489.vd4b_25144138f matrix-auth 3.2.3 -matrix-project 839.vff91cd7e3a_b_2 +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-172.vda_da_1feeb_c6e +okhttp-api 4.11.0-181.v1de5b_83857df 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-maven 1457.vf7a_de13b_c0d4 -pipeline-maven-api 1457.vf7a_de13b_c0d4 +pipeline-maven 1469.ve15ca_a_b_90b_44 +pipeline-maven-api 1469.ve15ca_a_b_90b_44 pipeline-milestone-step 119.vdfdc43fc3b_9a_ -pipeline-model-api 2.2214.vb_b_34b_2ea_9b_83 -pipeline-model-definition 2.2214.vb_b_34b_2ea_9b_83 -pipeline-model-extensions 2.2214.vb_b_34b_2ea_9b_83 +pipeline-model-api 2.2218.v56d0cda_37c72 +pipeline-model-definition 2.2218.v56d0cda_37c72 +pipeline-model-extensions 2.2218.v56d0cda_37c72 pipeline-rest-api 2.34 pipeline-stage-step 312.v8cd10304c27a_ -pipeline-stage-tags-metadata 2.2214.vb_b_34b_2ea_9b_83 +pipeline-stage-tags-metadata 2.2218.v56d0cda_37c72 pipeline-stage-view 2.34 plain-credentials 183.va_de8f1dd5a_2b_ plugin-util-api 5.1.0 -prism-api 1.29.0-17 +prism-api 1.29.0-18 prometheus 795.v995762102f28 promoted-builds 965.vcda_c6a_e0998f rebuild 332.va_1ee476d8f6d -resource-disposer 0.24 -scm-api 696.v778d637b_a_762 -script-security 1367.vdf2fc45f229c +resource-disposer 0.25 +scm-api 698.v8e3b_c788f0a_6 +script-security 1369.v9b_98a_4e95b_2d simple-theme-plugin 196.v96d9592f4efa_ snakeyaml-api 2.3-123.v13484c65210a_ -sonar 2.17.2 +sonar 2.17.3 ssh-agent 376.v8933585c69d3 -ssh-credentials 343.v884f71d78167 +ssh-credentials 349.vb_8b_6b_9709f5b_ ssh-slaves 2.973.v0fa_8c0dea_f9f structs 338.v848422169819 -timestamper 1.27 +timestamper 1.28 token-macro 400.v35420b_922dcb_ trilead-api 2.147.vb_73cc728a_32e variant 60.v7290fc0eb_b_cd -warnings-ng 11.10.0 +warnings-ng 11.12.0 workflow-aggregator 600.vb_57cdd26fdd7 workflow-api 1336.vee415d95c521 workflow-basic-steps 1058.vcb_fc1e3a_21a_9 -workflow-cps 3990.vd281dd77a_388 -workflow-durable-task-step 1371.vb_7cec8f3b_95e -workflow-job 1436.vfa_244484591f +workflow-cps 4000.v5198556e9cea_ +workflow-durable-task-step 1398.vf6c9e89e5988 +workflow-job 1472.ve4d5eca_143c4 workflow-multibranch 795.ve0cb_1f45ca_9a_ workflow-scm-step 427.v4ca_6512e7df1 workflow-step-api 678.v3ee58b_469476 -workflow-support 932.vb_555de1b_a_b_94 -ws-cleanup 0.47 +workflow-support 936.v9fa_77211ca_e1 +ws-cleanup 0.48 xvnc 1.28 diff --git a/instances/technology.justj/target/k8s/configmap-jenkins-config.yml b/instances/technology.justj/target/k8s/configmap-jenkins-config.yml index 21bc27cde..9d1fb0334 100644 --- a/instances/technology.justj/target/k8s/configmap-jenkins-config.yml +++ b/instances/technology.justj/target/k8s/configmap-jenkins-config.yml @@ -15,7 +15,7 @@ metadata: org.eclipse.cbi.jiro/kind: "master" annotations: org.eclipse.cbi.jiro/jenkins.version: "latest" - org.eclipse.cbi.jiro/jenkins.actualVersion: "2.462.3" + org.eclipse.cbi.jiro/jenkins.actualVersion: "2.479.2" org.eclipse.cbi.jiro/kubernetes.master.namespace: "justj" namespace: "justj" name: jenkins-config @@ -101,16 +101,18 @@ data: containerCapStr: "2" jenkinsUrl: "http://jenkins-ui.justj.svc.cluster.local/justj" jenkinsTunnel: "jenkins-discovery.justj.svc.cluster.local:50000" + garbageCollection: + timeout: 300 maxRequestsPerHostStr: "32" namespace: "justj" podRetention: "never" templates: - name: "basic" namespace: "justj" - label: "basic" + label: "basic basic-ubuntu" containers: - name: "jnlp" - image: docker.io/eclipsecbi/jiro-agent-basic:remoting-3248.3250.v3277a_8e88c9b_ + image: docker.io/eclipsecbi/jiro-agent-basic-ubuntu:remoting-3261.v9c670a_4748a_9 alwaysPullImage: true livenessProbe: failureThreshold: 0 @@ -196,285 +198,12 @@ data: name: m2-dir inheritYamlMergeStrategy: "true" yamlMergeStrategy: "merge" - - name: "basic-ubuntu" - namespace: "justj" - label: "basic-ubuntu" - containers: - - name: "jnlp" - image: docker.io/eclipsecbi/jiro-agent-basic-ubuntu:remoting-3248.3250.v3277a_8e88c9b_ - alwaysPullImage: true - livenessProbe: - failureThreshold: 0 - initialDelaySeconds: 0 - periodSeconds: 0 - successThreshold: 0 - timeoutSeconds: 0 - ttyEnabled: true - command: "" - args: "" - instanceCap: -1 - nodeUsageMode: EXCLUSIVE - envVars: - - envVar: - key: "JAVA_TOOL_OPTIONS" - value: "" - - envVar: - key: "JENKINS_REMOTING_JAVA_OPTS" - value: "-showversion -XshowSettings:vm -Xmx256m -Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true -Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true" - - envVar: - key: "OPENJ9_JAVA_OPTIONS" - value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" - - envVar: - key: "_JAVA_OPTIONS" - value: "" - volumes: - - persistentVolumeClaim: - claimName: "tools-claim-jiro-justj" - mountPath: "/opt/tools" - readOnly: true - - configMapVolume: - configMapName: "known-hosts" - mountPath: "/home/jenkins/.ssh/" - subPath: "." - - emptyDirVolume: - memory: false - mountPath: "/home/jenkins/" - - emptyDirVolume: - memory: false - mountPath: "/home/jenkins/.m2/repository" - - emptyDirVolume: - memory: false - mountPath: "/home/jenkins/.m2/wrapper" - workspaceVolume: - emptyDirWorkspaceVolume: - memory: false - yaml: | - apiVersion: v1 - kind: Pod - spec: - containers: - - name: jnlp - resources: - limits: - cpu: "2000m" - memory: "4096Mi" - requests: - cpu: "1000m" - memory: "4096Mi" - volumeMounts: - - name: m2-secret-dir - mountPath: /home/jenkins/.m2/settings-security.xml - subPath: settings-security.xml - readOnly: true - - name: m2-secret-dir - mountPath: /home/jenkins/.m2/settings.xml - subPath: settings.xml - readOnly: true - - name: m2-dir - mountPath: /home/jenkins/.m2/toolchains.xml - subPath: toolchains.xml - readOnly: true - - name: m2-dir - mountPath: /home/jenkins/.mavenrc - subPath: .mavenrc - readOnly: true - volumes: - - name: m2-secret-dir - secret: - secretName: m2-secret-dir - - name: m2-dir - configMap: - name: m2-dir - inheritYamlMergeStrategy: "true" - yamlMergeStrategy: "merge" - - name: "centos-7" - namespace: "justj" - label: "migration jipp-migration centos-7" - containers: - - name: "jnlp" - image: docker.io/eclipsecbi/jiro-agent-centos-7:remoting-3248.3250.v3277a_8e88c9b_ - alwaysPullImage: true - livenessProbe: - failureThreshold: 0 - initialDelaySeconds: 0 - periodSeconds: 0 - successThreshold: 0 - timeoutSeconds: 0 - ttyEnabled: true - command: "" - args: "" - instanceCap: -1 - nodeUsageMode: EXCLUSIVE - envVars: - - envVar: - key: "JAVA_TOOL_OPTIONS" - value: "" - - envVar: - key: "JENKINS_REMOTING_JAVA_OPTS" - value: "-showversion -XshowSettings:vm -Xmx256m -Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true -Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true" - - envVar: - key: "OPENJ9_JAVA_OPTIONS" - value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" - - envVar: - key: "_JAVA_OPTIONS" - value: "" - volumes: - - persistentVolumeClaim: - claimName: "tools-claim-jiro-justj" - mountPath: "/opt/tools" - readOnly: true - - configMapVolume: - configMapName: "known-hosts" - mountPath: "/home/jenkins/.ssh/" - subPath: "." - - emptyDirVolume: - memory: false - mountPath: "/home/jenkins/" - - emptyDirVolume: - memory: false - mountPath: "/home/jenkins/.m2/repository" - - emptyDirVolume: - memory: false - mountPath: "/home/jenkins/.m2/wrapper" - workspaceVolume: - emptyDirWorkspaceVolume: - memory: false - yaml: | - apiVersion: v1 - kind: Pod - spec: - containers: - - name: jnlp - resources: - limits: - cpu: "2000m" - memory: "4096Mi" - requests: - cpu: "1000m" - memory: "4096Mi" - volumeMounts: - - name: m2-secret-dir - mountPath: /home/jenkins/.m2/settings-security.xml - subPath: settings-security.xml - readOnly: true - - name: m2-secret-dir - mountPath: /home/jenkins/.m2/settings.xml - subPath: settings.xml - readOnly: true - - name: m2-dir - mountPath: /home/jenkins/.m2/toolchains.xml - subPath: toolchains.xml - readOnly: true - - name: m2-dir - mountPath: /home/jenkins/.mavenrc - subPath: .mavenrc - readOnly: true - volumes: - - name: m2-secret-dir - secret: - secretName: m2-secret-dir - - name: m2-dir - configMap: - name: m2-dir - inheritYamlMergeStrategy: "true" - yamlMergeStrategy: "merge" - - name: "centos-8" - namespace: "justj" - label: "centos-latest centos-8" - containers: - - name: "jnlp" - image: docker.io/eclipsecbi/jiro-agent-centos-8:remoting-3248.3250.v3277a_8e88c9b_ - alwaysPullImage: true - livenessProbe: - failureThreshold: 0 - initialDelaySeconds: 0 - periodSeconds: 0 - successThreshold: 0 - timeoutSeconds: 0 - ttyEnabled: true - command: "" - args: "" - instanceCap: -1 - nodeUsageMode: EXCLUSIVE - envVars: - - envVar: - key: "JAVA_TOOL_OPTIONS" - value: "" - - envVar: - key: "JENKINS_REMOTING_JAVA_OPTS" - value: "-showversion -XshowSettings:vm -Xmx256m -Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true -Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true" - - envVar: - key: "OPENJ9_JAVA_OPTIONS" - value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" - - envVar: - key: "_JAVA_OPTIONS" - value: "" - volumes: - - persistentVolumeClaim: - claimName: "tools-claim-jiro-justj" - mountPath: "/opt/tools" - readOnly: true - - configMapVolume: - configMapName: "known-hosts" - mountPath: "/home/jenkins/.ssh/" - subPath: "." - - emptyDirVolume: - memory: false - mountPath: "/home/jenkins/" - - emptyDirVolume: - memory: false - mountPath: "/home/jenkins/.m2/repository" - - emptyDirVolume: - memory: false - mountPath: "/home/jenkins/.m2/wrapper" - workspaceVolume: - emptyDirWorkspaceVolume: - memory: false - yaml: | - apiVersion: v1 - kind: Pod - spec: - containers: - - name: jnlp - resources: - limits: - cpu: "2000m" - memory: "4096Mi" - requests: - cpu: "1000m" - memory: "4096Mi" - volumeMounts: - - name: m2-secret-dir - mountPath: /home/jenkins/.m2/settings-security.xml - subPath: settings-security.xml - readOnly: true - - name: m2-secret-dir - mountPath: /home/jenkins/.m2/settings.xml - subPath: settings.xml - readOnly: true - - name: m2-dir - mountPath: /home/jenkins/.m2/toolchains.xml - subPath: toolchains.xml - readOnly: true - - name: m2-dir - mountPath: /home/jenkins/.mavenrc - subPath: .mavenrc - readOnly: true - volumes: - - name: m2-secret-dir - secret: - secretName: m2-secret-dir - - name: m2-dir - configMap: - name: m2-dir - inheritYamlMergeStrategy: "true" - yamlMergeStrategy: "merge" - name: "ubuntu-2204" namespace: "justj" label: "ubuntu-2204" containers: - name: "jnlp" - image: docker.io/eclipsecbi/jiro-agent-ubuntu-2204:remoting-3248.3250.v3277a_8e88c9b_ + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2204:remoting-3261.v9c670a_4748a_9 alwaysPullImage: true livenessProbe: failureThreshold: 0 @@ -562,10 +291,10 @@ data: yamlMergeStrategy: "merge" - name: "ubuntu-2404" namespace: "justj" - label: "ubuntu-latest ubuntu-2404" + label: "ubuntu-latest ubuntu-2404 migration jipp-migration centos-7 centos-8 centos-latest" containers: - name: "jnlp" - image: docker.io/eclipsecbi/jiro-agent-ubuntu-2404:remoting-3248.3250.v3277a_8e88c9b_ + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2404:remoting-3261.v9c670a_4748a_9 alwaysPullImage: true livenessProbe: failureThreshold: 0 @@ -736,7 +465,7 @@ data: remoteFS: "/home/justj/build" retentionStrategy: "always" - permanent: - name: "riscv-build2" + name: "riscv-build1" nodeDescription: "4-core 8Gb riscv machine hosted by EF" labelString: "hw.arch.riscv64 riscv64 swt.natives-gtk.linux.riscv64 native.builder-gtk.linux.riscv64" remoteFS: '/home/jenkins/agent' @@ -745,7 +474,7 @@ data: retentionStrategy: "always" launcher: ssh: - host: "172.30.206.102" + host: "172.30.206.101" port: "2023" credentialsId: "jenkins-riscv-ssh" prefixStartSlaveCmd: "ulimit -c 0 && " @@ -753,7 +482,7 @@ data: jvmOptions: "-XX:-HeapDumpOnOutOfMemoryError -XX:-CreateCoredumpOnCrash" sshHostKeyVerificationStrategy: manuallyProvidedKeyVerificationStrategy: - key: "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDf/pkxDx8mNaUfZYPeV/sOxXldsHRkleNHevV2ggPTA" + key: "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK6APwGHe77eUwqB5ZbqnWjzqK+6rV6OtbJvwnqqe7qq" - permanent: labelString: "windows windows11 swt.natives-win32.win32.aarch64 native.builder-win32.win32.aarch64 aarch64 arm64" launcher: @@ -855,7 +584,7 @@ data: createAccountBasedOnEmail: true useExistingAccountWithSameEmail: true jobConfigHistory: - excludePattern: "queue\\.xml|nodeMonitors\\.xml|UpdateCenter\\.xml|global-build-stats|LockableResourcesManager\\.xml|MilestoneStep\\.xml" + excludePattern: "queue\\.xml|nodeMonitors\\.xml|UpdateCenter\\.xml|global-build-stats|LockableResourcesManager\\.xml|MilestoneStep\\.xml|hudson.plugins.xvnc.Xvnc\\.xml" maxDaysToKeepEntries: "60" maxEntriesPerPage: "12" maxHistoryEntries: "500" @@ -996,7 +725,7 @@ data: - installSource: installers: - antFromApache: - id: "1.10.12" + id: "1.10.15" maven: installations: - name: "apache-maven-latest" diff --git a/instances/technology.justj/target/k8s/statefulset.json b/instances/technology.justj/target/k8s/statefulset.json index 243feb40c..75dd49a13 100644 --- a/instances/technology.justj/target/k8s/statefulset.json +++ b/instances/technology.justj/target/k8s/statefulset.json @@ -51,7 +51,7 @@ "env": [ { "name": "JAVA_OPTS", - "value": "-showversion -XshowSettings:vm -XX:+AlwaysPreTouch -XX:+ParallelRefProcEnabled -XX:+DisableExplicitGC -Duser.timezone=America/Toronto -Dhudson.footerURL=https://ci.eclipse.org -Dhudson.model.UsageStatistics.disabled=true -Dhudson.lifecycle=hudson.lifecycle.ExitLifecycle -Djenkins.model.Jenkins.exitCodeOnRestart=0 -Djenkins.model.Jenkins.slaveAgentPort=50000 -Djenkins.model.Jenkins.slaveAgentPortEnforce=true -Djenkins.slaves.JnlpSlaveAgentProtocol3.enabled=false -Djenkins.install.runSetupWizard=false -Djenkins.ui.refresh=true -Djenkins.security.ManagePermission=true -Dorg.jenkinsci.plugins.durabletask.BourneShellScript.HEARTBEAT_CHECK_INTERVAL=7200 -DexecutableWar.jetty.disableCustomSessionIdCookieName=false -DexecutableWar.jetty.sessionIdCookieName=JSESSIONID.justj -Dcasc.jenkins.config=/etc/jenkins/jenkins.yaml -Dio.jenkins.plugins.casc.ConfigurationAsCode.initialDelay=5000 -Dorg.csanchez.jenkins.plugins.kubernetes.pipeline.PodTemplateStepExecution.defaultImage=docker.io/eclipsecbi/jiro-agent-basic:remoting-3248.3250.v3277a_8e88c9b_ -Dorg.csanchez.jenkins.plugins.kubernetes.PodTemplate.connectionTimeout=180 -Dkubernetes.websocket.ping.interval=30000" + "value": "-showversion -XshowSettings:vm -XX:+AlwaysPreTouch -XX:+ParallelRefProcEnabled -XX:+DisableExplicitGC -Duser.timezone=America/Toronto -Dhudson.footerURL=https://ci.eclipse.org -Dhudson.model.UsageStatistics.disabled=true -Dhudson.lifecycle=hudson.lifecycle.ExitLifecycle -Djenkins.model.Jenkins.exitCodeOnRestart=0 -Djenkins.model.Jenkins.slaveAgentPort=50000 -Djenkins.model.Jenkins.slaveAgentPortEnforce=true -Djenkins.slaves.JnlpSlaveAgentProtocol3.enabled=false -Djenkins.install.runSetupWizard=false -Djenkins.ui.refresh=true -Djenkins.security.ManagePermission=true -Dorg.jenkinsci.plugins.durabletask.BourneShellScript.HEARTBEAT_CHECK_INTERVAL=7200 -DexecutableWar.jetty.disableCustomSessionIdCookieName=false -DexecutableWar.jetty.sessionIdCookieName=JSESSIONID.justj -Dcasc.jenkins.config=/etc/jenkins/jenkins.yaml -Dio.jenkins.plugins.casc.ConfigurationAsCode.initialDelay=5000 -Dorg.csanchez.jenkins.plugins.kubernetes.pipeline.PodTemplateStepExecution.defaultImage=docker.io/eclipsecbi/jiro-agent-basic-ubuntu:remoting-3261.v9c670a_4748a_9 -Dorg.csanchez.jenkins.plugins.kubernetes.PodTemplate.connectionTimeout=180 -Dkubernetes.websocket.ping.interval=30000" }, { "name": "JENKINS_OPTS", @@ -66,7 +66,7 @@ "value": "true" } ], - "image": "docker.io/eclipsecbijenkins/technology.justj:2.462.3", + "image": "docker.io/eclipsecbijenkins/technology.justj:2.479.2", "imagePullPolicy": "Always", "lifecycle": { "preStop": {