Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add openjdk 22 and update semeru #341

Merged
merged 1 commit into from
Jan 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build/gen-mvn-settings.sh
Original file line number Diff line number Diff line change
Expand Up @@ -329,5 +329,5 @@ if [[ "$(jq -r '.maven.generate' "${CONFIG}")" == "true" ]]; then

>&2 echo -e "${SCRIPT_NAME}\tINFO: Generating Maven toolchains.xml"
#TODO: update max version when new JDK has been released
gen_maven_toolchains "21" > "${WORKDIR}/toolchains.xml"
gen_maven_toolchains "22" > "${WORKDIR}/toolchains.xml"
fi
23 changes: 18 additions & 5 deletions instances/eclipse.jdt/target/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,13 @@
"agentWorkdir": "/home/jenkins/jenkins-agent",
"docker": {
"aliases": [
"docker.io/eclipsecbi/jiro-agent-basic:latest",
"docker.io/eclipsecbijenkins/basic-agent:3160.vd76b_9ddd10cc",
"docker.io/eclipsecbijenkins/jenkins-agent:3160.vd76b_9ddd10cc",
"docker.io/eclipsecbi/jenkins-jnlp-agent:3160.vd76b_9ddd10cc"
"docker.io/eclipsecbi/jenkins-jnlp-agent:3160.vd76b_9ddd10cc",
"docker.io/eclipsecbijenkins/basic-agent:latest",
"docker.io/eclipsecbijenkins/jenkins-agent:latest",
"docker.io/eclipsecbi/jenkins-jnlp-agent:latest"
],
"context": "basic",
"dockerfile": "#*******************************************************************************\n# Copyright (c) 2020 Eclipse Foundation and others.\n# This program and the accompanying materials are made available\n# under the terms of the Eclipse Public License 2.0\n# which is available at http://www.eclipse.org/legal/epl-v20.html,\n# or the MIT License which is available at https://opensource.org/licenses/MIT.\n# SPDX-License-Identifier: EPL-2.0 OR MIT\n#*******************************************************************************\nFROM docker.io/eclipsecbi/jiro-agent-basic: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/3160.vd76b_9ddd10cc/remoting-3160.vd76b_9ddd10cc.jar\" \"/usr/share/jenkins/agent.jar\" \nADD \"https://github.com/jenkinsci/docker-inbound-agent/raw/3160.vd76b_9ddd10cc-3/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",
Expand Down Expand Up @@ -116,9 +120,11 @@
"basic-ubuntu": {
"agentWorkdir": "/home/jenkins/jenkins-agent",
"docker": {
"aliases": [ ],
"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 [ \"uid_entrypoint\", \"/usr/local/bin/jenkins-agent\" ]\n\nADD \"https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3160.vd76b_9ddd10cc/remoting-3160.vd76b_9ddd10cc.jar\" \"/usr/share/jenkins/agent.jar\" \nADD \"https://github.com/jenkinsci/docker-inbound-agent/raw/3160.vd76b_9ddd10cc-3/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",
"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/3160.vd76b_9ddd10cc/remoting-3160.vd76b_9ddd10cc.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-inbound-agent/raw/3160.vd76b_9ddd10cc-3/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-ubuntu",
"registry": "docker.io",
"repository": "eclipsecbi",
Expand Down Expand Up @@ -210,10 +216,15 @@
"agentWorkdir": "/home/jenkins/jenkins-agent",
"docker": {
"aliases": [
"docker.io/eclipsecbi/jiro-agent-centos-7:latest",
"docker.io/eclipsecbijenkins/jipp-migration-agent:3160.vd76b_9ddd10cc",
"docker.io/eclipsecbijenkins/migration-fat-agent:3160.vd76b_9ddd10cc",
"docker.io/eclipsecbijenkins/ui-test-agent:3160.vd76b_9ddd10cc",
"docker.io/eclipsecbijenkins/ui-tests-agent:3160.vd76b_9ddd10cc"
"docker.io/eclipsecbijenkins/ui-tests-agent:3160.vd76b_9ddd10cc",
"docker.io/eclipsecbijenkins/jipp-migration-agent:latest",
"docker.io/eclipsecbijenkins/migration-fat-agent:latest",
"docker.io/eclipsecbijenkins/ui-test-agent:latest",
"docker.io/eclipsecbijenkins/ui-tests-agent: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 [ \"uid_entrypoint\", \"/usr/local/bin/jenkins-agent\" ]\n\nADD \"https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3160.vd76b_9ddd10cc/remoting-3160.vd76b_9ddd10cc.jar\" \"/usr/share/jenkins/agent.jar\" \nADD \"https://github.com/jenkinsci/docker-inbound-agent/raw/3160.vd76b_9ddd10cc-3/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",
Expand Down Expand Up @@ -309,7 +320,9 @@
"centos-8": {
"agentWorkdir": "/home/jenkins/jenkins-agent",
"docker": {
"aliases": [ ],
"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 [ \"uid_entrypoint\", \"/usr/local/bin/jenkins-agent\" ]\n\nADD \"https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3160.vd76b_9ddd10cc/remoting-3160.vd76b_9ddd10cc.jar\" \"/usr/share/jenkins/agent.jar\" \nADD \"https://github.com/jenkinsci/docker-inbound-agent/raw/3160.vd76b_9ddd10cc-3/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",
Expand Down
6 changes: 6 additions & 0 deletions instances/eclipse.jdt/target/jenkins/configuration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -521,6 +521,8 @@ tool:
home: "/opt/tools/java/openjdk/latest"
- name: "openjdk-ea-latest"
home: "/opt/tools/java/openjdk/ea-latest"
- name: "openjdk-jdk22-latest"
home: "/opt/tools/java/openjdk/jdk-22/latest"
- name: "openjdk-jdk21-latest"
home: "/opt/tools/java/openjdk/jdk-21/latest"
- name: "openjdk-jdk20-latest"
Expand Down Expand Up @@ -617,6 +619,10 @@ tool:
home: "/opt/tools/java/ibm/latest"
- name: "semeru-latest"
home: "/opt/tools/java/semeru/latest"
- name: "semeru-jdk20-latest"
home: "/opt/tools/java/semeru/jdk-20/latest"
- name: "semeru-jdk19-latest"
home: "/opt/tools/java/semeru/jdk-19/latest"
- name: "semeru-jdk18-latest"
home: "/opt/tools/java/semeru/jdk-18/latest"
- name: "semeru-jdk17-latest"
Expand Down
74 changes: 39 additions & 35 deletions instances/eclipse.jdt/target/jenkins/plugins.log
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
Resulting plugin list:
analysis-model-api 11.13.0
analysis-model-api 11.14.0
ant 497.v94e7d9fffa_b_9
antisamy-markup-formatter 162.v0e6ec0fcfcf6
apache-httpcomponents-client-4-api 4.5.14-208.v438351942757
authentication-tokens 1.53.v1c90fd9191a_b_
authorize-project 1.7.1
bootstrap5-api 5.3.2-3
bouncycastle-api 2.29
branch-api 2.1135.v8de8e7899051
build-timeout 1.31
bouncycastle-api 2.30.1.77-225.v26ea_c9455fd9
branch-api 2.1144.v1425d1c3d5a_7
build-timeout 1.32
caffeine-api 3.1.8-133.v17b_1ff2e0599
checks-api 2.0.2
cloudbees-folder 6.858.v898218f3609d
command-launcher 107.v773860566e2e
commons-lang3-api 3.13.0-62.v7d18e55f51e2
commons-text-api 1.11.0-95.v22a_d30ee5d36
config-file-provider 959.vcff671a_4518b_
configuration-as-code 1746.vf1673cfe690a
credentials 1309.v8835d63eb_d8a_
configuration-as-code 1763.vb_fe9c1b_83f7b
credentials 1311.vcf0a_900b_37c2
credentials-binding 642.v737c34dea_6c2
data-tables-api 1.13.8-2
display-url-api 2.200.vb_9327d658781
durable-task 523.va_a_22cf15d5e0
durable-task 543.v262f6a_803410
echarts-api 5.4.3-2
email-ext 2.102
email-ext 2.103
extended-read-permission 53.v6499940139e5
external-monitor-job 215.v2e88e894db_f8
extra-columns 1.26
Expand All @@ -37,15 +37,16 @@ git-forensics 2.0.0
git-parameter 0.9.19
github 1.37.3.1
github-api 1.318-461.v7a_c09c9fa_d63
github-branch-source 1752.vc201a_0235d80
github-branch-source 1767.va_7d01ea_c7256
github-checks 554.vb_ee03a_000f65
gitlab-api 5.3.0-91.v1f9a_fda_d654f
gitlab-branch-source 684.vea_fa_7c1e2fe3
gitlab-plugin 1.7.16
handy-uri-templates-2-api 2.1.8-22.v77d5b_75e6953
gitlab-plugin 1.8.0
gson-api 2.10.1-15.v0d99f670e0a_7
handy-uri-templates-2-api 2.1.8-30.v7e777411b_148
instance-identity 185.v303dc7c645f9
ionicons-api 56.v1b_1c8c49374e
jackson2-api 2.15.3-372.v309620682326
jackson2-api 2.16.1-373.ve709c6871598
jakarta-activation-api 2.0.1-3
jakarta-mail-api 2.0.1-3
javadoc 243.vb_b_503b_b_45537
Expand All @@ -55,64 +56,67 @@ jdk-tool 73.vddf737284550
jersey2-api 2.41-133.va_03323b_a_1396
jjwt-api 0.11.5-77.v646c772fddb_0
jobConfigHistory 1229.v3039470161a_d
joda-time-api 2.12.5-5.v5495a_235fedf
jquery3-api 3.7.1-1
jsch 0.2.8-65.v052c39de79b_2
junit 1240.vf9529b_881428
kubernetes 4147.va_d406fb_66172
jsch 0.2.16-86.v42e010d9484b_
json-api 20231013-17.v1c97069404b_e
json-path-api 2.8.0-21.v8b_7dc8b_1037b_
junit 1252.vfc2e5efa_294f
kubernetes 4174.v4230d0ccd951
kubernetes-client-api 6.8.1-224.vd388fca_4db_3b_
kubernetes-credentials 0.11
ldap 711.vb_d1a_491714dc
mailer 463.vedf8358e006b_
matrix-auth 3.2.1
matrix-project 818.v7eb_e657db_924
matrix-project 822.v01b_8c85d16d2
maven-plugin 3.23
metrics 4.2.18-442.v02e107157925
mina-sshd-api-common 2.11.0-86.v836f585d47fa_
mina-sshd-api-core 2.11.0-86.v836f585d47fa_
okhttp-api 4.11.0-157.v6852a_a_fa_ec11
pam-auth 1.10
parameterized-trigger 787.v665fcf2a_830b_
pipeline-build-step 516.v8ee60a_81c5b_9
pipeline-build-step 540.vb_e8849e1a_b_d8
pipeline-graph-analysis 202.va_d268e64deb_3
pipeline-groovy-lib 689.veec561a_dee13
pipeline-input-step 477.v339683a_8d55e
pipeline-maven 1362.vee39a_d4b_02b_1
pipeline-maven-api 1362.vee39a_d4b_02b_1
pipeline-maven 1368.vfb_8509d7b_869
pipeline-maven-api 1368.vfb_8509d7b_869
pipeline-milestone-step 111.v449306f708b_7
pipeline-model-api 2.2151.ve32c9d209a_3f
pipeline-model-definition 2.2151.ve32c9d209a_3f
pipeline-model-extensions 2.2151.ve32c9d209a_3f
pipeline-model-api 2.2168.vf921b_4e72c73
pipeline-model-definition 2.2168.vf921b_4e72c73
pipeline-model-extensions 2.2168.vf921b_4e72c73
pipeline-rest-api 2.34
pipeline-stage-step 305.ve96d0205c1c6
pipeline-stage-tags-metadata 2.2151.ve32c9d209a_3f
pipeline-stage-tags-metadata 2.2168.vf921b_4e72c73
pipeline-stage-view 2.34
plain-credentials 143.v1b_df8b_d3b_e48
plugin-util-api 3.6.0
prism-api 1.29.0-9
promoted-builds 936.va_571a_a_b_f8da_5
plugin-util-api 3.8.0
prism-api 1.29.0-10
promoted-builds 945.v597f5c6a_d3fd
rebuild 330.v645b_7df10e2a_
resource-disposer 0.23
scm-api 683.vb_16722fb_b_80b_
script-security 1294.v99333c047434
script-security 1310.vf24a_dfce068b_
simple-theme-plugin 176.v39740c03a_a_f5
snakeyaml-api 2.2-111.vc6598e30cc65
sonar 2.16.1
sonar 2.17
ssh-agent 346.vda_a_c4f2c8e50
ssh-credentials 308.ve4497b_ccd8f4
ssh-slaves 2.916.vd17b_43357ce4
ssh-slaves 2.947.v64ee6b_f87b_c1
structs 325.vcb_307d2a_2782
timestamper 1.26
token-macro 384.vf35b_f26814ec
trilead-api 2.84.v72119de229b_7
token-macro 400.v35420b_922dcb_
trilead-api 2.133.vfb_8a_7b_9c5dd1
variant 60.v7290fc0eb_b_cd
warnings-ng 10.5.2
warnings-ng 10.5.3
workflow-aggregator 596.v8c21c963d92d
workflow-api 1283.v99c10937efcb_
workflow-basic-steps 1042.ve7b_140c4a_e0c
workflow-cps 3817.vd20b_7e2b_692b_
workflow-durable-task-step 1289.v4d3e7b_01546b_
workflow-cps 3832.vc43e04d6d68c
workflow-durable-task-step 1313.vcb_970b_d2a_fb_3
workflow-job 1385.vb_58b_86ea_fff1
workflow-multibranch 756.v891d88f2cd46
workflow-multibranch 770.v1a_d0708dd1f6
workflow-scm-step 415.v434365564324
workflow-step-api 639.v6eca_cd8c04a_a_
workflow-support 865.v43e78cc44e0d
Expand Down

This file was deleted.

Loading
Loading