Skip to content

Commit

Permalink
Platform default pod template should use 8 GB so it can utilize a full
Browse files Browse the repository at this point in the history
  • Loading branch information
fredg02 committed Oct 27, 2023
1 parent 1361740 commit 292023b
Show file tree
Hide file tree
Showing 5 changed files with 303 additions and 27 deletions.
11 changes: 11 additions & 0 deletions instances/eclipse.platform/config.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,17 @@
},
},
},
"jipp-centos-8-agent-8gb": currentCloud.templates["centos-8"] {
labels: ["centos-8-8gb"],
kubernetes+: {
resources+: {
memory: {
limit: "8192Mi",
request: "8192Mi",
},
},
},
},
"jipp-centos-8-agent-4cpu": currentCloud.templates["centos-8"] {
labels: ["centos-8-4cpu"],
kubernetes+: {
Expand Down
93 changes: 93 additions & 0 deletions instances/eclipse.platform/target/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -590,6 +590,99 @@
},
"startupScript": "/usr/local/bin/jenkins-agent",
"username": "jenkins"
},
"jipp-centos-8-agent-8gb": {
"agentWorkdir": "/home/jenkins/jenkins-agent",
"docker": {
"aliases": [ ],
"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/3131.vf2b_b_798b_ce99/remoting-3131.vf2b_b_798b_ce99.jar\" \"/usr/share/jenkins/agent.jar\" \nADD \"https://github.com/jenkinsci/docker-inbound-agent/raw/3131.vf2b_b_798b_ce99-5/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-3131.vf2b_b_798b_ce99"
},
"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": {
"resources": {
"cpu": {
"limit": "2000m",
"request": "1000m"
},
"memory": {
"limit": "8192Mi",
"request": "8192Mi"
}
},
"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"
}
]
},
"labels": [
"centos-8-8gb"
],
"maxHeap": "256m",
"mode": "EXCLUSIVE",
"name": "centos-8",
"remoting": {
"jar": "/usr/share/jenkins/agent.jar",
"startupScript": {
"name": "jenkins-agent",
"url": "https://github.com/jenkinsci/docker-inbound-agent/raw/3131.vf2b_b_798b_ce99-5/jenkins-agent",
"version": "3131.vf2b_b_798b_ce99-5"
},
"url": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3131.vf2b_b_798b_ce99/remoting-3131.vf2b_b_798b_ce99.jar",
"version": "3131.vf2b_b_798b_ce99"
},
"startupScript": "/usr/local/bin/jenkins-agent",
"username": "jenkins"
}
}
}
Expand Down
86 changes: 86 additions & 0 deletions instances/eclipse.platform/target/jenkins/configuration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -598,6 +598,92 @@ jenkins:
- name: m2-dir
configMap:
name: m2-dir
- name: "jipp-centos-8-agent-8gb"
namespace: "platform"
label: "centos-8-8gb"
containers:
- name: "jnlp"
image: docker.io/eclipsecbi/jiro-agent-centos-8:remoting-3131.vf2b_b_798b_ce99
alwaysPullImage: true
livenessProbe:
failureThreshold: 0
initialDelaySeconds: 0
periodSeconds: 0
successThreshold: 0
timeoutSeconds: 0
resourceLimitCpu: "2000m"
resourceRequestCpu: "1000m"
resourceLimitMemory: "8192Mi"
resourceRequestMemory: "8192Mi"
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-platform"
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
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
security:
apiToken:
creationOfLegacyTokenEnabled: false
Expand Down
54 changes: 27 additions & 27 deletions instances/eclipse.platform/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.8.0
analysis-model-api 11.11.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-1
bootstrap5-api 5.3.2-2
bouncycastle-api 2.29
branch-api 2.1128.v717130d4f816
build-timeout 1.31
caffeine-api 3.1.8-133.v17b_1ff2e0599
checks-api 2.0.2
cloudbees-folder 6.848.ve3b_fd7839a_81
cloudbees-folder 6.858.v898218f3609d
command-launcher 107.v773860566e2e
commons-lang3-api 3.13.0-62.v7d18e55f51e2
commons-text-api 1.10.0-78.v3e7b_ea_d5a_fe1
config-file-provider 959.vcff671a_4518b_
configuration-as-code 1714.v09593e830cfa
credentials 1271.v54b_1c2c6388a_
credentials-binding 636.v55f1275c7b_27
data-tables-api 1.13.6-4
display-url-api 2.3.9
credentials 1305.v04f5ec1f3743
credentials-binding 642.v737c34dea_6c2
data-tables-api 1.13.6-5
display-url-api 2.200.vb_9327d658781
durable-task 523.va_a_22cf15d5e0
echarts-api 5.4.0-6
email-ext 2.101
echarts-api 5.4.0-7
email-ext 2.102
extended-read-permission 53.v6499940139e5
external-monitor-job 215.v2e88e894db_f8
extra-columns 1.26
Expand All @@ -35,40 +35,40 @@ git 5.2.0
git-client 4.5.0
git-forensics 2.0.0
git-parameter 0.9.19
github 1.37.3
github 1.37.3.1
github-api 1.316-451.v15738eef3414
github-branch-source 1741.va_3028eb_9fd21
github-checks 554.vb_ee03a_000f65
gitlab-api 5.3.0-91.v1f9a_fda_d654f
gitlab-branch-source 677.v0b_63b_038322b_
gitlab-branch-source 684.vea_fa_7c1e2fe3
gitlab-plugin 1.7.16
handy-uri-templates-2-api 2.1.8-22.v77d5b_75e6953
instance-identity 173.va_37c494ec4e5
ionicons-api 56.v1b_1c8c49374e
jackson2-api 2.15.2-350.v0c2f3f8fc595
jackson2-api 2.15.3-366.vfe8d1fa_f8c87
jakarta-activation-api 2.0.1-3
jakarta-mail-api 2.0.1-3
javadoc 243.vb_b_503b_b_45537
javax-activation-api 1.2.0-6
jaxb 2.3.8-1
jaxb 2.3.9-1
jdk-tool 73.vddf737284550
jersey2-api 2.40-1
jersey2-api 2.41-133.va_03323b_a_1396
jjwt-api 0.11.5-77.v646c772fddb_0
jobConfigHistory 1229.v3039470161a_d
jquery3-api 3.7.1-1
jsch 0.2.8-65.v052c39de79b_2
junit 1240.vf9529b_881428
kubernetes 4029.v5712230ccb_f8
kubernetes 4054.v2da_8e2794884
kubernetes-client-api 6.8.1-224.vd388fca_4db_3b_
kubernetes-credentials 0.11
ldap 701.vf8619de9160a_
mailer 463.vedf8358e006b_
matrix-auth 3.2.1
matrix-project 808.v5a_b_5f56d6966
matrix-project 818.v7eb_e657db_924
maven-plugin 3.23
metrics 4.2.18-442.v02e107157925
mina-sshd-api-common 2.10.0-69.v28e3e36d18eb_
mina-sshd-api-core 2.10.0-69.v28e3e36d18eb_
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 2.46
Expand All @@ -77,8 +77,8 @@ pipeline-github 2.8-155.8eab375ac9f8
pipeline-graph-analysis 202.va_d268e64deb_3
pipeline-groovy-lib 689.veec561a_dee13
pipeline-input-step 477.v339683a_8d55e
pipeline-maven 1342.vfc697b_789147
pipeline-maven-api 1342.vfc697b_789147
pipeline-maven 1345.va_0ef5530a_5ca_
pipeline-maven-api 1345.va_0ef5530a_5ca_
pipeline-milestone-step 111.v449306f708b_7
pipeline-model-api 2.2144.v077a_d1928a_40
pipeline-model-definition 2.2144.v077a_d1928a_40
Expand All @@ -88,16 +88,16 @@ pipeline-stage-step 305.ve96d0205c1c6
pipeline-stage-tags-metadata 2.2144.v077a_d1928a_40
pipeline-stage-view 2.33
plain-credentials 143.v1b_df8b_d3b_e48
plugin-util-api 3.3.0
plugin-util-api 3.6.0
prism-api 1.29.0-8
promoted-builds 892.vd6219fc0a_efb
promoted-builds 936.va_571a_a_b_f8da_5
rebuild 320.v5a_0933a_e7d61
resource-disposer 0.23
scm-api 676.v886669a_199a_a_
script-security 1275.v23895f409fb_d
simple-theme-plugin 160.vb_76454b_67900
snakeyaml-api 2.2-111.vc6598e30cc65
sonar 2.15
sonar 2.16.1
ssh-agent 333.v878b_53c89511
ssh-credentials 308.ve4497b_ccd8f4
ssh-slaves 2.916.vd17b_43357ce4
Expand All @@ -106,13 +106,13 @@ timestamper 1.26
token-macro 384.vf35b_f26814ec
trilead-api 2.84.v72119de229b_7
variant 60.v7290fc0eb_b_cd
warnings-ng 10.4.0
warnings-ng 10.5.1
workflow-aggregator 596.v8c21c963d92d
workflow-api 1281.vca_5fddb_3fceb_
workflow-api 1283.v99c10937efcb_
workflow-basic-steps 1042.ve7b_140c4a_e0c
workflow-cps 3793.v65dec41c3a_c3
workflow-cps 3806.va_3a_6988277b_2
workflow-durable-task-step 1289.v4d3e7b_01546b_
workflow-job 1346.v180a_63f40267
workflow-job 1360.vc6700e3136f5
workflow-multibranch 756.v891d88f2cd46
workflow-scm-step 415.v434365564324
workflow-step-api 639.v6eca_cd8c04a_a_
Expand Down
Loading

0 comments on commit 292023b

Please sign in to comment.