brpm_module_bladelogic 0.1.38 → 0.1.39

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjkzNmNjMDBiOGEwNjE2MmExYjI0YTk5NTRiMzg2ZDRmMmU3MjA0Yg==
+    ZTlhYjkyZjQ0YTIxZmQ1NjVlNmU5NGE1NjlkN2RhYmYzYmE5MDcxNw==
   data.tar.gz: !binary |-
-    YWZkODRmNzJkMTdmYTMzZTI3Zjk5NWIwMmRmYzM4MjYxY2ZkNGYwYQ==
+    MzQ0MjJhYjMwYmNkZjc5N2Q1ZWE0MTc0ZDk4MzBjNjUyN2JiODYyNQ==
 SHA512:
   metadata.gz: !binary |-
-    MzAyNjgzN2E0NzI2NjkwYzhkNzg2YmM1MGEwYTVmMThhYzk3YWY5ODRiMTM5
-    YWEzZGJmNjY1YzI0YjRlZTA3ZWFlY2ViODU2MDVkZjBmOWU0YjEwMTM1NjZm
-    NDFhMjBhZWZmYjExODRiY2IwMWNjNjIzZGZlZjA1MWE1Yzc2NDU=
+    M2Y0ZGVkODFhMGM1NmFlNzRmN2RhZDYzNTFlNmUwN2MzYzljMDcwMTg3Y2Fh
+    NzAxZDZkYzlmNGMzZjA4NzUxMTdiZmJjOTM1YmU1NmZkYTZmY2E3YzlmZTMy
+    MzcyNWViNmNlYTA1NmYzNjg5OGJlNGMzYWRjZjA5YzA2Y2JmYWQ=
   data.tar.gz: !binary |-
-    ZDEwOTVmMzllNWExOTNmMzUyODBiMWUwZWM5YjU2YmQwNDdhYTVhM2Y0Y2Iy
-    YTBkNjdmNWFhM2FiNGU4N2UwNWJlN2UzMjNiODllM2FjMTljMzQxMDU3Mjlk
-    M2NiZGVhMzUyZGRjOWI2YTIxNmI5ZDVmOGJkMTQ0ZTY4NjVjZDQ=
+    NTU2MzIwMjk2YmZmNDBlMWUxMDRiN2Y2ODBhM2JmZTBjOTc2OTkyODU2YzUw
+    NWY5MDQ0NGNmZTQ3MWI1YjEyOTExMDE2YjcyNDFkY2YxZTAxNjk4OWI4Zjdl
+    NjczNzcxMjRmYjNlNTM1ZWFjOWY3OTUxYTdkYjM1Y2NkYjg2YzQ=

data/automations/execute_job.rb

@@ -12,42 +12,6 @@ class String
   end
 end
 
-def pack_response_for_result_summaries(csv_content)
-  logs = csv_content[6..-1] # remove the headers of the csv file
-
-  logs = logs.select { |log| !log[0].start_with?("Run at") }
-
-  logs.each do |log|
-    log[2] = DateTime.parse(log[2])
-  end
-
-  logs = logs.sort_by { |log| [log[0], log[2]] }
-
-  servers_with_logs = logs.group_by {|log| log[0] }
-  failed_servers_with_logs = servers_with_logs.select {|key, value| value.select{|log| log[1] == "Error"}.count>0}
-
-  BrpmAuto.pack_response "results_summary", "#{servers_with_logs.count - failed_servers_with_logs.count}/#{servers_with_logs.count} servers were successful"
-
-  table_data = [[' ', 'Server', 'Result', 'Error message']]
-  counter = 0
-  server_cache = ""
-  logs.select{|log| log[1] == "Error"}.each do |log|
-    if log[0] == server_cache
-      server = ""
-    else
-      server = log[0]
-      server_cache = log[0]
-    end
-    result = log[1]
-    message = log[3]
-
-    counter += 1
-    table_data << [counter, server, result, message]
-  end
-
-  BrpmAuto.pack_response "results", { :perPage => 10, :totalItems => table_data.count - 1, :data => table_data }
-end
-
 brpm_rest_client = BrpmRestClient.new
 
 job_type_and_name = BrpmAuto.params["job_type_and_name"].split("|")
@@ -110,10 +74,71 @@ File.open(results_full_path, "w") do |f|
   f.puts(results_content)
 end
 
-csv_content = CSV.parse(results_content)
+BrpmAuto.log("Parsing the results...")
+# As this export contains "embedded" double quotes it is not possible to parse it with the CSV library
+log_lines = results_content.split("\n")[6..-1]
+log_lines.select! { |log| !log.start_with?("run level log,") }
+
+logs = log_lines.map do |log_line|
+  log_items = log_line.split(",",7)
+
+  # 0: server
+  # 1: phase
+  # 2: attempt
+  # 3: date part 1
+  # 4: date part 2
+  # 5: Info - Warning - Error
+  # 6: message
+
+  if log_items.count < 7 # Some lines are broken in two because of end-of-lines appearing in the message field...
+    nil
+  else
+    log_items[6] = log_items[6].tr(",,","")
+    log_items[3] = DateTime.parse("#{log_items[3]},#{log_items[4]}")
+
+    log_items
+  end
+end
+
+logs = logs.compact # removing the possible nils from the array
+
+logs = logs.sort_by { |log| [log[0], log[1], log[3]] }
+
+servers_with_logs = logs.group_by { |log| log[0] }
+
+failed_servers_with_logs = servers_with_logs.select { |key, value| value.select{|log| log[5] == "Error" }.count > 0}
+
+BrpmAuto.pack_response "results_summary", "#{servers_with_logs.count - failed_servers_with_logs.count}/#{servers_with_logs.count} servers were successful"
+
+table_data = [[' ', 'Server', 'Simulate', 'Stage', 'Commit']]
+counter = 0
+servers_with_logs.each do |key, logs|
+  server = key
+
+  phase_with_logs = logs.group_by { |log| log[1] }
+
+  if phase_with_logs.has_key?("Simulate")
+    simulate = phase_with_logs["Simulate"].any? { |log| log[5] == "Error" } ? "Error" : "Succeeded"
+  else
+    simulate = ""
+  end
+  if phase_with_logs.has_key?("Stage")
+    stage = phase_with_logs["Stage"].any? { |log| log[5] == "Error" } ? "Error" : "Succeeded"
+  else
+    stage = ""
+  end
+  if phase_with_logs.has_key?("Commit")
+    commit = phase_with_logs["Commit"].any? { |log| log[5] == "Error" } ? "Error" : "Succeeded"
+  else
+    commit = ""
+  end
+
+  counter += 1
+  table_data << [counter, server, simulate, stage, commit]
+end
 
-pack_response_for_result_summaries(csv_content)
+BrpmAuto.pack_response "results", { :perPage => 10, :totalItems => table_data.count - 1, :data => table_data }
 
 BrpmAuto.pack_response "results_link", results_full_path
 
-raise "The job had errors!" if had_errors
+raise "The Deploy job had errors!" if had_errors

data/config.yml

@@ -1,7 +1,7 @@
 dependencies:
  - brpm_module_brpm
 
-version: 0.1.38
+version: 0.1.39
 
 friendly_name: Blade
 author: Niek Bartholomeus

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brpm_module_bladelogic
 version: !ruby/object:Gem::Version
-  version: 0.1.38
+  version: 0.1.39
 platform: ruby
 authors:
 - Niek Bartholomeus