Replace -slaveLog with -agentLog (#822)

* Jenkins 2.266 upgraded to remoting 4.6 * remoting 4.6 has dropped support for the -slaveLog argument * we have to use -agentLog now * see #818 and/or JENKINS-64251
jenkinsci · Dec 15, 2020 · b697a31 · b697a31
1 parent 098af7f
commit b697a31
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## Unreleased
 A pre-release can be downloaded from https://ci.jenkins.io/job/Plugins/job/docker-plugin/job/master/
+* Fix Attach connection issue with Jenkins 2.266 onwards [#818](https://github.com/jenkinsci/docker-plugin/pull/818), [JENKINS-64251](https://issues.jenkins-ci.org/browse/JENKINS-64251)
 * Fix JNLP (incoming-agent) connection bug [#789](https://github.com/jenkinsci/docker-plugin/pull/789), [#757](https://github.com/jenkinsci/docker-plugin/issues/757), [JENKINS-59790](https://issues.jenkins-ci.org/browse/JENKINS-59790)
 
 ## 1.2.1

diff --git a/src/main/java/com/nirima/jenkins/plugins/docker/DockerCloud.java b/src/main/java/com/nirima/jenkins/plugins/docker/DockerCloud.java
@@ -354,7 +354,7 @@ public synchronized Collection<NodeProvisioner.PlannedNode> provision(final Labe
             while (remainingWorkload > 0 && !templates.isEmpty()) {
                 final DockerTemplate t = templates.get(0); // get first
 
-                final boolean thereIsCapacityToProvisionFromThisTemplate = canAddProvisionedSlave(t);
+                final boolean thereIsCapacityToProvisionFromThisTemplate = canAddProvisionedAgent(t);
                 if (!thereIsCapacityToProvisionFromThisTemplate) {
                     templates.remove(t);
                     continue;
@@ -626,7 +626,7 @@ public int countContainersInDocker(final String imageName) throws Exception {
     /**
      * Check not too many already running.
      */
-    private boolean canAddProvisionedSlave(DockerTemplate t) throws Exception {
+    private boolean canAddProvisionedAgent(DockerTemplate t) throws Exception {
         final String templateImage = t.getImage();
         final int templateContainerCap = t.instanceCap;
         final int cloudContainerCap = getContainerCap();

diff --git a/src/main/java/io/jenkins/docker/connector/DockerComputerAttachConnector.java b/src/main/java/io/jenkins/docker/connector/DockerComputerAttachConnector.java
@@ -201,7 +201,7 @@ public String getDescription() {
             + "${" + ArgumentVariables.RemoteFs.getName() + "}/${" + ArgumentVariables.JarName.getName() + "}\n"
             + "-noReconnect\n"
             + "-noKeepAlive\n"
-            + "-slaveLog\n"
+            + "-agentLog\n"
             + "${" + ArgumentVariables.RemoteFs.getName() + "}/agent.log";
 
     @Override