ansible: fix jnlp URL (#3304)

nodejs · Apr 12, 2023 · 48c3642 · 48c3642
1 parent 515fa71
commit 48c3642
Show file tree

Hide file tree

Showing 26 changed files with 26 additions and 26 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/slave.jar" \
           -secret {{secret}} \
-          -jnlpUrl https://ci.nodejs.org/computer/{{id}}/agent.jnlp >$jenkins_log_file 2>&1 &'
+          -jnlpUrl https://ci.nodejs.org/computer/{{id}}/jenkins-agent.jnlp >$jenkins_log_file 2>&1 &'
         ;;
 stop )
         ;;

diff --git a/ansible/roles/docker/templates/alpine311.Dockerfile.j2 b/ansible/roles/docker/templates/alpine311.Dockerfile.j2
@@ -58,5 +58,5 @@ 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 }}/agent.jnlp \
+          -jnlpUrl {{ jenkins_url }}/computer/{{ item.name }}/jenkins-agent.jnlp \
           -secret {{ item.secret }}
diff --git a/ansible/roles/docker/templates/alpine312.Dockerfile.j2 b/ansible/roles/docker/templates/alpine312.Dockerfile.j2
@@ -58,5 +58,5 @@ 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 }}/agent.jnlp \
+          -jnlpUrl {{ jenkins_url }}/computer/{{ item.name }}/jenkins-agent.jnlp \
           -secret {{ item.secret }}
diff --git a/ansible/roles/docker/templates/centos7.Dockerfile.j2 b/ansible/roles/docker/templates/centos7.Dockerfile.j2
@@ -52,5 +52,5 @@ 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 }}/agent.jnlp \
+          -jnlpUrl {{ jenkins_url }}/computer/{{ item.name }}/jenkins-agent.jnlp \
           -secret {{ item.secret }}
diff --git a/ansible/roles/docker/templates/debian10_armv7l.Dockerfile.j2 b/ansible/roles/docker/templates/debian10_armv7l.Dockerfile.j2
@@ -45,5 +45,5 @@ 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 }}/agent.jnlp \
+          -jnlpUrl {{ jenkins_url }}/computer/{{ item.name }}/jenkins-agent.jnlp \
           -secret {{ item.secret }}
diff --git a/ansible/roles/docker/templates/rhel8.Dockerfile.j2 b/ansible/roles/docker/templates/rhel8.Dockerfile.j2
@@ -57,5 +57,5 @@ 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 }}/agent.jnlp \
+          -jnlpUrl {{ jenkins_url }}/computer/{{ item.name }}/jenkins-agent.jnlp \
           -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
@@ -68,5 +68,5 @@ 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 }}/agent.jnlp \
+          -jnlpUrl {{ jenkins_url }}/computer/{{ item.name }}/jenkins-agent.jnlp \
           -secret {{ item.secret }}
diff --git a/ansible/roles/docker/templates/ubi81.Dockerfile.j2 b/ansible/roles/docker/templates/ubi81.Dockerfile.j2
@@ -47,5 +47,5 @@ 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 }}/agent.jnlp \
+          -jnlpUrl {{ jenkins_url }}/computer/{{ item.name }}/jenkins-agent.jnlp \
           -secret {{ item.secret }}
diff --git a/ansible/roles/docker/templates/ubuntu1604.Dockerfile.j2 b/ansible/roles/docker/templates/ubuntu1604.Dockerfile.j2
@@ -39,5 +39,5 @@ 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 }}/agent.jnlp \
+          -jnlpUrl {{ jenkins_url }}/computer/{{ item.name }}/jenkins-agent.jnlp \
           -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,5 @@ 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 }}/agent.jnlp \
+          -jnlpUrl {{ jenkins_url }}/computer/{{ item.name }}/jenkins-agent.jnlp \
           -secret {{ item.secret }}
diff --git a/ansible/roles/docker/templates/ubuntu1804.Dockerfile.j2 b/ansible/roles/docker/templates/ubuntu1804.Dockerfile.j2
@@ -51,5 +51,5 @@ 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 }}/agent.jnlp \
+          -jnlpUrl {{ jenkins_url }}/computer/{{ item.name }}/jenkins-agent.jnlp \
           -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,5 @@ 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 }}/agent.jnlp \
+          -jnlpUrl {{ jenkins_url }}/computer/{{ item.name }}/jenkins-agent.jnlp \
           -secret {{ item.secret }}
diff --git a/ansible/roles/docker/templates/ubuntu1804_sharedlibs.Dockerfile.j2 b/ansible/roles/docker/templates/ubuntu1804_sharedlibs.Dockerfile.j2
@@ -110,5 +110,5 @@ 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 }}/agent.jnlp \
+          -jnlpUrl {{ jenkins_url }}/computer/{{ item.name }}/jenkins-agent.jnlp \
           -secret {{ item.secret }}
diff --git a/ansible/roles/docker/templates/ubuntu2004.Dockerfile.j2 b/ansible/roles/docker/templates/ubuntu2004.Dockerfile.j2
@@ -43,5 +43,5 @@ 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 }}/agent.jnlp \
+          -jnlpUrl {{ jenkins_url }}/computer/{{ item.name }}/jenkins-agent.jnlp \
           -secret {{ item.secret }}
diff --git a/ansible/roles/docker/templates/ubuntu2004_armv7l.Dockerfile.j2 b/ansible/roles/docker/templates/ubuntu2004_armv7l.Dockerfile.j2
@@ -40,5 +40,5 @@ 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 }}/agent.jnlp \
+          -jnlpUrl {{ jenkins_url }}/computer/{{ item.name }}/jenkins-agent.jnlp \
           -secret {{ item.secret }}
diff --git a/ansible/roles/docker/templates/ubuntu2004_sharedlibs.Dockerfile.j2 b/ansible/roles/docker/templates/ubuntu2004_sharedlibs.Dockerfile.j2
@@ -103,5 +103,5 @@ 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 }}/agent.jnlp \
+          -jnlpUrl {{ jenkins_url }}/computer/{{ item.name }}/jenkins-agent.jnlp \
           -secret {{ item.secret }}
diff --git a/ansible/roles/jenkins-worker-windows/templates/jenkins.bat b/ansible/roles/jenkins-worker-windows/templates/jenkins.bat
@@ -2,6 +2,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 }}/agent.jnlp -secret {{ secret }}
+java -Dhudson.remoting.Launcher.pingIntervalSec=10 -jar {{ agent_path }} -jnlpUrl {{ jenkins_url }}/computer/{{ inventory_hostname }}/jenkins-agent.jnlp -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/slave.jar" \
           -secret {{secret}} \
-          -jnlpUrl {{jenkins_url}}/computer/{{inventory_hostname}}/agent.jnlp >$jenkins_log_file 2>&1 &'
+          -jnlpUrl {{jenkins_url}}/computer/{{inventory_hostname}}/jenkins-agent.jnlp >$jenkins_log_file 2>&1 &'
         ;;
 stop )
         ;;

diff --git a/ansible/roles/jenkins-worker/templates/centos6.sysconfig.j2 b/ansible/roles/jenkins-worker/templates/centos6.sysconfig.j2
@@ -2,7 +2,7 @@ JENKINS_SLAVE_USER="iojs"
 JENKINS_SLAVE_JAR="/home/iojs/slave.jar"
 JENKINS_SLAVE_LOG="/home/iojs/$NAME.log"
 JENKINS_SECRET="{{ secret }}"
-JENKINS_SLAVE_ARGS="-jnlpUrl {{ jenkins_url }}/computer/{{ ansible_hostname }}/agent.jnlp -secret $JENKINS_SECRET"
+JENKINS_SLAVE_ARGS="-jnlpUrl {{ jenkins_url }}/computer/{{ ansible_hostname }}/jenkins-agent.jnlp -secret $JENKINS_SECRET"
 JENKINS_PATH=""
 JENKINS_ENV="JOBS={{ jobs_env }} \
   HOME=/home/{{ server_user }} \

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 }}/slave.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 }}/agent.jnlp \
+  -jnlpUrl {{ jenkins_url }}/computer/{{ inventory_hostname }}/jenkins-agent.jnlp \
   -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 }}/slave.jar -secret {{ secret }} -jnlpUrl {{ jenkins_url }}/computer/{{ inventory_hostname }}/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 }}/slave.jar -secret {{ secret }} -jnlpUrl {{ jenkins_url }}/computer/{{ inventory_hostname }}/jenkins-agent.jnlp >{{ 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 }}/slave.jar -jnlpUrl {{ jenkins_url }}/computer/{{ inventory_hostname }}/agent.jnlp -secret {{ secret }}'
+                   exec='{{ java_path[os] }} -Dsun.security.pkcs11.enable-solaris=false -Xmx{{ server_ram|default('128m') }} -jar /home/{{ server_user }}/slave.jar -jnlpUrl {{ jenkins_url }}/computer/{{ inventory_hostname }}/jenkins-agent.jnlp -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 }}/slave.jar -secret {{ secret }} \
-    -jnlpUrl {{ jenkins_url }}/computer/{{ inventory_hostname }}/agent.jnlp
+    -jnlpUrl {{ jenkins_url }}/computer/{{ inventory_hostname }}/jenkins-agent.jnlp
diff --git a/ansible/roles/jenkins-worker/templates/systemd.service.j2 b/ansible/roles/jenkins-worker/templates/systemd.service.j2
@@ -27,5 +27,5 @@ Environment="ARCH={{ arch }}"
 
 ExecStart=/usr/bin/java -Xmx{{ server_ram|default('128m') }} \
           -jar /home/{{ server_user }}/slave.jar \
-          -jnlpUrl {{ jenkins_url }}/computer/{{ inventory_hostname }}/agent.jnlp \
+          -jnlpUrl {{ jenkins_url }}/computer/{{ inventory_hostname }}/jenkins-agent.jnlp \
           -secret {{ secret }}
diff --git a/ansible/roles/jenkins-worker/templates/upstart.j2 b/ansible/roles/jenkins-worker/templates/upstart.j2
@@ -30,5 +30,5 @@ script
 
   exec java -Xmx{{ server_ram|default('128m') }} \
         -jar /home/{{ server_user }}/slave.jar -secret {{ secret }} \
-        -jnlpUrl {{ jenkins_url }}/computer/{{ inventory_hostname }}/agent.jnlp
+        -jnlpUrl {{ jenkins_url }}/computer/{{ inventory_hostname }}/jenkins-agent.jnlp
 end script
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 }}/slave.jar -secret {{ secret }} \
-    -jnlpUrl {{ jenkins_url }}/computer/{{ inventory_hostname }}/agent.jnlp >{{ home }}/{{ server_user }}/jenkins.log 2>&1  &
+    -jnlpUrl {{ jenkins_url }}/computer/{{ inventory_hostname }}/jenkins-agent.jnlp >{{ home }}/{{ server_user }}/jenkins.log 2>&1  &
 EOF