feat: add pipeline-utility-steps plugin to releng instance

Related to https://gitlab.eclipse.org/eclipsefdn/helpdesk/-/issues/4125 Signed-off-by: sebastien.heurtematte <[email protected]>
eclipse-cbi · Jan 8, 2024 · 5d8241c · 5d8241c
1 parent 208315d
commit 5d8241c
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 18 deletions.
diff --git a/instances/eclipse.platform.releng/config.jsonnet b/instances/eclipse.platform.releng/config.jsonnet
@@ -15,6 +15,7 @@ local permissionsTemplates = import '../../templates/permissions.libsonnet';
       "git-forensics",
       "job-dsl",
       "pipeline-graph-view",
+      "pipeline-utility-steps",
     ],
     staticAgentCount: 10,
     permissions+:

diff --git a/instances/eclipse.platform.releng/target/config.json b/instances/eclipse.platform.releng/target/config.json
@@ -20,9 +20,13 @@
                "agentWorkdir": "/home/jenkins/jenkins-agent",
                "docker": {
                   "aliases": [
+                     "docker.io/eclipsecbi/jiro-agent-basic:latest",
                      "docker.io/eclipsecbijenkins/basic-agent:3160.vd76b_9ddd10cc",
                      "docker.io/eclipsecbijenkins/jenkins-agent:3160.vd76b_9ddd10cc",
-                     "docker.io/eclipsecbi/jenkins-jnlp-agent:3160.vd76b_9ddd10cc"
+                     "docker.io/eclipsecbi/jenkins-jnlp-agent:3160.vd76b_9ddd10cc",
+                     "docker.io/eclipsecbijenkins/basic-agent:latest",
+                     "docker.io/eclipsecbijenkins/jenkins-agent:latest",
+                     "docker.io/eclipsecbi/jenkins-jnlp-agent:latest"
                   ],
                   "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/3160.vd76b_9ddd10cc/remoting-3160.vd76b_9ddd10cc.jar\" \"/usr/share/jenkins/agent.jar\" \nADD \"https://github.com/jenkinsci/docker-inbound-agent/raw/3160.vd76b_9ddd10cc-3/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",
@@ -128,9 +132,11 @@
             "basic-ubuntu": {
                "agentWorkdir": "/home/jenkins/jenkins-agent",
                "docker": {
-                  "aliases": [ ],
+                  "aliases": [
+                     "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 [ \"uid_entrypoint\", \"/usr/local/bin/jenkins-agent\" ]\n\nADD \"https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3160.vd76b_9ddd10cc/remoting-3160.vd76b_9ddd10cc.jar\" \"/usr/share/jenkins/agent.jar\" \nADD \"https://github.com/jenkinsci/docker-inbound-agent/raw/3160.vd76b_9ddd10cc-3/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/3160.vd76b_9ddd10cc/remoting-3160.vd76b_9ddd10cc.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-inbound-agent/raw/3160.vd76b_9ddd10cc-3/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-ubuntu",
                   "registry": "docker.io",
                   "repository": "eclipsecbi",
@@ -234,10 +240,15 @@
                "agentWorkdir": "/home/jenkins/jenkins-agent",
                "docker": {
                   "aliases": [
+                     "docker.io/eclipsecbi/jiro-agent-centos-7:latest",
                      "docker.io/eclipsecbijenkins/jipp-migration-agent:3160.vd76b_9ddd10cc",
                      "docker.io/eclipsecbijenkins/migration-fat-agent:3160.vd76b_9ddd10cc",
                      "docker.io/eclipsecbijenkins/ui-test-agent:3160.vd76b_9ddd10cc",
-                     "docker.io/eclipsecbijenkins/ui-tests-agent:3160.vd76b_9ddd10cc"
+                     "docker.io/eclipsecbijenkins/ui-tests-agent:3160.vd76b_9ddd10cc",
+                     "docker.io/eclipsecbijenkins/jipp-migration-agent:latest",
+                     "docker.io/eclipsecbijenkins/migration-fat-agent:latest",
+                     "docker.io/eclipsecbijenkins/ui-test-agent:latest",
+                     "docker.io/eclipsecbijenkins/ui-tests-agent:latest"
                   ],
                   "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 [ \"uid_entrypoint\", \"/usr/local/bin/jenkins-agent\" ]\n\nADD \"https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3160.vd76b_9ddd10cc/remoting-3160.vd76b_9ddd10cc.jar\" \"/usr/share/jenkins/agent.jar\" \nADD \"https://github.com/jenkinsci/docker-inbound-agent/raw/3160.vd76b_9ddd10cc-3/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",
@@ -345,7 +356,9 @@
             "centos-8": {
                "agentWorkdir": "/home/jenkins/jenkins-agent",
                "docker": {
-                  "aliases": [ ],
+                  "aliases": [
+                     "docker.io/eclipsecbi/jiro-agent-centos-8:latest"
+                  ],
                   "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 [ \"uid_entrypoint\", \"/usr/local/bin/jenkins-agent\" ]\n\nADD \"https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3160.vd76b_9ddd10cc/remoting-3160.vd76b_9ddd10cc.jar\" \"/usr/share/jenkins/agent.jar\" \nADD \"https://github.com/jenkinsci/docker-inbound-agent/raw/3160.vd76b_9ddd10cc-3/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",
@@ -562,7 +575,8 @@
          "github-checks",
          "git-forensics",
          "job-dsl",
-         "pipeline-graph-view"
+         "pipeline-graph-view",
+         "pipeline-utility-steps"
       ],
       "pluginsForceUpgrade": true,
       "staticAgentCount": 10,

diff --git a/instances/eclipse.platform.releng/target/jenkins/plugins-list.txt b/instances/eclipse.platform.releng/target/jenkins/plugins-list.txt
@@ -5,3 +5,4 @@ github-checks
 job-dsl
 mail-watcher-plugin
 pipeline-graph-view
+pipeline-utility-steps
diff --git a/instances/eclipse.platform.releng/target/jenkins/plugins.log b/instances/eclipse.platform.releng/target/jenkins/plugins.log
@@ -1,14 +1,14 @@
 Resulting plugin list:
-analysis-model-api 11.14.0
+analysis-model-api 11.13.0
 ant 497.v94e7d9fffa_b_9
 antisamy-markup-formatter 162.v0e6ec0fcfcf6
 apache-httpcomponents-client-4-api 4.5.14-208.v438351942757
 authentication-tokens 1.53.v1c90fd9191a_b_
 authorize-project 1.7.1
 bootstrap5-api 5.3.2-3
 bouncycastle-api 2.30.1.77-225.v26ea_c9455fd9
-branch-api 2.1135.v8de8e7899051
-build-timeout 1.32
+branch-api 2.1144.v1425d1c3d5a_7
+build-timeout 1.31
 caffeine-api 3.1.8-133.v17b_1ff2e0599
 checks-api 2.0.2
 cloudbees-folder 6.858.v898218f3609d
@@ -21,9 +21,9 @@ credentials 1311.vcf0a_900b_37c2
 credentials-binding 642.v737c34dea_6c2
 data-tables-api 1.13.8-2
 display-url-api 2.200.vb_9327d658781
-durable-task 523.va_a_22cf15d5e0
+durable-task 543.v262f6a_803410
 echarts-api 5.4.3-2
-email-ext 2.103
+email-ext 2.102
 extended-read-permission 53.v6499940139e5
 external-monitor-job 215.v2e88e894db_f8
 extra-columns 1.26
@@ -41,8 +41,8 @@ github-branch-source 1767.va_7d01ea_c7256
 github-checks 554.vb_ee03a_000f65
 gitlab-api 5.3.0-91.v1f9a_fda_d654f
 gitlab-branch-source 684.vea_fa_7c1e2fe3
-gitlab-plugin 1.8.0
-gson-api 2.10.1-3.vb_25b_599b_e4f8
+gitlab-plugin 1.7.16
+gson-api 2.10.1-15.v0d99f670e0a_7
 handy-uri-templates-2-api 2.1.8-30.v7e777411b_148
 instance-identity 185.v303dc7c645f9
 ionicons-api 56.v1b_1c8c49374e
@@ -63,7 +63,7 @@ jsch 0.2.16-86.v42e010d9484b_
 json-api 20231013-3.v20f3c247f2fe
 json-path-api 2.8.0-21.v8b_7dc8b_1037b_
 junit 1252.vfc2e5efa_294f
-kubernetes 4174.v4230d0ccd951
+kubernetes 4151.v6fa_f0fb_0b_4c9
 kubernetes-client-api 6.8.1-224.vd388fca_4db_3b_
 kubernetes-credentials 0.11
 ldap 711.vb_d1a_491714dc
@@ -83,8 +83,8 @@ pipeline-graph-analysis 202.va_d268e64deb_3
 pipeline-graph-view 205.vb_8e3a_b_51f12e
 pipeline-groovy-lib 689.veec561a_dee13
 pipeline-input-step 477.v339683a_8d55e
-pipeline-maven 1368.vfb_8509d7b_869
-pipeline-maven-api 1368.vfb_8509d7b_869
+pipeline-maven 1362.vee39a_d4b_02b_1
+pipeline-maven-api 1362.vee39a_d4b_02b_1
 pipeline-milestone-step 111.v449306f708b_7
 pipeline-model-api 2.2168.vf921b_4e72c73
 pipeline-model-definition 2.2168.vf921b_4e72c73
@@ -93,6 +93,7 @@ pipeline-rest-api 2.34
 pipeline-stage-step 305.ve96d0205c1c6
 pipeline-stage-tags-metadata 2.2168.vf921b_4e72c73
 pipeline-stage-view 2.34
+pipeline-utility-steps 2.16.0
 plain-credentials 143.v1b_df8b_d3b_e48
 plugin-util-api 3.8.0
 prism-api 1.29.0-10
@@ -112,14 +113,14 @@ timestamper 1.26
 token-macro 400.v35420b_922dcb_
 trilead-api 2.133.vfb_8a_7b_9c5dd1
 variant 60.v7290fc0eb_b_cd
-warnings-ng 10.5.3
+warnings-ng 10.5.2
 workflow-aggregator 596.v8c21c963d92d
 workflow-api 1283.v99c10937efcb_
 workflow-basic-steps 1042.ve7b_140c4a_e0c
 workflow-cps 3832.vc43e04d6d68c
 workflow-durable-task-step 1313.vcb_970b_d2a_fb_3
 workflow-job 1385.vb_58b_86ea_fff1
-workflow-multibranch 756.v891d88f2cd46
+workflow-multibranch 770.v1a_d0708dd1f6
 workflow-scm-step 415.v434365564324
 workflow-step-api 639.v6eca_cd8c04a_a_
 workflow-support 865.v43e78cc44e0d