hybrid_platforms_conductor 33.9.0 → 33.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d88a5c946d63351586ef1b77ec9840e13e84af48c210bc8dfd1004abc27f547d
-  data.tar.gz: 8d04e563077d81cc72d5c3dc883f0010205a3880a255c1fb229ff3ba11771b49
+  metadata.gz: 2f6fe7f17295eff7ec9450d1ee910807a17904b8fa3c2bc5959449805b3c4aee
+  data.tar.gz: 3e39403d767099165e0765ba631effcb76b4d998ab7e34069d6d63ce9d75979a
 SHA512:
-  metadata.gz: 211847acef3bff5d8e2e554a6262c783230989c3877b830cdbf4a3c5ff8a0fdb414669c891b9bf102f8adf26aed4000189df7565a1e33e93094ee384a577cbd1
-  data.tar.gz: 1faa911b27e3fdda61c605711de26598c6bac9a533519a4b2d583da479f1be9ea32265433d34cf9d8c6aaeee06d45e83b80e648c013ed2342df728a83f9bb6cf
+  metadata.gz: 2abe0958607c3980f84acfb55a1d1b4b5dd96e03ab94db21f1069a30e9026e7053fca09125c253c619bd3228772718acf744af6447450d8bb36277ee341c18e5
+  data.tar.gz: a14bfcaaf1bff4ca92206d54c7e2bf0d7367c8ccd1609a311bec0c9fb844e3ae1fd1aaf2836ab7e69446b98713bdfea227653da4c55b2c2d1c797ed9896465bb

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+# [v33.9.1](https://github.com/sweet-delights/hybrid-platforms-conductor/compare/v33.9.0...v33.9.1) (2021-09-01 16:59:59)
+
+## Global changes
+### Patches
+
+* [[Fix(nodes_to_deploy)] [#110] Make sure unknown platforms are taken into account when detecting nodes to be deployed](https://github.com/sweet-delights/hybrid-platforms-conductor/commit/c1b8312c5d473a1c5d044f6cda3ad9bed2b3ca61)
+
+## Changes for nodes_to_deploy
+### Patches
+
+* [[Fix(nodes_to_deploy)] [#110] Make sure unknown platforms are taken into account when detecting nodes to be deployed](https://github.com/sweet-delights/hybrid-platforms-conductor/commit/c1b8312c5d473a1c5d044f6cda3ad9bed2b3ca61)
+
 # [v33.9.0](https://github.com/sweet-delights/hybrid-platforms-conductor/compare/v33.8.4...v33.9.0) (2021-08-24 13:15:44)
 
 ## Global changes

data/bin/nodes_to_deploy

@@ -17,6 +17,7 @@ executable = HybridPlatformsConductor::Executable.new(deploy_options: false) do
   end
 end
 nodes_handler = executable.nodes_handler
+platforms_handler = executable.platforms_handler
 deployer = executable.deployer
 
 executable.parse_options!
@@ -72,20 +73,29 @@ unless ignore_deploy_info
         commit_id = node_deploy_info[:deployment_info]["commit_id_#{repo_idx}".to_sym]
         impacted_nodes = cache_impacted_nodes.dig(repo_name, commit_id)
         if impacted_nodes.nil?
-          begin
-            impacted_nodes, _single_impacted_nodes, _impacted_services, _impact_global = nodes_handler.impacted_nodes_from_git_diff(
-              repo_name,
-              from_commit: commit_id,
-              to_commit: 'master'
-            )
-          rescue HybridPlatformsConductor::NodesHandler::GitError
-            # Consider the node was deployed with a non-release branch commit (as it is missing)
+          if platforms_handler.platform(repo_name)
+            begin
+              impacted_nodes, _single_impacted_nodes, _impacted_services, _impact_global = nodes_handler.impacted_nodes_from_git_diff(
+                repo_name,
+                from_commit: commit_id,
+                to_commit: 'master'
+              )
+            rescue HybridPlatformsConductor::NodesHandler::GitError
+              # Consider the node was deployed with a non-release branch commit (as it is missing)
+              # So we have to make sure we deploy it again
+              executable.log_warn "[ #{node} ] - Unknown commit ID from deployment logs: #{repo_name} / #{commit_id}."
+              impacted_nodes = :unknown
+            end
+          else
+            # Consider the node was deployed with an obdsolete platform (as it is unknown)
             # So we have to make sure we deploy it again
-            impacted_nodes = [node]
+            executable.log_warn "[ #{node} ] - Unknown platform from deployment logs: #{repo_name}."
+            impacted_nodes = :unknown
           end
           cache_impacted_nodes[repo_name] = {} unless cache_impacted_nodes.key?(repo_name)
           cache_impacted_nodes[repo_name][commit_id] = impacted_nodes
         end
+        impacted_nodes = [node] if impacted_nodes == :unknown
         if impacted_nodes.include?(node)
           executable.log_debug "[ #{node} ] - Diffs on #{repo_name} between #{commit_id} and master are impacting this node."
           node_impacted = true

data/lib/hybrid_platforms_conductor/version.rb

@@ -1,5 +1,5 @@
 module HybridPlatformsConductor
 
-  VERSION = '33.9.0'
+  VERSION = '33.9.1'
 
 end

data/spec/hybrid_platforms_conductor_test/executables/nodes_to_deploy_spec.rb

@@ -190,6 +190,81 @@ describe 'nodes_to_deploy executable' do
     end
   end
 
+  it 'considers nodes having the same invalid commit ids in their logs to be deployed' do
+    with_test_platform_for_nodes_to_deploy do
+      expect(test_deployer).to receive(:deployment_info_from).with(%w[node1 node2]).and_return(
+        'node1' => {
+          services: %w[service1],
+          deployment_info: {
+            repo_name_0: 'platform',
+            commit_id_0: 'abcdef1',
+            exit_status: 0
+          },
+          exit_status: 0,
+          stdout: '',
+          stderr: ''
+        },
+        'node2' => {
+          services: %w[service2],
+          deployment_info: {
+            repo_name_0: 'platform',
+            commit_id_0: 'abcdef1',
+            exit_status: 0
+          },
+          exit_status: 0,
+          stdout: '',
+          stderr: ''
+        }
+      )
+      expect(test_nodes_handler).to receive(:impacted_nodes_from_git_diff).with('platform', from_commit: 'abcdef1', to_commit: 'master') do
+        raise HybridPlatformsConductor::NodesHandler::GitError, 'Mocked git error due to an invalid commit id'
+      end
+      exit_code, stdout = run 'nodes_to_deploy'
+      expect(exit_code).to eq 0
+      expect(stdout).to eq <<~EO_STDOUT
+        ===== Nodes to deploy =====
+        node1
+        node2
+      EO_STDOUT
+    end
+  end
+
+  it 'considers nodes having unknown platforms in their logs to be deployed' do
+    with_test_platform_for_nodes_to_deploy do
+      expect(test_deployer).to receive(:deployment_info_from).with(%w[node1 node2]).and_return(
+        'node1' => {
+          services: %w[service1],
+          deployment_info: {
+            repo_name_0: 'unknown_platform',
+            commit_id_0: 'abcdef1',
+            exit_status: 0
+          },
+          exit_status: 0,
+          stdout: '',
+          stderr: ''
+        },
+        'node2' => {
+          services: %w[service2],
+          deployment_info: {
+            repo_name_0: 'platform',
+            commit_id_0: 'abcdef2',
+            exit_status: 0
+          },
+          exit_status: 0,
+          stdout: '',
+          stderr: ''
+        }
+      )
+      expect(test_nodes_handler).to receive(:impacted_nodes_from_git_diff).with('platform', from_commit: 'abcdef2', to_commit: 'master').and_return [%w[], [], [], false]
+      exit_code, stdout = run 'nodes_to_deploy'
+      expect(exit_code).to eq 0
+      expect(stdout).to eq <<~EO_STDOUT
+        ===== Nodes to deploy =====
+        node1
+      EO_STDOUT
+    end
+  end
+
   it 'ignores impacts if asked' do
     with_test_platform_for_nodes_to_deploy do
       exit_code, stdout = run 'nodes_to_deploy', '--ignore-deployed-info'

metadata

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