hybrid_platforms_conductor 32.17.0 → 33.0.2

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

@@ -1,3 +1,5 @@
+require 'hybrid_platforms_conductor/test_only_remote_node'
+
 module HybridPlatformsConductor
 
   module HpcPlugins
@@ -5,7 +7,7 @@ module HybridPlatformsConductor
     module Test
 
       # Test that the hostname is correct
-      class Hostname < HybridPlatformsConductor::Test
+      class Hostname < TestOnlyRemoteNode
 
         # Check my_test_plugin.rb.sample documentation for signature details.
         def test_on_node

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

@@ -13,7 +13,7 @@ module HybridPlatformsConductor
       # Don't forget to add the testadmin private key in your SSH agent if you run this test locally.
       class Idempotence < TestByService
 
-        self.extend_config_dsl_with CommonConfigDsl::IdempotenceTests, :init_idempotence_tests
+        extend_config_dsl_with CommonConfigDsl::IdempotenceTests, :init_idempotence_tests
 
         # Check my_test_plugin.rb.sample documentation for signature details.
         def test_for_node
@@ -21,7 +21,7 @@ module HybridPlatformsConductor
             # First deploy as root
             deployer.nbr_retries_on_error = 3
             exit_status, _stdout, _stderr = deployer.deploy_on(@node)[@node]
-            if exit_status == 0
+            if exit_status.zero?
               # As it's possible sshd has to be restarted because of a change in its conf, restart the container.
               # Otherwise you'll get the following error upon reconnection:
               #   System is booting up. See pam_nologin(8)

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

@@ -1,3 +1,5 @@
+require 'hybrid_platforms_conductor/test_only_remote_node'
+
 module HybridPlatformsConductor
 
   module HpcPlugins
@@ -5,7 +7,7 @@ module HybridPlatformsConductor
     module Test
 
       # Test that the private IP address is correct
-      class Ip < HybridPlatformsConductor::Test
+      class Ip < TestOnlyRemoteNode
 
         # Check my_test_plugin.rb.sample documentation for signature details.
         def test_on_node
@@ -17,7 +19,7 @@ module HybridPlatformsConductor
               else
                 private_ips = @nodes_handler.get_private_ips_of @node
                 if private_ips
-                  host_ips = stdout.first.split(' ').select { |ip| ip =~ /^172\.16\.\d+\.\d+$/ }.sort
+                  host_ips = stdout.first.split.select { |ip| ip =~ /^172\.16\.\d+\.\d+$/ }.sort
                   ref_ips = private_ips.sort
                   assert_equal(
                     host_ips,

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

@@ -1,3 +1,4 @@
+require 'open-uri'
 require 'nokogiri'
 require 'hybrid_platforms_conductor/credentials'
 require 'hybrid_platforms_conductor/common_config_dsl/bitbucket'
@@ -11,7 +12,7 @@ module HybridPlatformsConductor
       # Check that all repositories have a correct Jenkins CI configuration.
       class JenkinsCiConf < HybridPlatformsConductor::Test
 
-        self.extend_config_dsl_with CommonConfigDsl::Bitbucket, :init_bitbucket
+        extend_config_dsl_with CommonConfigDsl::Bitbucket, :init_bitbucket
 
         # Check my_test_plugin.rb.sample documentation for signature details.
         def test
@@ -21,27 +22,25 @@ module HybridPlatformsConductor
             else
               Credentials.with_credentials_for(:jenkins_ci, @logger, @logger_stderr, url: repo_info[:jenkins_ci_url]) do |jenkins_user, jenkins_password|
                 # Get its config
-                begin
-                  doc = Nokogiri::XML(open("#{repo_info[:jenkins_ci_url]}/config.xml", http_basic_authentication: [jenkins_user, jenkins_password]).read)
-                  # Check that this job builds the correct Bitbucket repository
-                  assert_equal(
-                    doc.xpath('/org.jenkinsci.plugins.workflow.multibranch.WorkflowMultiBranchProject/sources/data/jenkins.branch.BranchSource/source/serverUrl').text,
-                    bitbucket.bitbucket_url,
-                    "Job #{repo_info[:jenkins_ci_url]} does not build repository from Bitbucket"
-                  )
-                  assert_equal(
-                    doc.xpath('/org.jenkinsci.plugins.workflow.multibranch.WorkflowMultiBranchProject/sources/data/jenkins.branch.BranchSource/source/repoOwner').text.downcase,
-                    repo_info[:project].downcase,
-                    "Job #{repo_info[:jenkins_ci_url]} does not build repository from project #{repo_info[:project]}"
-                  )
-                  assert_equal(
-                    doc.xpath('/org.jenkinsci.plugins.workflow.multibranch.WorkflowMultiBranchProject/sources/data/jenkins.branch.BranchSource/source/repository').text,
-                    repo_info[:name],
-                    "Job #{repo_info[:jenkins_ci_url]} does not build repository named #{repo_info[:name]}"
-                  )
-                rescue
-                  error "Error while checking Jenkins CI job for #{repo_info[:project]}/#{repo_info[:name]} from URL #{repo_info[:jenkins_ci_url]}: #{$!}"
-                end
+                doc = Nokogiri::XML(URI.parse("#{repo_info[:jenkins_ci_url]}/config.xml").open(http_basic_authentication: [jenkins_user, jenkins_password]).read)
+                # Check that this job builds the correct Bitbucket repository
+                assert_equal(
+                  doc.xpath('/org.jenkinsci.plugins.workflow.multibranch.WorkflowMultiBranchProject/sources/data/jenkins.branch.BranchSource/source/serverUrl').text,
+                  bitbucket.bitbucket_url,
+                  "Job #{repo_info[:jenkins_ci_url]} does not build repository from Bitbucket"
+                )
+                assert_equal(
+                  doc.xpath('/org.jenkinsci.plugins.workflow.multibranch.WorkflowMultiBranchProject/sources/data/jenkins.branch.BranchSource/source/repoOwner').text.downcase,
+                  repo_info[:project].downcase,
+                  "Job #{repo_info[:jenkins_ci_url]} does not build repository from project #{repo_info[:project]}"
+                )
+                assert_equal(
+                  doc.xpath('/org.jenkinsci.plugins.workflow.multibranch.WorkflowMultiBranchProject/sources/data/jenkins.branch.BranchSource/source/repository').text,
+                  repo_info[:name],
+                  "Job #{repo_info[:jenkins_ci_url]} does not build repository named #{repo_info[:name]}"
+                )
+              rescue
+                error "Error while checking Jenkins CI job for #{repo_info[:project]}/#{repo_info[:name]} from URL #{repo_info[:jenkins_ci_url]}: #{$ERROR_INFO}"
               end
             end
           end

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

@@ -11,7 +11,7 @@ module HybridPlatformsConductor
       # Check that all repositories have a successful master branch on a Jenkins CI
       class JenkinsCiMastersOk < HybridPlatformsConductor::Test
 
-        self.extend_config_dsl_with CommonConfigDsl::Bitbucket, :init_bitbucket
+        extend_config_dsl_with CommonConfigDsl::Bitbucket, :init_bitbucket
 
         SUCCESS_STATUSES = [
           # Add nil as the status of a currently running job (which is always the case for hybrid-platforms) is null
@@ -29,17 +29,15 @@ module HybridPlatformsConductor
             else
               master_info_url = "#{repo_info[:jenkins_ci_url]}/job/master/api/json"
               Credentials.with_credentials_for(:jenkins_ci, @logger, @logger_stderr, url: master_info_url) do |jenkins_user, jenkins_password|
-                begin
-                  # Get the master branch info from the API
-                  master_info = JSON.parse(open(master_info_url, http_basic_authentication: [jenkins_user, jenkins_password]).read)
-                  # Get the last build's URL
-                  last_build_info_url = "#{master_info['lastBuild']['url']}/api/json"
-                  last_build_info = JSON.parse(open(last_build_info_url, http_basic_authentication: [jenkins_user, jenkins_password]).read)
-                  log_debug "Build info for #{master_info_url}:\n#{JSON.pretty_generate(last_build_info)}"
-                  error "Last build for job #{repo_info[:project]}/#{repo_info[:name]} is in status #{last_build_info['result']}: #{master_info['lastBuild']['url']}" unless SUCCESS_STATUSES.include?(last_build_info['result'])
-                rescue
-                  error "Error while checking Jenkins CI job for #{repo_info[:project]}/#{repo_info[:name]} from URL #{master_info_url}: #{$!}"
-                end
+                # Get the master branch info from the API
+                master_info = JSON.parse(URI.parse(master_info_url).open(http_basic_authentication: [jenkins_user, jenkins_password]).read)
+                # Get the last build's URL
+                last_build_info_url = "#{master_info['lastBuild']['url']}/api/json"
+                last_build_info = JSON.parse(URI.parse(last_build_info_url).open(http_basic_authentication: [jenkins_user, jenkins_password]).read)
+                log_debug "Build info for #{master_info_url}:\n#{JSON.pretty_generate(last_build_info)}"
+                error "Last build for job #{repo_info[:project]}/#{repo_info[:name]} is in status #{last_build_info['result']}: #{master_info['lastBuild']['url']}" unless SUCCESS_STATUSES.include?(last_build_info['result'])
+              rescue
+                error "Error while checking Jenkins CI job for #{repo_info[:project]}/#{repo_info[:name]} from URL #{master_info_url}: #{$ERROR_INFO}"
               end
             end
           end

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

@@ -17,7 +17,7 @@ module HybridPlatformsConductor
             log_to_stdout: log_debug?
           )
           stdout.split("\n").each do |merge_commit_id|
-            _exit_status, stdout, _stderr = @cmd_runner.run_cmd(<<~EOS, log_to_stdout: log_debug?, no_exception: true, expected_code: [0, 1])
+            _exit_status, stdout, _stderr = @cmd_runner.run_cmd(<<~EO_BASH, log_to_stdout: log_debug?, no_exception: true, expected_code: [0, 1])
               cd #{@platform.repository_path} && \
               git --no-pager log \
                 $(git merge-base \
@@ -27,14 +27,14 @@ module HybridPlatformsConductor
                 --pretty=format:\"%H\" \
                 --graph \
               | grep '|'
-            EOS
-            if !stdout.empty?
-              _exit_status, stdout, _stderr = @cmd_runner.run_cmd(
-                "cd #{@platform.repository_path} && git --no-pager log #{merge_commit_id} --pretty=format:%aI",
-                log_to_stdout: log_debug?
-              )
-              error "Git history is not linear because of Merge commit #{merge_commit_id}" if Time.now - Time.parse(stdout.strip) < LOOKING_PERIOD
-            end
+            EO_BASH
+            next if stdout.empty?
+
+            _exit_status, stdout, _stderr = @cmd_runner.run_cmd(
+              "cd #{@platform.repository_path} && git --no-pager log #{merge_commit_id} --pretty=format:%aI",
+              log_to_stdout: log_debug?
+            )
+            error "Git history is not linear because of Merge commit #{merge_commit_id}" if Time.now - Time.parse(stdout.strip) < LOOKING_PERIOD
           end
         end
 

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

@@ -1,3 +1,5 @@
+require 'hybrid_platforms_conductor/test_only_remote_node'
+
 module HybridPlatformsConductor
 
   module HpcPlugins
@@ -5,7 +7,7 @@ module HybridPlatformsConductor
     module Test
 
       # Test that the node's local users
-      class LocalUsers < HybridPlatformsConductor::Test
+      class LocalUsers < TestOnlyRemoteNode
 
         # Config DSL extension for this test plugin
         module ConfigDslExtension
@@ -22,7 +24,7 @@ module HybridPlatformsConductor
           # Array< Hash<Symbol, Object> >
           attr_reader :users_that_should_be_present
 
-          # Initialize the DSL 
+          # Initialize the DSL
           def init_local_users_test
             @users_that_should_be_absent = []
             @users_that_should_be_present = []
@@ -52,7 +54,7 @@ module HybridPlatformsConductor
 
         end
 
-        self.extend_config_dsl_with ConfigDslExtension, :init_local_users_test
+        extend_config_dsl_with ConfigDslExtension, :init_local_users_test
 
         # Check my_test_plugin.rb.sample documentation for signature details.
         def test_on_node

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

@@ -1,3 +1,5 @@
+require 'hybrid_platforms_conductor/test_only_remote_node'
+
 module HybridPlatformsConductor
 
   module HpcPlugins
@@ -5,7 +7,7 @@ module HybridPlatformsConductor
     module Test
 
       # Various tests on mounts
-      class Mounts < HybridPlatformsConductor::Test
+      class Mounts < TestOnlyRemoteNode
 
         # Config DSL extension for this test plugin
         module ConfigDslExtension
@@ -22,7 +24,7 @@ module HybridPlatformsConductor
           # Array< Hash<Symbol, Object> >
           attr_reader :mount_rules_that_should_be_present
 
-          # Initialize the DSL 
+          # Initialize the DSL
           def init_mounts_test
             @mount_rules_that_should_be_absent = []
             @mount_rules_that_should_be_present = []
@@ -56,7 +58,7 @@ module HybridPlatformsConductor
 
         end
 
-        self.extend_config_dsl_with ConfigDslExtension, :init_mounts_test
+        extend_config_dsl_with ConfigDslExtension, :init_mounts_test
 
         # Check my_test_plugin.rb.sample documentation for signature details.
         def test_on_node

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

@@ -1,3 +1,5 @@
+require 'hybrid_platforms_conductor/test_only_remote_node'
+
 module HybridPlatformsConductor
 
   module HpcPlugins
@@ -5,7 +7,7 @@ module HybridPlatformsConductor
     module Test
 
       # Test that the node has no orphan files
-      class OrphanFiles < HybridPlatformsConductor::Test
+      class OrphanFiles < TestOnlyRemoteNode
 
         # Config DSL extension for this test plugin
         module ConfigDslExtension
@@ -16,7 +18,7 @@ module HybridPlatformsConductor
           # Array< Hash<Symbol, Object> >
           attr_reader :ignored_orphan_files_paths
 
-          # Initialize the DSL 
+          # Initialize the DSL
           def init_orphan_files_test
             # List of paths to ignore info. Each info has the following properties:
             # * *nodes_selectors_stack* (Array<Object>): Stack of nodes selectors impacted by this rule
@@ -32,13 +34,13 @@ module HybridPlatformsConductor
           def ignore_orphan_files_from(paths_to_ignore)
             @ignored_orphan_files_paths << {
               ignored_paths: paths_to_ignore.is_a?(Array) ? paths_to_ignore : [paths_to_ignore],
-              nodes_selectors_stack: current_nodes_selectors_stack,
+              nodes_selectors_stack: current_nodes_selectors_stack
             }
           end
 
         end
 
-        self.extend_config_dsl_with ConfigDslExtension, :init_orphan_files_test
+        extend_config_dsl_with ConfigDslExtension, :init_orphan_files_test
 
         # List of directories to always ignore
         DIRECTORIES_TO_ALWAYS_IGNORE = [
@@ -51,12 +53,13 @@ module HybridPlatformsConductor
         def test_on_node
           {
             # TODO: Access the user correctly when the user notion will be moved out of the ssh connector
-            "#{@deployer.instance_variable_get(:@actions_executor).connector(:ssh).ssh_user == 'root' ? '' : "#{@nodes_handler.sudo_on(@node)} "}/usr/bin/find / \\( #{@nodes_handler.
-              select_confs_for_node(@node, @config.ignored_orphan_files_paths).
-              inject(DIRECTORIES_TO_ALWAYS_IGNORE) { |merged_paths, paths_to_ignore_info| merged_paths + paths_to_ignore_info[:ignored_paths] }.
-              uniq.
-              map { |dir| "-path #{dir}" }.
-              join(' -o ')
+            "#{@deployer.instance_variable_get(:@actions_executor).connector(:ssh).ssh_user == 'root' ? '' : "#{@nodes_handler.sudo_on(@node)} "}/usr/bin/find / \\( #{
+              @nodes_handler.
+                select_confs_for_node(@node, @config.ignored_orphan_files_paths).
+                inject(DIRECTORIES_TO_ALWAYS_IGNORE) { |merged_paths, paths_to_ignore_info| merged_paths + paths_to_ignore_info[:ignored_paths] }.
+                uniq.
+                map { |dir| "-path #{dir}" }.
+                join(' -o ')
             } \\) -prune -o -nogroup -nouser -print" => {
               validator: proc do |stdout|
                 assert_equal stdout, [], "#{stdout.size} orphan files found.", stdout.join("\n")

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

@@ -1,3 +1,5 @@
+require 'hybrid_platforms_conductor/test_only_remote_node'
+
 module HybridPlatformsConductor
 
   module HpcPlugins
@@ -5,7 +7,7 @@ module HybridPlatformsConductor
     module Test
 
       # Various tests on ports
-      class Ports < HybridPlatformsConductor::Test
+      class Ports < TestOnlyRemoteNode
 
         # Config DSL extension for this test plugin
         module ConfigDslExtension
@@ -19,7 +21,7 @@ module HybridPlatformsConductor
           # Array< Hash<Symbol, Object> >
           attr_reader :ports_rules
 
-          # Initialize the DSL 
+          # Initialize the DSL
           def init_ports_test
             @ports_rules = []
           end
@@ -50,7 +52,7 @@ module HybridPlatformsConductor
 
         end
 
-        self.extend_config_dsl_with ConfigDslExtension, :init_ports_test
+        extend_config_dsl_with ConfigDslExtension, :init_ports_test
 
         # Check my_test_plugin.rb.sample documentation for signature details.
         def test_for_node

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

@@ -11,15 +11,15 @@ module HybridPlatformsConductor
         def test
           # Get a map of private IPs per node
           @nodes_handler.prefetch_metadata_of @nodes_handler.known_nodes, :private_ips
-          private_ips = Hash[@nodes_handler.
+          private_ips = @nodes_handler.
             known_nodes.
-            map { |node| [node, @nodes_handler.get_private_ips_of(node) || []] }
-          ]
+            map { |node| [node, @nodes_handler.get_private_ips_of(node) || []] }.
+            to_h
 
           # Check there are no duplicates
           nodes_per_private_ip = {}
-          private_ips.each do |node, private_ips|
-            private_ips.each do |private_ip|
+          private_ips.each do |node, node_private_ips|
+            node_private_ips.each do |private_ip|
               nodes_per_private_ip[private_ip] = [] unless nodes_per_private_ip.key?(private_ip)
               nodes_per_private_ip[private_ip] << node
             end

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

@@ -11,15 +11,15 @@ module HybridPlatformsConductor
         def test
           # Get a map of public IPs per node
           @nodes_handler.prefetch_metadata_of @nodes_handler.known_nodes, :public_ips
-          public_ips = Hash[@nodes_handler.
+          public_ips = @nodes_handler.
             known_nodes.
-            map { |node| [node, @nodes_handler.get_public_ips_of(node) || []] }
-          ]
+            map { |node| [node, @nodes_handler.get_public_ips_of(node) || []] }.
+            to_h
 
           # Check there are no duplicates
           nodes_per_public_ip = {}
-          public_ips.each do |node, public_ips|
-            public_ips.each do |public_ip|
+          public_ips.each do |node, node_public_ips|
+            node_public_ips.each do |public_ip|
               nodes_per_public_ip[public_ip] = [] unless nodes_per_public_ip.key?(public_ip)
               nodes_per_public_ip[public_ip] << node
             end

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

@@ -1,3 +1,5 @@
+require 'hybrid_platforms_conductor/test_only_remote_node'
+
 module HybridPlatformsConductor
 
   module HpcPlugins
@@ -5,7 +7,7 @@ module HybridPlatformsConductor
     module Test
 
       # Test that the vulnerabilities Spectre and Meltdown are patched
-      class Spectre < HybridPlatformsConductor::Test
+      class Spectre < TestOnlyRemoteNode
 
         VULNERABILITIES_TO_CHECK = {
           'CVE-2017-5753' => 'Spectre Variant 1',
@@ -15,11 +17,11 @@ module HybridPlatformsConductor
 
         # Check my_test_plugin.rb.sample documentation for signature details.
         def test_on_node
-          spectre_cmd = <<~EOS
+          spectre_cmd = <<~EO_BASH
             #{@deployer.instance_variable_get(:@actions_executor).connector(:ssh).ssh_user == 'root' ? '' : "#{@nodes_handler.sudo_on(@node)} "}/bin/bash <<'EOAction'
             #{File.read("#{__dir__}/spectre-meltdown-checker.sh")}
             EOAction
-          EOS
+          EO_BASH
           {
             spectre_cmd => {
               validator: proc do |stdout|
@@ -29,13 +31,11 @@ module HybridPlatformsConductor
                   if status_idx.nil?
                     error "Unable to find vulnerability section #{id}"
                   else
-                    while !stdout[status_idx].nil? && !(stdout[status_idx] =~ /STATUS:[^A-Z]+([A-Z ]+)/)
-                      status_idx += 1
-                    end
+                    status_idx += 1 while !stdout[status_idx].nil? && stdout[status_idx] !~ /STATUS:[^A-Z]+([A-Z ]+)/
                     if stdout[status_idx].nil?
                       error "Unable to find vulnerability status for #{id}"
                     else
-                      status = $1.strip
+                      status = Regexp.last_match(1).strip
                       error "Status for #{name}: #{status}" if status != 'NOT VULNERABLE'
                     end
                   end

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

@@ -11,10 +11,10 @@ module HybridPlatformsConductor
         def test
           # Get a map of VEIDs per node
           @nodes_handler.prefetch_metadata_of @nodes_handler.known_nodes, :veid
-          veids = Hash[@nodes_handler.
+          veids = @nodes_handler.
             known_nodes.
-            map { |node| [node, @nodes_handler.get_veid_of(node) ? @nodes_handler.get_veid_of(node).to_i : nil] }
-          ]
+            map { |node| [node, @nodes_handler.get_veid_of(node) ? @nodes_handler.get_veid_of(node).to_i : nil] }.
+            to_h
 
           # Check there are no duplicates
           veids.group_by { |_node, veid| veid }.each do |veid, nodes|