foreman_remote_execution 1.3.2 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba7dfa6dd3c06e3240541005c42afc45c5d2c61f
-  data.tar.gz: b6985d294864cc4e69919ccf6ec6d7a29478e674
+  metadata.gz: bb2c9a95f22cf5c9002035f47adfc90eee494da5
+  data.tar.gz: 75e9a15b54a3832e112c5b8d2706a3a353f48e86
 SHA512:
-  metadata.gz: e3cb2b3678b4127b56ac9b37a7983e42d283a0728204f22c47c319d17878c5eff268cb327311b7d64e74cbef7a750217f2b98b7ef81ce4be1a87dd7695253b85
-  data.tar.gz: 5a8f1dc7ff728d443decf1047246e1f11bb87bed37df736b6baa3a19da3ea28797740533d8cb199ed3c93325bdcccaf6a02cd109b7c557f60234cb4654ef2e1e
+  metadata.gz: af011f877cc95f1bf64cb3dd5c8633de7d0fd2aa6a445d15925c78950a50e636acdd298660b0c6970d2c4f17b53a492a51282004011a0fe5ac030ebed57bae3d
+  data.tar.gz: 4d8e436256f46a252dc95987de9e1749c41852baf2e33f837dc6465bcf802d84781ac6e5eac307b2717d2bbbd18b594cac8a9fecc1a0a6adb741edf7dfd1965f

data/app/controllers/job_invocations_controller.rb

@@ -43,8 +43,11 @@ class JobInvocationsController < ApplicationController
     @job_invocation = resource_base.includes(:template_invocations => :run_host_job_task).find(params[:id])
     @auto_refresh = @job_invocation.task.try(:pending?)
     hosts_base = @job_invocation.targeting.hosts.authorized(:view_hosts, Host)
-                                .joins(:template_invocations)
-                                .merge(TemplateInvocation.where(:job_invocation_id => @job_invocation.id))
+    # There's no need to do the joining if we're not filtering
+    unless params[:search].nil?
+      hosts_base = hosts_base.joins(:template_invocations)
+                             .where(:template_invocations => { :job_invocation_id => @job_invocation.id})
+    end
     @hosts = hosts_base.search_for(params[:search], :order => params[:order] || 'name ASC').paginate(:page => params[:page])
   end
 

data/app/lib/actions/remote_execution/run_hosts_job.rb

@@ -7,18 +7,18 @@ module Actions
       middleware.use Actions::Middleware::BindJobInvocation
       middleware.use Actions::Middleware::RecurringLogic
 
-      def delay(delay_options, job_invocation, locked = false)
+      def delay(delay_options, job_invocation)
         task.add_missing_task_groups(job_invocation.task_group)
-        job_invocation.targeting.resolve_hosts! if job_invocation.targeting.static?
-        super delay_options, job_invocation, locked
+        job_invocation.targeting.resolve_hosts! if job_invocation.targeting.static? && !job_invocation.targeting.resolved?
+        super delay_options, job_invocation
       end
 
-      def plan(job_invocation, locked = false)
+      def plan(job_invocation)
         set_up_concurrency_control job_invocation
         job_invocation.task_group.save! if job_invocation.task_group.try(:new_record?)
         task.add_missing_task_groups(job_invocation.task_group) if job_invocation.task_group
-        action_subject(job_invocation) unless locked
-        job_invocation.targeting.resolve_hosts! if job_invocation.targeting.dynamic? || !locked
+        action_subject(job_invocation)
+        job_invocation.targeting.resolve_hosts! if job_invocation.targeting.dynamic? || !job_invocation.targeting.resolved?
         input.update(:job_category => job_invocation.job_category)
         plan_self(:job_invocation_id => job_invocation.id)
       end

data/app/views/job_templates/_custom_tabs.html.erb

@@ -15,7 +15,7 @@
 
   <%= select_f f, :provider_type, providers_options, :first, :last, :disabled => @template.locked? %>
 
-  <%= number_f f, :timeout_interval, :disabled => @template.locked?, :label => _('Timeout interval') %>
+  <%= number_f f, :execution_timeout_interval, :disabled => @template.locked?, :label => _('Timeout to kill') %>
 
   <div class="children_fields">
     <%= new_child_fields_template(f, :template_inputs, { :partial => "template_inputs/form" }) %>

data/lib/foreman_remote_execution/version.rb

@@ -1,3 +1,3 @@
 module ForemanRemoteExecution
-  VERSION = '1.3.2'.freeze
+  VERSION = '1.3.3'.freeze
 end

data/test/unit/actions/run_hosts_job_test.rb

@@ -37,9 +37,34 @@ module ForemanRemoteExecution
       action
     end
 
-    it 'resolves the hosts on targeting in plan phase' do
-      planned
-      targeting.hosts.must_include(host)
+    context 'targeting resolving' do
+      let(:delayed) do
+        action.delay({ :start_at => Time.now.getlocal }, job_invocation)
+        action
+      end
+
+      it 'resolves dynamic targeting in plan' do
+        targeting.targeting_type = 'dynamic_query'
+        refute targeting.resolved?
+        delayed
+        refute targeting.resolved?
+        planned
+        targeting.hosts.must_include(host)
+      end
+
+      it 'resolves the hosts on static targeting in delay' do
+        refute targeting.resolved?
+        delayed
+        targeting.hosts.must_include(host)
+        # Verify Targeting#resolve_hosts! won't be hit again
+        targeting.expects(:resolve_hosts!).never
+        planned
+      end
+
+      it 'resolves the hosts on static targeting in plan phase if not resolved yet' do
+        planned
+        targeting.hosts.must_include(host)
+      end
     end
 
     it 'triggers the RunHostJob actions on the resolved hosts in run phase' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_remote_execution
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors:
 - Foreman Remote Execution team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-11 00:00:00.000000000 Z
+date: 2017-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface