Skip to content

Commit

Permalink
[JENKINS-42724] - Restore the windows-service/jenkins.xml resource to…
Browse files Browse the repository at this point in the history 
… 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
  • Loading branch information
@oleg-nenashev
oleg-nenashev committed Mar 19, 2017
1 parent e8efc96 commit 4ac7c08
Showing 1 changed file with 65 additions and 0 deletions.
65 changes: 65 additions & 0 deletions core/src/main/resources/windows-service/jenkins-slave.xml
View file
@@ -0,0 +1,65 @@
<!--
The MIT License
Copyright (c) 2004-2017, Sun Microsystems, Inc., Kohsuke Kawaguchi, Oleg Nenashev and other contributors
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
-->

<!--
Windows service definition for Jenkins agent.
This service is powered by the WinSW project: https://github.com/kohsuke/winsw/
You can find more information about available options here: https://github.com/kohsuke/winsw/blob/master/doc/xmlConfigFile.md
Configuration examples are available here: https://github.com/kohsuke/winsw/tree/master/examples
To uninstall, run "jenkins-slave.exe stop" to stop the service, then "jenkins-slave.exe uninstall" to uninstall the service.
Both commands don't produce any output if the execution is successful.
-->
<service>
<id>@ID@</id>
<name>Jenkins agent (@ID@)</name>
<description>This service runs an agent for Jenkins automation server.</description>
<!--
if you'd like to run Jenkins with a specific version of Java, specify a full path to java.exe.
The following value assumes that you have java in your PATH.
-->
<executable>@JAVA@</executable>
<arguments>-Xrs @VMARGS@ -jar "%BASE%\slave.jar" @ARGS@</arguments>
<!--
interactive flag causes the empty black Java window to be displayed.
I'm still debugging this.
<interactive />
-->
<logmode>rotate</logmode>

<onfailure action="restart" />

<!--
In the case WinSW gets terminated and leaks the process, we want to abort
these runaway JAR processes on startup to prevent "Slave is already connected errors" (JENKINS-28492).
-->
<extensions>
<!-- This is a sample configuration for the RunawayProcessKiller extension. -->
<extension enabled="true"
className="winsw.Plugins.RunawayProcessKiller.RunawayProcessKillerExtension"
id="killOnStartup">
<pidfile>%BASE%\jenkins_agent.pid</pidfile>
<stopTimeout>5000</stopTimeout>
<stopParentFirst>false</stopParentFirst>
</extension>
</extensions>

<!-- See referenced examples for more options -->

</service>

0 comments on commit 4ac7c08

Please sign in to comment.