From f47cb13be558ff17363d6b8c132b71d64e43e010 Mon Sep 17 00:00:00 2001 From: Pawel Stankiewicz Date: Mon, 28 Oct 2024 10:01:09 +0100 Subject: [PATCH] Add metrics-vm2 node. EF issue: https://gitlab.eclipse.org/eclipsefdn/infrazilla/-/issues/1850 Signed-off-by: Pawel Stankiewicz --- .../jenkins/configuration.yml | 18 +- .../target/config.json | 4 +- .../target/jenkins/configuration.yml | 204 ++---------------- .../target/jenkins/plugins.log | 50 ++--- .../target/k8s/configmap-jenkins-config.yml | 204 ++---------------- 5 files changed, 88 insertions(+), 392 deletions(-) diff --git a/instances/foundation-internal.infra/jenkins/configuration.yml b/instances/foundation-internal.infra/jenkins/configuration.yml index a81c747a1..105395fc8 100644 --- a/instances/foundation-internal.infra/jenkins/configuration.yml +++ b/instances/foundation-internal.infra/jenkins/configuration.yml @@ -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: @@ -116,4 +132,4 @@ tool: installers: - gradleInstaller: id: "8.0.2" - \ No newline at end of file + diff --git a/instances/foundation-internal.infra/target/config.json b/instances/foundation-internal.infra/target/config.json index afd5d0148..39bc4caa6 100644 --- a/instances/foundation-internal.infra/target/config.json +++ b/instances/foundation-internal.infra/target/config.json @@ -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", @@ -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", diff --git a/instances/foundation-internal.infra/target/jenkins/configuration.yml b/instances/foundation-internal.infra/target/jenkins/configuration.yml index 19bfc4e33..be4024225 100644 --- a/instances/foundation-internal.infra/target/jenkins/configuration.yml +++ b/instances/foundation-internal.infra/target/jenkins/configuration.yml @@ -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" @@ -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 @@ -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: diff --git a/instances/foundation-internal.infra/target/jenkins/plugins.log b/instances/foundation-internal.infra/target/jenkins/plugins.log index 38920780b..86d51ed99 100644 --- a/instances/foundation-internal.infra/target/jenkins/plugins.log +++ b/instances/foundation-internal.infra/target/jenkins/plugins.log @@ -3,22 +3,22 @@ analysis-model-api 12.9.0 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.0 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.1193.v64a_61471c489 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-disk-usage-simple 205.v47f4ee8803d1 cloudbees-folder 6.955.v81e2a_35c08d3 command-launcher 115.vd8b_301cc15d0 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 +config-file-provider 980.v88956a_a_5d6a_d configuration-as-code 1850.va_a_8c31d3158b_ credentials 1384.vf0a_2ed06f9c6 credentials-binding 681.vf91669a_32e45 @@ -27,7 +27,7 @@ display-url-api 2.204.vf6fddd8a_8b_e9 docker-commons 443.v921729d5611d docker-workflow 580.vc0c340686b_54 durable-task 577.v2a_8a_4b_7c0247 -echarts-api 5.5.1-1 +echarts-api 5.5.1-3 eddsa-api 0.3.0-4.v84c6f0f4969e email-ext 1844.v3ea_a_b_842374a_ extended-read-permission 53.v6499940139e5 @@ -41,14 +41,14 @@ git-client 5.0.0 git-parameter 0.9.19 github 1.40.0 github-api 1.321-468.v6a_9f5f2d5a_7e -github-branch-source 1797.v86fdb_4d57d43 +github-branch-source 1807.v50351eb_7dd13 gitlab-api 5.6.0-97.v6603a_83f8690 -gitlab-branch-source 710.v6f19df32544b_ -gitlab-plugin 1.8.1 +gitlab-branch-source 711.v41fb_c8b_2b_7a_e +gitlab-plugin 1.8.2 gradle 2.13.1 -gson-api 2.11.0-41.v019fcf6125dc +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 @@ -60,23 +60,23 @@ 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 1277.vb_9a_0808495d7 +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 1307.vdd5b_2646279e +kubernetes 4295.v7fa_01b_309c95 kubernetes-cli 1.12.1 kubernetes-client-api 6.10.0-240.v57880ce8b_0b_2 kubernetes-credentials 190.v03c305394deb_ ldap 725.v3cb_b_711b_1a_ef mail-watcher-plugin 1.19 mailer 488.v0c9639c1a_eb_3 -matrix-auth 3.2.2 +matrix-auth 3.2.3 matrix-project 839.vff91cd7e3a_b_2 -maven-plugin 3.23 +maven-plugin 3.24 metrics 4.2.21-451.vd51df8df52ec mina-sshd-api-common 2.14.0-133.vcc091215a_358 mina-sshd-api-core 2.14.0-133.vcc091215a_358 @@ -86,7 +86,7 @@ parameterized-trigger 806.vf6fff3e28c3e pipeline-build-step 540.vb_e8849e1a_b_d8 pipeline-github 2.8-159.09e4403bc62f pipeline-graph-analysis 216.vfd8b_ece330ca_ -pipeline-groovy-lib 730.ve57b_34648c63 +pipeline-groovy-lib 744.v5b_556ee7c253 pipeline-input-step 495.ve9c153f6067b_ pipeline-maven 1457.vf7a_de13b_c0d4 pipeline-maven-api 1457.vf7a_de13b_c0d4 @@ -106,7 +106,7 @@ 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 +script-security 1366.vd44b_49a_5c85c simple-theme-plugin 196.v96d9592f4efa_ slack 751.v2e44153c8fe1 snakeyaml-api 2.3-123.v13484c65210a_ @@ -119,17 +119,17 @@ timestamper 1.27 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.10.0 workflow-aggregator 600.vb_57cdd26fdd7 workflow-api 1336.vee415d95c521 workflow-basic-steps 1058.vcb_fc1e3a_21a_9 -workflow-cps 3969.vdc9d3a_efcc6a_ +workflow-cps 3975.v567e2a_1ffa_22 workflow-durable-task-step 1371.vb_7cec8f3b_95e workflow-job 1436.vfa_244484591f workflow-multibranch 795.ve0cb_1f45ca_9a_ workflow-scm-step 427.v4ca_6512e7df1 workflow-step-api 678.v3ee58b_469476 -workflow-support 926.v9f4f9b_b_98c19 +workflow-support 930.vf51d22b_ce488 ws-cleanup 0.47 xvnc 1.28 diff --git a/instances/foundation-internal.infra/target/k8s/configmap-jenkins-config.yml b/instances/foundation-internal.infra/target/k8s/configmap-jenkins-config.yml index 32eedb3ab..044f97a1b 100644 --- a/instances/foundation-internal.infra/target/k8s/configmap-jenkins-config.yml +++ b/instances/foundation-internal.infra/target/k8s/configmap-jenkins-config.yml @@ -681,188 +681,6 @@ data: 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" @@ -911,6 +729,21 @@ data: 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 @@ -1031,6 +864,13 @@ data: 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: