CBI: Sponsor resource packs of DLR to have macOS agent for Eclipse SUMO

https://gitlab.eclipse.org/eclipsefdn/helpdesk/-/issues/5445
eclipse-cbi · Dec 20, 2024 · 6ca7be3 · 6ca7be3
1 parent 567f082
commit 6ca7be3
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 2 deletions.
diff --git a/instances/automotive.sumo/jenkins/configuration.yml b/instances/automotive.sumo/jenkins/configuration.yml
@@ -0,0 +1,19 @@
+jenkins:
+  nodes:
+  # https://gitlab.eclipse.org/eclipsefdn/helpdesk/-/issues/5445
+  - permanent:
+      labelString: "macos macos-11 arm64"
+      launcher:
+        ssh:
+          credentialsId: "w8qlf-macos11-arm64-bot-ssh"
+          host: "208.52.170.174"
+          jvmOptions: "-Xmx256m"
+          port: 22
+          sshHostKeyVerificationStrategy:
+            manuallyProvidedKeyVerificationStrategy:
+              key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC6+qT5aiFFqU70gw+d9+ZJN3oF/9yWStUtJfFIqboLDMWv/+L+1a8nOaobwT8U867Vwwwo0IvErq4eL+5IUXiNBdEu501WL82pfVMU3C509dRpkNqAT9Ymu3cLiPWhJ6BM9r5cCyaGIWYwsNTmvkLO2WRSt20b3TaQxhzyEewuI97OpoZPQCo2EIJqaOjnlynmbyhJjkJ98B10BCcaUbtKjyEhKXv2OmqpGf61or+mfmBEfOrW2HrE3mbE/ZRgPqb5nT/q6C7ObhVA/L0oGG+Gy1DSJnqSN2vy+kWsPAfGcI/1hh9xOS3wiJorEc3hvZYWH3PgyU5KwyRNAoB1LXVE/JyLtmcL36uwkLLcVROJtcVw6j3vSZgFFp7LiUEiYSVtwqwm74dlD/W7qO9pKEWQDltywk8NwqTTvhvSN9WXDMtSrRFfuRYJEVQquu5SHxTJLzQ2v/T+CRAD3WMKbTEILY+d7wOJrPNoxLbVQ+/joE96opoCI1BlgGchF3Q66hM="
+      mode: EXCLUSIVE
+      name: "w8qlf-macos11-arm64"
+      remoteFS: "/Users/genie.sumo/jenkins"
+      retentionStrategy: "always"
+
diff --git a/instances/automotive.sumo/target/config.json b/instances/automotive.sumo/target/config.json
@@ -420,8 +420,8 @@
       "id": "2.479.2",
       "key_fingerprint": "5BA31D57EF5975CA",
       "plugin_manager": {
-         "jar": "https://github.com/jenkinsci/plugin-installation-manager-tool/releases/download/2.13.0/jenkins-plugin-manager-2.13.0.jar",
-         "version": "2.13.0"
+         "jar": "https://github.com/jenkinsci/plugin-installation-manager-tool/releases/download/2.13.2/jenkins-plugin-manager-2.13.2.jar",
+         "version": "2.13.2"
       },
       "pluginroot": "/var/cache/jenkins/plugins",
       "plugins": [

diff --git a/instances/automotive.sumo/target/jenkins/configuration.yml b/instances/automotive.sumo/target/jenkins/configuration.yml
@@ -73,6 +73,8 @@ jenkins:
         containerCapStr: "4"
         jenkinsUrl: "http://jenkins-ui.sumo.svc.cluster.local/sumo"
         jenkinsTunnel: "jenkins-discovery.sumo.svc.cluster.local:50000"
+        garbageCollection:
+          timeout: 300
         maxRequestsPerHostStr: "32"
         namespace: "sumo"
         podRetention: "never"
@@ -350,6 +352,23 @@ jenkins:
                     name: m2-dir
             inheritYamlMergeStrategy: "true"
             yamlMergeStrategy: "merge"
+  nodes:
+    # https://gitlab.eclipse.org/eclipsefdn/helpdesk/-/issues/5445
+    - permanent:
+        labelString: "macos macos-11 arm64"
+        launcher:
+          ssh:
+            credentialsId: "w8qlf-macos11-arm64-bot-ssh"
+            host: "208.52.170.174"
+            jvmOptions: "-Xmx256m"
+            port: 22
+            sshHostKeyVerificationStrategy:
+              manuallyProvidedKeyVerificationStrategy:
+                key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC6+qT5aiFFqU70gw+d9+ZJN3oF/9yWStUtJfFIqboLDMWv/+L+1a8nOaobwT8U867Vwwwo0IvErq4eL+5IUXiNBdEu501WL82pfVMU3C509dRpkNqAT9Ymu3cLiPWhJ6BM9r5cCyaGIWYwsNTmvkLO2WRSt20b3TaQxhzyEewuI97OpoZPQCo2EIJqaOjnlynmbyhJjkJ98B10BCcaUbtKjyEhKXv2OmqpGf61or+mfmBEfOrW2HrE3mbE/ZRgPqb5nT/q6C7ObhVA/L0oGG+Gy1DSJnqSN2vy+kWsPAfGcI/1hh9xOS3wiJorEc3hvZYWH3PgyU5KwyRNAoB1LXVE/JyLtmcL36uwkLLcVROJtcVw6j3vSZgFFp7LiUEiYSVtwqwm74dlD/W7qO9pKEWQDltywk8NwqTTvhvSN9WXDMtSrRFfuRYJEVQquu5SHxTJLzQ2v/T+CRAD3WMKbTEILY+d7wOJrPNoxLbVQ+/joE96opoCI1BlgGchF3Q66hM="
+        mode: EXCLUSIVE
+        name: "w8qlf-macos11-arm64"
+        remoteFS: "/Users/genie.sumo/jenkins"
+        retentionStrategy: "always"
 security:
   apiToken:
     creationOfLegacyTokenEnabled: false

diff --git a/instances/automotive.sumo/target/k8s/configmap-jenkins-config.yml b/instances/automotive.sumo/target/k8s/configmap-jenkins-config.yml
@@ -96,6 +96,8 @@ data:
             containerCapStr: "4"
             jenkinsUrl: "http://jenkins-ui.sumo.svc.cluster.local/sumo"
             jenkinsTunnel: "jenkins-discovery.sumo.svc.cluster.local:50000"
+            garbageCollection:
+              timeout: 300
             maxRequestsPerHostStr: "32"
             namespace: "sumo"
             podRetention: "never"
@@ -373,6 +375,23 @@ data:
                         name: m2-dir
                 inheritYamlMergeStrategy: "true"
                 yamlMergeStrategy: "merge"
+      nodes:
+        # https://gitlab.eclipse.org/eclipsefdn/helpdesk/-/issues/5445
+        - permanent:
+            labelString: "macos macos-11 arm64"
+            launcher:
+              ssh:
+                credentialsId: "w8qlf-macos11-arm64-bot-ssh"
+                host: "208.52.170.174"
+                jvmOptions: "-Xmx256m"
+                port: 22
+                sshHostKeyVerificationStrategy:
+                  manuallyProvidedKeyVerificationStrategy:
+                    key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC6+qT5aiFFqU70gw+d9+ZJN3oF/9yWStUtJfFIqboLDMWv/+L+1a8nOaobwT8U867Vwwwo0IvErq4eL+5IUXiNBdEu501WL82pfVMU3C509dRpkNqAT9Ymu3cLiPWhJ6BM9r5cCyaGIWYwsNTmvkLO2WRSt20b3TaQxhzyEewuI97OpoZPQCo2EIJqaOjnlynmbyhJjkJ98B10BCcaUbtKjyEhKXv2OmqpGf61or+mfmBEfOrW2HrE3mbE/ZRgPqb5nT/q6C7ObhVA/L0oGG+Gy1DSJnqSN2vy+kWsPAfGcI/1hh9xOS3wiJorEc3hvZYWH3PgyU5KwyRNAoB1LXVE/JyLtmcL36uwkLLcVROJtcVw6j3vSZgFFp7LiUEiYSVtwqwm74dlD/W7qO9pKEWQDltywk8NwqTTvhvSN9WXDMtSrRFfuRYJEVQquu5SHxTJLzQ2v/T+CRAD3WMKbTEILY+d7wOJrPNoxLbVQ+/joE96opoCI1BlgGchF3Q66hM="
+            mode: EXCLUSIVE
+            name: "w8qlf-macos11-arm64"
+            remoteFS: "/Users/genie.sumo/jenkins"
+            retentionStrategy: "always"
     security:
       apiToken:
         creationOfLegacyTokenEnabled: false