Skip to content

Removed java_path variable. #8

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.

Sign up for GitHub

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

Open
nickme wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Removed java_path variable. #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9274d98
Removed absolute path to the java.exe and the java_path variable. Si…
nickme Dec 2, 2013
eb50075
Removed the commented out code for the Java_Path variable
nickme Dec 2, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions manifests/slave.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,12 +151,6 @@
windows_common::configuration::feature { 'NET-Framework-Features':
ensure => present,
}

#
# Bug - need to modify windows_java to export the java_path variable
#
#$java_path = ${::java::params::java_path}
$java_path = "${systemdrive}\\Program Files\\Java\\jre7\\bin"

file { $slave_home:
ensure => directory,
Expand Down
2 changes: 1 addition & 1 deletion templates/jenkins-slave.xml.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ THE SOFTWARE.
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_path -%>\java.exe</executable>
<executable>java.exe</executable>
<arguments>-Xrs -jar "<%= @slave_home -%>\<%= @client_jar -%>" -executors <%= @executors -%> <%= @masterurl_flag -%> <%= @labels_flag -%></arguments>
<!--
interactive flag causes the empty black Java window to be displayed.
Expand Down