Skip to content

Commit

Permalink
feat: webdev develocity integration
Browse files Browse the repository at this point in the history
Related to https://gitlab.eclipse.org/eclipsefdn/helpdesk/-/issues/5626

Signed-off-by: sebastien.heurtematte <sebastien.heurtematte@eclipse-foundation.org>
  • Loading branch information
heurtematte authored and fredg02 committed Feb 17, 2025
1 parent 79e20b0 commit 9c62752
Show file tree
Hide file tree
Showing 7 changed files with 138 additions and 75 deletions.
4 changes: 4 additions & 0 deletions instances/foundation-internal.webdev/config.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ local permissionsTemplates = import '../../templates/permissions.libsonnet';
plugins+: [
"disable-failed-job",
"docker-workflow",
"gradle",
"hashicorp-vault-plugin",
"kubernetes-cli",
"mail-watcher-plugin",
Expand All @@ -36,6 +37,9 @@ local permissionsTemplates = import '../../templates/permissions.libsonnet';
namespace: "foundation-internal-webdev"
}
},
develocity+: {
generate: true,
},
secrets+: {
"gerrit-trigger-plugin": {},
},
Expand Down
16 changes: 13 additions & 3 deletions instances/foundation-internal.webdev/target/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@
"basic": {
"agentWorkdir": "/home/jenkins/jenkins-agent",
"docker": {
"aliases": [ ],
"aliases": [
"docker.io/eclipsecbi/jiro-agent-basic-ubuntu:latest"
],
"context": "basic",
"dockerfile": "#*******************************************************************************\n# Copyright (c) 2020 Eclipse Foundation and others.\n# This program and the accompanying materials are made available\n# under the terms of the Eclipse Public License 2.0\n# which is available at http://www.eclipse.org/legal/epl-v20.html,\n# or the MIT License which is available at https://opensource.org/licenses/MIT.\n# SPDX-License-Identifier: EPL-2.0 OR MIT\n#*******************************************************************************\nFROM docker.io/eclipsecbi/jiro-agent-basic-ubuntu:spec\n\n# These environment variables will be used in the uid_entrypoint script from the parent image\nENV USER_NAME=\"jenkins\"\nENV HOME=\"/home/jenkins\"\n\nVOLUME [ \"/home/jenkins\" ]\nWORKDIR \"/home/jenkins\"\nENTRYPOINT [ \"/usr/local/bin/jenkins-agent\" ]\n\nADD \"https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/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",
Expand Down Expand Up @@ -115,7 +117,9 @@
"ubuntu-2204": {
"agentWorkdir": "/home/jenkins/jenkins-agent",
"docker": {
"aliases": [ ],
"aliases": [
"docker.io/eclipsecbi/jiro-agent-ubuntu-2204:latest"
],
"build_args": "['FROM_TAG': '22.04']",
"context": "ubuntu",
"dockerfile": "#*******************************************************************************\n# Copyright (c) 2020 Eclipse Foundation and others.\n# This program and the accompanying materials are made available\n# under the terms of the Eclipse Public License 2.0\n# which is available at http://www.eclipse.org/legal/epl-v20.html,\n# or the MIT License which is available at https://opensource.org/licenses/MIT.\n# SPDX-License-Identifier: EPL-2.0 OR MIT\n#*******************************************************************************\nFROM docker.io/eclipsecbi/jiro-agent-ubuntu-2204:spec\n\n# These environment variables will be used in the uid_entrypoint script from the parent image\nENV USER_NAME=\"jenkins\"\nENV HOME=\"/home/jenkins\"\n\nVOLUME [ \"/home/jenkins\" ]\nWORKDIR \"/home/jenkins\"\nENTRYPOINT [ \"/usr/local/bin/jenkins-agent\" ]\n\nADD \"https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/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",
Expand Down Expand Up @@ -211,7 +215,9 @@
"ubuntu-2404": {
"agentWorkdir": "/home/jenkins/jenkins-agent",
"docker": {
"aliases": [ ],
"aliases": [
"docker.io/eclipsecbi/jiro-agent-ubuntu-2404:latest"
],
"build_args": "['FROM_TAG': '24.04']",
"context": "ubuntu",
"dockerfile": "#*******************************************************************************\n# Copyright (c) 2020 Eclipse Foundation and others.\n# This program and the accompanying materials are made available\n# under the terms of the Eclipse Public License 2.0\n# which is available at http://www.eclipse.org/legal/epl-v20.html,\n# or the MIT License which is available at https://opensource.org/licenses/MIT.\n# SPDX-License-Identifier: EPL-2.0 OR MIT\n#*******************************************************************************\nFROM docker.io/eclipsecbi/jiro-agent-ubuntu-2404:spec\n\n# These environment variables will be used in the uid_entrypoint script from the parent image\nENV USER_NAME=\"jenkins\"\nENV HOME=\"/home/jenkins\"\n\nVOLUME [ \"/home/jenkins\" ]\nWORKDIR \"/home/jenkins\"\nENTRYPOINT [ \"/usr/local/bin/jenkins-agent\" ]\n\nADD \"https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/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",
Expand Down Expand Up @@ -322,6 +328,9 @@
"uiPort": 8080,
"url": "https://foundation.eclipse.org/ci/webdev"
},
"develocity": {
"generate": true
},
"docker": {
"master": {
"dockerfile": "FROM docker.io/eclipsecbi/jiro-master:2.479.2\n\nEXPOSE 8080\nEXPOSE 50000\n\nCOPY jenkins/ref/plugins /usr/share/jenkins/ref/plugins\n\nRUN mkdir -p /usr/share/jenkins/ref/userContent/theme/\nCOPY jenkins/quicksilver.css.override /usr/share/jenkins/ref/userContent/theme/\nCOPY jenkins/title.js /usr/share/jenkins/ref/userContent/theme/\n\nUSER 10001\n",
Expand Down Expand Up @@ -429,6 +438,7 @@
"plugins": [
"disable-failed-job",
"docker-workflow",
"gradle",
"hashicorp-vault-plugin",
"kubernetes-cli",
"mail-watcher-plugin",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,9 @@ jenkins:
- emptyDirVolume:
memory: false
mountPath: "/home/jenkins/.m2/wrapper"
- emptyDirVolume:
memory: false
mountPath: "/home/jenkins/.m2/.develocity"
workspaceVolume:
emptyDirWorkspaceVolume:
memory: false
Expand Down Expand Up @@ -229,6 +232,9 @@ jenkins:
- emptyDirVolume:
memory: false
mountPath: "/home/jenkins/.m2/wrapper"
- emptyDirVolume:
memory: false
mountPath: "/home/jenkins/.m2/.develocity"
workspaceVolume:
emptyDirWorkspaceVolume:
memory: false
Expand Down Expand Up @@ -320,6 +326,9 @@ jenkins:
- emptyDirVolume:
memory: false
mountPath: "/home/jenkins/.m2/wrapper"
- emptyDirVolume:
memory: false
mountPath: "/home/jenkins/.m2/.develocity"
workspaceVolume:
emptyDirWorkspaceVolume:
memory: false
Expand Down Expand Up @@ -469,6 +478,13 @@ unclassified:
showBuildBadges: "never"
showChangeReasonCommentWindow: false
skipDuplicateHistory: true
hashicorpVault:
configuration:
disableChildPoliciesOverride: false
engineVersion: 2
timeout: 60
vaultCredentialId: "secretsmanager-approle"
vaultUrl: "https://secretsmanager.eclipse.org"
openShift:
clusterConfigs:
- credentialsId: "ecda650e-23ab-4b17-82cd-20e4e6cbb9d7"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# GENERATED FILE - DO NOT EDIT
disable-failed-job
docker-workflow
gradle
hashicorp-vault-plugin
kubernetes-cli
mail-watcher-plugin
Expand Down
146 changes: 74 additions & 72 deletions instances/foundation-internal.webdev/target/jenkins/plugins.log
Original file line number Diff line number Diff line change
Expand Up @@ -2,136 +2,138 @@ Resulting plugin list:
analysis-model-api 12.9.1
ant 511.v0a_a_1a_334f41b_
antisamy-markup-formatter 162.v0e6ec0fcfcf6
apache-httpcomponents-client-4-api 4.5.14-208.v438351942757
apache-httpcomponents-client-5-api 5.4-124.v31e2987e48f4
apache-httpcomponents-client-4-api 4.5.14-269.vfa_2321039a_83
apache-httpcomponents-client-5-api 5.4-136.v5a_21779c63f8
asm-api 9.7.1-97.v4cc844130d97
authentication-tokens 1.119.v50285141b_7e1
authorize-project 1.8.1
authorize-project 2.0.0
bootstrap5-api 5.3.3-1
bouncycastle-api 2.30.1.79-254.vfdb_814e7791e
branch-api 2.1206.vd9f35001c95c
build-timeout 1.33
bouncycastle-api 2.30.1.80-256.vf98926042a_9b_
branch-api 2.1214.v3f652804588d
build-timeout 1.35
caffeine-api 3.1.8-133.v17b_1ff2e0599
checks-api 2.2.1
checks-api 2.2.3
cloudbees-disk-usage-simple 232.v713eeed2e1f4
cloudbees-folder 6.975.v4161e479479f
command-launcher 116.vd85919c54a_d6
cloudbees-folder 6.982.vf165a_16c9507
command-launcher 118.v72741845c17a_
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 1915.vcdd0a_d0d2625
credentials 1405.vb_cda_74a_f8974
commons-text-api 1.13.0-153.v91dcd89e2a_22
config-file-provider 982.vb_a_e458a_37021
configuration-as-code 1932.v75cb_b_f1b_698d
credentials 1408.va_622a_b_f5b_1b_1
credentials-binding 687.v619cb_15e923f
data-tables-api 2.1.8-1
disable-failed-job 1.15
display-url-api 2.209.v582ed814ff2f
docker-commons 445.v6b_646c962a_94
docker-workflow 580.vc0c340686b_54
docker-workflow 595.v60cec912059b_
durable-task 581.v299a_5609d767
echarts-api 5.5.1-5
eddsa-api 0.3.0-4.v84c6f0f4969e
email-ext 1866.v14fa_6d201654
extended-read-permission 53.v6499940139e5
external-monitor-job 215.v2e88e894db_f8
email-ext 1876.v28d8d38315b_d
extended-read-permission 61.vf24570ff3b_e9
external-monitor-job 221.v35059272565b_
extra-columns 1.27
font-awesome-api 6.6.0-2
forensics-api 2.7.0
ghprb 1.42.2
git 5.7.0
git-client 6.1.0
git-parameter 0.10.0
github 1.40.0
git-client 6.1.2
git-parameter 0.11.0
github 1.41.0
github-api 1.321-478.vc9ce627ce001
github-branch-source 1807.v50351eb_7dd13
github-branch-source 1810.v913311241fa_9
gitlab-api 5.6.0-97.v6603a_83f8690
gitlab-branch-source 715.v4c830b_ca_ef95
gitlab-plugin 1.9.6
gson-api 2.11.0-85.v1f4e87273c33
gitlab-branch-source 718.v40b_5f0e67cd3
gitlab-plugin 1.9.7
gradle 2.14
gson-api 2.12.1-113.v347686d6729f
handy-uri-templates-2-api 2.1.8-30.v7e777411b_148
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
jackson2-api 2.17.0-386.vcb_b_037da_0d62
jakarta-activation-api 2.1.3-1
jakarta-mail-api 2.1.3-1
javadoc 280.v050b_5c849f69
javadoc 310.v032f3f16b_0f8
javax-activation-api 1.2.0-7
jaxb 2.3.9-1
jdk-tool 80.v8a_dee33ed6f0
jersey2-api 2.44-151.v6df377fff741
jdk-tool 83.v417146707a_3d
jersey2-api 2.45-154.v4ded3dc34f81
jjwt-api 0.11.5-112.ve82dfb_224b_a_d
jobConfigHistory 1283.veb_dfb_00b_5ec0
joda-time-api 2.13.0-93.v9934da_29b_a_e9
jobConfigHistory 1302.va_65b_ccb_fde71
joda-time-api 2.13.1-115.va_6b_5f8efb_1d8
jquery3-api 3.7.1-2
jsch 0.2.16-86.v42e010d9484b_
json-api 20241224-119.va_dca_a_b_ea_7da_5
json-path-api 2.9.0-118.v7f23ed82a_8b_8
junit 1312.v1a_235a_b_94a_31
json-api 20250107-125.v28b_a_ffa_eb_f01
json-path-api 2.9.0-148.v22a_7ffe323ce
junit 1314.vd966e9a_88895
kubernetes 4306.vc91e951ea_eb_d
kubernetes-cli 1.12.1
kubernetes-client-api 6.10.0-240.v57880ce8b_0b_2
kubernetes-credentials 190.v03c305394deb_
ldap 770.vb_455e934581a_
ldap 776.vddf3e325103b_
mail-watcher-plugin 1.19
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-138.v6341ee58e1df
mina-sshd-api-core 2.14.0-138.v6341ee58e1df
matrix-auth 3.2.4
matrix-project 845.vffd7fa_f27555
maven-plugin 3.25
metrics 4.2.21-461.v881e35d8fa_b_a_
mina-sshd-api-common 2.14.0-143.v2b_362fc39576
mina-sshd-api-core 2.14.0-143.v2b_362fc39576
okhttp-api 4.11.0-183.va_87fc7a_89810
openshift-client 1.1.0.424.v829cb_ccf8798
oss-symbols-api 296.v4981240eeb_1a_
pam-auth 1.11
parameterized-trigger 806.vf6fff3e28c3e
pipeline-build-step 540.vb_e8849e1a_b_d8
parameterized-trigger 840.v3c7d4a_a_5e6c7
pipeline-build-step 555.v589d5c24a_3d6
pipeline-github 2.8-159.09e4403bc62f
pipeline-graph-analysis 216.vfd8b_ece330ca_
pipeline-graph-view 382.vb_9a_27b_7b_ea_71
pipeline-groovy-lib 745.vdf6077913de0
pipeline-input-step 495.ve9c153f6067b_
pipeline-maven 1469.ve15ca_a_b_90b_44
pipeline-maven-api 1469.ve15ca_a_b_90b_44
pipeline-graph-view 409.v98f212e980b_4
pipeline-groovy-lib 752.vdddedf804e72
pipeline-input-step 513.v7eb_fe7e2c0fc
pipeline-maven 1485.v9a_5a_116d6fb_0
pipeline-maven-api 1485.v9a_5a_116d6fb_0
pipeline-milestone-step 119.vdfdc43fc3b_9a_
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-model-api 2.2221.vc657003fb_d93
pipeline-model-definition 2.2221.vc657003fb_d93
pipeline-model-extensions 2.2221.vc657003fb_d93
pipeline-rest-api 2.37
pipeline-stage-step 312.v8cd10304c27a_
pipeline-stage-tags-metadata 2.2218.v56d0cda_37c72
pipeline-stage-view 2.34
pipeline-stage-tags-metadata 2.2221.vc657003fb_d93
pipeline-stage-view 2.37
plain-credentials 183.va_de8f1dd5a_2b_
plugin-util-api 5.1.0
prism-api 1.29.0-18
prometheus 801.v98e119d8eeda_
promoted-builds 965.vcda_c6a_e0998f
rebuild 332.va_1ee476d8f6d
prometheus 811.v1823c780b_e8e
promoted-builds 978.v4536a_f065dd8
rebuild 338.va_0a_b_50e29397
resource-disposer 0.25
scm-api 698.v8e3b_c788f0a_6
script-security 1369.v9b_98a_4e95b_2d
simple-theme-plugin 196.v96d9592f4efa_
slack 751.v2e44153c8fe1
scm-api 703.v72ff4b_259600
script-security 1373.vb_b_4a_a_c26fa_00
simple-theme-plugin 202.v6367d3dea_73b_
slack 761.v2a_8770f0d169
snakeyaml-api 2.3-123.v13484c65210a_
sonar 2.17.3
sonar 2.18
ssh-agent 376.v8933585c69d3
ssh-credentials 349.vb_8b_6b_9709f5b_
ssh-slaves 3.1021.va_cc11b_de26a_e
ssh-slaves 3.1031.v72c6b_883b_869
structs 338.v848422169819
timestamper 1.28
token-macro 400.v35420b_922dcb_
token-macro 444.v52de7e9c573d
trilead-api 2.147.vb_73cc728a_32e
variant 60.v7290fc0eb_b_cd
variant 70.va_d9f17f859e0
warnings-ng 11.12.0
workflow-aggregator 600.vb_57cdd26fdd7
workflow-api 1336.vee415d95c521
workflow-basic-steps 1058.vcb_fc1e3a_21a_9
workflow-cps 4007.vd705fc76a_34e
workflow-durable-task-step 1398.vf6c9e89e5988
workflow-job 1476.v90f02a_225559
workflow-multibranch 795.ve0cb_1f45ca_9a_
workflow-api 1363.v03f731255494
workflow-basic-steps 1079.vce64b_a_929c5a_
workflow-cps 4018.vf02e01888da_f
workflow-durable-task-step 1405.v1fcd4a_d00096
workflow-job 1505.vea_4b_20a_4a_495
workflow-multibranch 800.v5f0a_a_660950e
workflow-scm-step 427.v4ca_6512e7df1
workflow-step-api 678.v3ee58b_469476
workflow-support 936.v9fa_77211ca_e1
workflow-step-api 686.v603d058a_e148
workflow-support 946.v2a_79d8a_4b_e14
ws-cleanup 0.48
xvnc 1.28

14 changes: 14 additions & 0 deletions instances/foundation-internal.webdev/target/jenkins/title.js
Original file line number Diff line number Diff line change
@@ -1 +1,15 @@
document.title = "Eclipse Foundation WebDev - " + document.title;
document.addEventListener('DOMContentLoaded', function() {
let header = document.querySelector('.page-header__brand');
if (header) {
let newLink = document.createElement('a');
newLink.href = 'https://github.com/eclipse-cbi/jiro/blob/master/instances/foundation-internal.webdev/target/config.json';
newLink.textContent = 'JCasC Source';
newLink.style = 'color: white; border-left: 1px solid white; padding-left: 1em; font-size: 1.1em; position: relative; top: 0.2em; left: -1.6em;';
newLink.target = '_blank';
newLink.title = 'JIRO JCasC Configuration as Code';
header.appendChild(newLink);
} else {
console.log('Element with class "header" not found.');
}
});
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,9 @@ data:
- emptyDirVolume:
memory: false
mountPath: "/home/jenkins/.m2/wrapper"
- emptyDirVolume:
memory: false
mountPath: "/home/jenkins/.m2/.develocity"
workspaceVolume:
emptyDirWorkspaceVolume:
memory: false
Expand Down Expand Up @@ -252,6 +255,9 @@ data:
- emptyDirVolume:
memory: false
mountPath: "/home/jenkins/.m2/wrapper"
- emptyDirVolume:
memory: false
mountPath: "/home/jenkins/.m2/.develocity"
workspaceVolume:
emptyDirWorkspaceVolume:
memory: false
Expand Down Expand Up @@ -343,6 +349,9 @@ data:
- emptyDirVolume:
memory: false
mountPath: "/home/jenkins/.m2/wrapper"
- emptyDirVolume:
memory: false
mountPath: "/home/jenkins/.m2/.develocity"
workspaceVolume:
emptyDirWorkspaceVolume:
memory: false
Expand Down Expand Up @@ -492,6 +501,13 @@ data:
showBuildBadges: "never"
showChangeReasonCommentWindow: false
skipDuplicateHistory: true
hashicorpVault:
configuration:
disableChildPoliciesOverride: false
engineVersion: 2
timeout: 60
vaultCredentialId: "secretsmanager-approle"
vaultUrl: "https://secretsmanager.eclipse.org"
openShift:
clusterConfigs:
- credentialsId: "ecda650e-23ab-4b17-82cd-20e4e6cbb9d7"
Expand Down

0 comments on commit 9c62752

Please sign in to comment.