foreman_remote_execution 14.1.1 → 14.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c7d7e0afd2637caccf6c287144c92599fd6abb3acecdc27b4fdfa960bc12e8a
-  data.tar.gz: 85e3859a4e3c81e03cc0441222d79bec187156e942e1abd3f4aec17b67c1a044
+  metadata.gz: 5e583aa5a9aac3e6a34ae0f42fa35f154d56830ad88558dbe86513389fe1dbb5
+  data.tar.gz: 2cd7f2449b0e5a8b4925462c0fbb4bb02912586173d204db1d25d644f0fd1bdb
 SHA512:
-  metadata.gz: e24ea3d8af7755d15f5ed7b72b606590835414521b5bd100b137fcffdf0496bb6a2f52d94140622f18ed7121bf07725ffed2be76d7ef4ca648664f6b47a9b385
-  data.tar.gz: b8ef21fe312ee53f7dd60e746c0fed2e8e60386c06202cddc6c3ad23da3beaccdbd0f01214517a4a80c17546d1c32fa74a80c4de4a0d783be1a78dda8703ddcd
+  metadata.gz: c8d3f21e337dee5e4102eeccdd4717539cf2422938302311953c6ac2bc37050c082c0cd5f68ad82041ea2b6bcebd89dd934708862694658632c5b941221b9ef4
+  data.tar.gz: 5dfcabcae4a0cf33e8806936b2e8b23ea5030be225cc0b1ff3b6f8f60c48eb2f4456feb7a5597b437d5f49d9d162295bfa5069fad950f73056afec35a1a166fb

data/app/models/job_template.rb

@@ -64,6 +64,7 @@ class JobTemplate < ::Template
     # will overwrite (sync) an existing template if options[:update] is true.
     def import_raw(contents, options = {})
       metadata = Template.parse_metadata(contents)
+      return unless SeedHelper.test_template_requirements(metadata['name'], metadata['require'] || [])
       import_parsed(metadata['name'], contents, metadata, options)
     end
 

data/app/views/template_invocations/show.js.erb

@@ -9,7 +9,7 @@ var target = $("div.terminal div.printable");
   target.html(lines);
 <% end %>
 
-<%= render :partial => 'refresh.js' %>
+<%= render partial: 'refresh', formats: :js %>
 
 if (scrolledToBottom) {
   $("html, body").animate({ scrollTop: $(document).height() }, "slow");

data/db/migrate/20240312133027_extend_template_invocation_events.rb

@@ -6,6 +6,15 @@ class ExtendTemplateInvocationEvents < ActiveRecord::Migration[6.1]
 
     TemplateInvocationEvent.update_all("external_id = CASE WHEN event_type = 'exit' THEN 'exit' ELSE sequence_id::varchar END")
 
+    # For each template invocation return the lowest id of its exit event, if there is more than 1 exit event
+    scope = TemplateInvocationEvent.select("MIN(id) as id")
+                                   .where(external_id: 'exit')
+                                   .group(:template_invocation_id)
+                                   .having("count(*) > 1")
+
+    # Make sure there is at most one exit event per template invocation
+    TemplateInvocationEvent.where(:id => scope.limit(BATCH_SIZE)).delete_all while scope.any?
+
     remove_index :template_invocation_events, name: :unique_template_invocation_events_index
     remove_column :template_invocation_events, :sequence_id
 

data/db/migrate/20241126150849_remove_remote_execution_workers_pool_size.rb

@@ -0,0 +1,8 @@
+class RemoveRemoteExecutionWorkersPoolSize < ActiveRecord::Migration[6.1]
+  def up
+    Setting.find_by(:name => 'remote_execution_workers_pool_size')&.delete
+  end
+
+  def down
+  end
+end

data/lib/foreman_remote_execution/engine.rb

@@ -28,7 +28,7 @@ module ForemanRemoteExecution
 
     initializer 'foreman_remote_execution.require_dynflow', :before => 'foreman_tasks.initialize_dynflow' do |app|
       ForemanTasks.dynflow.require!
-      ForemanTasks.dynflow.config.queues.add(DYNFLOW_QUEUE, :pool_size => Setting['remote_execution_workers_pool_size']) if Setting.table_exists? rescue(false)
+      ForemanTasks.dynflow.config.queues.add(DYNFLOW_QUEUE)
       ForemanTasks.dynflow.config.eager_load_paths << File.join(ForemanRemoteExecution::Engine.root, 'app/lib/actions')
     end
 
@@ -117,11 +117,6 @@ module ForemanRemoteExecution
                 default: nil,
                 full_name: N_('Default SSH key passphrase'),
                 encrypted: true
-              setting 'remote_execution_workers_pool_size',
-                type: :integer,
-                description: N_('Amount of workers in the pool to handle the execution of the remote execution jobs. Restart of the dynflowd/foreman-tasks service is required.'),
-                default: 5,
-                full_name: N_('Workers pool size')
               setting 'remote_execution_cleanup_working_dirs',
                 type: :boolean,
                 description: N_('When enabled, working directories will be removed after task completion. You may override this per host by setting a parameter called remote_execution_cleanup_working_dirs.'),

data/lib/foreman_remote_execution/version.rb

@@ -1,3 +1,3 @@
 module ForemanRemoteExecution
-  VERSION = '14.1.1'.freeze
+  VERSION = '14.1.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_remote_execution
 version: !ruby/object:Gem::Version
-  version: 14.1.1
+  version: 14.1.3
 platform: ruby
 authors:
 - Foreman Remote Execution team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-11-12 00:00:00.000000000 Z
+date: 2024-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -341,6 +341,7 @@ files:
 - db/migrate/20240312133027_extend_template_invocation_events.rb
 - db/migrate/20240522093412_add_smart_proxy_id_to_template_invocation.rb
 - db/migrate/20240522093413_migrate_smart_proxy_ids_to_template_invocations.rb
+- db/migrate/20241126150849_remove_remote_execution_workers_pool_size.rb
 - db/seeds.d/100-assign_features_with_templates.rb
 - db/seeds.d/20-permissions.rb
 - db/seeds.d/50-notification_blueprints.rb