[releng] Add provider string to the agent name

https://gitlab.eclipse.org/eclipsefdn/infrazilla/-/issues/1026
eclipse-cbi · Aug 23, 2024 · 0e54b21 · 0e54b21
1 parent ae82fb4
commit 0e54b21
Show file tree

Hide file tree

Showing 9 changed files with 1,264 additions and 22 deletions.
diff --git a/instances/technology.cbi/jenkins/configuration.yml b/instances/technology.cbi/jenkins/configuration.yml
@@ -11,7 +11,7 @@ jenkins:
             manuallyProvidedKeyVerificationStrategy:
               key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDeTB1LA7FnUI8kNrY8zVx/Ywy1RN4tJj11W9QWFWTr6gAJgSNEneKIa8hnjZEPddYOIsBOQ9VSvgXYGFRKEFXW23zskuWEyCqSZ/e7RTw2VTCh5nfUZlX1eG7iujn1mpineX/+hRR7HtxDM9MPhpbrq6HVjXuSx8mex9vu4p20ZVZkewedmtG2+qYDDTsv8uw0kX+kkyRuE6An14omsCQ+8mJ17zQnGXN2CnrXXMOWbgH9BC8RZUvNZOzNY1JkWf9EqY2Tz3YJPgUM+9qVj3/BEjGopEIUT/jDuk2NnOo+V1GT8aWzwmBjv91F7wgjuQ72cV8GeSbxz0utQ9isuMkp"
       mode: EXCLUSIVE
-      name: "fmlw3-ubuntu1804"
+      name: "ubuntu1804-azr-ef-fmlw3"
       nodeDescription: "2vCPU, 8GB RAM, Hosted @ Azure"
       remoteFS: "/home/genie.cbi/jenkins-agent"
       numExecutors: 2

diff --git a/instances/technology.cbi/target/config.json b/instances/technology.cbi/target/config.json
diff --git a/instances/technology.cbi/target/jenkins/configuration.yml b/instances/technology.cbi/target/jenkins/configuration.yml
@@ -541,6 +541,238 @@ jenkins:
                     secretName: gradle-secret-dir
             inheritYamlMergeStrategy: "true"
             yamlMergeStrategy: "merge"
+          - name: "ubuntu-2204"
+            namespace: "cbi"
+            label: "ubuntu-2204"
+            containers:
+              - name: "jnlp"
+                image: docker.io/eclipsecbi/jiro-agent-ubuntu-2204:remoting-3248.3250.v3277a_8e88c9b_
+                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-cbi"
+                  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"
+              - emptyDirVolume:
+                  memory: false
+                  mountPath: "/home/jenkins/.m2/.develocity"
+              - emptyDirVolume:
+                  memory: false
+                  mountPath: "/home/jenkins/.gradle/caches"
+              - emptyDirVolume:
+                  memory: false
+                  mountPath: "/home/jenkins/.gradle/daemon"
+              - emptyDirVolume:
+                  memory: false
+                  mountPath: "/home/jenkins/.gradle/native"
+              - emptyDirVolume:
+                  memory: false
+                  mountPath: "/home/jenkins/.gradle/workers"
+              - emptyDirVolume:
+                  memory: false
+                  mountPath: "/home/jenkins/.gradle/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
+                  - name: gradle-secret-dir
+                    mountPath: /home/jenkins/.gradle/gradle.properties
+                    subPath: gradle.properties
+                    readOnly: true
+                volumes:
+                - name: m2-secret-dir
+                  secret:
+                    secretName: m2-secret-dir
+                - name: m2-dir
+                  configMap:
+                    name: m2-dir
+                - name: gradle-secret-dir
+                  secret:
+                    secretName: gradle-secret-dir
+            inheritYamlMergeStrategy: "true"
+            yamlMergeStrategy: "merge"
+          - name: "ubuntu-2404"
+            namespace: "cbi"
+            label: "ubuntu-latest ubuntu-2404"
+            containers:
+              - name: "jnlp"
+                image: docker.io/eclipsecbi/jiro-agent-ubuntu-2404:remoting-3248.3250.v3277a_8e88c9b_
+                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-cbi"
+                  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"
+              - emptyDirVolume:
+                  memory: false
+                  mountPath: "/home/jenkins/.m2/.develocity"
+              - emptyDirVolume:
+                  memory: false
+                  mountPath: "/home/jenkins/.gradle/caches"
+              - emptyDirVolume:
+                  memory: false
+                  mountPath: "/home/jenkins/.gradle/daemon"
+              - emptyDirVolume:
+                  memory: false
+                  mountPath: "/home/jenkins/.gradle/native"
+              - emptyDirVolume:
+                  memory: false
+                  mountPath: "/home/jenkins/.gradle/workers"
+              - emptyDirVolume:
+                  memory: false
+                  mountPath: "/home/jenkins/.gradle/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
+                  - name: gradle-secret-dir
+                    mountPath: /home/jenkins/.gradle/gradle.properties
+                    subPath: gradle.properties
+                    readOnly: true
+                volumes:
+                - name: m2-secret-dir
+                  secret:
+                    secretName: m2-secret-dir
+                - name: m2-dir
+                  configMap:
+                    name: m2-dir
+                - name: gradle-secret-dir
+                  secret:
+                    secretName: gradle-secret-dir
+            inheritYamlMergeStrategy: "true"
+            yamlMergeStrategy: "merge"
   nodes:
     - permanent:
         labelString: "docker-build"
@@ -553,7 +785,7 @@ jenkins:
               manuallyProvidedKeyVerificationStrategy:
                 key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDeTB1LA7FnUI8kNrY8zVx/Ywy1RN4tJj11W9QWFWTr6gAJgSNEneKIa8hnjZEPddYOIsBOQ9VSvgXYGFRKEFXW23zskuWEyCqSZ/e7RTw2VTCh5nfUZlX1eG7iujn1mpineX/+hRR7HtxDM9MPhpbrq6HVjXuSx8mex9vu4p20ZVZkewedmtG2+qYDDTsv8uw0kX+kkyRuE6An14omsCQ+8mJ17zQnGXN2CnrXXMOWbgH9BC8RZUvNZOzNY1JkWf9EqY2Tz3YJPgUM+9qVj3/BEjGopEIUT/jDuk2NnOo+V1GT8aWzwmBjv91F7wgjuQ72cV8GeSbxz0utQ9isuMkp"
         mode: EXCLUSIVE
-        name: "fmlw3-ubuntu1804"
+        name: "ubuntu1804-azr-ef-fmlw3"
         nodeDescription: "2vCPU, 8GB RAM, Hosted @ Azure"
         remoteFS: "/home/genie.cbi/jenkins-agent"
         numExecutors: 2

diff --git a/instances/technology.cbi/target/jenkins/plugins.log b/instances/technology.cbi/target/jenkins/plugins.log
@@ -18,26 +18,26 @@ cloudbees-disk-usage-simple 203.v3f46a_7462b_1a_
 cloudbees-folder 6.942.vb_43318a_156b_2
 cloudbees-jenkins-advisor 358.v58972d19b_1f0
 command-launcher 115.vd8b_301cc15d0
-commons-lang3-api 3.14.0-76.vda_5591261cfe
+commons-lang3-api 3.16.0-82.ve2b_07d659d95
 commons-text-api 1.12.0-129.v99a_50df237f7
 config-file-provider 973.vb_a_80ecb_9a_4d0
 configuration-as-code 1836.vccda_4a_122a_a_e
 credentials 1371.vfee6b_095f0a_3
 credentials-binding 681.vf91669a_32e45
-data-tables-api 2.0.8-1
+data-tables-api 2.1.3-1
 display-url-api 2.204.vf6fddd8a_8b_e9
 docker-commons 443.v921729d5611d
 docker-workflow 580.vc0c340686b_54
 durable-task 568.v8fb_5c57e8417
-echarts-api 5.5.0-1
+echarts-api 5.5.1-1
 eddsa-api 0.3.0-4.v84c6f0f4969e
 email-ext 1814.v404722f34263
 embeddable-build-status 487.va_0ef04c898a_2
 extended-read-permission 53.v6499940139e5
 external-monitor-job 215.v2e88e894db_f8
 extra-columns 1.26
 favorite 2.221.v19ca_666b_62f5
-font-awesome-api 6.5.2-1
+font-awesome-api 6.6.0-1
 forensics-api 2.4.0
 ghprb 1.42.2
 git 5.3.0
@@ -75,7 +75,7 @@ json-path-api 2.9.0-58.v62e3e85b_a_655
 junit 1284.vf75d778f98c5
 kubernetes 4285.v50ed5f624918
 kubernetes-client-api 6.10.0-240.v57880ce8b_0b_2
-kubernetes-credentials 174.va_36e093562d9
+kubernetes-credentials 189.v90a_488b_d1d65
 ldap 725.v3cb_b_711b_1a_ef
 mail-watcher-plugin 1.19
 mailer 472.vf7c289a_4b_420
@@ -84,16 +84,16 @@ matrix-auth 3.2.2
 matrix-project 832.va_66e270d2946
 maven-plugin 3.23
 metrics 4.2.21-451.vd51df8df52ec
-mina-sshd-api-common 2.13.1-117.v2f1a_b_66ff91d
-mina-sshd-api-core 2.13.1-117.v2f1a_b_66ff91d
+mina-sshd-api-common 2.13.2-125.v200281b_61d59
+mina-sshd-api-core 2.13.2-125.v200281b_61d59
 nexus-jenkins-plugin 3.14.431.v37ca_dc788b_b_1
 okhttp-api 4.11.0-172.vda_da_1feeb_c6e
 pam-auth 1.11
 parameterized-trigger 806.vf6fff3e28c3e
 pipeline-build-step 540.vb_e8849e1a_b_d8
 pipeline-graph-analysis 216.vfd8b_ece330ca_
 pipeline-graph-view 313.v1322ce83d680
-pipeline-groovy-lib 727.ve832a_9244dfa_
+pipeline-groovy-lib 730.ve57b_34648c63
 pipeline-input-step 495.ve9c153f6067b_
 pipeline-maven 1421.v610fa_b_e2d60e
 pipeline-maven-api 1421.v610fa_b_e2d60e
@@ -114,7 +114,7 @@ pubsub-light 1.18
 rebuild 332.va_1ee476d8f6d
 resource-disposer 0.23
 scm-api 696.v778d637b_a_762
-script-security 1341.va_2819b_414686
+script-security 1354.va_70a_fe478c7f
 simple-theme-plugin 191.vcd207ef9dd24
 slack 734.v7f9ec8b_66975
 snakeyaml-api 2.2-121.v5a_68b_9300b_d4
@@ -129,11 +129,11 @@ timestamper 1.27
 token-macro 400.v35420b_922dcb_
 trilead-api 2.147.vb_73cc728a_32e
 variant 60.v7290fc0eb_b_cd
-warnings-ng 11.4.0
+warnings-ng 11.4.1
 workflow-aggregator 600.vb_57cdd26fdd7
-workflow-api 1332.vc21122317a_8e
+workflow-api 1336.vee415d95c521
 workflow-basic-steps 1058.vcb_fc1e3a_21a_9
-workflow-cps 3922.va_f73b_7c4246b_
+workflow-cps 3943.v3519a_3260660
 workflow-durable-task-step 1364.v2fd76fb_6fd41
 workflow-job 1436.vfa_244484591f
 workflow-multibranch 795.ve0cb_1f45ca_9a_