Replace -toolLocations with --toolLocation

voxpupuli · Sep 21, 2015 · 60dd474 · 60dd474
1 parent 031197f
commit 60dd474
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/spec/classes/jenkins_slave_spec.rb b/spec/classes/jenkins_slave_spec.rb
@@ -37,6 +37,11 @@
       let(:params) { {:enable => false, :ensure => 'stopped' } }
       it { should contain_service('jenkins-slave').with(:enable => false, :ensure => 'stopped') }
     end
+
+    describe 'with tool_locations' do
+      let(:params) { { :tool_locations => 'System-CPython-2.7:/usr/bin/python2.7' } }
+      it { should contain_file(slave_runtime_file).with_content(/--toolLocation System-CPython-2.7:\/usr\/bin\/python2.7/) }
+    end
   end
 
   shared_examples 'using slave_name' do

diff --git a/templates/jenkins-slave-defaults.erb b/templates/jenkins-slave-defaults.erb
@@ -50,8 +50,6 @@ CLIENT_NAME="<%= @slave_name -%>"
 
 FSROOT="<%= @slave_home -%>"
 
-TOOL_LOCATIONS="<%= @tool_locations -%>"
-
 DESCRIPTION="<%= @description -%>"
 
 # credentials
@@ -80,9 +78,12 @@ if [ -n "$FSROOT" ]; then
   FSROOT_ARG="-fsroot '$FSROOT'"
 fi
 
-if [ -n "$TOOL_LOCATIONS" ]; then
-  TOOL_LOCATIONS_ARG="-toolLocations '$TOOL_LOCATIONS'"
-fi
+<% if @tool_locations %>
+  TOOL_LOCATIONS_ARG=""
+  <% @tool_locations.split.each do |tool_location| %>
+    TOOL_LOCATIONS_ARG='$TOOL_LOCATIONS_ARG --toolLocation <%= tool_location -%>'
+  <% end %>
+<% end %>
 
 if [ -n "$DESCRIPTION" ]; then
   DESCRIPTION_ARG="-description '$DESCRIPTION'"