ansible: use non-deprecated way to connect Jenkins agents

Closes: nodejs#3640 Refs: https://www.jenkins.io/doc/upgrade-guide/2.440/
richardlau · Mar 18, 2024 · 24e1beb · 24e1beb
1 parent 204bd32
commit 24e1beb
Show file tree

Hide file tree

Showing 25 changed files with 42 additions and 25 deletions.
diff --git a/ansible/aix61-standalone/resources/S20jenkins b/ansible/aix61-standalone/resources/S20jenkins
@@ -20,7 +20,7 @@ start )
               export SSL_CERT_FILE="$HOME/ca-bundle.crt"; \
         java -Xmx128m -Dorg.jenkinsci.plugins.gitclient.Git.timeOut=30 -jar "$HOME/agent.jar" \
           -secret {{secret}} \
-          -jnlpUrl https://ci.nodejs.org/computer/{{id}}/jenkins-agent.jnlp >$jenkins_log_file 2>&1 &'
+          -url https://ci.nodejs.org -name {{id}} >$jenkins_log_file 2>&1 &'
         ;;
 stop )
         ;;

diff --git a/ansible/roles/docker/templates/alpine315.Dockerfile.j2 b/ansible/roles/docker/templates/alpine315.Dockerfile.j2
@@ -58,5 +58,6 @@ CMD cd /home/iojs \
   && curl https://ci.nodejs.org/jnlpJars/agent.jar -O \
   && java -Xmx{{ server_ram|default('128m') }} \
           -jar /home/{{ server_user }}/agent.jar \
-          -jnlpUrl {{ jenkins_url }}/computer/{{ item.name }}/jenkins-agent.jnlp \
+          -url {{ jenkins_url }} \
+          -name {{ item.name }} \
           -secret {{ item.secret }}
diff --git a/ansible/roles/docker/templates/alpine318.Dockerfile.j2 b/ansible/roles/docker/templates/alpine318.Dockerfile.j2
@@ -58,5 +58,6 @@ CMD cd /home/iojs \
   && curl https://ci.nodejs.org/jnlpJars/agent.jar -O \
   && java -Xmx{{ server_ram|default('128m') }} \
           -jar /home/{{ server_user }}/agent.jar \
-          -jnlpUrl {{ jenkins_url }}/computer/{{ item.name }}/jenkins-agent.jnlp \
+          -url {{ jenkins_url }} \
+          -name {{ item.name }} \
           -secret {{ item.secret }}
diff --git a/ansible/roles/docker/templates/centos7.Dockerfile.j2 b/ansible/roles/docker/templates/centos7.Dockerfile.j2
@@ -53,5 +53,6 @@ CMD cd /home/iojs \
   && curl https://ci.nodejs.org/jnlpJars/agent.jar -O \
   && java -Xmx{{ server_ram|default('128m') }} \
           -jar /home/{{ server_user }}/agent.jar \
-          -jnlpUrl {{ jenkins_url }}/computer/{{ item.name }}/jenkins-agent.jnlp \
+          -url {{ jenkins_url }} \
+          -name {{ item.name }} \
           -secret {{ item.secret }}
diff --git a/ansible/roles/docker/templates/debian11_armv7l.Dockerfile.j2 b/ansible/roles/docker/templates/debian11_armv7l.Dockerfile.j2
@@ -45,5 +45,6 @@ CMD cd /home/iojs \
   && curl https://ci.nodejs.org/jnlpJars/agent.jar -O \
   && java -Xmx{{ server_ram|default('128m') }} \
           -jar /home/{{ server_user }}/agent.jar \
-          -jnlpUrl {{ jenkins_url }}/computer/{{ item.name }}/jenkins-agent.jnlp \
+          -url {{ jenkins_url }} \
+          -name {{ item.name }} \
           -secret {{ item.secret }}
diff --git a/ansible/roles/docker/templates/rhel8.Dockerfile.j2 b/ansible/roles/docker/templates/rhel8.Dockerfile.j2
@@ -58,5 +58,6 @@ CMD cd /home/{{ server_user }} \
   && curl https://ci.nodejs.org/jnlpJars/agent.jar -O \
   && java -Xmx{{ server_ram|default('128m') }} \
           -jar /home/{{ server_user }}/agent.jar \
-          -jnlpUrl {{ jenkins_url }}/computer/{{ item.name }}/jenkins-agent.jnlp \
+          -url {{ jenkins_url }} \
+          -name {{ item.name }} \
           -secret {{ item.secret }}
diff --git a/ansible/roles/docker/templates/rhel8_arm_cross.Dockerfile.j2 b/ansible/roles/docker/templates/rhel8_arm_cross.Dockerfile.j2
@@ -69,5 +69,6 @@ CMD cd /home/{{ server_user }} \
   && curl https://ci.nodejs.org/jnlpJars/agent.jar -O \
   && java -Xmx{{ server_ram|default('128m') }} \
           -jar /home/{{ server_user }}/agent.jar \
-          -jnlpUrl {{ jenkins_url }}/computer/{{ item.name }}/jenkins-agent.jnlp \
+          -url {{ jenkins_url }} \
+          -name {{ item.name }} \
           -secret {{ item.secret }}
diff --git a/ansible/roles/docker/templates/ubi81.Dockerfile.j2 b/ansible/roles/docker/templates/ubi81.Dockerfile.j2
@@ -54,5 +54,6 @@ CMD cd /home/iojs \
   && curl https://ci.nodejs.org/jnlpJars/agent.jar -O \
   && java -Xmx{{ server_ram|default('128m') }} \
           -jar /home/{{ server_user }}/agent.jar \
-          -jnlpUrl {{ jenkins_url }}/computer/{{ item.name }}/jenkins-agent.jnlp \
+          -url {{ jenkins_url }} \
+          -name {{ item.name }} \
           -secret {{ item.secret }}
diff --git a/ansible/roles/docker/templates/ubuntu1604.Dockerfile.j2 b/ansible/roles/docker/templates/ubuntu1604.Dockerfile.j2
@@ -39,5 +39,6 @@ CMD cd /home/iojs \
   && curl https://ci.nodejs.org/jnlpJars/agent.jar -O \
   && java -Xmx{{ server_ram|default('128m') }} \
           -jar /home/{{ server_user }}/agent.jar \
-          -jnlpUrl {{ jenkins_url }}/computer/{{ item.name }}/jenkins-agent.jnlp \
+          -url {{ jenkins_url }} \
+          -name {{ item.name }} \
           -secret {{ item.secret }}
diff --git a/ansible/roles/docker/templates/ubuntu1604_arm_cross.Dockerfile.j2 b/ansible/roles/docker/templates/ubuntu1604_arm_cross.Dockerfile.j2
@@ -56,5 +56,6 @@ CMD cd /home/{{ server_user }} \
   && curl https://ci.nodejs.org/jnlpJars/agent.jar -O \
   && java -Xmx{{ server_ram|default('128m') }} \
           -jar /home/{{ server_user }}/agent.jar \
-          -jnlpUrl {{ jenkins_url }}/computer/{{ item.name }}/jenkins-agent.jnlp \
+          -url {{ jenkins_url }} \
+          -name {{ item.name }} \
           -secret {{ item.secret }}
diff --git a/ansible/roles/docker/templates/ubuntu1804.Dockerfile.j2 b/ansible/roles/docker/templates/ubuntu1804.Dockerfile.j2
@@ -51,5 +51,6 @@ CMD cd /home/iojs \
   && curl https://ci.nodejs.org/jnlpJars/agent.jar -O \
   && java -Xmx{{ server_ram|default('128m') }} \
           -jar /home/{{ server_user }}/agent.jar \
-          -jnlpUrl {{ jenkins_url }}/computer/{{ item.name }}/jenkins-agent.jnlp \
+          -url {{ jenkins_url }} \
+          -name {{ item.name }} \
           -secret {{ item.secret }}
diff --git a/ansible/roles/docker/templates/ubuntu1804_arm_cross.Dockerfile.j2 b/ansible/roles/docker/templates/ubuntu1804_arm_cross.Dockerfile.j2
@@ -65,5 +65,6 @@ CMD cd /home/{{ server_user }} \
   && curl https://ci.nodejs.org/jnlpJars/agent.jar -O \
   && java -Xmx{{ server_ram|default('128m') }} \
           -jar /home/{{ server_user }}/agent.jar \
-          -jnlpUrl {{ jenkins_url }}/computer/{{ item.name }}/jenkins-agent.jnlp \
+          -url {{ jenkins_url }} \
+          -name {{ item.name }} \
           -secret {{ item.secret }}
diff --git a/ansible/roles/docker/templates/ubuntu1804_sharedlibs.Dockerfile.j2 b/ansible/roles/docker/templates/ubuntu1804_sharedlibs.Dockerfile.j2
@@ -111,5 +111,6 @@ CMD cd /home/iojs \
   && curl https://ci.nodejs.org/jnlpJars/agent.jar -O \
   && java -Xmx{{ server_ram|default('128m') }} \
           -jar /home/{{ server_user }}/agent.jar \
-          -jnlpUrl {{ jenkins_url }}/computer/{{ item.name }}/jenkins-agent.jnlp \
+          -url {{ jenkins_url }} \
+          -name {{ item.name }} \
           -secret {{ item.secret }}
diff --git a/ansible/roles/docker/templates/ubuntu2004.Dockerfile.j2 b/ansible/roles/docker/templates/ubuntu2004.Dockerfile.j2
@@ -45,5 +45,6 @@ CMD cd /home/iojs \
   && curl https://ci.nodejs.org/jnlpJars/agent.jar -O \
   && java -Xmx{{ server_ram|default('128m') }} \
           -jar /home/{{ server_user }}/agent.jar \
-          -jnlpUrl {{ jenkins_url }}/computer/{{ item.name }}/jenkins-agent.jnlp \
+          -url {{ jenkins_url }} \
+          -name {{ item.name }} \
           -secret {{ item.secret }}
diff --git a/ansible/roles/docker/templates/ubuntu2004_armv7l.Dockerfile.j2 b/ansible/roles/docker/templates/ubuntu2004_armv7l.Dockerfile.j2
@@ -42,5 +42,6 @@ CMD cd /home/iojs \
   && curl https://ci.nodejs.org/jnlpJars/agent.jar -O \
   && java -Xmx{{ server_ram|default('128m') }} \
           -jar /home/{{ server_user }}/agent.jar \
-          -jnlpUrl {{ jenkins_url }}/computer/{{ item.name }}/jenkins-agent.jnlp \
+          -url {{ jenkins_url }} \
+          -name {{ item.name }} \
           -secret {{ item.secret }}
diff --git a/ansible/roles/docker/templates/ubuntu2004_sharedlibs.Dockerfile.j2 b/ansible/roles/docker/templates/ubuntu2004_sharedlibs.Dockerfile.j2
@@ -106,5 +106,6 @@ CMD cd /home/iojs \
   && curl https://ci.nodejs.org/jnlpJars/agent.jar -O \
   && java -Xmx{{ server_ram|default('128m') }} \
           -jar /home/{{ server_user }}/agent.jar \
-          -jnlpUrl {{ jenkins_url }}/computer/{{ item.name }}/jenkins-agent.jnlp \
+          -url {{ jenkins_url }} \
+          -name {{ item.name }} \
           -secret {{ item.secret }}
diff --git a/ansible/roles/docker/templates/ubuntu2204_sharedlibs.Dockerfile.j2 b/ansible/roles/docker/templates/ubuntu2204_sharedlibs.Dockerfile.j2
@@ -133,5 +133,6 @@ CMD cd /home/iojs \
   && curl https://ci.nodejs.org/jnlpJars/agent.jar -O \
   && java -Xmx{{ server_ram|default('128m') }} \
           -jar /home/{{ server_user }}/agent.jar \
-          -jnlpUrl {{ jenkins_url }}/computer/{{ item.name }}/jenkins-agent.jnlp \
+          -url {{ jenkins_url }} \
+          -name {{ item.name }} \
           -secret {{ item.secret }}
diff --git a/ansible/roles/jenkins-worker-windows/templates/jenkins.bat b/ansible/roles/jenkins-worker-windows/templates/jenkins.bat
@@ -7,6 +7,6 @@ C:
 cd \
 :start
 curl -L {{ jenkins_agent_jar }} -o {{ agent_path }}
-java -Dhudson.remoting.Launcher.pingIntervalSec=10 -jar {{ agent_path }} -jnlpUrl {{ jenkins_url }}/computer/{{ inventory_hostname }}/jenkins-agent.jnlp -secret {{ secret }}
+java -Dhudson.remoting.Launcher.pingIntervalSec=10 -jar {{ agent_path }} -url {{ jenkins_url }} -name {{ inventory_hostname }} -secret {{ secret }}
 echo Restarting Jenkins...
 goto start
diff --git a/ansible/roles/jenkins-worker/templates/aix.rc2.j2 b/ansible/roles/jenkins-worker/templates/aix.rc2.j2
@@ -22,7 +22,7 @@ start )
               export JOBS={{ jobs_env }}; \
         /usr/bin/java -Xmx128m -Dorg.jenkinsci.plugins.gitclient.Git.timeOut=30 -jar "$HOME/agent.jar" \
           -secret {{secret}} \
-          -jnlpUrl {{jenkins_url}}/computer/{{inventory_hostname}}/jenkins-agent.jnlp >$jenkins_log_file 2>&1 &'
+          -url {{jenkins_url}} -name {{inventory_hostname}} >$jenkins_log_file 2>&1 &'
         ;;
 stop )
         ;;

diff --git a/ansible/roles/jenkins-worker/templates/freebsd.initd.j2 b/ansible/roles/jenkins-worker/templates/freebsd.initd.j2
@@ -34,7 +34,7 @@ jenkins_env=" \
 jenkins_jar="/home/{{ server_user }}/agent.jar"
 jenkins_log_file="/home/{{ server_user }}/${name}_console.log"
 jenkins_args="-Xmx{{ server_ram|default('128m') }} -jar ${jenkins_jar} \
-  -jnlpUrl {{ jenkins_url }}/computer/{{ inventory_hostname }}/jenkins-agent.jnlp \
+  -url {{ jenkins_url }} -name {{ inventory_hostname }} \
   -secret {{ secret }}"
 jenkins_user="{{ server_user }}"
 jenkins_group="{{ server_user }}"

diff --git a/ansible/roles/jenkins-worker/templates/ibmi_start.j2 b/ansible/roles/jenkins-worker/templates/ibmi_start.j2
@@ -40,6 +40,6 @@ echo "done"
 
 ########################### Now start our agent
 
-export START_CMD="{{ java_path[os] }} -Xmx{{ server_ram|default('128m') }} -Dos400.stdio.convert=N -Djava.net.preferIPv4Stack=true -jar {{ home }}/{{ server_user }}/agent.jar -secret {{ secret }} -jnlpUrl {{ jenkins_url }}/computer/{{ inventory_hostname }}/jenkins-agent.jnlp >{{ home }}/{{ server_user }}/jenkins.log 2>&1 "
+export START_CMD="{{ java_path[os] }} -Xmx{{ server_ram|default('128m') }} -Dos400.stdio.convert=N -Djava.net.preferIPv4Stack=true -jar {{ home }}/{{ server_user }}/agent.jar -secret {{ secret }} -url {{ jenkins_url }} -name {{ inventory_hostname }} >{{ home }}/{{ server_user }}/jenkins.log 2>&1 "
 echo $START_CMD
 exec /QOpenSys/usr/bin/system -v -kpiveO "SBMJOB CMD(QSH CMD('echo starting Jenkins agent && cd $HOME && env && touch $HOME/jenkins.log && setccsid 1208 $HOME/jenkins.log && exec $START_CMD')) CPYENVVAR(*YES) PRTDEV(*USRPRF) ALWMLTTHD(*YES) $SBMJOB_OPTS"
diff --git a/ansible/roles/jenkins-worker/templates/jenkins_manifest.xml.j2 b/ansible/roles/jenkins-worker/templates/jenkins_manifest.xml.j2
@@ -28,7 +28,7 @@
 
       <exec_method type='method'
                    name='start'
-                   exec='{{ java_path[os] }} -Dsun.security.pkcs11.enable-solaris=false -Xmx{{ server_ram|default('128m') }} -jar /home/{{ server_user }}/agent.jar -jnlpUrl {{ jenkins_url }}/computer/{{ inventory_hostname }}/jenkins-agent.jnlp -secret {{ secret }}'
+                   exec='{{ java_path[os] }} -Dsun.security.pkcs11.enable-solaris=false -Xmx{{ server_ram|default('128m') }} -jar /home/{{ server_user }}/agent.jar -url {{ jenkins_url }} -name {{ inventory_hostname }} -secret {{ secret }}'
                    timeout_seconds='30' />
 
       <exec_method type="method"

diff --git a/ansible/roles/jenkins-worker/templates/start.j2 b/ansible/roles/jenkins-worker/templates/start.j2
@@ -11,4 +11,4 @@ export PATH="/usr/local/opt/python3/Frameworks/Python.framework/Versions/Current
 export PATH="$(brew --prefix)/opt/ccache/libexec:$PATH"
 {{ java_path[os] }} -Xmx{{ server_ram|default('128m') }} \
     -jar {{ home }}/{{ server_user }}/agent.jar -secret {{ secret }} \
-    -jnlpUrl {{ jenkins_url }}/computer/{{ inventory_hostname }}/jenkins-agent.jnlp
+    -url {{ jenkins_url }} -name {{ inventory_hostname }}
diff --git a/ansible/roles/jenkins-worker/templates/systemd.service.j2 b/ansible/roles/jenkins-worker/templates/systemd.service.j2
@@ -27,5 +27,6 @@ Environment="ARCH={{ arch }}"
 
 ExecStart=/usr/bin/java -Xmx{{ server_ram|default('128m') }} \
           -jar /home/{{ server_user }}/agent.jar \
-          -jnlpUrl {{ jenkins_url }}/computer/{{ inventory_hostname }}/jenkins-agent.jnlp \
+          -url {{ jenkins_url }} \
+          -name {{ inventory_hostname }} \
           -secret {{ secret }}
diff --git a/ansible/roles/jenkins-worker/templates/zos_start.j2 b/ansible/roles/jenkins-worker/templates/zos_start.j2
@@ -25,5 +25,5 @@ export LDFLAGS="-q64"
 
 {{ java_path[os] }} -Dfile.encoding=ISO8859_1 -Xmx{{ server_ram|default('128m') }} \
     -jar {{ home }}/{{ server_user }}/agent.jar -secret {{ secret }} \
-    -jnlpUrl {{ jenkins_url }}/computer/{{ inventory_hostname }}/jenkins-agent.jnlp >{{ home }}/{{ server_user }}/jenkins.log 2>&1  &
+    -url {{ jenkins_url }} -name {{ inventory_hostname }} >{{ home }}/{{ server_user }}/jenkins.log 2>&1  &
 EOF