Skip to content

Commit

Permalink
Add metrics-vm2 node.
Browse files Browse the repository at this point in the history 
EF issue: https://gitlab.eclipse.org/eclipsefdn/infrazilla/-/issues/1850

Signed-off-by: Pawel Stankiewicz <[email protected]>
  • Loading branch information
@pstankie
pstankie committed Nov 5, 2024
1 parent ee186ed commit 901d17a
Show file tree
Hide file tree
Showing 5 changed files with 96 additions and 400 deletions.
18 changes: 17 additions & 1 deletion instances/foundation-internal.infra/jenkins/configuration.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,22 @@ jenkins:
retentionStrategy: "always"
numExecutors: 2

- permanent:
name: "metrics-vm2"
remoteFS: "/home/metrics"
labelString: "metrics-vm1"
launcher:
ssh:
credentialsId: "metrics-ssh-bot"
host: "172.211.6.76"
port: 2022
sshHostKeyVerificationStrategy:
manuallyProvidedKeyVerificationStrategy:
key: "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBCzg9AZquKQEzThi7pyk2tMfQL/l7qQDWViRIE/u1UdUfOgiVI+L4mlRA9YoJjkTT0N/QKgoDCF6BhvZA/ST7NY="
mode: EXCLUSIVE
retentionStrategy: "always"
numExecutors: 2

security:
gitHostKeyVerificationConfiguration:
sshHostKeyVerificationStrategy:
Expand Down Expand Up @@ -116,4 +132,4 @@ tool:
installers:
- gradleInstaller:
id: "8.0.2"


4 changes: 2 additions & 2 deletions instances/foundation-internal.infra/target/config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"docker.io/eclipsecbi/jiro-agent-basic: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/3248.3250.v3277a_8e88c9b_/remoting-3248.3250.v3277a_8e88c9b_.jar\" \"/usr/share/jenkins/agent.jar\" \nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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: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",
Expand Down Expand Up @@ -120,7 +120,7 @@
"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/3206.vb_15dcf73f6a_9-12/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/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",
"image": "jiro-agent-basic-ubuntu",
"registry": "docker.io",
"repository": "eclipsecbi",
Expand Down
208 changes: 24 additions & 184 deletions instances/foundation-internal.infra/target/jenkins/configuration.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -658,188 +658,6 @@ jenkins:
name: m2-dir
inheritYamlMergeStrategy: "true"
yamlMergeStrategy: "merge"
- name: "ubuntu-2204"
namespace: "foundation-internal-infra"
label: "ubuntu-2204"
containers:
- name: "jnlp"
image: docker.io/eclipsecbi/jiro-agent-ubuntu-2204:remoting-3206.3208.v409508a_675ff
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-infra"
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-2404"
namespace: "foundation-internal-infra"
label: "ubuntu-latest ubuntu-2404"
containers:
- name: "jnlp"
image: docker.io/eclipsecbi/jiro-agent-ubuntu-2404:remoting-3206.3208.v409508a_675ff
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-infra"
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"
nodes:
- permanent:
labelString: "docker-build"
Expand Down Expand Up @@ -888,6 +706,21 @@ jenkins:
mode: EXCLUSIVE
retentionStrategy: "always"
numExecutors: 2
- permanent:
name: "metrics-vm2"
remoteFS: "/home/metrics"
labelString: "metrics-vm1"
launcher:
ssh:
credentialsId: "metrics-ssh-bot"
host: "172.211.6.76"
port: 2022
sshHostKeyVerificationStrategy:
manuallyProvidedKeyVerificationStrategy:
key: "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBCzg9AZquKQEzThi7pyk2tMfQL/l7qQDWViRIE/u1UdUfOgiVI+L4mlRA9YoJjkTT0N/QKgoDCF6BhvZA/ST7NY="
mode: EXCLUSIVE
retentionStrategy: "always"
numExecutors: 2
security:
apiToken:
creationOfLegacyTokenEnabled: false
Expand Down Expand Up @@ -974,7 +807,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"
Expand Down Expand Up @@ -1008,6 +841,13 @@ unclassified:
name: "gitlab.eclipse.org emo"
serverUrl: "https://gitlab.eclipse.org"
webhookSecretCredentialsId: "gitlab-emo-webhook-secret"
hashicorpVault:
configuration:
disableChildPoliciesOverride: false
engineVersion: 2
timeout: 60
vaultCredentialId: "secretsmanager-approle"
vaultUrl: "https://secretsmanager.eclipse.org"
tool:
jdk:
installations:
Expand Down Expand Up @@ -1141,7 +981,7 @@ tool:
- installSource:
installers:
- antFromApache:
id: "1.10.12"
id: "1.10.15"
maven:
installations:
- name: "apache-maven-latest"
Expand Down
Loading

0 comments on commit 901d17a

Please sign in to comment.