hybrid_platforms_conductor 33.0.0 → 33.0.1

data/lib/hybrid_platforms_conductor/hpc_plugins/secrets_reader/thycotic.rb

@@ -54,7 +54,7 @@ module HybridPlatformsConductor
         # * *service* (String): Service to be deployed
         # Result::
         # * Hash: The secrets
-        def secrets_for(node, service)
+        def secrets_for(node, _service)
           secrets = {}
           # As we are dealing with global secrets, cache the reading for performance between nodes and services.
           # Keep secrets cache grouped by URL/ID
@@ -65,14 +65,17 @@ module HybridPlatformsConductor
               HybridPlatformsConductor::Thycotic.with_thycotic(thycotic_secrets_info[:thycotic_url], @logger, @logger_stderr) do |thycotic|
                 secret_file_item_id = thycotic.get_secret(thycotic_secrets_info[:secret_id]).dig(:secret, :items, :secret_item, :id)
                 raise "Unable to fetch secret file ID #{thycotic_secrets_info[:secret_id]} from #{thycotic_secrets_info[:thycotic_url]}" if secret_file_item_id.nil?
+
                 secret = thycotic.download_file_attachment_by_item_id(thycotic_secrets_info[:secret_id], secret_file_item_id)
                 raise "Unable to fetch secret file attachment from secret ID #{thycotic_secrets_info[:secret_id]} from #{thycotic_secrets_info[:thycotic_url]}" if secret.nil?
+
                 @secrets[server_id] = JSON.parse(secret)
               end
             end
-            secrets.merge!(@secrets[server_id]) do |key, value1, value2|
-              raise "Thycotic secret #{key} served by #{thycotic_secrets_info[:thycotic_url]} from secret ID #{thycotic_secrets_info[:secret_id]} has conflicting values between different secrets." if value1 != value2
-              value1
+            secrets.merge!(@secrets[server_id]) do |key, value_1, value_2|
+              raise "Thycotic secret #{key} served by #{thycotic_secrets_info[:thycotic_url]} from secret ID #{thycotic_secrets_info[:secret_id]} has conflicting values between different secrets." if value_1 != value_2
+
+              value_1
             end
           end
           secrets

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

@@ -10,7 +10,7 @@ module HybridPlatformsConductor
       # Check that all repositories in Bitbucket have a consistent dev workflow.
       class BitbucketConf < 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
@@ -107,12 +107,12 @@ module HybridPlatformsConductor
             mandatory_default_reviewers = repo_info.dig(*%i[checks pr_settings mandatory_default_reviewers])
             if mandatory_default_reviewers
               reviewers_found = default_reviewers.any? do |condition_info|
-                reviewers = condition_info.dig('reviewers')
+                reviewers = condition_info['reviewers']
                 condition_info.dig('sourceRefMatcher', 'id') == 'ANY_REF_MATCHER_ID' &&
                   condition_info.dig('targetRefMatcher', 'id') == 'ANY_REF_MATCHER_ID' &&
                   !reviewers.nil? &&
                   (mandatory_default_reviewers - reviewers.map { |reviewer_info| reviewer_info['name'] }).empty? &&
-                  (required_approvers.nil? || condition_info.dig('requiredApprovals') == required_approvers)
+                  (required_approvers.nil? || condition_info['requiredApprovals'] == required_approvers)
               end
               assert_equal(
                 reviewers_found,

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

@@ -18,7 +18,7 @@ module HybridPlatformsConductor
       # Don't forget to add the testadmin private key in your SSH agent if you run this test locally.
       class CheckDeployAndIdempotence < 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
@@ -30,6 +30,7 @@ module HybridPlatformsConductor
                 ssh_ok = ssh.exec!('echo Works').strip == 'Works'
               end
             rescue
+              nil
             end
             assert_equal ssh_ok, true, 'Root does not have access from the empty image'
 
@@ -46,7 +47,7 @@ module HybridPlatformsConductor
               deployer.nbr_retries_on_error = 3
               exit_status, _stdout, _stderr = deployer.deploy_on(@node)[@node]
               assert_equal exit_status, 0, "Deploy from scratch returned error code #{exit_status}", log_debug? ? nil : deployer.stdouts_to_s
-              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)
@@ -63,6 +64,7 @@ module HybridPlatformsConductor
                         ssh_ok = ssh.exec!('echo Works').strip == 'Works'
                       end
                     rescue
+                      nil
                     end
                     assert_equal ssh_ok, false, 'Root can still connect on the image after deployment'
                     # Even if we can connect using root, run the idempotence test

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

@@ -13,7 +13,6 @@ module HybridPlatformsConductor
 
         # Check my_test_plugin.rb.sample documentation for signature details.
         def test_for_node
-          now = Time.now
           deploy_info = @deployer.deployment_info_from(@node)[@node]
           if deploy_info.key?(:error)
             error "Error while getting deployment info: #{deploy_info[:error]}"

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

@@ -12,32 +12,34 @@ module HybridPlatformsConductor
 
         # Check my_test_plugin.rb.sample documentation for signature details.
         def test_for_node
-          unless @nodes_handler.get_root_access_allowed_of(@node)
-            @deployer.with_test_provisioned_instance(@config.tests_provisioner_id, @node, environment: 'deploy_removes_root_access', reuse_instance: log_debug?) do |deployer, instance|
-              # Check that we can connect with root
+          return if @nodes_handler.get_root_access_allowed_of(@node)
+
+          @deployer.with_test_provisioned_instance(@config.tests_provisioner_id, @node, environment: 'deploy_removes_root_access', reuse_instance: log_debug?) do |deployer, instance|
+            # Check that we can connect with root
+            ssh_ok = false
+            begin
+              Net::SSH.start(instance.ip, 'root', password: 'root_pwd', auth_methods: ['password'], verify_host_key: :never) do |ssh|
+                ssh_ok = ssh.exec!('echo Works').strip == 'Works'
+              end
+            rescue
+              nil
+            end
+            assert_equal ssh_ok, true, 'Root does not have access from the empty image'
+            if ssh_ok
+              deployer.nbr_retries_on_error = 3
+              deployer.deploy_on @node
+              # As sshd is certainly being restarted, start and stop the container to reload it.
+              deployer.restart @node
+              # Check that we can't connect with root
               ssh_ok = false
               begin
                 Net::SSH.start(instance.ip, 'root', password: 'root_pwd', auth_methods: ['password'], verify_host_key: :never) do |ssh|
                   ssh_ok = ssh.exec!('echo Works').strip == 'Works'
                 end
               rescue
+                nil
               end
-              assert_equal ssh_ok, true, 'Root does not have access from the empty image'
-              if ssh_ok
-                deployer.nbr_retries_on_error = 3
-                deployer.deploy_on @node
-                # As sshd is certainly being restarted, start and stop the container to reload it.
-                deployer.restart @node
-                # Check that we can't connect with root
-                ssh_ok = false
-                begin
-                  Net::SSH.start(instance.ip, 'root', password: 'root_pwd', auth_methods: ['password'], verify_host_key: :never) do |ssh|
-                    ssh_ok = ssh.exec!('echo Works').strip == 'Works'
-                  end
-                rescue
-                end
-                assert_equal ssh_ok, false, 'Root can still connect on the image after deployment'
-              end
+              assert_equal ssh_ok, false, 'Root can still connect on the image after deployment'
             end
           end
         end

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

@@ -10,10 +10,10 @@ module HybridPlatformsConductor
       # Test that the node has not diverged since last deployment
       class Divergence < HybridPlatformsConductor::Test
 
-        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_on_check_node(stdout, stderr, exit_status)
+        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])

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

@@ -27,7 +27,7 @@ module HybridPlatformsConductor
           ).known_platforms.first
           unless example_platform.nil?
             tests.concat [
-              "#{CmdRunner.executables_prefix}get_impacted_nodes --platform #{example_platform.name} --show-commands",
+              "#{CmdRunner.executables_prefix}get_impacted_nodes --platform #{example_platform.name} --show-commands"
             ]
             example_node = example_platform.known_nodes.first
             unless example_node.nil?
@@ -42,7 +42,7 @@ module HybridPlatformsConductor
               ]
             end
           end
-        	tests.sort.each do |cmd|
+          tests.sort.each do |cmd|
             log_debug "Testing #{cmd}"
             exit_status, stdout, _stderr = @cmd_runner.run_cmd "#{cmd} 2>&1", no_exception: true, log_to_stdout: log_debug?
             assert_equal(exit_status, 0, "Command #{cmd} returned code #{exit_status}:\n#{stdout}")

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

@@ -10,31 +10,29 @@ module HybridPlatformsConductor
       # Perform various tests on a node's file system
       class FileSystem < TestOnlyRemoteNode
 
-        self.extend_config_dsl_with CommonConfigDsl::FileSystemTests, :init_file_system_tests
+        extend_config_dsl_with CommonConfigDsl::FileSystemTests, :init_file_system_tests
 
         # Check my_test_plugin.rb.sample documentation for signature details.
         def test_on_node
           # Flatten the paths rules so that we can spot inconsistencies in configuration
-          Hash[
-            @config.aggregate_files_rules(@nodes_handler, @node).map do |path, rule_info|
-              [
-                "if #{@nodes_handler.sudo_on(@node)} /bin/bash -c '[[ -d \"#{path}\" ]]' ; then echo 1 ; else echo 0 ; fi",
-                {
-                  validator: proc do |stdout, stderr|
-                    case stdout.last
-                    when '1'
-                      error "Path found that should be absent: #{path}" if rule_info[:state] == :absent
-                    when '0'
-                      error "Path not found that should be present: #{path}" if rule_info[:state] == :present
-                    else
-                      error "Could not check for existence of path #{path}", "----- STDOUT:\n#{stdout.join("\n")}----- STDERR:\n#{stderr.join("\n")}"
-                    end
-                  end,
-                  timeout: 2
-                }
-              ]
-            end
-          ]
+          @config.aggregate_files_rules(@nodes_handler, @node).map do |path, rule_info|
+            [
+              "if #{@nodes_handler.sudo_on(@node)} /bin/bash -c '[[ -d \"#{path}\" ]]' ; then echo 1 ; else echo 0 ; fi",
+              {
+                validator: proc do |stdout, stderr|
+                  case stdout.last
+                  when '1'
+                    error "Path found that should be absent: #{path}" if rule_info[:state] == :absent
+                  when '0'
+                    error "Path not found that should be present: #{path}" if rule_info[:state] == :present
+                  else
+                    error "Could not check for existence of path #{path}", "----- STDOUT:\n#{stdout.join("\n")}----- STDERR:\n#{stderr.join("\n")}"
+                  end
+                end,
+                timeout: 2
+              }
+            ]
+          end.to_h
         end
 
       end

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

@@ -9,31 +9,29 @@ module HybridPlatformsConductor
       # Perform various tests on a HDFS's file system
       class FileSystemHdfs < HybridPlatformsConductor::Test
 
-        self.extend_config_dsl_with CommonConfigDsl::FileSystemTests, :init_file_system_tests
+        extend_config_dsl_with CommonConfigDsl::FileSystemTests, :init_file_system_tests
 
         # Check my_test_plugin.rb.sample documentation for signature details.
         def test_on_node
           # Flatten the paths rules so that we can spot inconsistencies in configuration
-          Hash[
-            @config.aggregate_files_rules(@nodes_handler, @node, file_system_type: :hdfs).map do |path, rule_info|
-              [
-                "if sudo#{rule_info[:context][:sudo_user] ? " -u #{rule_info[:context][:sudo_user]}" : ''} hdfs dfs -ls \"#{path}\" ; then echo 1 ; else echo 0 ; fi",
-                {
-                  validator: proc do |stdout, stderr|
-                    case stdout.last
-                    when '1'
-                      error "HDFS path found that should be absent: #{path}" if rule_info[:state] == :absent
-                    when '0'
-                      error "HDFS path not found that should be present: #{path}" if rule_info[:state] == :present
-                    else
-                      error "Could not check for existence of HDFS path #{path}", "----- STDOUT:\n#{stdout.join("\n")}----- STDERR:\n#{stderr.join("\n")}"
-                    end
-                  end,
-                  timeout: 5
-                }
-              ]
-            end
-          ]
+          @config.aggregate_files_rules(@nodes_handler, @node, file_system_type: :hdfs).map do |path, rule_info|
+            [
+              "if sudo#{rule_info[:context][:sudo_user] ? " -u #{rule_info[:context][:sudo_user]}" : ''} hdfs dfs -ls \"#{path}\" ; then echo 1 ; else echo 0 ; fi",
+              {
+                validator: proc do |stdout, stderr|
+                  case stdout.last
+                  when '1'
+                    error "HDFS path found that should be absent: #{path}" if rule_info[:state] == :absent
+                  when '0'
+                    error "HDFS path not found that should be present: #{path}" if rule_info[:state] == :present
+                  else
+                    error "Could not check for existence of HDFS path #{path}", "----- STDOUT:\n#{stdout.join("\n")}----- STDERR:\n#{stderr.join("\n")}"
+                  end
+                end,
+                timeout: 5
+              }
+            ]
+          end.to_h
         end
 
       end

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

@@ -9,7 +9,7 @@ module HybridPlatformsConductor
       # Check that all repositories have a successful Github CI
       class GithubCi < HybridPlatformsConductor::Test
 
-        self.extend_config_dsl_with CommonConfigDsl::Github, :init_github
+        extend_config_dsl_with CommonConfigDsl::Github, :init_github
 
         # Check my_test_plugin.rb.sample documentation for signature details.
         def test
@@ -17,8 +17,7 @@ module HybridPlatformsConductor
             log_debug "Checking CI for Github repository #{repo_info[:slug]}"
             last_status = client.repository_workflow_runs(repo_info[:slug])[:workflow_runs].
               select { |run| run[:head_branch] == 'master' }.
-              sort_by { |run| run[:created_at] }.
-              last[:conclusion]
+              max_by { |run| run[:created_at] }[:conclusion]
             error "Last workflow status for repository #{repo_info[:slug]} is #{last_status}" unless last_status == 'success'
           end
         end

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

@@ -19,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