Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use non-deprecated agent URL arguments #3250

Open
basil opened this issue Jan 10, 2024 · 0 comments
Open

Use non-deprecated agent URL arguments #3250

basil opened this issue Jan 10, 2024 · 0 comments

Comments

@basil
Copy link
Contributor

basil commented Jan 10, 2024

While searching the jenkins-infra organization for references to the deprecated -jnlpUrl option I found a few in this repository. I think this is what needs to be done to migrate, but I have no way of testing this change so I have not created a PR:

diff --git a/dist/profile/templates/jenkinscontroller/casc/clouds.yaml.erb b/dist/profile/templates/jenkinscontroller/casc/clouds.yaml.erb
index 77f2de9a..1d4403e6 100644
--- a/dist/profile/templates/jenkinscontroller/casc/clouds.yaml.erb
+++ b/dist/profile/templates/jenkinscontroller/casc/clouds.yaml.erb
@@ -41,7 +41,7 @@ jenkins:
           # Prepare config
           Write-Output 'Executing agent process...'
           $configExec = '<%= agent['agentJavaBin'] ? agent['agentJavaBin'] : @jcasc['agents_setup'][agent['os'].to_s]['agentJavaBin'] %>'
-          $configArgs = '-jnlpUrl "{0}/computer/{1}/jenkins-agent.jnlp" -workDir {2}' -f $jenkinsserverurl, $agentName, $jenkinsWorkDir
+          $configArgs = '-url {0} -name {1} -workDir {2}' -f $jenkinsserverurl, $agentName, $jenkinsWorkDir
           if ($agentSecret) {
               $configArgs += " -secret `"$agentSecret`""
           }
@@ -85,7 +85,6 @@ jenkins:
             export AGENT_WORKDIR='<%= agent['agentDir'] ? agent['agentDir'] : @jcasc['agents_setup'][agent['os'].to_s]['agentDir'] %>'
             export AGENT_JAR="^${AGENT_WORKDIR}/agent.jar"
             export AGENT_SECRETFILE="^${AGENT_WORKDIR}/agent-secret"
-            export AGENT_URL="^${JENKINS_URL}computer/^${AGENT_NAME}/jenkins-agent.jnlp"
             export JENKINS_JAVA_OPTS='<%= agent['agentJavaOpts'] ? agent['agentJavaOpts'] : @jcasc['agents_setup'][agent['os'].to_s]['agentJavaOpts'] %>'
             export ARTIFACT_CACHING_PROXY_PROVIDER='azure'
             export JAVA_HOME='<%= agent['javaHome'] ? agent['javaHome'] : @jcasc['agents_setup'][agent['os'].to_s]['javaHome'] %>'
@@ -103,7 +102,7 @@ jenkins:
             After=network.target
 
             [Service]
-            ExecStart=^${JENKINS_JAVA_BIN} ^${JENKINS_JAVA_OPTS} -jar ^${AGENT_JAR} -jnlpUrl ^${AGENT_URL} -secret @^${AGENT_SECRETFILE} -workDir ^${AGENT_WORKDIR}
+            ExecStart=^${JENKINS_JAVA_BIN} ^${JENKINS_JAVA_OPTS} -jar ^${AGENT_JAR} -url ^${JENKINS_URL} -name ^${AGENT_NAME} -secret @^${AGENT_SECRETFILE} -workDir ^${AGENT_WORKDIR}
             User=^${USER}
             WorkingDirectory=^${AGENT_WORKDIR}
             Restart=on-failure
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants