Jenkins LTS upgrade

Remove ort-vm1 and metrics-vm1 agents
eclipse-cbi · Dec 3, 2024 · 8c27aac · 8c27aac
1 parent bd7b6fc
commit 8c27aac
Show file tree

Hide file tree

Showing 7 changed files with 144 additions and 1,371 deletions.
diff --git a/instances/foundation-internal.infra/jenkins/configuration.yml b/instances/foundation-internal.infra/jenkins/configuration.yml
@@ -20,30 +20,17 @@ jenkins:
           offlineAddresses: "[email protected]"
           onlineAddresses: "[email protected]"
   - permanent:
-      name: "ort-vm1"
-      remoteFS: "/home/genie.infra"
-      launcher:
-        ssh:
-          credentialsId: "ort-ssh-bot"
-          host: "20.104.233.12"
-          port: 2022
-          sshHostKeyVerificationStrategy:
-            manuallyProvidedKeyVerificationStrategy:
-              key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDkH1ET4ScUfV5JHHr7f7dOg4jHg09SL2Q03ST6oAmC5yxmU52uu8vhUZRM5H5zjrW4ml7/U4s+J3LyUHNtcQq5xqBrQCDc2uSXUTFeShp3FeehHRvvOzlJqSANvQj+0Qdxb/aU0lxAYXaLsRy+HEH75aSceTXYDFvVjygteBApVFAaTCNYlDNPsxMUQ1ZKi7cy7DPT1w6PVpGO+9i7WXHkMCJlhOLf6ivJWgH5NtcHJMAxs7fGHYPjn8rUJlSAY/Hg1bT5JcGAdNWxsaCmKMucaGBeHz2E+hXtx6k4ye5fJqlFuWkxfWyJSewmoNrilACl9XKp5mPbVZyCZCDJCtVYkT6gf3nm5bTiSfIBb5fLM1eVKssa2PNcEW7sajRKEpw6GKcD0a1gj1ERbZapVWk42AD9TCIeaT8SniZrq60n5E/SVRBQvoCArdLIQgfm4zflUsH/gFeMFMV/PvQ6vrbRCd+fhbnaRWFVOpUUwwMaM+8OXCbS9XOPge8B2wqOVqk="
-      mode: EXCLUSIVE
-      retentionStrategy: "always"
-      numExecutors: 2
-  - permanent:
-      name: "metrics-vm1"
+      name: "metrics-vm2"
       remoteFS: "/home/metrics"
+      labelString: "metrics-vm1"
       launcher:
         ssh:
           credentialsId: "metrics-ssh-bot"
-          host: "4.180.46.65"
+          host: "172.211.6.76"
           port: 2022
           sshHostKeyVerificationStrategy:
             manuallyProvidedKeyVerificationStrategy:
-              key: "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBIQUZTgLsuKws+iCoZjI2CTCopxZN/zUCvCaOKLZXafFZ5Wt9DeLSt+Dc6V2rcYGz9T7ZQYnIO+6THFYbCglg2w="
+              key: "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBCzg9AZquKQEzThi7pyk2tMfQL/l7qQDWViRIE/u1UdUfOgiVI+L4mlRA9YoJjkTT0N/QKgoDCF6BhvZA/ST7NY="
       mode: EXCLUSIVE
       retentionStrategy: "always"
       numExecutors: 2

diff --git a/instances/foundation-internal.infra/target/Dockerfile b/instances/foundation-internal.infra/target/Dockerfile
@@ -1,4 +1,4 @@
-FROM docker.io/eclipsecbi/jiro-master:2.462.3
+FROM docker.io/eclipsecbi/jiro-master:2.479.2
 
 EXPOSE 8080
 EXPOSE 50000

diff --git a/instances/foundation-internal.infra/target/config.json b/instances/foundation-internal.infra/target/config.json