Update Windows Agent Installer to 1.7 and WinSW to 2.0.2 #2765

oleg-nenashev · 2017-02-27T14:19:27Z

This change integrates major WinSW fixes into Jenkins. The change is WiP, jenkinsci/windows-slave-installer-module#6 to be integrated at least

WinSW changes

The update includes many fixes and improvements, the full list is provided in the WinSW changelog. There are several issues referenced in Jenkins bugtracker:

JENKINS-22692 - Connection reset issues when WinSW gets terminated due to the system shutdown
JENKINS-23487- Support of shared directories in WinSW
JENKINS-39231 - Enable Runaway Process Killer by default
JENKINS-39237 - Auto-upgrade of JNLP agent versions on the slaves

Windows Agent Installer changes

Adapt the default configurations to pick fixes above
Slave => Agent renaming where possible

Jenkins core changes

Modify the configuration template, reference advanced options
Enable Runaway Process Killer by default

@reviewbybees


        Update Windows Agent Installer to 1.7

oleg-nenashev · 2017-02-27T14:20:29Z

core/src/main/resources/windows-service/jenkins-slave.xml

@@ -23,15 +23,22 @@ THE SOFTWARE.
 -->

 <!--
-  Windows service definition for Jenkins slave
+  Windows service definition for Jenkins agent.
+  The actual version of this definition has been moved to https://github.com/jenkinsci/windows-slave-installer-module/blob/master/src/main/resources/org/jenkinsci/modules/windows_slave_installer/jenkins-slave.xml.


I do not see any usages, but this file can be downloaded as a resource.
So I'd prefer to keep it up to date

Left behind from

jenkins/core/src/main/java/hudson/lifecycle/WindowsSlaveInstaller.java

Line 219 in f79f53f

String xml = IOUtils.toString(WindowsSlaveInstaller.class.getResourceAsStream("/windows-service/jenkins-slave.xml"), "UTF-8");

it seems -- probably time to remove it from core?

IMHO then we need to add the resource alias somehow

OK, I have found no legitimate way to use this file excepting the access to the master's classloader from plugins (why would they do it). No occurrence in OSS repos as well.

Will remove the file


        Remove the obsolete jenkins-slave.xml file from the core.

Now it is within windows-slave-installer

daniel-beck · 2017-02-28T13:38:00Z

war/pom.xml

@@ -114,7 +114,7 @@ THE SOFTWARE.
    <dependency>
      <groupId>org.jenkins-ci.modules</groupId>
      <artifactId>windows-slave-installer</artifactId>
-      <version>1.6</version>
+      <version>1.7-SNAPSHOT</version>


Could you upload a snapshot and reference it by timestamp?


        Use the deployed Snapshot for CI

oleg-nenashev · 2017-03-03T17:08:12Z

Created PR with some upgrade docs: jenkinsci/windows-slave-installer-module#9


        Pick the release version of windows-slave-installer-1.7

oleg-nenashev · 2017-03-04T23:01:38Z

@jenkinsci/code-reviewers since I was unable to get feedback from @reviewbybees in time :(

reviewbybees · 2017-03-05T10:43:42Z

This pull request originates from a CloudBees employee. At CloudBees, we require that all pull requests be reviewed by other CloudBees employees before we seek to have the change accepted. If you want to learn more about our process please see this explanation.

oleg-nenashev · 2017-03-06T16:31:55Z

@reviewbybees ping. 1-week review timeout is today

jglick

I presume you have done manual testing on various platforms. Given the magnitude of the changes, meaningful code review seems hopeless.

jglick · 2017-03-06T16:59:04Z

core/pom.xml

@@ -755,7 +755,7 @@ THE SOFTWARE.
                <artifactItem>
                  <groupId>com.sun.winsw</groupId>
                  <artifactId>winsw</artifactId>
-                  <version>1.16</version>
+                  <version>2.0.2</version>


jglick · 2017-03-06T16:59:04Z

war/pom.xml

@@ -114,7 +114,7 @@ THE SOFTWARE.
    <dependency>
      <groupId>org.jenkins-ci.modules</groupId>
      <artifactId>windows-slave-installer</artifactId>
-      <version>1.6</version>
+      <version>1.7</version>


jglick · 2017-03-06T17:01:54Z

21:08:37 [Windows] [ERROR] npm ERR! code ECONNRESET

is likely CI flakiness.

oleg-nenashev · 2017-03-06T17:04:46Z

@jglick

I presume you have done manual testing on various platforms. Given the magnitude of the changes, meaningful code review seems hopeless.

Yes, tested changes on 3 platforms (Win 10, Win Server 2012, Win 7).
I would also like to test the stuff on WinXP, but I have no such machine. In the case of WinSW there was one bug report to this platform, which has been fixed in 2.0.2

@reviewbybees done

oleg-nenashev · 2017-03-08T11:08:46Z

Got +1 from @daniel-beck in IRC


        Noting changes towards 2.50

* NEW: jenkinsci/jenkins#2765 * NEW: jenkinsci/jenkins#2778 * NEW: jenkinsci/jenkins#2780 * NEW: jenkinsci/jenkins#2683 * NEW: jenkinsci/jenkins#2773 * UPD: jenkinsci/jenkins#2772


        [JENKINS-42724] - Restore the jenkins-slave.xml file

@daniel-beck

Windows Slaves plugin performs a direct access to the resources bundled into the core. Hence the file removal was a bad idea though I have not seen the issue in automatic tests and ATH. This change also was a last-minute change in jenkinsci#2765 in order to address suggestions from @daniel-beck, hence I didn't test it properly


        [JENKINS-42724] - Restore the windows-service/jenkins.xml resource to…

@daniel-beck

… restore compatibility with windows-slaves 1.2 (#2803) * [JENKINS-42724] - Restore the jenkins-slave.xml file Windows Slaves plugin performs a direct access to the resources bundled into the core. Hence the file removal was a bad idea though I have not seen the issue in automatic tests and ATH. This change also was a last-minute change in #2765 in order to address suggestions from @daniel-beck, hence I didn't test it properly * [JENKINS-42724] - Update the Windows Agents plugin dependency to 1.3.1 * [JENKINS-42724] -Revert the war/pom.xml upgrade

Update Windows Agent Installer to 1.7

Loading status checks…

375fb3e

oleg-nenashev added the work-in-progress label Feb 27, 2017

oleg-nenashev reviewed Feb 27, 2017

View changes

oleg-nenashev added the needs-more-reviews label Feb 27, 2017

Remove the obsolete jenkins-slave.xml file from the core.

Loading status checks…

69b01b3

Now it is within windows-slave-installer

daniel-beck reviewed Feb 28, 2017

View changes

Use the deployed Snapshot for CI

Loading status checks…

69e9175

Pick the release version of windows-slave-installer-1.7

Loading status checks…

4e0b96c

oleg-nenashev removed the work-in-progress label Mar 5, 2017

jglick approved these changes Mar 6, 2017

View changes

oleg-nenashev added ready-for-merge and removed needs-more-reviews labels Mar 8, 2017

oleg-nenashev merged commit e698d1d into jenkinsci:master Mar 8, 2017
1 of 2 checks passed

1 of 2 checks passed

continuous-integration/jenkins/pr-head This commit cannot be built
Details

Jenkins This pull request looks good
Details

oleg-nenashev mentioned this pull request Mar 9, 2017

Noting changes towards 2.50 #725

Merged

oleg-nenashev mentioned this pull request Mar 13, 2017

[JENKINS-42724] - Restore the windows-service/jenkins.xml resource to restore compatibility with windows-slaves 1.2 #2803

Merged

4 of 4 tasks complete

jenkinsci / jenkins

Update Windows Agent Installer to 1.7 and WinSW to 2.0.2 #2765

Update Windows Agent Installer to 1.7 and WinSW to 2.0.2 #2765

oleg-nenashev commented Feb 27, 2017

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

oleg-nenashev commented Mar 3, 2017

oleg-nenashev commented Mar 4, 2017

reviewbybees commented Mar 5, 2017

oleg-nenashev commented Mar 6, 2017

jglick left a comment

This comment has been minimized.

This comment has been minimized.

jglick commented Mar 6, 2017

oleg-nenashev commented Mar 6, 2017

oleg-nenashev commented Mar 8, 2017

jenkinsci / jenkins

Sponsor jenkinsci/jenkins

Join GitHub today

Update Windows Agent Installer to 1.7 and WinSW to 2.0.2 #2765

Update Windows Agent Installer to 1.7 and WinSW to 2.0.2 #2765

Conversation

oleg-nenashev commented Feb 27, 2017

WinSW changes

Windows Agent Installer changes

Jenkins core changes

This comment has been minimized.

oleg-nenashev Feb 27, 2017

This comment has been minimized.

daniel-beck Feb 27, 2017

This comment has been minimized.

oleg-nenashev Feb 27, 2017

This comment has been minimized.

oleg-nenashev Feb 28, 2017

This comment has been minimized.

daniel-beck Feb 28, 2017

oleg-nenashev commented Mar 3, 2017

oleg-nenashev commented Mar 4, 2017

reviewbybees commented Mar 5, 2017

oleg-nenashev commented Mar 6, 2017

jglick left a comment

This comment has been minimized.

jglick Mar 6, 2017

This comment has been minimized.

jglick Mar 6, 2017

jglick commented Mar 6, 2017

oleg-nenashev commented Mar 6, 2017

oleg-nenashev commented Mar 8, 2017