Add x86_64 label to mp23n-windows-10-label.

EF issue: https://gitlab.eclipse.org/eclipsefdn/helpdesk/-/issues/5075#note_2831970 Signed-off-by: Pawel Stankiewicz <[email protected]>
eclipse-cbi · Oct 8, 2024 · 3c13524 · 3c13524
1 parent f7c8336
commit 3c13524
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 25 deletions.
diff --git a/instances/technology.justj/jenkins/configuration.yml b/instances/technology.justj/jenkins/configuration.yml
@@ -1,7 +1,7 @@
 jenkins:
   nodes:
   - permanent:
-      labelString: "windows windows10"
+      labelString: "x86_64 windows windows10"
       launcher:
         inbound:
           webSocket: true

diff --git a/instances/technology.justj/target/config.json b/instances/technology.justj/target/config.json
@@ -19,9 +19,7 @@
             "basic": {
                "agentWorkdir": "/home/jenkins/jenkins-agent",
                "docker": {
-                  "aliases": [
-                     "docker.io/eclipsecbi/jiro-agent-basic:latest"
-                  ],
+                  "aliases": [ ],
                   "context": "basic",
                   "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: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 [ \"uid_entrypoint\", \"/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",
                   "image": "jiro-agent-basic",
@@ -116,9 +114,7 @@
             "basic-ubuntu": {
                "agentWorkdir": "/home/jenkins/jenkins-agent",
                "docker": {
-                  "aliases": [
-                     "docker.io/eclipsecbi/jiro-agent-basic-ubuntu:latest"
-                  ],
+                  "aliases": [ ],
                   "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\nRUN ln -sf /bin/bash /bin/sh\n\nUSER 10001:0\n\n",
                   "image": "jiro-agent-basic-ubuntu",
@@ -213,9 +209,7 @@
             "centos-7": {
                "agentWorkdir": "/home/jenkins/jenkins-agent",
                "docker": {
-                  "aliases": [
-                     "docker.io/eclipsecbi/jiro-agent-centos-7:latest"
-                  ],
+                  "aliases": [ ],
                   "context": "centos-7",
                   "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-centos-7: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",
                   "image": "jiro-agent-centos-7",
@@ -312,9 +306,7 @@
             "centos-8": {
                "agentWorkdir": "/home/jenkins/jenkins-agent",
                "docker": {
-                  "aliases": [
-                     "docker.io/eclipsecbi/jiro-agent-centos-8:latest"
-                  ],
+                  "aliases": [ ],
                   "context": "centos-8",
                   "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-centos-8: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",
                   "image": "jiro-agent-centos-8",
@@ -410,9 +402,7 @@
             "ubuntu-2204": {
                "agentWorkdir": "/home/jenkins/jenkins-agent",
                "docker": {
-                  "aliases": [
-                     "docker.io/eclipsecbi/jiro-agent-ubuntu-2204:latest"
-                  ],
+                  "aliases": [ ],
                   "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\nRUN ln -sf /bin/bash /bin/sh\n\nUSER 10001:0\n\n",
@@ -508,9 +498,7 @@
             "ubuntu-2404": {
                "agentWorkdir": "/home/jenkins/jenkins-agent",
                "docker": {
-                  "aliases": [
-                     "docker.io/eclipsecbi/jiro-agent-ubuntu-2404:latest"
-                  ],
+                  "aliases": [ ],
                   "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\nRUN ln -sf /bin/bash /bin/sh\n\nUSER 10001:0\n\n",

diff --git a/instances/technology.justj/target/jenkins/configuration.yml b/instances/technology.justj/target/jenkins/configuration.yml
@@ -630,7 +630,7 @@ jenkins:
             yamlMergeStrategy: "merge"
   nodes:
     - permanent:
-        labelString: "windows windows10"
+        labelString: "x86_64 windows windows10"
         launcher:
           inbound:
             webSocket: true

diff --git a/instances/technology.justj/target/jenkins/plugins.log b/instances/technology.justj/target/jenkins/plugins.log
@@ -35,7 +35,7 @@ extra-columns 1.26
 font-awesome-api 6.6.0-2
 forensics-api 2.6.0
 ghprb 1.42.2
-git 5.5.1
+git 5.5.2
 git-client 5.0.0
 git-parameter 0.9.19
 github 1.40.0
@@ -64,7 +64,7 @@ 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 1303.v05e2505656b_7
+junit 1304.vc85a_b_ca_96613
 kubernetes 4290.v93ea_4b_b_26a_61
 kubernetes-client-api 6.10.0-240.v57880ce8b_0b_2
 kubernetes-credentials 190.v03c305394deb_
@@ -75,8 +75,8 @@ matrix-auth 3.2.2
 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
-mina-sshd-api-core 2.13.2-125.v200281b_61d59
+mina-sshd-api-common 2.14.0-133.vcc091215a_358
+mina-sshd-api-core 2.14.0-133.vcc091215a_358
 okhttp-api 4.11.0-172.vda_da_1feeb_c6e
 pam-auth 1.11
 parameterized-trigger 806.vf6fff3e28c3e

diff --git a/instances/technology.justj/target/k8s/configmap-jenkins-config.yml b/instances/technology.justj/target/k8s/configmap-jenkins-config.yml
@@ -653,7 +653,7 @@ data:
                 yamlMergeStrategy: "merge"
       nodes:
         - permanent:
-            labelString: "windows windows10"
+            labelString: "x86_64 windows windows10"
             launcher:
               inbound:
                 webSocket: true