hybrid_platforms_conductor 32.10.0 → 32.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d350aa81076d2c5a6837b7184bf903640fb0be35aae2b22f596b870b56a53b8
-  data.tar.gz: d75bebd5e1f6b12b30ea6f62c01c835bc9f89fba9ed3a208b3fd2dd0bc021328
+  metadata.gz: 465192e04717236671a6794a0c114d0aa862d5b6305d6554feff5590ced3cf5d
+  data.tar.gz: f6df3a500c30840ea8f151dcd4a290a05a1b0ad6a1884641721e91b8fc558f67
 SHA512:
-  metadata.gz: 37c23ac804c359f5875cb9f77f3e639b1711dc967ae664554d50b6e8aeefe26f59385a786c8ff31f56f5a3fc9eb55aaf65cfdc2946fa4c7e8b4b4372fa1ac3e0
-  data.tar.gz: a558f9c2b88b4a69110a870ba27549315823f2fab6c91c61068f3be1b10c7f2482d18b33883b0762d9cf2ac787fe61616b81d08535b1bc5d352e29e914a0519c
+  metadata.gz: bac26c60bb434dee2d2bae35a4c652abf4d4fcd5aed9cd13fb494fd6661ef0c7cc93f54aa3b52bc3e4458773228644233aaaa50ca0fc48815c43e5edba6b8043
+  data.tar.gz: e2a5dc1e158bcd70317c1bf6eba19cba6b3068bf1c334ed31b0a1e377194a41312e967974df5365a549bbe55711c938580d320c206af051247e5e254f44f1322

data/lib/hybrid_platforms_conductor/common_config_dsl/idempotence_tests.rb

@@ -11,13 +11,24 @@ module HybridPlatformsConductor
       # Array< Hash<Symbol, Object> >
       attr_reader :ignored_idempotence_tasks
 
-      # Initialize the DSL 
+      # List of ignored tasks info. Each info has the following properties:
+      # * *nodes_selectors_stack* (Array<Object>): Stack of nodes selectors impacted by this rule
+      # * *ignored_tasks* (Hash<String, String>): List of task names for which we ignore divergence errors, with the corresponding descriptive reason for ignore.
+      # Array< Hash<Symbol, Object> >
+      attr_reader :ignored_divergent_tasks
+
+      # Initialize the DSL
       def init_idempotence_tests
         # List of ignored tasks info. Each info has the following properties:
         # * *nodes_selectors_stack* (Array<Object>): Stack of nodes selectors impacted by this rule
         # * *ignored_tasks* (Hash<String, String>): List of task names for which we ignore idempotence errors, with the corresponding descriptive reason for ignore.
         # Array< Hash<Symbol, Object> >
         @ignored_idempotence_tasks = []
+        # List of ignored tasks info. Each info has the following properties:
+        # * *nodes_selectors_stack* (Array<Object>): Stack of nodes selectors impacted by this rule
+        # * *ignored_tasks* (Hash<String, String>): List of task names for which we ignore divergence errors, with the corresponding descriptive reason for ignore.
+        # Array< Hash<Symbol, Object> >
+        @ignored_divergent_tasks = []
       end
 
       # Ignore idempotence errors on a set of tasks
@@ -31,6 +42,17 @@ module HybridPlatformsConductor
         }
       end
 
+      # Ignore idempotence errors on a set of tasks
+      #
+      # Parameters::
+      # * *tasks_to_ignore* (Hash<String, String>): Set of tasks to ignore, along with the reason
+      def ignore_divergent_tasks(tasks_to_ignore)
+        @ignored_divergent_tasks << {
+          ignored_tasks: tasks_to_ignore,
+          nodes_selectors_stack: current_nodes_selectors_stack,
+        }
+      end
+
     end
 
   end

data/lib/hybrid_platforms_conductor/hpc_plugins/test/check_deploy_and_idempotence.rb

@@ -81,7 +81,10 @@ module HybridPlatformsConductor
                   exit_status, stdout, stderr = deployer.deploy_on(@node)[@node]
                   assert_equal exit_status, 0, "Check-node after deployment returned error code #{exit_status}", log_debug? ? nil : deployer.stdouts_to_s
                   # Check that the output of the check-node returns no changes.
-                  ignored_tasks = @nodes_handler.select_confs_for_node(@node, @config.ignored_idempotence_tasks).inject({}) do |merged_ignored_tasks, conf|
+                  ignored_tasks = (
+                    @nodes_handler.select_confs_for_node(@node, @config.ignored_idempotence_tasks) +
+                      @nodes_handler.select_confs_for_node(@node, @config.ignored_divergent_tasks)
+                  ).inject({}) do |merged_ignored_tasks, conf|
                     merged_ignored_tasks.merge(conf[:ignored_tasks])
                   end
                   @deployer.parse_deploy_output(@node, stdout, stderr).each do |task_info|

data/lib/hybrid_platforms_conductor/hpc_plugins/test/divergence.rb

@@ -11,8 +11,23 @@ module HybridPlatformsConductor
 
         # Check my_test_plugin.rb.sample documentation for signature details.
         def test_on_check_node(stdout, stderr, exit_status)
+          # Check that the output of the check-node returns no changes.
+          ignored_tasks = @nodes_handler.select_confs_for_node(@node, @config.ignored_divergent_tasks).inject({}) do |merged_ignored_tasks, conf|
+            merged_ignored_tasks.merge(conf[:ignored_tasks])
+          end
           @deployer.parse_deploy_output(@node, stdout, stderr).each do |task_info|
-            error "Task #{task_info[:name]} has diverged", JSON.pretty_generate(task_info) if task_info[:status] == :changed
+            if task_info[:status] == :changed
+              if ignored_tasks.key?(task_info[:name])
+                # It was expected that this task is not idempotent
+                log_debug "Task #{task_info[:name]} was expected to be divergent. Reason: #{ignored_tasks[task_info[:name]]}"
+              else
+                extra_details = task_info.slice(*(task_info.keys - %i[name status diffs]))
+                error_details = []
+                error_details << "----- Changes:\n#{task_info[:diffs].strip}\n-----" if task_info[:diffs]
+                error_details << "----- Additional details:\n#{JSON.pretty_generate(extra_details)}\n-----" unless extra_details.empty?
+                error "Task #{task_info[:name]} has diverged", error_details.empty? ? nil : error_details.join("\n")
+              end
+            end
           end
         end
 

data/lib/hybrid_platforms_conductor/hpc_plugins/test/idempotence.rb

@@ -43,7 +43,10 @@ module HybridPlatformsConductor
                   assert_equal tested_node, @node, "Wrong node being tested: #{tested_node} should be #{@node}"
                   assert_equal exit_status, 0, "Check-node returned error code #{exit_status}"
                   # Check that the output of the check-node returns no changes.
-                  ignored_tasks = @nodes_handler.select_confs_for_node(@node, @config.ignored_idempotence_tasks).inject({}) do |merged_ignored_tasks, conf|
+                  ignored_tasks = (
+                    @nodes_handler.select_confs_for_node(@node, @config.ignored_idempotence_tasks) +
+                      @nodes_handler.select_confs_for_node(@node, @config.ignored_divergent_tasks)
+                  ).inject({}) do |merged_ignored_tasks, conf|
                     merged_ignored_tasks.merge(conf[:ignored_tasks])
                   end
                   @deployer.parse_deploy_output(@node, stdout, stderr).each do |task_info|

data/lib/hybrid_platforms_conductor/version.rb

@@ -1,5 +1,5 @@
 module HybridPlatformsConductor
 
-  VERSION = '32.10.0'
+  VERSION = '32.11.0'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hybrid_platforms_conductor
 version: !ruby/object:Gem::Version
-  version: 32.10.0
+  version: 32.11.0
 platform: ruby
 authors:
 - Muriel Salvan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-24 00:00:00.000000000 Z
+date: 2021-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: range_operators