foreman_remote_execution 1.3.1 → 1.3.2

data/locale/fr/foreman_remote_execution.po

@@ -397,6 +397,9 @@ msgstr "Les entrées n'ont pas toutes des valeurs associées. Les entrées deman
 msgid "Override the description format from the template for this invocation only"
 msgstr "Remplacer le format de description du modèle pour ce lancement uniquement"
 
+msgid "Override the timeout interval from the template for this invocation only"
+msgstr ""
+
 msgid "Overview"
 msgstr "Vue globale"
 
@@ -412,6 +415,9 @@ msgstr "En cours"
 msgid "Perform no more executions after this time"
 msgstr "Ne pas lancer d'autres exécutions après cette date."
 
+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 "Ce modèle est utilisé pour générer la description. Les valeurs d'ent
 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 "Durée"
 
+msgid "Timeout interval"
+msgstr ""
+
+msgid "Timeout to kill"
+msgstr ""
+
+msgid "Timeout to kill after"
+msgstr ""
+
 msgid "Toggle DEBUG"
 msgstr "Afficher STDOUT"
 
@@ -821,6 +839,9 @@ msgstr "lancé"
 msgid "running %{percent}%%"
 msgstr ""
 
+msgid "seconds"
+msgstr ""
+
 msgid "succeeded"
 msgstr "réussi"
 

data/locale/ja/foreman_remote_execution.po

@@ -397,6 +397,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 "概要"
 
@@ -412,6 +415,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 ""
 
@@ -645,9 +651,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 "DEBUG の切り替え"
 
@@ -821,6 +839,9 @@ msgstr ""
 msgid "running %{percent}%%"
 msgstr ""
 
+msgid "seconds"
+msgstr ""
+
 msgid "succeeded"
 msgstr "成功"
 

data/locale/ko/foreman_remote_execution.po

@@ -396,6 +396,9 @@ msgstr "값이 없는 필수 입력이 있습니다. 누락된 입력: %s"
 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 "개요"
 
@@ -411,6 +414,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 ""
 
@@ -644,9 +650,21 @@ msgstr "이 템플릿은 설명을 생성하는 데 사용됩니다. %{package}
 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 "DEBUG 토글"
 
@@ -820,6 +838,9 @@ msgstr ""
 msgid "running %{percent}%%"
 msgstr ""
 
+msgid "seconds"
+msgstr ""
+
 msgid "succeeded"
 msgstr "성공"
 

data/locale/pt_BR/foreman_remote_execution.po

@@ -397,6 +397,9 @@ msgstr "Nem todas as entradas necessárias possuem valores. Entradas ausentes: %
 msgid "Override the description format from the template for this invocation only"
 msgstr "Substituir o formato de descrição do modelo somente para esta invocação"
 
+msgid "Override the timeout interval from the template for this invocation only"
+msgstr ""
+
 msgid "Overview"
 msgstr "Visão geral"
 
@@ -412,6 +415,9 @@ msgstr "Pendente"
 msgid "Perform no more executions after this time"
 msgstr "Não desempenhar execuções depois deste período"
 
+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 "Este modelo é usado para gerar a descrição. Os valores de entrada pod
 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 tempo"
 
+msgid "Timeout interval"
+msgstr ""
+
+msgid "Timeout to kill"
+msgstr ""
+
+msgid "Timeout to kill after"
+msgstr ""
+
 msgid "Toggle DEBUG"
 msgstr "Toggle DEBUG"
 
@@ -821,6 +839,9 @@ msgstr ""
 msgid "running %{percent}%%"
 msgstr ""
 
+msgid "seconds"
+msgstr ""
+
 msgid "succeeded"
 msgstr "com êxito "
 

data/locale/ru/foreman_remote_execution.po

@@ -402,6 +402,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 "Обзор"
 
@@ -417,6 +420,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 ""
 
@@ -652,9 +658,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 "Показать DEBUG"
 
@@ -828,6 +846,9 @@ msgstr "выполняется"
 msgid "running %{percent}%%"
 msgstr ""
 
+msgid "seconds"
+msgstr ""
+
 msgid "succeeded"
 msgstr "завершено"
 

data/locale/zh_CN/foreman_remote_execution.po

@@ -397,6 +397,9 @@ msgstr "没有为所有必填输入分配值。缺少输入：%s"
 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 "概览"
 
@@ -412,6 +415,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 ""
 
@@ -645,9 +651,21 @@ msgstr "这个模板是用来生成描述。可和使用句法 %{package} 输入
 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 "切换 DEBUG"
 
@@ -821,6 +839,9 @@ msgstr ""
 msgid "running %{percent}%%"
 msgstr ""
 
+msgid "seconds"
+msgstr ""
+
 msgid "succeeded"
 msgstr "已成功"
 

data/locale/zh_TW/foreman_remote_execution.po

@@ -397,6 +397,9 @@ msgstr "並不是所需的輸入都有值。缺少的輸入：%s"
 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 "概覽"
 
@@ -412,6 +415,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 ""
 
@@ -645,9 +651,21 @@ msgstr "這範本是用來產生描述。輸入值可以使用 %{package} 語法
 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 "切換 DEBUG"
 
@@ -821,6 +839,9 @@ msgstr ""
 msgid "running %{percent}%%"
 msgstr ""
 
+msgid "seconds"
+msgstr ""
+
 msgid "succeeded"
 msgstr "已成功"
 

data/test/unit/actions/run_hosts_job_test.rb

@@ -44,7 +44,7 @@ module ForemanRemoteExecution
 
     it 'triggers the RunHostJob actions on the resolved hosts in run phase' do
       planned.expects(:output).returns(:planned_count => 0)
-      planned.expects(:trigger).with() { |*args| args[0] == Actions::RemoteExecution::RunHostJob }
+      planned.expects(:trigger).with { |*args| args[0] == Actions::RemoteExecution::RunHostJob }
       planned.create_sub_plans
     end
 

data/test/unit/concerns/foreman_tasks_cleaner_extensions_test.rb

@@ -0,0 +1,20 @@
+require 'test_plugin_helper'
+
+class ForemanRemoteExecutionForemanTasksCleanerExtensionsTest < ActiveSupport::TestCase
+  it 'tries to delete associated job invocations' do
+    job = FactoryGirl.create(:job_invocation, :with_task)
+    ForemanTasks::Cleaner.new(:filter => "id = #{job.task.id}").delete
+    JobInvocation.where(:id => job.id).must_be :empty?
+  end
+
+  it 'removes orphaned job invocations' do
+    job = FactoryGirl.create(:job_invocation, :with_task)
+    JobInvocation.where(:id => job.id).count.must_equal 1
+    job.task.delete
+    job.reload
+    job.task.must_be :nil?
+    job.task_id.wont_be :nil?
+    ForemanTasks::Cleaner.new(:filter => 'id = 1').delete
+    JobInvocation.where(:id => job.id).must_be :empty?
+  end
+end

data/test/unit/input_template_renderer_test.rb

@@ -147,9 +147,9 @@ class InputTemplateRendererTest < ActiveSupport::TestCase
       end
 
       let(:package_template) do
-        FactoryGirl.build(:job_template, :name => 'package action', :template => <<TEMPLATE) do |template|
-<%= render_template("command action", "command" => "yum -y \#{ input("action") } \#{ input('package') }") -%>
-TEMPLATE
+        FactoryGirl.build(:job_template, :name => 'package action', :template => <<-TEMPLATE.strip_heredoc) do |template|
+          <%= render_template("command action", "command" => "yum -y \#{ input("action") } \#{ input('package') }") -%>
+        TEMPLATE
           template.template_inputs << FactoryGirl.build(:template_input, :name => 'package', :input_type => 'user')
           template.template_inputs << FactoryGirl.build(:template_input, :name => 'action', :input_type => 'user')
           template.foreign_input_sets << FactoryGirl.build(:foreign_input_set, :target_template => command_template, :include_all => true, :exclude => 'command')
@@ -464,8 +464,7 @@ TEMPLATE
               puppetclass
             end
             let(:lookup_key) do
-              lookup_key_factory = SETTINGS[:version].short == '1.9' ? :lookup_key : :variable_lookup_key
-              FactoryGirl.create(lookup_key_factory,
+              FactoryGirl.create(:variable_lookup_key,
                                  :key => 'client_key',
                                  :puppetclass => puppet_class,
                                  :overrides => {"fqdn=#{renderer.host.fqdn}" => 'RSA KEY'})
@@ -550,8 +549,7 @@ TEMPLATE
               puppetclass
             end
             let(:lookup_key) do
-              lookup_key_factory = SETTINGS[:version].short == '1.9' ? :lookup_key : :puppetclass_lookup_key
-              FactoryGirl.create(lookup_key_factory, :as_smart_class_param,
+              FactoryGirl.create(:puppetclass_lookup_key, :as_smart_class_param,
                                  :key => 'version',
                                  :puppetclass => puppet_class,
                                  :path => 'fqdn',

data/test/unit/job_template_importer_test.rb

@@ -22,13 +22,13 @@ class JobTemplateImporterTest < ActiveSupport::TestCase
           { 'name' => 'verbose', 'input_type' => 'user' }
         ]
       }
-      text = <<-END_TEMPLATE
-<%#
-#{YAML.dump(metadata)}
-%>
+      text = <<-END_TEMPLATE.strip_heredoc
+        <%#
+        #{YAML.dump(metadata)}
+        %>
 
-service <%= input("service_name") %> restart
-END_TEMPLATE
+        service <%= input("service_name") %> restart
+      END_TEMPLATE
 
       JobTemplateImporter.import!(name, text, metadata)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_remote_execution
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Foreman Remote Execution team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-30 00:00:00.000000000 Z
+date: 2017-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -56,16 +56,16 @@ dependencies:
   name: foreman-tasks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -181,6 +181,7 @@ files:
 - app/models/concerns/foreman_remote_execution/bookmark_extensions.rb
 - app/models/concerns/foreman_remote_execution/errors_flattener.rb
 - app/models/concerns/foreman_remote_execution/exportable.rb
+- app/models/concerns/foreman_remote_execution/foreman_tasks_cleaner_extensions.rb
 - app/models/concerns/foreman_remote_execution/foreman_tasks_task_extensions.rb
 - app/models/concerns/foreman_remote_execution/foreman_tasks_triggering_extensions.rb
 - app/models/concerns/foreman_remote_execution/host_extensions.rb
@@ -313,6 +314,7 @@ files:
 - db/migrate/20160203104056_add_concurrency_options_to_job_invocation.rb
 - db/migrate/20160926225841_update_template_input_value.rb
 - db/migrate/20170110145641_add_host_action_button_to_remote_execution_feature.rb
+- db/migrate/20170613101039_add_timeout_to_job_templates_and_job_invocations.rb
 - db/seeds.d/60-ssh_proxy_feature.rb
 - db/seeds.d/70-job_templates.rb
 - db/seeds.d/90-bookmarks.rb
@@ -395,6 +397,7 @@ files:
 - test/test_plugin_helper.rb
 - test/unit/actions/run_hosts_job_test.rb
 - test/unit/concerns/exportable_test.rb
+- test/unit/concerns/foreman_tasks_cleaner_extensions_test.rb
 - test/unit/concerns/host_extensions_test.rb
 - test/unit/concerns/nic_extensions_test.rb
 - test/unit/execution_task_status_mapper_test.rb
@@ -445,6 +448,7 @@ test_files:
 - test/test_plugin_helper.rb
 - test/unit/actions/run_hosts_job_test.rb
 - test/unit/concerns/exportable_test.rb
+- test/unit/concerns/foreman_tasks_cleaner_extensions_test.rb
 - test/unit/concerns/host_extensions_test.rb
 - test/unit/concerns/nic_extensions_test.rb
 - test/unit/execution_task_status_mapper_test.rb