From a0df7ff403b9254a84486b45890e9ccddc5f9a62 Mon Sep 17 00:00:00 2001 From: "sebastien.heurtematte" Date: Thu, 11 Jul 2024 14:19:58 +0200 Subject: [PATCH 1/2] fix: jcasc node configuration for equinox Signed-off-by: sebastien.heurtematte --- instances/eclipse.equinox/config.jsonnet | 4 +- instances/eclipse.equinox/target/config.json | 22 +- .../target/jenkins/configuration.yml | 298 +++++++++++++++++- .../target/jenkins/plugins-list.txt | 2 +- .../target/jenkins/plugins.log | 88 +++--- .../target/k8s/configmap-jenkins-config.yml | 298 +++++++++++++++++- 6 files changed, 628 insertions(+), 84 deletions(-) diff --git a/instances/eclipse.equinox/config.jsonnet b/instances/eclipse.equinox/config.jsonnet index 92956411c..c3b845ca1 100644 --- a/instances/eclipse.equinox/config.jsonnet +++ b/instances/eclipse.equinox/config.jsonnet @@ -1,15 +1,15 @@ { project+: { fullName: "eclipse.equinox", - displayName: "Eclipse Equinox" + displayName: "Eclipse Equinox", # remoteFSSuffix must be individual among all JIPPs which link the eclipse.platform.releng/jenkins/configuration.yml remoteFSSuffix: "equinox", }, jenkins+: { plugins+: [ - "gerrit-code-review", "github-checks", "git-forensics", + "mail-watcher-plugin", ], }, } diff --git a/instances/eclipse.equinox/target/config.json b/instances/eclipse.equinox/target/config.json index 1e1bbf341..e0528d5b0 100644 --- a/instances/eclipse.equinox/target/config.json +++ b/instances/eclipse.equinox/target/config.json @@ -45,6 +45,7 @@ }, "home": "/home/jenkins", "kubernetes": { + "inheritYamlMergeStrategy": true, "resources": { "cpu": { "limit": "2000m", @@ -88,7 +89,8 @@ ], "name": "m2-dir" } - ] + ], + "yamlMergeStrategy": "merge" }, "labels": [ "basic" @@ -138,6 +140,7 @@ }, "home": "/home/jenkins", "kubernetes": { + "inheritYamlMergeStrategy": true, "resources": { "cpu": { "limit": "2000m", @@ -181,7 +184,8 @@ ], "name": "m2-dir" } - ] + ], + "yamlMergeStrategy": "merge" }, "labels": [ "basic-ubuntu" @@ -231,6 +235,7 @@ }, "home": "/home/jenkins", "kubernetes": { + "inheritYamlMergeStrategy": true, "resources": { "cpu": { "limit": "2000m", @@ -274,7 +279,8 @@ ], "name": "m2-dir" } - ] + ], + "yamlMergeStrategy": "merge" }, "labels": [ "migration", @@ -326,6 +332,7 @@ }, "home": "/home/jenkins", "kubernetes": { + "inheritYamlMergeStrategy": true, "resources": { "cpu": { "limit": "2000m", @@ -369,7 +376,8 @@ ], "name": "m2-dir" } - ] + ], + "yamlMergeStrategy": "merge" }, "labels": [ "centos-latest", @@ -482,9 +490,9 @@ } ], "plugins": [ - "gerrit-code-review", "github-checks", - "git-forensics" + "git-forensics", + "mail-watcher-plugin" ], "pluginsForceUpgrade": true, "staticAgentCount": 0, @@ -515,6 +523,7 @@ "authorize-project", "bouncycastle-api", "build-timeout", + "cloudbees-disk-usage-simple", "cloudbees-folder", "command-launcher", "config-file-provider", @@ -666,6 +675,7 @@ "project": { "displayName": "Eclipse Equinox", "fullName": "eclipse.equinox", + "remoteFSSuffix": "equinox", "resourcePacks": 1, "shortName": "equinox", "unixGroupName": "eclipse.equinox" diff --git a/instances/eclipse.equinox/target/jenkins/configuration.yml b/instances/eclipse.equinox/target/jenkins/configuration.yml index 724f4d3e6..2e59baccf 100644 --- a/instances/eclipse.equinox/target/jenkins/configuration.yml +++ b/instances/eclipse.equinox/target/jenkins/configuration.yml @@ -90,10 +90,6 @@ jenkins: periodSeconds: 0 successThreshold: 0 timeoutSeconds: 0 - resourceLimitCpu: "2000m" - resourceRequestCpu: "1000m" - resourceLimitMemory: "4096Mi" - resourceRequestMemory: "4096Mi" ttyEnabled: true command: "" args: "" @@ -139,6 +135,13 @@ jenkins: 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 @@ -163,6 +166,8 @@ jenkins: - name: m2-dir configMap: name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" - name: "basic-ubuntu" namespace: "equinox" label: "basic-ubuntu" @@ -176,10 +181,6 @@ jenkins: periodSeconds: 0 successThreshold: 0 timeoutSeconds: 0 - resourceLimitCpu: "2000m" - resourceRequestCpu: "1000m" - resourceLimitMemory: "4096Mi" - resourceRequestMemory: "4096Mi" ttyEnabled: true command: "" args: "" @@ -225,6 +226,13 @@ jenkins: 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 @@ -249,6 +257,8 @@ jenkins: - name: m2-dir configMap: name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" - name: "centos-7" namespace: "equinox" label: "migration jipp-migration centos-7" @@ -262,10 +272,6 @@ jenkins: periodSeconds: 0 successThreshold: 0 timeoutSeconds: 0 - resourceLimitCpu: "2000m" - resourceRequestCpu: "1000m" - resourceLimitMemory: "4096Mi" - resourceRequestMemory: "4096Mi" ttyEnabled: true command: "" args: "" @@ -311,6 +317,13 @@ jenkins: 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 @@ -335,6 +348,8 @@ jenkins: - name: m2-dir configMap: name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" - name: "centos-8" namespace: "equinox" label: "centos-latest centos-8" @@ -348,10 +363,6 @@ jenkins: periodSeconds: 0 successThreshold: 0 timeoutSeconds: 0 - resourceLimitCpu: "2000m" - resourceRequestCpu: "1000m" - resourceLimitMemory: "4096Mi" - resourceRequestMemory: "4096Mi" ttyEnabled: true command: "" args: "" @@ -397,6 +408,13 @@ jenkins: 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 @@ -421,6 +439,254 @@ jenkins: - name: m2-dir configMap: name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" + nodes: + - permanent: + name: "b9h15-macos11-x86_64" + nodeDescription: "macOS 11 (Big Sur), no login session, hosted on MacStadium" + labelString: "macos macos-11 swt.natives-cocoa.macosx.x86_64 native.builder-cocoa.macosx.x86_64" + remoteFS: '/Users/genie.releng/jenkins_agent/equinox/' + numExecutors: 1 + mode: EXCLUSIVE + retentionStrategy: "always" + launcher: + ssh: + credentialsId: "b9h15-macos11-x86_64-bot-ssh" + host: "208.52.161.179" + port: 22 + sshHostKeyVerificationStrategy: + manuallyProvidedKeyVerificationStrategy: + key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDlxEHVKo8Mu6JEHdDOabGlbvZTQISBnCWWUXq2G/csOQwY2CimuzC3BX5ysdORTTnpMtq7Ck75cXMXr1h0mHszU7Pwx5ZPpTvNyWFFt9zMevlViGKy4OWSkq9W8qEL/JsZm1LGtP/lau+26XmE4gId1GAs2urTxbn923XSuFCbSEQAdPs11K8FRK4espEfXqmQ/w6BdiISwy3zB6/HKbOS462Qcar/1J9434nkTicH8bl5lGMfMFo57JsgrYcMFM5zB2GqHORHGsQ/88J/dsoTX1Bn+irZ6JMHx0HrkVJz1zXqDtfs8CH4q8PtFPFuSfEj2WZ7fGcRExqkiZ5mGfqrVsN5cV5vwXPE/EKFjxCgPvfUcmLHEYl00PhvyjScrP2XBJ1cFnHt44Ia0mM5zn69pxLWeuMdwfwk1mS+wAYvmwa0lGK61YupgOBiSyMV1KSYSnlcIyc1mRguZT6x3/qktzX7urJumuOskTnbAX5HdJnr7kWYmrBc4/Uyf8SXfes=" + nodeProperties: + - envVars: + env: + - key: "PATH" + value: '$HOME/.cargo/bin:$PATH' + - watcher: + offlineAddresses: "releng@eclipse.org" + onlineAddresses: "releng@eclipse.org" + - permanent: + name: "rs68g-win10" + nodeDescription: "Windows 10 Pro, hosted on Azure" + labelString: "windows swt.natives-win32.win32.x86_64 native.builder-win32.win32.x86_64" + remoteFS: 'C:\Users\genie.releng\ci\equinox\' + numExecutors: 1 + mode: EXCLUSIVE + retentionStrategy: "always" + launcher: + ssh: + host: "13.68.249.87" + port: "22" + credentialsId: "rs68g-win10-ssh" + javaPath: "\"C:\\Program Files\\AdoptOpenJDK\\jdk-11.0.11.9-hotspot\\bin\\java.exe\"" + sshHostKeyVerificationStrategy: + manuallyProvidedKeyVerificationStrategy: + key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDAkHWAKiWv/T3uaCBj8RdbPR4BW3GBdb5Digq4lpwnFc5xCLCZ/Wke6GBEBlai+zJndjm5sNYgKAAGUOFvW1t0ZCFxgS+uZ+tu2eyDoGyCAvS+XzbzN4pEGf3x/2GJE2aWoesrdx/Uhc/8J3cZG04Fy1SsllW36j4e/20PnZaCtPRBuU/9ZlX4pUDKIUDV+7ejOTTViAzxV0IqUQagiKLv1rxgkRQRgy49+oszYbTFmO7Sqy8L20sSRpSjO0eym6CTpbdjJSm70ZjlJNFocwREmlISNtdPPzY56NWQKf6qpzTlw94zZGVV/0WNdapn3pWS3OLIttVB1C1f1nHBdwvmooFgFiTJzfWaqY9wZFy+jNDi8BHHauLYySIh2PT65XWltnnJcwPM/87nk0hESuBglq3580mGbqoqYmoYhVOsJgn0r0HOHoCsfrUkk9EbUzuUh4TmbR9d6c+zrXe/p6XW8MNNoD1FC+IpruUiEIK9sJ25LAdeXP0hupL9SbddlCc=" + nodeProperties: + - envVars: + env: + - key: "JAVA_HOME" + value: 'C:\Program Files\AdoptOpenJDK\jdk-11.0.11.9-hotspot' + - key: "PATH" + value: 'C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\ProgramData\GooGet;C:\Users\SSHD\AppData\Local\Microsoft\WindowsApps;C:\ProgramData\chocolatey\bin' + - key: "VS90_HOME" + value: 'C:\Program Files (x86)\Microsoft Visual Studio\2019' + - key: "VS90COMNTOOLS" + value: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\Common7\Tools' + - toolLocation: + locations: + - home: 'C:\ProgramData\chocolatey\lib\maven\apache-maven-3.8.1\bin\mvn.cmd' + key: "hudson.tasks.Maven$MavenInstallation$DescriptorImpl@apache-maven-latest" + - home: 'C:\ProgramData\chocolatey\bin\ant.bat' + key: "hudson.tasks.Ant$AntInstallation$DescriptorImpl@apache-ant-1.9.6" + - home: 'C:\Program Files\AdoptOpenJDK\jdk-11.0.11.9-hotspot' + key: "hudson.model.JDK$DescriptorImpl@openjdk-jdk11-latest" + - home: 'C:\tools\cygwin\bin\git' + key: "hudson.plugins.git.GitTool$DescriptorImpl@Default" + - permanent: + name: "zyt5z-centos83" + nodeDescription: "Dedicated agent for performance tests, hosted on Azure" + labelString: "performance docker-build" + remoteFS: '/home/genie.releng/jenkins/equinox/' + numExecutors: 1 + mode: EXCLUSIVE + retentionStrategy: "always" + launcher: + ssh: + host: "20.231.104.175" + port: "22" + credentialsId: "zyt5z-centos83-ssh" + javaPath: "" + sshHostKeyVerificationStrategy: + manuallyProvidedKeyVerificationStrategy: + key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC6tfKfT8YiNcb3WQOO2t4AmMEGsq+IhxAo2ROEXYrcYDJNWiR7jI4drW1jlOICQKqN5EcvBmTAUegHWuUVE+EVAQm9HrqFtAkJ7bhCcAUTtoMqdYzIR6vQ0LKCMsw6KuGVqsZ2Ub2pkA7CCbJE0CEX5uQFRFd57ngn5+kOJ4TcM9x8N7dEXyIv0lgos9J9JEm/XAlLfsdPomi79KcAE4DTWPkMCgs91aTzTRylIb0iEeReTSljw0UyWdsZgwPEX3ISUM+dWA0nl4W/lyeiEjD8r8EWx8h7POZXlMyYuwysbatrU8hfUlGoLKEKLuzozMfJCgW/v7gITU8J5pXCs4hV1lynM1G0avGnNWBrdeX+PW8abKK015/OZ+28Lt9+ig+BQtIF0S3AcUzzDPTjz1CpO0pq1dh2A2ed5RwHSg18CGzU17s4rnbBsNqZyB34NoUMEb0Lfs2ozucfXsasIhbtTqoo08LopcHagYx0VOHrYv3PPjOEemROmMPiU2xc1i8=" + nodeProperties: + - toolLocation: + locations: + - home: '/usr/bin/ant' + key: "hudson.tasks.Ant$AntInstallation$DescriptorImpl@apache-ant-1.9.6" + - home: '/usr/bin/mvn' + key: "hudson.tasks.Maven$MavenInstallation$DescriptorImpl@apache-maven-latest" + - home: '/usr/bin/java' + key: "hudson.model.JDK$DescriptorImpl@openjdk-latest" + - watcher: + offlineAddresses: "releng@eclipse.org" + onlineAddresses: "releng@eclipse.org" + - permanent: + name: "ppcle-buildTest" + labelString: "ppctest ppcbuild swt.natives-gtk.linux.ppc64le native.builder-gtk.linux.ppc64le" + remoteFS: "/home/swtbuild/build/equinox/" + numExecutors: 1 + mode: EXCLUSIVE + retentionStrategy: "always" + launcher: + inbound: + webSocket: true + workDirSettings: + disabled: false + failIfWorkDirIsMissing: false + internalDir: "remoting" + - permanent: + name: "ppcle-test" + labelString: "ppctest" + remoteFS: "/home/swtbuild/build/equinox/" + numExecutors: 1 + mode: EXCLUSIVE + retentionStrategy: "always" + launcher: + inbound: + webSocket: true + workDirSettings: + disabled: false + failIfWorkDirIsMissing: false + internalDir: "remoting" + - permanent: + name: "centos-aarch64-1" + labelString: "aarch64 arm64 swt.natives-gtk.linux.aarch64 native.builder-gtk.linux.aarch64" + nodeDescription: "Agent provided by the project" + remoteFS: "/home/swtbuild/build/equinox/" + numExecutors: 1 + mode: EXCLUSIVE + retentionStrategy: "always" + launcher: + inbound: + webSocket: true + workDirSettings: + disabled: false + failIfWorkDirIsMissing: false + internalDir: "remoting" + - permanent: + name: "centos-aarch64-2" + labelString: "aarch64 arm64 swt.natives-gtk.linux.aarch64 native.builder-gtk.linux.aarch64" + nodeDescription: "Agent provided by the project" + remoteFS: "/home/swtbuild/build/equinox/" + numExecutors: 1 + mode: EXCLUSIVE + retentionStrategy: "always" + launcher: + inbound: + webSocket: true + workDirSettings: + disabled: false + failIfWorkDirIsMissing: false + internalDir: "remoting" + - permanent: + name: "centos-aarch64-3" + labelString: "aarch64 arm64 swt.natives-gtk.linux.aarch64 native.builder-gtk.linux.aarch64" + nodeDescription: "Agent provided by the project" + remoteFS: "/home/swtbuild/build/equinox/" + numExecutors: 1 + mode: EXCLUSIVE + retentionStrategy: "always" + launcher: + inbound: + webSocket: true + workDirSettings: + disabled: false + failIfWorkDirIsMissing: false + internalDir: "remoting" + - permanent: + name: "centos-aarch64-4" + labelString: "aarch64 arm64 swt.natives-gtk.linux.aarch64 native.builder-gtk.linux.aarch64" + nodeDescription: "Agent provided by the project" + remoteFS: "/home/swtbuild/build/equinox/" + numExecutors: 1 + mode: EXCLUSIVE + retentionStrategy: "always" + launcher: + inbound: + webSocket: true + workDirSettings: + disabled: false + failIfWorkDirIsMissing: false + internalDir: "remoting" + - permanent: + name: "nc1ht-macos11-arm64" + labelString: "macos macos11 swt.natives-cocoa.macosx.aarch64 native.builder-cocoa.macosx.aarch64" + nodeDescription: "macOS Ventura 13.0.1" + launcher: + ssh: + credentialsId: "nc1ht-macos11-arm64-bot-ssh" + host: "208.52.190.236" + port: 22 + sshHostKeyVerificationStrategy: + manuallyProvidedKeyVerificationStrategy: + key: "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM2EUBUJSBAIzhw5Vc1B/nIwWNWix+4Co8xtYGOJjEPP" + mode: EXCLUSIVE + nodeProperties: + - toolLocation: + locations: + - home: "/usr/local/openjdk-17/Contents/Home/bin" + key: "hudson.model.JDK$DescriptorImpl@openjdk-jdk17-latest" + - home: "/Library/Java/JavaVirtualMachines/temurin-11.jdk/Contents/Home/bin" + key: "hudson.model.JDK$DescriptorImpl@adoptopenjdk-hotspot-jdk11-latest" + remoteFS: "/Users/genie.releng/equinox/" + retentionStrategy: "always" + - permanent: + name: "qa6xd-win11" + labelString: "windows" + launcher: + inbound: + webSocket: true + workDirSettings: + disabled: false + failIfWorkDirIsMissing: false + internalDir: "remoting" + mode: EXCLUSIVE + nodeDescription: "Windows 11 Pro, hosted on Azure" + nodeProperties: + - watcher: + offlineAddresses: "releng@eclipse.org" + onlineAddresses: "releng@eclipse.org" + - toolLocation: + locations: + - home: "C:\\ProgramData\\chocolatey\\lib\\ant\\tools\\apache-ant-1.10.13" + key: "hudson.tasks.Ant$AntInstallation$DescriptorImpl@apache-ant-latest" + remoteFS: "C:\\Users\\genie.releng\equinox\\" + retentionStrategy: "always" + - permanent: + labelString: "windows windows11 swt.natives-win32.win32.aarch64 native.builder-win32.win32.aarch64" + launcher: + inbound: + webSocket: true + workDirSettings: + disabled: false + failIfWorkDirIsMissing: false + internalDir: "remoting" + mode: EXCLUSIVE + name: "rie8t-win11-arm64" + nodeDescription: "Windows 11 Pro ARM64, 2vCPUs, 8GB RAM, hosted on Azure" + remoteFS: "C:\\Users\\genie.releng.rie8t-win11-arm\\jenkins_agent\equinox\\" + retentionStrategy: "always" + nodeProperties: + - watcher: + offlineAddresses: "releng@eclipse.org" + onlineAddresses: "releng@eclipse.org" + - toolLocation: + locations: + - home: "C:\\Program Files\\Git\\bin\\git" + key: "hudson.plugins.git.GitTool$DescriptorImpl@Default" security: apiToken: creationOfLegacyTokenEnabled: false diff --git a/instances/eclipse.equinox/target/jenkins/plugins-list.txt b/instances/eclipse.equinox/target/jenkins/plugins-list.txt index 28945abca..252a85a16 100644 --- a/instances/eclipse.equinox/target/jenkins/plugins-list.txt +++ b/instances/eclipse.equinox/target/jenkins/plugins-list.txt @@ -1,4 +1,4 @@ # GENERATED FILE - DO NOT EDIT -gerrit-code-review git-forensics github-checks +mail-watcher-plugin diff --git a/instances/eclipse.equinox/target/jenkins/plugins.log b/instances/eclipse.equinox/target/jenkins/plugins.log index 007c21055..8cf139789 100644 --- a/instances/eclipse.equinox/target/jenkins/plugins.log +++ b/instances/eclipse.equinox/target/jenkins/plugins.log @@ -3,38 +3,39 @@ analysis-model-api 12.3.3 ant 497.v94e7d9fffa_b_9 antisamy-markup-formatter 162.v0e6ec0fcfcf6 apache-httpcomponents-client-4-api 4.5.14-208.v438351942757 -apache-httpcomponents-client-5-api 5.3.1-1.0 +apache-httpcomponents-client-5-api 5.3.1-110.v77252fb_d4da_5 asm-api 9.7-33.v4d23ef79fcc8 -authentication-tokens 1.53.v1c90fd9191a_b_ -authorize-project 1.7.1 +authentication-tokens 1.119.v50285141b_7e1 +authorize-project 1.7.2 bootstrap5-api 5.3.3-1 -bouncycastle-api 2.30.1.77-225.v26ea_c9455fd9 +bouncycastle-api 2.30.1.78.1-248.ve27176eb_46cb_ branch-api 2.1169.va_f810c56e895 -build-timeout 1.32 +build-timeout 1.33 caffeine-api 3.1.8-133.v17b_1ff2e0599 checks-api 2.2.0 +cloudbees-disk-usage-simple 203.v3f46a_7462b_1a_ cloudbees-folder 6.928.v7c780211d66e command-launcher 107.v773860566e2e -commons-lang3-api 3.13.0-62.v7d18e55f51e2 -commons-text-api 1.11.0-109.vfe16c66636eb_ +commons-lang3-api 3.14.0-76.vda_5591261cfe +commons-text-api 1.12.0-119.v73ef73f2345d config-file-provider 973.vb_a_80ecb_9a_4d0 configuration-as-code 1810.v9b_c30a_249a_4c -credentials 1337.v60b_d7b_c7b_c9f -credentials-binding 677.vdc9d38cb_254d -data-tables-api 2.0.7-1 +credentials 1361.v56f5ca_35d21c +credentials-binding 681.vf91669a_32e45 +data-tables-api 2.0.8-1 display-url-api 2.204.vf6fddd8a_8b_e9 durable-task 555.v6802fe0f0b_82 echarts-api 5.5.0-1 +eddsa-api 0.3.0-4.v84c6f0f4969e email-ext 1814.v404722f34263 extended-read-permission 53.v6499940139e5 external-monitor-job 215.v2e88e894db_f8 extra-columns 1.26 font-awesome-api 6.5.2-1 forensics-api 2.4.0 -gerrit-code-review 0.4.9 ghprb 1.42.2 git 5.2.2 -git-client 4.7.0 +git-client 5.0.0 git-forensics 2.1.0 git-parameter 0.9.19 github 1.39.0 @@ -44,7 +45,7 @@ github-checks 554.vb_ee03a_000f65 gitlab-api 5.3.0-91.v1f9a_fda_d654f gitlab-branch-source 704.vc7f1202d7e14 gitlab-plugin 1.8.1 -gson-api 2.10.1-15.v0d99f670e0a_7 +gson-api 2.11.0-41.v019fcf6125dc handy-uri-templates-2-api 2.1.8-30.v7e777411b_148 instance-identity 185.v303dc7c645f9 ionicons-api 74.v93d5eb_813d5f @@ -52,7 +53,7 @@ jackson2-api 2.17.0-379.v02de8ec9f64c jakarta-activation-api 2.1.3-1 jakarta-mail-api 2.1.3-1 javadoc 243.vb_b_503b_b_45537 -javax-activation-api 1.2.0-6 +javax-activation-api 1.2.0-7 jaxb 2.3.9-1 jdk-tool 73.vddf737284550 jersey2-api 2.42-147.va_28a_44603b_d5 @@ -64,65 +65,66 @@ jsch 0.2.16-86.v42e010d9484b_ json-api 20240303-41.v94e11e6de726 json-path-api 2.9.0-58.v62e3e85b_a_655 junit 1265.v65b_14fa_f12f0 -kubernetes 4233.vb_67a_0e11a_039 +kubernetes 4253.v7700d91739e5 kubernetes-client-api 6.10.0-240.v57880ce8b_0b_2 -kubernetes-credentials 173.v04e9c17cffd7 +kubernetes-credentials 174.va_36e093562d9 ldap 725.v3cb_b_711b_1a_ef +mail-watcher-plugin 1.19 mailer 472.vf7c289a_4b_420 matrix-auth 3.2.2 -matrix-project 822.824.v14451b_c0fd42 +matrix-project 832.va_66e270d2946 maven-plugin 3.23 metrics 4.2.21-451.vd51df8df52ec -mina-sshd-api-common 2.12.1-101.v85b_e08b_780dd -mina-sshd-api-core 2.12.1-101.v85b_e08b_780dd +mina-sshd-api-common 2.13.1-117.v2f1a_b_66ff91d +mina-sshd-api-core 2.13.1-117.v2f1a_b_66ff91d okhttp-api 4.11.0-172.vda_da_1feeb_c6e -pam-auth 1.10 +pam-auth 1.11 parameterized-trigger 806.vf6fff3e28c3e pipeline-build-step 540.vb_e8849e1a_b_d8 pipeline-graph-analysis 216.vfd8b_ece330ca_ -pipeline-groovy-lib 710.v4b_94b_077a_808 +pipeline-groovy-lib 727.ve832a_9244dfa_ pipeline-input-step 495.ve9c153f6067b_ -pipeline-maven 1396.veb_f07b_2fc1d8 -pipeline-maven-api 1396.veb_f07b_2fc1d8 +pipeline-maven 1421.v610fa_b_e2d60e +pipeline-maven-api 1421.v610fa_b_e2d60e pipeline-milestone-step 119.vdfdc43fc3b_9a_ -pipeline-model-api 2.2198.v41dd8ef6dd56 -pipeline-model-definition 2.2198.v41dd8ef6dd56 -pipeline-model-extensions 2.2198.v41dd8ef6dd56 +pipeline-model-api 2.2203.v89fa_170c2b_f5 +pipeline-model-definition 2.2203.v89fa_170c2b_f5 +pipeline-model-extensions 2.2203.v89fa_170c2b_f5 pipeline-rest-api 2.34 pipeline-stage-step 312.v8cd10304c27a_ -pipeline-stage-tags-metadata 2.2198.v41dd8ef6dd56 +pipeline-stage-tags-metadata 2.2203.v89fa_170c2b_f5 pipeline-stage-view 2.34 -plain-credentials 182.v468b_97b_9dcb_8 +plain-credentials 183.va_de8f1dd5a_2b_ plugin-util-api 4.1.0 prism-api 1.29.0-15 -prometheus 770.ve5e758db_606e -promoted-builds 945.v597f5c6a_d3fd +prometheus 773.v3b_62d8178eec +promoted-builds 957.vf5b_cee587563 rebuild 332.va_1ee476d8f6d resource-disposer 0.23 scm-api 690.vfc8b_54395023 -script-security 1336.vf33a_a_9863911 -simple-theme-plugin 176.v39740c03a_a_f5 +script-security 1341.va_2819b_414686 +simple-theme-plugin 191.vcd207ef9dd24 snakeyaml-api 2.2-111.vc6598e30cc65 sonar 2.17.2 ssh-agent 367.vf9076cd4ee21 ssh-credentials 337.v395d2403ccd4 -ssh-slaves 2.948.vb_8050d697fec -structs 337.v1b_04ea_4df7c8 +ssh-slaves 2.973.v0fa_8c0dea_f9f +structs 338.v848422169819 timestamper 1.27 token-macro 400.v35420b_922dcb_ -trilead-api 2.142.v748523a_76693 +trilead-api 2.147.vb_73cc728a_32e variant 60.v7290fc0eb_b_cd warnings-ng 11.3.0 -workflow-aggregator 596.v8c21c963d92d -workflow-api 1311.v4250456a_e552 +workflow-aggregator 600.vb_57cdd26fdd7 +workflow-api 1316.v33eb_726c50b_a_ workflow-basic-steps 1058.vcb_fc1e3a_21a_9 -workflow-cps 3894.3896.vca_2c931e7935 -workflow-durable-task-step 1353.v1891a_b_01da_18 +workflow-cps 3908.vd6b_b_5a_a_54010 +workflow-durable-task-step 1360.v82d13453da_a_f workflow-job 1400.v7fd111b_ec82f -workflow-multibranch 783.va_6eb_ef636fb_d +workflow-multibranch 783.787.v50539468395f workflow-scm-step 427.v4ca_6512e7df1 -workflow-step-api 657.v03b_e8115821b_ -workflow-support 907.v6713a_ed8a_573 -ws-cleanup 0.45 +workflow-step-api 678.v3ee58b_469476 +workflow-support 920.v59f71ce16f04 +ws-cleanup 0.46 xvnc 1.28 diff --git a/instances/eclipse.equinox/target/k8s/configmap-jenkins-config.yml b/instances/eclipse.equinox/target/k8s/configmap-jenkins-config.yml index d9b4952d5..53f73c1aa 100644 --- a/instances/eclipse.equinox/target/k8s/configmap-jenkins-config.yml +++ b/instances/eclipse.equinox/target/k8s/configmap-jenkins-config.yml @@ -113,10 +113,6 @@ data: periodSeconds: 0 successThreshold: 0 timeoutSeconds: 0 - resourceLimitCpu: "2000m" - resourceRequestCpu: "1000m" - resourceLimitMemory: "4096Mi" - resourceRequestMemory: "4096Mi" ttyEnabled: true command: "" args: "" @@ -162,6 +158,13 @@ data: 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 @@ -186,6 +189,8 @@ data: - name: m2-dir configMap: name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" - name: "basic-ubuntu" namespace: "equinox" label: "basic-ubuntu" @@ -199,10 +204,6 @@ data: periodSeconds: 0 successThreshold: 0 timeoutSeconds: 0 - resourceLimitCpu: "2000m" - resourceRequestCpu: "1000m" - resourceLimitMemory: "4096Mi" - resourceRequestMemory: "4096Mi" ttyEnabled: true command: "" args: "" @@ -248,6 +249,13 @@ data: 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 @@ -272,6 +280,8 @@ data: - name: m2-dir configMap: name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" - name: "centos-7" namespace: "equinox" label: "migration jipp-migration centos-7" @@ -285,10 +295,6 @@ data: periodSeconds: 0 successThreshold: 0 timeoutSeconds: 0 - resourceLimitCpu: "2000m" - resourceRequestCpu: "1000m" - resourceLimitMemory: "4096Mi" - resourceRequestMemory: "4096Mi" ttyEnabled: true command: "" args: "" @@ -334,6 +340,13 @@ data: 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 @@ -358,6 +371,8 @@ data: - name: m2-dir configMap: name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" - name: "centos-8" namespace: "equinox" label: "centos-latest centos-8" @@ -371,10 +386,6 @@ data: periodSeconds: 0 successThreshold: 0 timeoutSeconds: 0 - resourceLimitCpu: "2000m" - resourceRequestCpu: "1000m" - resourceLimitMemory: "4096Mi" - resourceRequestMemory: "4096Mi" ttyEnabled: true command: "" args: "" @@ -420,6 +431,13 @@ data: 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 @@ -444,6 +462,254 @@ data: - name: m2-dir configMap: name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" + nodes: + - permanent: + name: "b9h15-macos11-x86_64" + nodeDescription: "macOS 11 (Big Sur), no login session, hosted on MacStadium" + labelString: "macos macos-11 swt.natives-cocoa.macosx.x86_64 native.builder-cocoa.macosx.x86_64" + remoteFS: '/Users/genie.releng/jenkins_agent/equinox/' + numExecutors: 1 + mode: EXCLUSIVE + retentionStrategy: "always" + launcher: + ssh: + credentialsId: "b9h15-macos11-x86_64-bot-ssh" + host: "208.52.161.179" + port: 22 + sshHostKeyVerificationStrategy: + manuallyProvidedKeyVerificationStrategy: + key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDlxEHVKo8Mu6JEHdDOabGlbvZTQISBnCWWUXq2G/csOQwY2CimuzC3BX5ysdORTTnpMtq7Ck75cXMXr1h0mHszU7Pwx5ZPpTvNyWFFt9zMevlViGKy4OWSkq9W8qEL/JsZm1LGtP/lau+26XmE4gId1GAs2urTxbn923XSuFCbSEQAdPs11K8FRK4espEfXqmQ/w6BdiISwy3zB6/HKbOS462Qcar/1J9434nkTicH8bl5lGMfMFo57JsgrYcMFM5zB2GqHORHGsQ/88J/dsoTX1Bn+irZ6JMHx0HrkVJz1zXqDtfs8CH4q8PtFPFuSfEj2WZ7fGcRExqkiZ5mGfqrVsN5cV5vwXPE/EKFjxCgPvfUcmLHEYl00PhvyjScrP2XBJ1cFnHt44Ia0mM5zn69pxLWeuMdwfwk1mS+wAYvmwa0lGK61YupgOBiSyMV1KSYSnlcIyc1mRguZT6x3/qktzX7urJumuOskTnbAX5HdJnr7kWYmrBc4/Uyf8SXfes=" + nodeProperties: + - envVars: + env: + - key: "PATH" + value: '$HOME/.cargo/bin:$PATH' + - watcher: + offlineAddresses: "releng@eclipse.org" + onlineAddresses: "releng@eclipse.org" + - permanent: + name: "rs68g-win10" + nodeDescription: "Windows 10 Pro, hosted on Azure" + labelString: "windows swt.natives-win32.win32.x86_64 native.builder-win32.win32.x86_64" + remoteFS: 'C:\Users\genie.releng\ci\equinox\' + numExecutors: 1 + mode: EXCLUSIVE + retentionStrategy: "always" + launcher: + ssh: + host: "13.68.249.87" + port: "22" + credentialsId: "rs68g-win10-ssh" + javaPath: "\"C:\\Program Files\\AdoptOpenJDK\\jdk-11.0.11.9-hotspot\\bin\\java.exe\"" + sshHostKeyVerificationStrategy: + manuallyProvidedKeyVerificationStrategy: + key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDAkHWAKiWv/T3uaCBj8RdbPR4BW3GBdb5Digq4lpwnFc5xCLCZ/Wke6GBEBlai+zJndjm5sNYgKAAGUOFvW1t0ZCFxgS+uZ+tu2eyDoGyCAvS+XzbzN4pEGf3x/2GJE2aWoesrdx/Uhc/8J3cZG04Fy1SsllW36j4e/20PnZaCtPRBuU/9ZlX4pUDKIUDV+7ejOTTViAzxV0IqUQagiKLv1rxgkRQRgy49+oszYbTFmO7Sqy8L20sSRpSjO0eym6CTpbdjJSm70ZjlJNFocwREmlISNtdPPzY56NWQKf6qpzTlw94zZGVV/0WNdapn3pWS3OLIttVB1C1f1nHBdwvmooFgFiTJzfWaqY9wZFy+jNDi8BHHauLYySIh2PT65XWltnnJcwPM/87nk0hESuBglq3580mGbqoqYmoYhVOsJgn0r0HOHoCsfrUkk9EbUzuUh4TmbR9d6c+zrXe/p6XW8MNNoD1FC+IpruUiEIK9sJ25LAdeXP0hupL9SbddlCc=" + nodeProperties: + - envVars: + env: + - key: "JAVA_HOME" + value: 'C:\Program Files\AdoptOpenJDK\jdk-11.0.11.9-hotspot' + - key: "PATH" + value: 'C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\ProgramData\GooGet;C:\Users\SSHD\AppData\Local\Microsoft\WindowsApps;C:\ProgramData\chocolatey\bin' + - key: "VS90_HOME" + value: 'C:\Program Files (x86)\Microsoft Visual Studio\2019' + - key: "VS90COMNTOOLS" + value: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\Common7\Tools' + - toolLocation: + locations: + - home: 'C:\ProgramData\chocolatey\lib\maven\apache-maven-3.8.1\bin\mvn.cmd' + key: "hudson.tasks.Maven$MavenInstallation$DescriptorImpl@apache-maven-latest" + - home: 'C:\ProgramData\chocolatey\bin\ant.bat' + key: "hudson.tasks.Ant$AntInstallation$DescriptorImpl@apache-ant-1.9.6" + - home: 'C:\Program Files\AdoptOpenJDK\jdk-11.0.11.9-hotspot' + key: "hudson.model.JDK$DescriptorImpl@openjdk-jdk11-latest" + - home: 'C:\tools\cygwin\bin\git' + key: "hudson.plugins.git.GitTool$DescriptorImpl@Default" + - permanent: + name: "zyt5z-centos83" + nodeDescription: "Dedicated agent for performance tests, hosted on Azure" + labelString: "performance docker-build" + remoteFS: '/home/genie.releng/jenkins/equinox/' + numExecutors: 1 + mode: EXCLUSIVE + retentionStrategy: "always" + launcher: + ssh: + host: "20.231.104.175" + port: "22" + credentialsId: "zyt5z-centos83-ssh" + javaPath: "" + sshHostKeyVerificationStrategy: + manuallyProvidedKeyVerificationStrategy: + key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC6tfKfT8YiNcb3WQOO2t4AmMEGsq+IhxAo2ROEXYrcYDJNWiR7jI4drW1jlOICQKqN5EcvBmTAUegHWuUVE+EVAQm9HrqFtAkJ7bhCcAUTtoMqdYzIR6vQ0LKCMsw6KuGVqsZ2Ub2pkA7CCbJE0CEX5uQFRFd57ngn5+kOJ4TcM9x8N7dEXyIv0lgos9J9JEm/XAlLfsdPomi79KcAE4DTWPkMCgs91aTzTRylIb0iEeReTSljw0UyWdsZgwPEX3ISUM+dWA0nl4W/lyeiEjD8r8EWx8h7POZXlMyYuwysbatrU8hfUlGoLKEKLuzozMfJCgW/v7gITU8J5pXCs4hV1lynM1G0avGnNWBrdeX+PW8abKK015/OZ+28Lt9+ig+BQtIF0S3AcUzzDPTjz1CpO0pq1dh2A2ed5RwHSg18CGzU17s4rnbBsNqZyB34NoUMEb0Lfs2ozucfXsasIhbtTqoo08LopcHagYx0VOHrYv3PPjOEemROmMPiU2xc1i8=" + nodeProperties: + - toolLocation: + locations: + - home: '/usr/bin/ant' + key: "hudson.tasks.Ant$AntInstallation$DescriptorImpl@apache-ant-1.9.6" + - home: '/usr/bin/mvn' + key: "hudson.tasks.Maven$MavenInstallation$DescriptorImpl@apache-maven-latest" + - home: '/usr/bin/java' + key: "hudson.model.JDK$DescriptorImpl@openjdk-latest" + - watcher: + offlineAddresses: "releng@eclipse.org" + onlineAddresses: "releng@eclipse.org" + - permanent: + name: "ppcle-buildTest" + labelString: "ppctest ppcbuild swt.natives-gtk.linux.ppc64le native.builder-gtk.linux.ppc64le" + remoteFS: "/home/swtbuild/build/equinox/" + numExecutors: 1 + mode: EXCLUSIVE + retentionStrategy: "always" + launcher: + inbound: + webSocket: true + workDirSettings: + disabled: false + failIfWorkDirIsMissing: false + internalDir: "remoting" + - permanent: + name: "ppcle-test" + labelString: "ppctest" + remoteFS: "/home/swtbuild/build/equinox/" + numExecutors: 1 + mode: EXCLUSIVE + retentionStrategy: "always" + launcher: + inbound: + webSocket: true + workDirSettings: + disabled: false + failIfWorkDirIsMissing: false + internalDir: "remoting" + - permanent: + name: "centos-aarch64-1" + labelString: "aarch64 arm64 swt.natives-gtk.linux.aarch64 native.builder-gtk.linux.aarch64" + nodeDescription: "Agent provided by the project" + remoteFS: "/home/swtbuild/build/equinox/" + numExecutors: 1 + mode: EXCLUSIVE + retentionStrategy: "always" + launcher: + inbound: + webSocket: true + workDirSettings: + disabled: false + failIfWorkDirIsMissing: false + internalDir: "remoting" + - permanent: + name: "centos-aarch64-2" + labelString: "aarch64 arm64 swt.natives-gtk.linux.aarch64 native.builder-gtk.linux.aarch64" + nodeDescription: "Agent provided by the project" + remoteFS: "/home/swtbuild/build/equinox/" + numExecutors: 1 + mode: EXCLUSIVE + retentionStrategy: "always" + launcher: + inbound: + webSocket: true + workDirSettings: + disabled: false + failIfWorkDirIsMissing: false + internalDir: "remoting" + - permanent: + name: "centos-aarch64-3" + labelString: "aarch64 arm64 swt.natives-gtk.linux.aarch64 native.builder-gtk.linux.aarch64" + nodeDescription: "Agent provided by the project" + remoteFS: "/home/swtbuild/build/equinox/" + numExecutors: 1 + mode: EXCLUSIVE + retentionStrategy: "always" + launcher: + inbound: + webSocket: true + workDirSettings: + disabled: false + failIfWorkDirIsMissing: false + internalDir: "remoting" + - permanent: + name: "centos-aarch64-4" + labelString: "aarch64 arm64 swt.natives-gtk.linux.aarch64 native.builder-gtk.linux.aarch64" + nodeDescription: "Agent provided by the project" + remoteFS: "/home/swtbuild/build/equinox/" + numExecutors: 1 + mode: EXCLUSIVE + retentionStrategy: "always" + launcher: + inbound: + webSocket: true + workDirSettings: + disabled: false + failIfWorkDirIsMissing: false + internalDir: "remoting" + - permanent: + name: "nc1ht-macos11-arm64" + labelString: "macos macos11 swt.natives-cocoa.macosx.aarch64 native.builder-cocoa.macosx.aarch64" + nodeDescription: "macOS Ventura 13.0.1" + launcher: + ssh: + credentialsId: "nc1ht-macos11-arm64-bot-ssh" + host: "208.52.190.236" + port: 22 + sshHostKeyVerificationStrategy: + manuallyProvidedKeyVerificationStrategy: + key: "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM2EUBUJSBAIzhw5Vc1B/nIwWNWix+4Co8xtYGOJjEPP" + mode: EXCLUSIVE + nodeProperties: + - toolLocation: + locations: + - home: "/usr/local/openjdk-17/Contents/Home/bin" + key: "hudson.model.JDK$DescriptorImpl@openjdk-jdk17-latest" + - home: "/Library/Java/JavaVirtualMachines/temurin-11.jdk/Contents/Home/bin" + key: "hudson.model.JDK$DescriptorImpl@adoptopenjdk-hotspot-jdk11-latest" + remoteFS: "/Users/genie.releng/equinox/" + retentionStrategy: "always" + - permanent: + name: "qa6xd-win11" + labelString: "windows" + launcher: + inbound: + webSocket: true + workDirSettings: + disabled: false + failIfWorkDirIsMissing: false + internalDir: "remoting" + mode: EXCLUSIVE + nodeDescription: "Windows 11 Pro, hosted on Azure" + nodeProperties: + - watcher: + offlineAddresses: "releng@eclipse.org" + onlineAddresses: "releng@eclipse.org" + - toolLocation: + locations: + - home: "C:\\ProgramData\\chocolatey\\lib\\ant\\tools\\apache-ant-1.10.13" + key: "hudson.tasks.Ant$AntInstallation$DescriptorImpl@apache-ant-latest" + remoteFS: "C:\\Users\\genie.releng\equinox\\" + retentionStrategy: "always" + - permanent: + labelString: "windows windows11 swt.natives-win32.win32.aarch64 native.builder-win32.win32.aarch64" + launcher: + inbound: + webSocket: true + workDirSettings: + disabled: false + failIfWorkDirIsMissing: false + internalDir: "remoting" + mode: EXCLUSIVE + name: "rie8t-win11-arm64" + nodeDescription: "Windows 11 Pro ARM64, 2vCPUs, 8GB RAM, hosted on Azure" + remoteFS: "C:\\Users\\genie.releng.rie8t-win11-arm\\jenkins_agent\equinox\\" + retentionStrategy: "always" + nodeProperties: + - watcher: + offlineAddresses: "releng@eclipse.org" + onlineAddresses: "releng@eclipse.org" + - toolLocation: + locations: + - home: "C:\\Program Files\\Git\\bin\\git" + key: "hudson.plugins.git.GitTool$DescriptorImpl@Default" security: apiToken: creationOfLegacyTokenEnabled: false From 3322eac8f7e3564c51038011c3b96e5b68f4f522 Mon Sep 17 00:00:00 2001 From: "sebastien.heurtematte" Date: Tue, 16 Jul 2024 18:29:32 +0200 Subject: [PATCH 2/2] feat: add releng statefulset configuration for consistency Signed-off-by: sebastien.heurtematte --- instances/eclipse.equinox/jiro.jsonnet | 22 +------------ .../k8s/master-known-hosts.yml | 31 +++++++++++++++++++ 2 files changed, 32 insertions(+), 21 deletions(-) create mode 100644 instances/eclipse.equinox/k8s/master-known-hosts.yml diff --git a/instances/eclipse.equinox/jiro.jsonnet b/instances/eclipse.equinox/jiro.jsonnet index 584584b73..8e10150c7 100644 --- a/instances/eclipse.equinox/jiro.jsonnet +++ b/instances/eclipse.equinox/jiro.jsonnet @@ -2,25 +2,5 @@ local jiro = import '../../templates/jiro.libsonnet'; jiro+ { "config.json"+: import "config.jsonnet", - "k8s/statefulset.json"+: { - spec+: { - template+: { - spec+: { - containers: [ - container + { - env: [ - # Required for gerrit-code-review https://github.com/jenkinsci/gerrit-code-review-plugin/releases/tag/gerrit-code-review-0.4.6, - if (env.name == "JAVA_OPTS") then - env + { - value: env.value + " -Dhudson.remoting.ClassFilter=com.google.gerrit.extensions.common.AvatarInfo,com.google.gerrit.extensions.common.ReviewerUpdateInfo,com.google.gerrit.extensions.common.ActionInfo,com.google.gerrit.extensions.common.TrackingIdInfo,com.google.gerrit.extensions.common.LabelInfo,com.google.gerrit.extensions.common.ApprovalInfo,com.google.gerrit.extensions.common.RevisionInfo,com.google.gerrit.extensions.common.ChangeInfo,com.google.gerrit.extensions.common.FetchInfo,com.google.gerrit.extensions.common.CommitInfo,com.google.gerrit.extensions.common.WebLinkInfo,com.google.gerrit.extensions.common.GitPerson,com.google.gerrit.extensions.common.FileInfo,com.google.gerrit.extensions.common.VotingRangeInfo" - } else - env - for env in super.env - ] - } for container in super.containers - ], - }, - }, - }, - }, + "k8s/statefulset.json"+: import "../eclipse.platform.releng/k8s/statefulset.jsonnet", } \ No newline at end of file diff --git a/instances/eclipse.equinox/k8s/master-known-hosts.yml b/instances/eclipse.equinox/k8s/master-known-hosts.yml new file mode 100644 index 000000000..8de20cc59 --- /dev/null +++ b/instances/eclipse.equinox/k8s/master-known-hosts.yml @@ -0,0 +1,31 @@ +#******************************************************************************* +# Copyright (c) 2019 Eclipse Foundation and others. +# This program and the accompanying materials are made available +# under the terms of the Eclipse Public License 2.0 +# which is available at http://www.eclipse.org/legal/epl-v20.html, +# or the MIT License which is available at https://opensource.org/licenses/MIT. +# SPDX-License-Identifier: EPL-2.0 OR MIT +#******************************************************************************* +apiVersion: v1 +kind: ConfigMap +metadata: + labels: + org.eclipse.cbi.jiro/project.shortname: "equinox" + org.eclipse.cbi.jiro/project.fullName: "eclipse.platform.equinox" + org.eclipse.cbi.jiro/kind: "master" + annotations: + org.eclipse.cbi.jiro/jenkins.version: "latest" + org.eclipse.cbi.jiro/jenkins.actualVersion: "2.190.1" + org.eclipse.cbi.jiro/kubernetes.master.namespace: "equinox" + org.eclipse.cbi.jiro/project.sponsorshipLevel: "S0" + namespace: "equinox" + name: master-known-hosts +data: + known_hosts: |- + 208.52.161.179 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC3Mo4/c9Hn6sA594UEGHVxCKbu/QtophcofQIfrX1cJwkxfx/MGjMhllrWw49SfpNPh/VOlR4T7r3xeFq9TM+sDXAii54deTENpqg5q1uBOx9hi+7W8MhKpuJEhwL37kTQHSjcnIcexpm76Tbyd3QtHU3xQzMCjfREfqIAWkWaKbdzNVu1JJRcwqRXDDzPNkoLfYUZtdQi/XiROlX5zYh3/GpQctGkL3y8mdkeUY7RGUDKTjd7osAK59IR30H2KFRfewey9YnMnIKM0cokA8t3KDvAwmXFLQ+iAxG1RFLZQ88iz7agO1clNYFR3+2ersXcMu/AZUoA6sBsBXIJ9419 + 199.229.252.222 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDIDpuYI9V+tjtHK8Tty9ZNgYnkWgCRI4lprI8eRxj8zeJhXH4nZvK2od8dR5N0StvQEt/rzKTlxGm3roF4ibGHQEHyBG1M99LG8/vim9JvogR2sKys6goNHmBICxP99vPo6GTJ8pcb2pmYdY6ZwW05NaFcgaslzg0fdGlJrFYIauERFVGON/+KXPs3u4RBbSm+0sDZB83Sf6ME7OgFRp9EXVIcombNv8smRcb+VTIR+JK2NXvKfFPR8xWrnE9q8h73J8HPi25KRJvuiwQPrYvVrE1oxifxawwHiBxGWr+pSh1KIJiatg71f514vOpFrKK8CuPKRYbRRfzbnzj/i90b + 199.229.252.231 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDIDpuYI9V+tjtHK8Tty9ZNgYnkWgCRI4lprI8eRxj8zeJhXH4nZvK2od8dR5N0StvQEt/rzKTlxGm3roF4ibGHQEHyBG1M99LG8/vim9JvogR2sKys6goNHmBICxP99vPo6GTJ8pcb2pmYdY6ZwW05NaFcgaslzg0fdGlJrFYIauERFVGON/+KXPs3u4RBbSm+0sDZB83Sf6ME7OgFRp9EXVIcombNv8smRcb+VTIR+JK2NXvKfFPR8xWrnE9q8h73J8HPi25KRJvuiwQPrYvVrE1oxifxawwHiBxGWr+pSh1KIJiatg71f514vOpFrKK8CuPKRYbRRfzbnzj/i90b + 35.196.120.228 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDWh6lJpuNxDVvfSfLjdjfF6DygBspcxp+rnrv2hHVh16MRAF/qtsMru6kBMPiMaMASUl5d4FfsZnbBIpg51hPY5HaUYx71KQM5QevlXnUqqxkkvHpZxLt1M8Xh+cvo3RPHoFCE00MbMmVFPatUtRMprga7z5SgEKeKdyxcKirwyTHu8zVQmBLrctiIplNII594GphiJr3MUBK/oEf1AoQS+P/r2WFJZlbvlAwlpQ+BHlW1jQUGCAVZcGpfTE4KIAc4/GHUiEDcNR3ZH2/U4DmH0r1F8CqQpAqDw5+aM/dYS4GSaml774XOV4esNfPQYHkkIdfaqFk0S6WQyvHba05P + 207.254.46.148 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCejyvfy3TfWh2CwKcEwj3BdLRb5ZpCw1k846vwpq/RzKEpIWFXarfH3KcDSDFUXQFSxxDCOokbfvPYxG+MyqmkQZ+g8nAahVX07rKIZu7AudHVPmYNOr8+iwKst38MuBB77UEKWwIaAov8UcM4bC6xPGc7SDVW59bMa151GN/dSDKHqTgKz2vMS62tdUG4D/bVYVYzmwSDOs85wnsX+oZe8TXABEt94jy10uDpgSkABdzNl/0m/C1boSIi3hOBrWuIk676PNj2lcUWz69SSUlmFElI7q9Mo+1TxuA0KQxy9D87mkRQ6lesZv/+CQJMhVuIso+APktrQ9uw3RhAbGoVq3MtANEoy3yv005HKIxnsVhUhkSCB1/EFSerbVBLndVXqY/3R7NgJDI0kbYg8VLLRWCoALveiO40Ss7tiHrTHXY2hFBsrhAzPTCZGLUbCjVc6tN+at1hjXhSJoB0h5uInywgMc1TfiJapihvrFoJlU+OhkJ/+oP6BgwVWDohiGE= + 35.196.82.59 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCcc2k3hDeh60ivTJCTmFJCbsN5maW3M30lHjs1LH8MMY5Xl2m0bg65mEVwgXH4w3oStDFdxCkXIcQf2pvhLcGYxhIhZj0thju14kGyPEm4lYdQhqEKn1o1ThRR9LAVANBFduE7nb+ohiZQFDpvhxEQzMi4BNCHxGdiriT0TteR044CZEtTtYO5DANZgNzQ0hqYzV2ooaE3ZeswcBQ7KF/aARB6SiAj3QDVvf5TUYtYFlgCwXRwSv9aHWkstrnRgQWI2hZ577BH6NcsDVb6inWIgJyi1o8ykKtoLX7x26HL5MyP854FT7pOhlU/QV84W/o3hdxknDpcaXwX6fukLNYf +