foreman_remote_execution 13.1.0 → 13.2.0

data/app/controllers/api/v2/job_invocations_controller.rb

@@ -139,6 +139,7 @@ module Api
       api :POST, '/job_invocations/:id/rerun', N_('Rerun job on failed hosts')
       param :id, :identifier, :required => true
       param :failed_only, :bool
+      param :succeeded_only, :bool
       def rerun
         composer = JobInvocationComposer.from_job_invocation(@job_invocation, params)
         if composer.rerun_possible?

data/app/models/job_invocation.rb

@@ -194,6 +194,10 @@ class JobInvocation < ApplicationRecord
     failed_hosts.pluck(:id)
   end
 
+  def succeeded_host_ids
+    succeeded_hosts.pluck(:id)
+  end
+
   def failed_hosts
     base = targeting.hosts
     if finished?
@@ -203,6 +207,15 @@ class JobInvocation < ApplicationRecord
     end
   end
 
+  def succeeded_hosts
+    base = targeting.hosts
+    if finished?
+      base.where.not(:id => not_succeeded_template_invocations.select(:host_id))
+    else
+      base.where(:id => succeeded_template_invocations.select(:host_id))
+    end
+  end
+
   def total_hosts_count
     count = _('N/A')
 
@@ -290,4 +303,14 @@ class JobInvocation < ApplicationRecord
     results = [:cancelled, :failed].map { |state| TemplateInvocation::TaskResultMap.status_to_task_result(state) }.flatten
     template_invocations.joins(:run_host_job_task).where.not(ForemanTasks::Task.table_name => { :result => results })
   end
+
+  def succeeded_template_invocations
+    result = TemplateInvocation::TaskResultMap.status_to_task_result(:success)
+    template_invocations.joins(:run_host_job_task).where(ForemanTasks::Task.table_name => { :result => result })
+  end
+
+  def not_succeeded_template_invocations
+    result = TemplateInvocation::TaskResultMap.status_to_task_result(:success)
+    template_invocations.joins(:run_host_job_task).where.not(ForemanTasks::Task.table_name => { :result => result })
+  end
 end

data/app/models/job_invocation_composer.rb

@@ -232,6 +232,8 @@ class JobInvocationComposer
         @host_ids = params[:host_ids]
       elsif params[:failed_only]
         @host_ids = job_invocation.failed_host_ids
+      elsif params[:succeeded_only]
+        @host_ids = job_invocation.succeeded_host_ids
       end
     end
 

data/app/views/api/v2/job_invocations/base.json.rabl

@@ -25,9 +25,10 @@ end
 if params.key?(:include_permissions)
   node :permissions do |invocation|
     authorizer = Authorizer.new(User.current)
-    edit_job_templates_permission = Permission.where(name: "edit_job_templates", resource_type: "JobTemplate").first
     {
-      "edit_job_templates" => (edit_job_templates_permission && authorizer.can?("edit_job_templates", invocation, false)),
+      "edit_job_templates" => authorizer.can?("edit_job_templates", invocation, false),
+      "view_foreman_tasks" => authorizer.can?("view_foreman_tasks", invocation.task, false),
+      "edit_recurring_logics" => authorizer.can?("edit_recurring_logics", invocation.recurring_logic, false),
     }
   end
 end

data/app/views/templates/script/package_action.erb

@@ -66,6 +66,7 @@ exit_with_message () {
 <% if package_manager == 'zypper' -%>
 handle_zypp_res_codes () {
   RETVAL=$1
+  ACTION=$2
 
   # See https://github.com/openSUSE/zypper/blob/master/src/main.h
   declare -A ZYPP_RES_CODES
@@ -83,6 +84,8 @@ handle_zypp_res_codes () {
   fi
   if [[ $RETVAL -ge 100 && $RETVAL -le 103 ]]; then
     RETVAL=0
+  elif [ "$ACTION" = "remove" ] && [ "$RETVAL" -eq 104 ]; then
+    RETVAL=0
   fi
 
   return $RETVAL
@@ -122,7 +125,7 @@ handle_zypp_res_codes () {
   apt-get -y update
   LANG=C apt-get -o APT::Get::Upgrade-Allow-New="true" -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" -y <%= input("options") %> <%= action %> <%= input("package") %> 2>&1 | tee $OUTFILE
   RETVAL=$?
-  if grep -q "Unable to locate" $OUTFILE; then
+  if grep -q "Unable to locate" $OUTFILE && [ "$action" = "remove" ]; then
     true
   else
     setReturnValue() { RETVAL=$1; return $RETVAL; }
@@ -138,7 +141,7 @@ handle_zypp_res_codes () {
   -%>
   zypper refresh
   zypper -n <%= action %> <%= input("options") %> <%= input("package") %>
-  handle_zypp_res_codes $?
+  handle_zypp_res_codes $? $action
 <% end -%>
 RETVAL=$?
 [ $RETVAL -eq 0 ] || exit_with_message "Package action failed" $RETVAL

data/lib/foreman_remote_execution/version.rb

@@ -1,3 +1,3 @@
 module ForemanRemoteExecution
-  VERSION = '13.1.0'.freeze
+  VERSION = '13.2.0'.freeze
 end

data/locale/de/foreman_remote_execution.po

@@ -22,6 +22,9 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+msgid "${d.title} ${d.count} hosts"
+msgstr ""
+
 msgid "%s"
 msgstr "%s"
 
@@ -156,6 +159,9 @@ msgstr "Job abbrechen"
 msgid "Cancel job invocation"
 msgstr "Job-Aufruf abbrechen"
 
+msgid "Canceled:"
+msgstr ""
+
 msgid "Cancelled"
 msgstr "Abgebrochen"
 
@@ -441,6 +447,9 @@ msgstr ""
 msgid "Failed rendering template: %s"
 msgstr "Rendern der Vorlage fehlgeschlagen: %s"
 
+msgid "Failed:"
+msgstr ""
+
 msgid "Fallback to Any Proxy"
 msgstr "Fallback auf einen beliebigen Proxy"
 
@@ -543,6 +552,9 @@ msgstr "Import"
 msgid "Import a job template from ERB"
 msgstr "Job-Vorlage aus ERB importieren"
 
+msgid "In Progress:"
+msgstr ""
+
 msgid "Include all inputs from the foreign template"
 msgstr "Alle Eingaben aus Fremdvorlage einschließen"
 
@@ -1040,12 +1052,18 @@ msgstr ""
 msgid "Scheduled"
 msgstr "Geplant"
 
+msgid "Scheduled at:"
+msgstr ""
+
 msgid "Scheduled to start at"
 msgstr "Geplanter Start um"
 
 msgid "Scheduled to start before"
 msgstr "Geplanter Start vor"
 
+msgid "Scheduled: ${totalHosts} hosts"
+msgstr ""
+
 msgid "Script"
 msgstr "Skript"
 
@@ -1190,6 +1208,9 @@ msgstr ""
 msgid "Succeeded"
 msgstr "Erfolgreich"
 
+msgid "Succeeded:"
+msgstr ""
+
 msgid "Success"
 msgstr "Erfolg"
 
@@ -1199,6 +1220,12 @@ msgstr ""
 msgid "Sync Job Templates"
 msgstr "Synchronisations Job-Vorlage"
 
+msgid "System status"
+msgstr ""
+
+msgid "Systems"
+msgstr ""
+
 msgid "Target hosts"
 msgstr "Zielhosts"
 

data/locale/en/foreman_remote_execution.po

@@ -17,6 +17,9 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "\n"
 
+msgid "${d.title} ${d.count} hosts"
+msgstr ""
+
 msgid "%s"
 msgstr ""
 
@@ -151,6 +154,9 @@ msgstr ""
 msgid "Cancel job invocation"
 msgstr ""
 
+msgid "Canceled:"
+msgstr ""
+
 msgid "Cancelled"
 msgstr ""
 
@@ -436,6 +442,9 @@ msgstr ""
 msgid "Failed rendering template: %s"
 msgstr ""
 
+msgid "Failed:"
+msgstr ""
+
 msgid "Fallback to Any Proxy"
 msgstr ""
 
@@ -538,6 +547,9 @@ msgstr ""
 msgid "Import a job template from ERB"
 msgstr ""
 
+msgid "In Progress:"
+msgstr ""
+
 msgid "Include all inputs from the foreign template"
 msgstr ""
 
@@ -1033,12 +1045,18 @@ msgstr ""
 msgid "Scheduled"
 msgstr ""
 
+msgid "Scheduled at:"
+msgstr ""
+
 msgid "Scheduled to start at"
 msgstr ""
 
 msgid "Scheduled to start before"
 msgstr ""
 
+msgid "Scheduled: ${totalHosts} hosts"
+msgstr ""
+
 msgid "Script"
 msgstr ""
 
@@ -1183,6 +1201,9 @@ msgstr ""
 msgid "Succeeded"
 msgstr ""
 
+msgid "Succeeded:"
+msgstr ""
+
 msgid "Success"
 msgstr ""
 
@@ -1192,6 +1213,12 @@ msgstr ""
 msgid "Sync Job Templates"
 msgstr ""
 
+msgid "System status"
+msgstr ""
+
+msgid "Systems"
+msgstr ""
+
 msgid "Target hosts"
 msgstr ""
 

data/locale/en_GB/foreman_remote_execution.po

@@ -18,6 +18,9 @@ msgstr ""
 "Language: en_GB\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+msgid "${d.title} ${d.count} hosts"
+msgstr ""
+
 msgid "%s"
 msgstr ""
 
@@ -152,6 +155,9 @@ msgstr ""
 msgid "Cancel job invocation"
 msgstr ""
 
+msgid "Canceled:"
+msgstr ""
+
 msgid "Cancelled"
 msgstr ""
 
@@ -437,6 +443,9 @@ msgstr ""
 msgid "Failed rendering template: %s"
 msgstr ""
 
+msgid "Failed:"
+msgstr ""
+
 msgid "Fallback to Any Proxy"
 msgstr ""
 
@@ -539,6 +548,9 @@ msgstr ""
 msgid "Import a job template from ERB"
 msgstr ""
 
+msgid "In Progress:"
+msgstr ""
+
 msgid "Include all inputs from the foreign template"
 msgstr ""
 
@@ -1034,12 +1046,18 @@ msgstr ""
 msgid "Scheduled"
 msgstr ""
 
+msgid "Scheduled at:"
+msgstr ""
+
 msgid "Scheduled to start at"
 msgstr ""
 
 msgid "Scheduled to start before"
 msgstr ""
 
+msgid "Scheduled: ${totalHosts} hosts"
+msgstr ""
+
 msgid "Script"
 msgstr ""
 
@@ -1184,6 +1202,9 @@ msgstr ""
 msgid "Succeeded"
 msgstr ""
 
+msgid "Succeeded:"
+msgstr ""
+
 msgid "Success"
 msgstr "Success"
 
@@ -1193,6 +1214,12 @@ msgstr ""
 msgid "Sync Job Templates"
 msgstr ""
 
+msgid "System status"
+msgstr ""
+
+msgid "Systems"
+msgstr ""
+
 msgid "Target hosts"
 msgstr ""
 

data/locale/es/foreman_remote_execution.po

@@ -18,6 +18,9 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 :"
 " 2;\n"
 
+msgid "${d.title} ${d.count} hosts"
+msgstr ""
+
 msgid "%s"
 msgstr "%s"
 
@@ -152,6 +155,9 @@ msgstr "Cancelar tarea"
 msgid "Cancel job invocation"
 msgstr "Cancelar invocación de trabajo"
 
+msgid "Canceled:"
+msgstr ""
+
 msgid "Cancelled"
 msgstr "Cancelado"
 
@@ -437,6 +443,9 @@ msgstr "Anfitriones fallidos"
 msgid "Failed rendering template: %s"
 msgstr "Falló la reproducción de la plantilla: %s."
 
+msgid "Failed:"
+msgstr ""
+
 msgid "Fallback to Any Proxy"
 msgstr "Acción de reserva en cualquier proxy"
 
@@ -539,6 +548,9 @@ msgstr "Importar"
 msgid "Import a job template from ERB"
 msgstr "Importar una plantilla de trabajo desde ERB"
 
+msgid "In Progress:"
+msgstr ""
+
 msgid "Include all inputs from the foreign template"
 msgstr "Incluir todas las entradas de la plantilla externa"
 
@@ -1034,12 +1046,18 @@ msgstr "Tipo de horario"
 msgid "Scheduled"
 msgstr "Programado"
 
+msgid "Scheduled at:"
+msgstr ""
+
 msgid "Scheduled to start at"
 msgstr "Programado para comenzar a las"
 
 msgid "Scheduled to start before"
 msgstr "Programado para iniciar antes"
 
+msgid "Scheduled: ${totalHosts} hosts"
+msgstr ""
+
 msgid "Script"
 msgstr "Guión"
 
@@ -1184,6 +1202,9 @@ msgstr "Suscríbase a mis trabajos con éxito"
 msgid "Succeeded"
 msgstr "exitoso"
 
+msgid "Succeeded:"
+msgstr ""
+
 msgid "Success"
 msgstr "Éxito"
 
@@ -1193,6 +1214,12 @@ msgstr ""
 msgid "Sync Job Templates"
 msgstr "Sincronizar plantillas de trabajo"
 
+msgid "System status"
+msgstr ""
+
+msgid "Systems"
+msgstr ""
+
 msgid "Target hosts"
 msgstr "Hosts de destino"