Add windows11 aarch64 for JustJ.

EF issue: https://gitlab.eclipse.org/eclipsefdn/helpdesk/-/issues/5075 Signed-off-by: Pawel Stankiewicz <[email protected]>
eclipse-cbi · Oct 7, 2024 · 0d3e267 · 0d3e267
1 parent 66fb4fe
commit 0d3e267
Show file tree

Hide file tree

Showing 5 changed files with 85 additions and 18 deletions.
diff --git a/instances/technology.justj/jenkins/configuration.yml b/instances/technology.justj/jenkins/configuration.yml
@@ -102,4 +102,27 @@ jenkins:
           jvmOptions: "-XX:-HeapDumpOnOutOfMemoryError -XX:-CreateCoredumpOnCrash"
           sshHostKeyVerificationStrategy:
             manuallyProvidedKeyVerificationStrategy:
-              key: "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKJ2Lzuv0XMw3KCnkSRmOL2Dz+glZIdwwaqErqmnoaHm"
+              key: "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIF8QagFvSqEwoiC+9zTw1F9BV7MfRo16NmTJoXgPSwDi"
+  - permanent:
+      labelString: "windows windows11 swt.natives-win32.win32.aarch64 native.builder-win32.win32.aarch64 aarch64 arm64"
+      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.justj.rie8t-win11-arm\\jenkins_agent\\"
+      retentionStrategy: "always"
+      nodeProperties:
+      - watcher:
+          offlineAddresses: "[email protected]"
+          onlineAddresses: "[email protected]"
+      - toolLocation:
+          locations:
+          - home: "C:\\Program Files\\Git\\bin\\git"
+            key: "hudson.plugins.git.GitTool$DescriptorImpl@Default"
+
diff --git a/instances/technology.justj/target/config.json b/instances/technology.justj/target/config.json
@@ -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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.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-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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.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",
                   "image": "jiro-agent-basic-ubuntu",
                   "registry": "docker.io",
                   "repository": "eclipsecbi",
@@ -415,7 +415,7 @@
                   ],
                   "build_args": "['FROM_TAG': '22.04']",
                   "context": "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-ubuntu-2204: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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.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-ubuntu-2204: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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.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",
                   "image": "jiro-agent-ubuntu-2204",
                   "registry": "docker.io",
                   "repository": "eclipsecbi",
@@ -513,7 +513,7 @@
                   ],
                   "build_args": "['FROM_TAG': '24.04']",
                   "context": "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-ubuntu-2404: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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.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-ubuntu-2404: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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.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",
                   "image": "jiro-agent-ubuntu-2404",
                   "registry": "docker.io",
                   "repository": "eclipsecbi",

diff --git a/instances/technology.justj/target/jenkins/configuration.yml b/instances/technology.justj/target/jenkins/configuration.yml
@@ -730,7 +730,29 @@ jenkins:
             jvmOptions: "-XX:-HeapDumpOnOutOfMemoryError -XX:-CreateCoredumpOnCrash"
             sshHostKeyVerificationStrategy:
               manuallyProvidedKeyVerificationStrategy:
-                key: "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKJ2Lzuv0XMw3KCnkSRmOL2Dz+glZIdwwaqErqmnoaHm"
+                key: "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIF8QagFvSqEwoiC+9zTw1F9BV7MfRo16NmTJoXgPSwDi"
+    - permanent:
+        labelString: "windows windows11 swt.natives-win32.win32.aarch64 native.builder-win32.win32.aarch64 aarch64 arm64"
+        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.justj.rie8t-win11-arm\\jenkins_agent\\"
+        retentionStrategy: "always"
+        nodeProperties:
+          - watcher:
+              offlineAddresses: "[email protected]"
+              onlineAddresses: "[email protected]"
+          - toolLocation:
+              locations:
+                - home: "C:\\Program Files\\Git\\bin\\git"
+                  key: "hudson.plugins.git.GitTool$DescriptorImpl@Default"
 security:
   apiToken:
     creationOfLegacyTokenEnabled: false

diff --git a/instances/technology.justj/target/jenkins/plugins.log b/instances/technology.justj/target/jenkins/plugins.log
@@ -4,7 +4,7 @@ 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-33.v4d23ef79fcc8
+asm-api 9.7.1-95.v9f552033802a_
 authentication-tokens 1.119.v50285141b_7e1
 authorize-project 1.7.2
 bootstrap5-api 5.3.3-1
@@ -21,14 +21,14 @@ 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
 configuration-as-code 1850.va_a_8c31d3158b_
-credentials 1378.v81ef4269d764
+credentials 1380.va_435002fa_924
 credentials-binding 681.vf91669a_32e45
 data-tables-api 2.1.6-1
 display-url-api 2.204.vf6fddd8a_8b_e9
 durable-task 577.v2a_8a_4b_7c0247
 echarts-api 5.5.1-1
 eddsa-api 0.3.0-4.v84c6f0f4969e
-email-ext 1814.v404722f34263
+email-ext 1844.v3ea_a_b_842374a_
 extended-read-permission 53.v6499940139e5
 external-monitor-job 215.v2e88e894db_f8
 extra-columns 1.26
@@ -47,7 +47,7 @@ gitlab-plugin 1.8.1
 gson-api 2.11.0-41.v019fcf6125dc
 handy-uri-templates-2-api 2.1.8-30.v7e777411b_148
 hashicorp-vault-plugin 370.v946b_53544a_30
-instance-identity 185.v303dc7c645f9
+instance-identity 201.vd2a_b_5a_468a_a_6
 ionicons-api 74.v93d5eb_813d5f
 jackson2-api 2.17.0-379.v02de8ec9f64c
 jakarta-activation-api 2.1.3-1
@@ -64,15 +64,15 @@ 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 1300.v03d9d8a_cf1fb_
-kubernetes 4288.v1719f9d0c854
+junit 1303.v05e2505656b_7
+kubernetes 4290.v93ea_4b_b_26a_61
 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 472.vf7c289a_4b_420
+mailer 488.v0c9639c1a_eb_3
 matrix-auth 3.2.2
-matrix-project 832.va_66e270d2946
+matrix-project 838.v4d7b_7b_f9b_d4b_
 maven-plugin 3.23
 metrics 4.2.21-451.vd51df8df52ec
 mina-sshd-api-common 2.13.2-125.v200281b_61d59
@@ -84,8 +84,8 @@ pipeline-build-step 540.vb_e8849e1a_b_d8
 pipeline-graph-analysis 216.vfd8b_ece330ca_
 pipeline-groovy-lib 730.ve57b_34648c63
 pipeline-input-step 495.ve9c153f6067b_
-pipeline-maven 1421.v610fa_b_e2d60e
-pipeline-maven-api 1421.v610fa_b_e2d60e
+pipeline-maven 1457.vf7a_de13b_c0d4
+pipeline-maven-api 1457.vf7a_de13b_c0d4
 pipeline-milestone-step 119.vdfdc43fc3b_9a_
 pipeline-model-api 2.2214.vb_b_34b_2ea_9b_83
 pipeline-model-definition 2.2214.vb_b_34b_2ea_9b_83
@@ -100,7 +100,7 @@ prism-api 1.29.0-17
 prometheus 787.v52e8f47488fc
 promoted-builds 965.vcda_c6a_e0998f
 rebuild 332.va_1ee476d8f6d
-resource-disposer 0.23
+resource-disposer 0.24
 scm-api 696.v778d637b_a_762
 script-security 1362.v67dc1f0e1b_b_3
 simple-theme-plugin 196.v96d9592f4efa_
@@ -118,7 +118,7 @@ warnings-ng 11.7.0
 workflow-aggregator 600.vb_57cdd26fdd7
 workflow-api 1336.vee415d95c521
 workflow-basic-steps 1058.vcb_fc1e3a_21a_9
-workflow-cps 3964.v0767b_4b_a_0b_fa_
+workflow-cps 3969.vdc9d3a_efcc6a_
 workflow-durable-task-step 1371.vb_7cec8f3b_95e
 workflow-job 1400.v7fd111b_ec82f
 workflow-multibranch 783.787.v50539468395f

diff --git a/instances/technology.justj/target/k8s/configmap-jenkins-config.yml b/instances/technology.justj/target/k8s/configmap-jenkins-config.yml
@@ -753,7 +753,29 @@ data:
                 jvmOptions: "-XX:-HeapDumpOnOutOfMemoryError -XX:-CreateCoredumpOnCrash"
                 sshHostKeyVerificationStrategy:
                   manuallyProvidedKeyVerificationStrategy:
-                    key: "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKJ2Lzuv0XMw3KCnkSRmOL2Dz+glZIdwwaqErqmnoaHm"
+                    key: "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIF8QagFvSqEwoiC+9zTw1F9BV7MfRo16NmTJoXgPSwDi"
+        - permanent:
+            labelString: "windows windows11 swt.natives-win32.win32.aarch64 native.builder-win32.win32.aarch64 aarch64 arm64"
+            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.justj.rie8t-win11-arm\\jenkins_agent\\"
+            retentionStrategy: "always"
+            nodeProperties:
+              - watcher:
+                  offlineAddresses: "[email protected]"
+                  onlineAddresses: "[email protected]"
+              - toolLocation:
+                  locations:
+                    - home: "C:\\Program Files\\Git\\bin\\git"
+                      key: "hudson.plugins.git.GitTool$DescriptorImpl@Default"
     security:
       apiToken:
         creationOfLegacyTokenEnabled: false