foreman_remote_execution 1.3.1 → 1.3.2

data/app/views/job_invocations/_tab_overview.html.erb

@@ -49,8 +49,11 @@
     <% if job_invocation.time_span %>
       <b><%= _("Set to distribute over") %></b>: <%= job_invocation.concurrency_level %> <%= _('minutes') %><br>
     <% end %>
-    <% if job_invocation.task && job_invocation.task.delayed? || job_invocation.task.recurring? %>
+    <% if job_invocation.task && (job_invocation.task.delayed? || job_invocation.task.recurring?) %>
       <b><%= _("Scheduled to start at") %></b>: <%= job_invocation.task.start_at.try(:in_time_zone) %><br>
     <% end %>
+    <% unless job_invocation.execution_timeout_interval.nil? %>
+      <b><%= _("Timeout to kill after") %></b>: <%= job_invocation.execution_timeout_interval %> <%= _('seconds') %><br>
+    <% end %>
   <% end %>
 </div>

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

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

data/db/migrate/20170613101039_add_timeout_to_job_templates_and_job_invocations.rb

@@ -0,0 +1,6 @@
+class AddTimeoutToJobTemplatesAndJobInvocations < ActiveRecord::Migration
+  def change
+    add_column :templates, :execution_timeout_interval, :integer
+    add_column :job_invocations, :execution_timeout_interval, :integer
+  end
+end

data/foreman_remote_execution.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'deface'
   s.add_dependency 'dynflow', '~> 0.8.10'
   s.add_dependency 'foreman_remote_execution_core'
-  s.add_dependency 'foreman-tasks', '~> 0.9.0'
+  s.add_dependency 'foreman-tasks', '>= 0.9'
 
   s.add_development_dependency 'rubocop'
   s.add_development_dependency 'rdoc'

data/lib/foreman_remote_execution/engine.rb

@@ -164,6 +164,7 @@ module ForemanRemoteExecution
       # having issues with resolving it to Rake::Task otherwise
       require_dependency 'foreman_tasks/task'
       ForemanTasks::Task.send(:include, ForemanRemoteExecution::ForemanTasksTaskExtensions)
+      ForemanTasks::Cleaner.send(:include, ForemanRemoteExecution::ForemanTasksCleanerExtensions)
       RemoteExecutionProvider.register(:SSH, SSHExecutionProvider)
     end
 

data/lib/foreman_remote_execution/version.rb

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

data/locale/de/foreman_remote_execution.po

@@ -397,6 +397,9 @@ msgstr "Nicht alle erforderlichen Eingaben haben Werte. Fehlende Eingaben: %s"
 msgid "Override the description format from the template for this invocation only"
 msgstr "Beschreibungsformat der Vorlage nur für diesen Aufruf außer Kraft setzen "
 
+msgid "Override the timeout interval from the template for this invocation only"
+msgstr ""
+
 msgid "Overview"
 msgstr "Überblick"
 
@@ -412,6 +415,9 @@ msgstr "Ausstehend"
 msgid "Perform no more executions after this time"
 msgstr "Danach nicht mehr ausführen"
 
+msgid "Play Ansible roles"
+msgstr ""
+
 msgid "Port to use for SSH communication. Default port 22. You may override per host by setting a parameter called remote_execution_ssh_port."
 msgstr ""
 
@@ -645,9 +651,21 @@ msgstr "Diese Vorlage wird für die Erstellung der Beschreibung verwendet. Einga
 msgid "This template is used to generate the description.<br/>Input values can be used using the syntax %{package}.<br/>You may also include the job category and template<br/>name using %{job_category} and %{template_name}."
 msgstr ""
 
+msgid "Time in seconds from the start on the remote host after which the job should be killed."
+msgstr ""
+
 msgid "Time span"
 msgstr "Zeitspanne"
 
+msgid "Timeout interval"
+msgstr ""
+
+msgid "Timeout to kill"
+msgstr ""
+
+msgid "Timeout to kill after"
+msgstr ""
+
 msgid "Toggle DEBUG"
 msgstr "Umschalt DEBUG"
 
@@ -821,6 +839,9 @@ msgstr ""
 msgid "running %{percent}%%"
 msgstr ""
 
+msgid "seconds"
+msgstr ""
+
 msgid "succeeded"
 msgstr "erfolgreich"
 

data/locale/en/foreman_remote_execution.po

@@ -398,6 +398,9 @@ msgstr ""
 msgid "Override the description format from the template for this invocation only"
 msgstr ""
 
+msgid "Override the timeout interval from the template for this invocation only"
+msgstr ""
+
 msgid "Overview"
 msgstr ""
 
@@ -413,6 +416,9 @@ msgstr ""
 msgid "Perform no more executions after this time"
 msgstr ""
 
+msgid "Play Ansible roles"
+msgstr ""
+
 msgid "Port to use for SSH communication. Default port 22. You may override per host by setting a parameter called remote_execution_ssh_port."
 msgstr ""
 
@@ -646,9 +652,21 @@ msgstr ""
 msgid "This template is used to generate the description.<br/>Input values can be used using the syntax %{package}.<br/>You may also include the job category and template<br/>name using %{job_category} and %{template_name}."
 msgstr ""
 
+msgid "Time in seconds from the start on the remote host after which the job should be killed."
+msgstr ""
+
 msgid "Time span"
 msgstr ""
 
+msgid "Timeout interval"
+msgstr ""
+
+msgid "Timeout to kill"
+msgstr ""
+
+msgid "Timeout to kill after"
+msgstr ""
+
 msgid "Toggle DEBUG"
 msgstr ""
 
@@ -822,6 +840,9 @@ msgstr ""
 msgid "running %{percent}%%"
 msgstr ""
 
+msgid "seconds"
+msgstr ""
+
 msgid "succeeded"
 msgstr ""
 

data/locale/en_GB/foreman_remote_execution.po

@@ -398,6 +398,9 @@ msgstr ""
 msgid "Override the description format from the template for this invocation only"
 msgstr ""
 
+msgid "Override the timeout interval from the template for this invocation only"
+msgstr ""
+
 msgid "Overview"
 msgstr ""
 
@@ -413,6 +416,9 @@ msgstr ""
 msgid "Perform no more executions after this time"
 msgstr ""
 
+msgid "Play Ansible roles"
+msgstr ""
+
 msgid "Port to use for SSH communication. Default port 22. You may override per host by setting a parameter called remote_execution_ssh_port."
 msgstr ""
 
@@ -646,9 +652,21 @@ msgstr ""
 msgid "This template is used to generate the description.<br/>Input values can be used using the syntax %{package}.<br/>You may also include the job category and template<br/>name using %{job_category} and %{template_name}."
 msgstr ""
 
+msgid "Time in seconds from the start on the remote host after which the job should be killed."
+msgstr ""
+
 msgid "Time span"
 msgstr ""
 
+msgid "Timeout interval"
+msgstr ""
+
+msgid "Timeout to kill"
+msgstr ""
+
+msgid "Timeout to kill after"
+msgstr ""
+
 msgid "Toggle DEBUG"
 msgstr ""
 
@@ -822,6 +840,9 @@ msgstr ""
 msgid "running %{percent}%%"
 msgstr ""
 
+msgid "seconds"
+msgstr ""
+
 msgid "succeeded"
 msgstr ""
 

data/locale/es/foreman_remote_execution.po

@@ -397,6 +397,9 @@ msgstr "No todas las entradas requeridas tienen valores. Entradas que faltan: %s
 msgid "Override the description format from the template for this invocation only"
 msgstr "Sustituir el formato de descripción de la plantilla solo para esta invocación"
 
+msgid "Override the timeout interval from the template for this invocation only"
+msgstr ""
+
 msgid "Overview"
 msgstr "Visión general"
 
@@ -412,6 +415,9 @@ msgstr "pendiente"
 msgid "Perform no more executions after this time"
 msgstr "No ejecutar más después de esta cantidad de veces"
 
+msgid "Play Ansible roles"
+msgstr ""
+
 msgid "Port to use for SSH communication. Default port 22. You may override per host by setting a parameter called remote_execution_ssh_port."
 msgstr ""
 
@@ -645,9 +651,21 @@ msgstr "Esta plantilla se utiliza para generar la descripción. Los valores de e
 msgid "This template is used to generate the description.<br/>Input values can be used using the syntax %{package}.<br/>You may also include the job category and template<br/>name using %{job_category} and %{template_name}."
 msgstr ""
 
+msgid "Time in seconds from the start on the remote host after which the job should be killed."
+msgstr ""
+
 msgid "Time span"
 msgstr "Período de tiempo"
 
+msgid "Timeout interval"
+msgstr ""
+
+msgid "Timeout to kill"
+msgstr ""
+
+msgid "Timeout to kill after"
+msgstr ""
+
 msgid "Toggle DEBUG"
 msgstr "Alternar DEBUG"
 
@@ -821,6 +839,9 @@ msgstr ""
 msgid "running %{percent}%%"
 msgstr ""
 
+msgid "seconds"
+msgstr ""
+
 msgid "succeeded"
 msgstr "exitoso"
 

data/locale/foreman_remote_execution.pot

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: foreman_remote_execution 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-30 18:05+0200\n"
-"PO-Revision-Date: 2017-05-30 18:05+0200\n"
+"POT-Creation-Date: 2017-07-11 20:38+0200\n"
+"PO-Revision-Date: 2017-07-11 20:38+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -138,7 +138,7 @@ msgid "Distribute tasks over N seconds"
 msgstr ""
 
 #: ../app/controllers/api/v2/job_invocations_controller.rb:50
-#: ../app/views/job_invocations/_form.html.erb:89
+#: ../app/views/job_invocations/_form.html.erb:93
 msgid "Run at most N tasks at a time"
 msgstr ""
 
@@ -146,19 +146,23 @@ msgstr ""
 msgid "Override the description format from the template for this invocation only"
 msgstr ""
 
-#: ../app/controllers/api/v2/job_invocations_controller.rb:59
+#: ../app/controllers/api/v2/job_invocations_controller.rb:56
+msgid "Override the timeout interval from the template for this invocation only"
+msgstr ""
+
+#: ../app/controllers/api/v2/job_invocations_controller.rb:60
 msgid "Create a job invocation"
 msgstr ""
 
-#: ../app/controllers/api/v2/job_invocations_controller.rb:68
+#: ../app/controllers/api/v2/job_invocations_controller.rb:69
 msgid "Get output for a host"
 msgstr ""
 
-#: ../app/controllers/api/v2/job_invocations_controller.rb:101
+#: ../app/controllers/api/v2/job_invocations_controller.rb:102
 msgid "Host with id '%{id}' was not found"
 msgstr ""
 
-#: ../app/controllers/api/v2/job_invocations_controller.rb:107
+#: ../app/controllers/api/v2/job_invocations_controller.rb:108
 msgid "Template with id '%{id}' was not found"
 msgstr ""
 
@@ -548,39 +552,39 @@ msgstr ""
 msgid "Failed rendering template: %s"
 msgstr ""
 
-#: ../app/lib/actions/remote_execution/run_host_job.rb:61
+#: ../app/lib/actions/remote_execution/run_host_job.rb:63
 msgid "Job execution failed"
 msgstr ""
 
-#: ../app/lib/actions/remote_execution/run_host_job.rb:70
+#: ../app/lib/actions/remote_execution/run_host_job.rb:72
 msgid "%{description} on %{host}"
 msgstr ""
 
-#: ../app/lib/actions/remote_execution/run_host_job.rb:75 action_names.rb:5
+#: ../app/lib/actions/remote_execution/run_host_job.rb:77 action_names.rb:3
 msgid "Remote action:"
 msgstr ""
 
-#: ../app/lib/actions/remote_execution/run_host_job.rb:97
+#: ../app/lib/actions/remote_execution/run_host_job.rb:99
 msgid "Exit status: %s"
 msgstr ""
 
-#: ../app/lib/actions/remote_execution/run_host_job.rb:99
+#: ../app/lib/actions/remote_execution/run_host_job.rb:101
 msgid "Job finished with error"
 msgstr ""
 
-#: ../app/lib/actions/remote_execution/run_host_job.rb:102
+#: ../app/lib/actions/remote_execution/run_host_job.rb:104
 msgid "Error loading data from proxy"
 msgstr ""
 
-#: ../app/lib/actions/remote_execution/run_host_job.rb:126
+#: ../app/lib/actions/remote_execution/run_host_job.rb:128
 msgid "User can not execute job on host %s"
 msgstr ""
 
-#: ../app/lib/actions/remote_execution/run_host_job.rb:127
+#: ../app/lib/actions/remote_execution/run_host_job.rb:129
 msgid "User can not execute this job template"
 msgstr ""
 
-#: ../app/lib/actions/remote_execution/run_host_job.rb:132
+#: ../app/lib/actions/remote_execution/run_host_job.rb:134
 msgid "User can not execute this job template on %s"
 msgstr ""
 
@@ -640,27 +644,27 @@ msgstr ""
 msgid "template"
 msgstr ""
 
-#: ../app/models/job_invocation_composer.rb:87
+#: ../app/models/job_invocation_composer.rb:97
 msgid "Cannot specify both bookmark_id and search_query"
 msgstr ""
 
-#: ../app/models/job_invocation_composer.rb:92
+#: ../app/models/job_invocation_composer.rb:102
 msgid "Cannot specify both recurrence and scheduling"
 msgstr ""
 
-#: ../app/models/job_invocation_composer.rb:126
+#: ../app/models/job_invocation_composer.rb:136
 msgid "Unknown input %{input_name} for template %{template_name}"
 msgstr ""
 
-#: ../app/models/job_invocation_composer.rb:243
+#: ../app/models/job_invocation_composer.rb:254
 msgid "Feature input %{input_name} not defined in template %{template_name}"
 msgstr ""
 
-#: ../app/models/job_invocation_composer.rb:252
+#: ../app/models/job_invocation_composer.rb:263
 msgid "No template mapped to feature %{feature_name}"
 msgstr ""
 
-#: ../app/models/job_invocation_composer.rb:258
+#: ../app/models/job_invocation_composer.rb:269
 msgid ""
 "The template %{template_name} mapped to feature %{feature_name} is not accessi"
 "ble by the user"
@@ -749,11 +753,11 @@ msgid "Effective user method \"%{current_value}\" is not one of %{valid_methods}
 msgstr ""
 
 #: ../app/models/targeting.rb:5
-msgid "Dynamic Query"
+msgid "Static Query"
 msgstr ""
 
 #: ../app/models/targeting.rb:5
-msgid "Static Query"
+msgid "Dynamic Query"
 msgstr ""
 
 #: ../app/models/targeting.rb:35
@@ -764,20 +768,20 @@ msgstr ""
 msgid "Cannot resolve hosts without a bookmark or search query"
 msgstr ""
 
-#: ../app/models/targeting.rb:70 ../app/models/targeting.rb:71
+#: ../app/models/targeting.rb:71 ../app/models/targeting.rb:72
 msgid "Must select a bookmark or enter a search query"
 msgstr ""
 
 #: ../app/models/template_input.rb:9
-msgid "Fact value"
+msgid "Variable"
 msgstr ""
 
 #: ../app/models/template_input.rb:9
-msgid "User input"
+msgid "Fact value"
 msgstr ""
 
 #: ../app/models/template_input.rb:9
-msgid "Variable"
+msgid "User input"
 msgstr ""
 
 #: ../app/models/template_input.rb:10
@@ -819,11 +823,17 @@ msgid "Preview"
 msgstr ""
 
 #: ../app/views/job_invocations/_form.html.erb:64
-msgid "Display advanced fields"
+msgid "Hide advanced fields"
 msgstr ""
 
 #: ../app/views/job_invocations/_form.html.erb:64
-msgid "Hide advanced fields"
+msgid "Display advanced fields"
+msgstr ""
+
+#: ../app/views/job_invocations/_form.html.erb:75
+#: ../app/views/job_invocations/_tab_overview.html.erb:44
+#: ../app/views/job_templates/_custom_tabs.html.erb:38
+msgid "Effective user"
 msgstr ""
 
 #: ../app/views/job_invocations/_form.html.erb:75
@@ -832,25 +842,33 @@ msgid ""
 "u or sudo is used to switch the accounts."
 msgstr ""
 
-#: ../app/views/job_invocations/_form.html.erb:75
-#: ../app/views/job_invocations/_tab_overview.html.erb:44
-#: ../app/views/job_templates/_custom_tabs.html.erb:36
-msgid "Effective user"
+#: ../app/views/job_invocations/_form.html.erb:81
+msgid ""
+"Time in seconds from the start on the remote host after which the job should b"
+"e killed."
+msgstr ""
+
+#: ../app/views/job_invocations/_form.html.erb:81
+msgid "Timeout to kill"
 msgstr ""
 
-#: ../app/views/job_invocations/_form.html.erb:89
+#: ../app/views/job_invocations/_form.html.erb:93
 msgid "Concurrency level"
 msgstr ""
 
-#: ../app/views/job_invocations/_form.html.erb:90
+#: ../app/views/job_invocations/_form.html.erb:94
 msgid "Distribute execution over N seconds"
 msgstr ""
 
-#: ../app/views/job_invocations/_form.html.erb:90
+#: ../app/views/job_invocations/_form.html.erb:94
 msgid "Time span"
 msgstr ""
 
-#: ../app/views/job_invocations/_form.html.erb:94
+#: ../app/views/job_invocations/_form.html.erb:98
+msgid "Type of query"
+msgstr ""
+
+#: ../app/views/job_invocations/_form.html.erb:98
 msgid ""
 "Type has impact on when is the query evaulated to hosts.<br><ul><li><b>Static<"
 "/b> - evaluates just after you submit this form</li><li><b>Dynamic</b> - evalu"
@@ -858,10 +876,6 @@ msgid ""
 "ed hosts set may change before it</li></ul>"
 msgstr ""
 
-#: ../app/views/job_invocations/_form.html.erb:94
-msgid "Type of query"
-msgstr ""
-
 #: ../app/views/job_invocations/_preview_hosts_list.html.erb:3
 msgid ""
 "The final host list may change because the selected query is dynamic.  It will"
@@ -957,17 +971,25 @@ msgid "Concurrency level limited to"
 msgstr ""
 
 #: ../app/views/job_invocations/_tab_overview.html.erb:50
-msgid "minutes"
+msgid "Set to distribute over"
 msgstr ""
 
 #: ../app/views/job_invocations/_tab_overview.html.erb:50
-msgid "Set to distribute over"
+msgid "minutes"
 msgstr ""
 
 #: ../app/views/job_invocations/_tab_overview.html.erb:53
 msgid "Scheduled to start at"
 msgstr ""
 
+#: ../app/views/job_invocations/_tab_overview.html.erb:56
+msgid "Timeout to kill after"
+msgstr ""
+
+#: ../app/views/job_invocations/_tab_overview.html.erb:56
+msgid "seconds"
+msgstr ""
+
 #: ../app/views/job_invocations/index.html.erb:1
 msgid "Job invocations"
 msgstr ""
@@ -1004,23 +1026,27 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
-#: ../app/views/job_templates/_custom_tabs.html.erb:25
-msgid "Add Input"
+#: ../app/views/job_templates/_custom_tabs.html.erb:18
+msgid "Timeout interval"
 msgstr ""
 
-#: ../app/views/job_templates/_custom_tabs.html.erb:25
+#: ../app/views/job_templates/_custom_tabs.html.erb:27
 msgid "add a input for this template"
 msgstr ""
 
-#: ../app/views/job_templates/_custom_tabs.html.erb:32
+#: ../app/views/job_templates/_custom_tabs.html.erb:27
+msgid "Add Input"
+msgstr ""
+
+#: ../app/views/job_templates/_custom_tabs.html.erb:34
 msgid "add an input set for this template to reference a different template inputs"
 msgstr ""
 
-#: ../app/views/job_templates/_custom_tabs.html.erb:32
+#: ../app/views/job_templates/_custom_tabs.html.erb:34
 msgid "Add Foreign Input Set"
 msgstr ""
 
-#: ../app/views/job_templates/_custom_tabs.html.erb:50
+#: ../app/views/job_templates/_custom_tabs.html.erb:52
 msgid "Snippet"
 msgstr ""
 
@@ -1031,11 +1057,11 @@ msgid ""
 msgstr ""
 
 #: ../app/views/job_templates/_import_job_template_modal.html.erb:14
-msgid "Whether to overwrite the template if it already exists"
+msgid "Overwrite"
 msgstr ""
 
 #: ../app/views/job_templates/_import_job_template_modal.html.erb:14
-msgid "Overwrite"
+msgid "Whether to overwrite the template if it already exists"
 msgstr ""
 
 #: ../app/views/job_templates/edit.html.erb:4
@@ -1186,15 +1212,19 @@ msgid "Jobs"
 msgstr ""
 
 #: action_names.rb:2
-msgid "Action with sub plans"
+msgid "Play Ansible roles"
 msgstr ""
 
-#: action_names.rb:3
+#: action_names.rb:4
+msgid "Import Puppet classes"
+msgstr ""
+
+#: action_names.rb:5
 msgid "Import facts"
 msgstr ""
 
-#: action_names.rb:4
-msgid "Import Puppet classes"
+#: action_names.rb:6
+msgid "Action with sub plans"
 msgstr ""
 
 #: gemspec.rb:2