foreman_remote_execution 1.3.0 → 1.3.1

data/locale/ru/foreman_remote_execution.po

@@ -20,6 +20,9 @@ msgstr ""
 "4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=1"
 "1 && n%100<=14)? 2 : 3);\n"
 
+msgid "%s"
+msgstr ""
+
 msgid "%s ago"
 msgstr "%s назад"
 
@@ -99,9 +102,18 @@ msgstr "Закрыть"
 msgid "Concurrency level"
 msgstr "Параллелизм"
 
+msgid "Concurrency level limited to"
+msgstr ""
+
 msgid "Control concurrency level and distribution over time"
 msgstr "Контроль параллельного выполнения и распределения во времени"
 
+msgid "Could not find any suitable interface for execution"
+msgstr ""
+
+msgid "Could not render the preview because no host matches the search query."
+msgstr ""
+
 msgid "Could not use any proxy. Consider configuring %{global_proxy}, %{fallback_proxy} or %{no_proxy} in settings"
 msgstr ""
 
@@ -189,12 +201,6 @@ msgstr "Выполнение"
 msgid "Exit status: %s"
 msgstr "Код завершения: %s"
 
-msgid "Explanation"
-msgstr "Объяснение"
-
-msgid "Export"
-msgstr "Экспорт"
-
 msgid "Export a job template to ERB"
 msgstr "Экспорт шаблона в ERB"
 
@@ -300,6 +306,9 @@ msgstr "Шаблоны заданий"
 msgid "Job category"
 msgstr "Категория"
 
+msgid "Job execution failed"
+msgstr ""
+
 msgid "Job finished with error"
 msgstr "Задание было завершено с ошибкой"
 
@@ -408,9 +417,6 @@ msgstr "Ожидание"
 msgid "Perform no more executions after this time"
 msgstr "Остановить после указанного числа повторений"
 
-msgid "Playbook execution failed"
-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 ""
 
@@ -501,12 +507,18 @@ msgstr "SSH"
 msgid "SSH provider specific options"
 msgstr "Параметры провайдера SSH"
 
+msgid "Schedule Remote Job"
+msgstr ""
+
 msgid "Schedule the job for a future time"
 msgstr "Настроить время запуска"
 
 msgid "Schedule the job to start at a later time"
 msgstr "Отложенный запуск"
 
+msgid "Scheduled to start at"
+msgstr ""
+
 msgid "Scroll to bottom"
 msgstr "Перейти вниз"
 
@@ -537,6 +549,12 @@ msgstr "Выберите все возможные прокси для этой
 msgid "Selectable values for user inputs"
 msgstr "Список возможных значений"
 
+msgid "Set to distribute over"
+msgstr ""
+
+msgid "Should the ip addresses on host interfaces be preferred over the fqdn? It is useful, when DNS not resolving the fqdns properly. You may override this per host by setting a parameter called remote_execution_connect_by_ip."
+msgstr ""
+
 msgid "Show foreign input set details"
 msgstr "Показать информацию о внешнем наборе входных параметров"
 
@@ -628,12 +646,12 @@ msgstr "Шаблон заблокирован."
 msgid "This template is locked. Please clone it to a new template to customize."
 msgstr "Шаблон заблокирован. Скопируйте его для создания нового шаблона на его основе."
 
-msgid "This template is used to generate the description Input values can be used using the syntax %{package}. You may also include the job category and template name using %{job_category} and %{template_name}."
-msgstr "Это шаблон для генерации описания. Для того чтобы добавить переменную, используйте синтаксис %{package}; категорию задания — %{job_category}; название шаблона — %{template_name}."
-
 msgid "This template is used to generate the description. Input values can be used using the syntax %{package}. You may also include the job category and template name using %{job_category} and %{template_name}."
 msgstr "Это шаблон для генерации описания. Для того чтобы добавить переменную, используйте синтаксис %{package}; категорию задания — %{job_category}; название шаблона — %{template_name}."
 
+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 span"
 msgstr "Интервал"
 
@@ -786,12 +804,18 @@ msgstr "связанный шаблон «%s» не найден"
 msgid "input macro with name '%s' used, but no input with such name defined for this template"
 msgstr "ожидается макрос «%s», но входных параметров с таким именем для этого шаблона не обнаружено"
 
+msgid "minutes"
+msgstr ""
+
 msgid "planned"
 msgstr "запланировано"
 
 msgid "queued"
 msgstr "в очереди"
 
+msgid "queued to start executing in %{time}"
+msgstr ""
+
 msgid "remove template input"
 msgstr "удалить параметр ввода"
 
@@ -810,6 +834,9 @@ msgstr "завершено"
 msgid "success"
 msgstr "успешно"
 
+msgid "tasks at a time"
+msgstr ""
+
 msgid "template"
 msgstr "шаблон"
 

data/locale/zh_CN/foreman_remote_execution.po

@@ -17,6 +17,9 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+msgid "%s"
+msgstr ""
+
 msgid "%s ago"
 msgstr "%s 前"
 
@@ -94,9 +97,18 @@ msgstr "关闭"
 msgid "Concurrency level"
 msgstr "并发等级"
 
+msgid "Concurrency level limited to"
+msgstr ""
+
 msgid "Control concurrency level and distribution over time"
 msgstr "控制并行等级及分配时间"
 
+msgid "Could not find any suitable interface for execution"
+msgstr ""
+
+msgid "Could not render the preview because no host matches the search query."
+msgstr ""
+
 msgid "Could not use any proxy. Consider configuring %{global_proxy}, %{fallback_proxy} or %{no_proxy} in settings"
 msgstr ""
 
@@ -184,12 +196,6 @@ msgstr "执行"
 msgid "Exit status: %s"
 msgstr "退出状态：%s"
 
-msgid "Explanation"
-msgstr "说明"
-
-msgid "Export"
-msgstr "导出"
-
 msgid "Export a job template to ERB"
 msgstr "导出任务模版到 ERB"
 
@@ -295,6 +301,9 @@ msgstr "任务模板"
 msgid "Job category"
 msgstr "任务类别"
 
+msgid "Job execution failed"
+msgstr ""
+
 msgid "Job finished with error"
 msgstr "任务完成但有错误"
 
@@ -403,9 +412,6 @@ msgstr "等待处理"
 msgid "Perform no more executions after this time"
 msgstr "这个时间后不再执行任何操作"
 
-msgid "Playbook execution failed"
-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 ""
 
@@ -496,12 +502,18 @@ msgstr "SSH"
 msgid "SSH provider specific options"
 msgstr "SSH 提供者的具体选项"
 
+msgid "Schedule Remote Job"
+msgstr ""
+
 msgid "Schedule the job for a future time"
 msgstr "将该任务调度为在将来的某个时间开始"
 
 msgid "Schedule the job to start at a later time"
 msgstr "将该任务调度为于稍后开始"
 
+msgid "Scheduled to start at"
+msgstr ""
+
 msgid "Scroll to bottom"
 msgstr "滚动到底部"
 
@@ -532,6 +544,12 @@ msgstr "为这个子网选择所有可使用的远程执行代理服务器。添
 msgid "Selectable values for user inputs"
 msgstr "用户输入的可选值"
 
+msgid "Set to distribute over"
+msgstr ""
+
+msgid "Should the ip addresses on host interfaces be preferred over the fqdn? It is useful, when DNS not resolving the fqdns properly. You may override this per host by setting a parameter called remote_execution_connect_by_ip."
+msgstr ""
+
 msgid "Show foreign input set details"
 msgstr "显示外部输入集详情"
 
@@ -621,12 +639,12 @@ msgstr "这个模板已锁定，无法编辑。"
 msgid "This template is locked. Please clone it to a new template to customize."
 msgstr "这个模板已锁定。请克隆一个新模板进行编辑。"
 
-msgid "This template is used to generate the description Input values can be used using the syntax %{package}. You may also include the job category and template name using %{job_category} and %{template_name}."
-msgstr "这个模板是用来生成描述。可和使用句法 %{package} 输入参数值。还可以和使用 %{job_category} 和 %{template_name} 在其中包含任务类别及模板名称。"
-
 msgid "This template is used to generate the description. Input values can be used using the syntax %{package}. You may also include the job category and template name using %{job_category} and %{template_name}."
 msgstr "这个模板是用来生成描述。可和使用句法 %{package} 输入参数值。还可以和使用 %{job_category} 和 %{template_name} 在其中包含任务类别及模板名称。"
 
+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 span"
 msgstr "时间跨度"
 
@@ -779,12 +797,18 @@ msgstr "未找到所包含模板 '%s'"
 msgid "input macro with name '%s' used, but no input with such name defined for this template"
 msgstr "名为 '%s' 的输入宏已被使用，但没有为这个模板定义使用这个名称的输入。"
 
+msgid "minutes"
+msgstr ""
+
 msgid "planned"
 msgstr ""
 
 msgid "queued"
 msgstr "已排队"
 
+msgid "queued to start executing in %{time}"
+msgstr ""
+
 msgid "remove template input"
 msgstr "删除模板输入"
 
@@ -803,6 +827,9 @@ msgstr "已成功"
 msgid "success"
 msgstr "成功"
 
+msgid "tasks at a time"
+msgstr ""
+
 msgid "template"
 msgstr "模板"
 

data/locale/zh_TW/foreman_remote_execution.po

@@ -17,6 +17,9 @@ msgstr ""
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+msgid "%s"
+msgstr ""
+
 msgid "%s ago"
 msgstr "%s 之前"
 
@@ -94,9 +97,18 @@ msgstr "關閉"
 msgid "Concurrency level"
 msgstr "同步等級"
 
+msgid "Concurrency level limited to"
+msgstr ""
+
 msgid "Control concurrency level and distribution over time"
 msgstr "隨時間控制週期等級並散佈"
 
+msgid "Could not find any suitable interface for execution"
+msgstr ""
+
+msgid "Could not render the preview because no host matches the search query."
+msgstr ""
+
 msgid "Could not use any proxy. Consider configuring %{global_proxy}, %{fallback_proxy} or %{no_proxy} in settings"
 msgstr ""
 
@@ -184,12 +196,6 @@ msgstr "執行"
 msgid "Exit status: %s"
 msgstr "退出狀態：%s"
 
-msgid "Explanation"
-msgstr "解釋"
-
-msgid "Export"
-msgstr ""
-
 msgid "Export a job template to ERB"
 msgstr ""
 
@@ -295,6 +301,9 @@ msgstr "工作範本"
 msgid "Job category"
 msgstr "工作類別"
 
+msgid "Job execution failed"
+msgstr ""
+
 msgid "Job finished with error"
 msgstr "工作完成但發生錯誤"
 
@@ -403,9 +412,6 @@ msgstr "等待處理中"
 msgid "Perform no more executions after this time"
 msgstr "此時間之後不再進行任何執行"
 
-msgid "Playbook execution failed"
-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 ""
 
@@ -496,12 +502,18 @@ msgstr "SSH"
 msgid "SSH provider specific options"
 msgstr "SSH 供應者特定選項"
 
+msgid "Schedule Remote Job"
+msgstr ""
+
 msgid "Schedule the job for a future time"
 msgstr "排程工作至未來時間"
 
 msgid "Schedule the job to start at a later time"
 msgstr "排程工作至晚一點的時間"
 
+msgid "Scheduled to start at"
+msgstr ""
+
 msgid "Scroll to bottom"
 msgstr "捲動至底端"
 
@@ -532,6 +544,12 @@ msgstr "為此子網路儘可能選擇遠端執行代理。加入有著同樣供
 msgid "Selectable values for user inputs"
 msgstr "使用者輸入可選擇的值"
 
+msgid "Set to distribute over"
+msgstr ""
+
+msgid "Should the ip addresses on host interfaces be preferred over the fqdn? It is useful, when DNS not resolving the fqdns properly. You may override this per host by setting a parameter called remote_execution_connect_by_ip."
+msgstr ""
+
 msgid "Show foreign input set details"
 msgstr "顯示外部輸入集的詳細資料"
 
@@ -621,12 +639,12 @@ msgstr "此範本已鎖定，因此無法編輯。"
 msgid "This template is locked. Please clone it to a new template to customize."
 msgstr "此範本已鎖定。請將它複製至一個新的範本以自訂化。"
 
-msgid "This template is used to generate the description Input values can be used using the syntax %{package}. You may also include the job category and template name using %{job_category} and %{template_name}."
-msgstr "這範本是用來產生描述。輸入值可以使用 %{package} 語法。您也可以使用 %{job_category} 與 %{template_name} 來包括工作類別與範本名稱。"
-
 msgid "This template is used to generate the description. Input values can be used using the syntax %{package}. You may also include the job category and template name using %{job_category} and %{template_name}."
 msgstr "這範本是用來產生描述。輸入值可以使用 %{package} 語法。您也可以使用 %{job_category} 與 %{template_name} 來包括工作類別與範本名稱。"
 
+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 span"
 msgstr "時間跨度"
 
@@ -779,12 +797,18 @@ msgstr "找不到包含的範本 '%s'"
 msgid "input macro with name '%s' used, but no input with such name defined for this template"
 msgstr "使用了名為 '%s' 的輸入巨集，但此範本並未輸入這樣的名稱"
 
+msgid "minutes"
+msgstr ""
+
 msgid "planned"
 msgstr ""
 
 msgid "queued"
 msgstr "已排程"
 
+msgid "queued to start executing in %{time}"
+msgstr ""
+
 msgid "remove template input"
 msgstr "移除範本輸入"
 
@@ -803,6 +827,9 @@ msgstr "已成功"
 msgid "success"
 msgstr "成功"
 
+msgid "tasks at a time"
+msgstr ""
+
 msgid "template"
 msgstr "範本"
 

data/test/benchmark/run_hosts_job_benchmark.rb

@@ -1,4 +1,4 @@
-require "benchmark/benchmark_helper"
+require 'benchmark/benchmark_helper'
 require 'dynflow/testing'
 
 # Add plugin to FactoryGirl's paths
@@ -63,7 +63,7 @@ foreman_benchmark do
   Benchmark.ips do |x|
     x.config(:time => 10, :warmup => 0)
 
-    x.report("rex-run-hosts-job") do
+    x.report('rex-run-hosts-job') do
       tester.run_action(job_invocation)
     end
   end

data/test/benchmark/targeting_benchmark.rb

@@ -1,4 +1,4 @@
-require "benchmark/benchmark_helper"
+require 'benchmark/benchmark_helper'
 require 'dynflow/testing'
 
 # Add plugin to FactoryGirl's paths
@@ -23,7 +23,7 @@ foreman_benchmark do
   Benchmark.ips do |x|
     x.config(:time => 10, :warmup => 0)
 
-    x.report("rex-targeting-resolve-hosts") do
+    x.report('rex-targeting-resolve-hosts') do
       targeting = FactoryGirl.create(:targeting, :search_query => "comment = benchmark-#{Foreman.uuid}", :user => User.current)
       targeting.resolve_hosts!
     end

data/test/factories/foreman_remote_execution_factories.rb

@@ -5,8 +5,8 @@ FactoryGirl.define do
     sequence(:job_category) { |n| "job name #{n}" }
     f.template 'id'
     f.provider_type 'SSH'
-    organizations { [Organization.find_by_name('Organization 1')] } if SETTINGS[:organizations_enabled]
-    locations { [Location.find_by_name('Location 1')] } if SETTINGS[:locations_enabled]
+    organizations { [Organization.find_by(name: 'Organization 1')] } if SETTINGS[:organizations_enabled]
+    locations { [Location.find_by(name: 'Location 1')] } if SETTINGS[:locations_enabled]
 
 
     trait :with_input do
@@ -47,6 +47,13 @@ FactoryGirl.define do
       end
 
     end
+
+    trait :with_task do
+      after(:build) do |invocation, _evaluator|
+        invocation.template_invocations << FactoryGirl.build(:template_invocation, :with_task, :with_host)
+        invocation.task = FactoryGirl.build(:some_task)
+      end
+    end
   end
 
   factory :remote_execution_provider do |f|
@@ -56,6 +63,24 @@ FactoryGirl.define do
   factory :template_invocation do |f|
     job_invocation
     association :template, :factory => :job_template
+
+    trait :with_task do
+      after(:build) do |template, _evaluator|
+        template.run_host_job_task = FactoryGirl.build(:some_task)
+      end
+    end
+
+    trait :with_failed_task do
+      after(:build) do |template, _evaluator|
+        template.run_host_job_task = FactoryGirl.build(:some_task, :result => 'error')
+      end
+    end
+
+    trait :with_host do
+      after(:build) do |template, _evaluator|
+        template.host = FactoryGirl.build(:host)
+      end
+    end
   end
 
   factory :template_invocation_input_value do |f|