brpm_module_bladelogic 0.1.15 → 0.1.16

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjI3MzIxMGQ4ZjM0OTE2YTE3MmU5NmQ4NWYxNDE1MjgyYmRlYjNlYw==
+    Njg2N2QwY2I2MjM0ZWNjMGM2NjNlZDYyMWYwOGQ1MTEzOGM0NTA3Mg==
   data.tar.gz: !binary |-
-    ZjI2MjIyYzlkNWJlYzViY2E3NWE1ZjdmN2M1ODZjNGQ0NDZmNjQ3Yw==
+    NGM0ZjZkMzkzODIxZDI5YTJjZDY1MjIxMDA1Y2NiNDU3NGU4YjgyNw==
 SHA512:
   metadata.gz: !binary |-
-    YzgxNDhlMWQ0YWRhMTJmMDMxODU0MjNmZmRjZDY5YWJkZjRiYzE4NTZlM2Yy
-    MGQxYTUwYTdlMjM2OTQ5NTI5Yzc2NmM4ZjNkOGE2NDVhYmI1MjYyYjY2ZWNh
-    MGMxMzhkMDRlOTMyM2I1NmFlYTg3MDgyZGJhMTM5NDBmMDVjMjM=
+    YWE0OWZlZTM0OTc1Zjg0NjQyYzY3NWFmOWVjOTJjN2M2MzhlZGI2MmU3ODZj
+    ZTA5ZGZjMTFhNGE4YjRmMzE5NTIyZTZjMjNiYzI5MmFiOTA0MDkzOTJkMjY1
+    MDBhZGU5NWNjNTFhNDMyMjk4MWI5NTZkZGUzYjMzNzZkOWY0YzU=
   data.tar.gz: !binary |-
-    NDA4ZTNiZWJiMWU1MjUxYmJkODY0NzA3MjljMGNjNmU1MDkxNjM2ZGY5NDI1
-    MDk3NDQwNTRkYWVhOWQwMDI3ZmM1MmFhMzBhNGEwZWFhMDc0YWZiMDEwZTQ2
-    MjM3OWZjNjdiYTQyOTVhOWE3YjRhYmFiNDcyZWUyZjhmYmFkZWM=
+    YmEzYzk4ZGMyM2FkZmU1YzNiZjBlNzYzYzdjZTBkZmRlMDE4YWQ2NTUxOWZl
+    MjE5ZTc2NjUzMmM5NThiYmU4N2RjMTk1NjE4MjhmMjdmMTY4ZjE2MzM0ZDVj
+    MjRiNGRkYjhjYTRhODg2ZGIwYjdhYjFhN2I4NDVlNmZmYmUyZjA=

data/automations/deploy_package.meta

@@ -22,8 +22,8 @@ params:
   deploy_options:
     name: Deploy options
     type: in-list-single
-    list_pairs: 0,Complete deployment|1,Only upload package|2,Only execute package
-    position: A7:F7
+    list_pairs: 0,Full deployment|1,Only upload package|2,Only execute package
+    position: A7:C7
   job_status:
     name: Job Status
     type: out-text

data/automations/deploy_package.rb

@@ -21,6 +21,11 @@ if params["deploy_options"] == "Only execute package"
   deploy_job_name = bsa_soap_client.job.get_job_name_by_db_key({:job_db_key => job_db_key})
   deploy_job_group_path_id = bsa_soap_client.job.get_group_id({:job_key => job_db_key})
   deploy_job_group_path = bsa_soap_client.group.get_a_qualified_group_name({:group_type => 5005, :group_id => deploy_job_group_path_id})
+
+  BrpmAuto.log("Executing the Deploy job...")
+  job_run_key = bsa_soap_client.job.execute_job_and_wait({:job_key => job_db_key})
+  BrpmAuto.log("Job run key is #{job_run_key}.")
+
 else
   target_type = BrpmAuto.first_defined(BrpmAuto.substitute_tokens(params["target_type"]), "Server group")
   BrpmAuto.log "Target type: #{params["target_type"]}"
@@ -97,9 +102,8 @@ else
   end
 
   if params["deploy_options"] == "Only upload package"
-    wait_time = 30
-    start_time = Time.now + wait_time
-    BrpmAuto.log("Setting the phase schedule of the Deploy job to only execute the stage phase, starting in #{wait_time} seconds (at #{start_time.strftime("%Y-%m-%d %H:%M:%S")})...")
+    start_time = Time.now - 60 * 60 * 2
+    BrpmAuto.log("Setting the phase schedule of the Deploy job to only execute the stage phase...")
     job_db_key = bsa_soap_client.deploy_job.set_phase_schedule_by_dbkey({:job_run_key => job_db_key,
                                                                          :simulate_type => "AtTime",
                                                                          :simulate_date => start_time.strftime("%Y-%m-%d %H:%M:%S"),
@@ -108,22 +112,27 @@ else
                                                                          :commit_type => "NotScheduled",
                                                                          :commit_date => ""})
 
+    sleep(10)
+    job_run_key = bsa_soap_client.job_run.find_last_run_key_by_job_key({:job_key => job_db_key})
+
+    BrpmAuto.log("Polling the Deploy job until it is finished...")
+    begin
+      sleep(10)
+      is_still_running = bsa_soap_client.job_run.get_job_run_is_running_by_run_key({:job_run_key => job_run_key})
+    end while is_still_running
+    BrpmAuto.log("The Deploy job has finished.")
+
+    BrpmAuto.log("Clearing the phase schedule of the Deploy job to enable the commit phase...")
+    job_db_key = bsa_soap_client.deploy_job.clear_deploy_job_schedules_by_dbkey({:job_run_key => job_db_key})
+
     BrpmAuto.log "Storing the Deploy job db key to the request params so it can be used later to execute the package (right now we are only going to upload the package to the target servers)."
     BrpmAuto.request_params["#{params.component}_deploy_job_db_key"] = job_db_key
-  end
-end
 
-BrpmAuto.log("Executing the Deploy job...")
-job_run_key = bsa_soap_client.job.execute_job_and_wait({:job_key => job_db_key})
-BrpmAuto.log("Job run key is #{job_run_key}.")
-
-if params["deploy_options"] == "Only upload package"
-  BrpmAuto.log("Polling the Deploy job until it is finished...")
-  begin
-    sleep(wait_time)
-    is_still_running = bsa_soap_client.job_run.get_job_run_is_running_by_run_key({:job_run_key => job_run_key})
-  end while is_still_running
-  BrpmAuto.log("The Deploy job has finished.")
+  else
+    BrpmAuto.log("Executing the Deploy job...")
+    job_run_key = bsa_soap_client.job.execute_job_and_wait({:job_key => job_db_key})
+    BrpmAuto.log("Job run key is #{job_run_key}.")
+  end
 end
 
 BrpmAuto.log("Checking if the job finished successfully...")

data/config.yml

@@ -1,7 +1,7 @@
 dependencies:
  - brpm_module_brpm
 
-version: 0.1.15
+version: 0.1.16
 
 author: Niek Bartholomeus
 email: niek.bartholomeus@gmail.com

data/lib/bl_soap/deploy_job.rb

@@ -91,4 +91,15 @@ class DeployJob < BsaSoapBase
   rescue => exception
     raise "#{self.class} Exception: #{exception.to_s}"
   end
+
+  def clear_deploy_job_schedules_by_dbkey(options = {})
+    validate_cli_options_hash([:job_run_key], options)
+    void_result = execute_cli_with_param_list(self.class, "clearDeployJobSchedulesByDBKey",
+                                              [
+                                                  options[:job_run_key],
+                                              ])
+    void_value = get_cli_return_value(void_result)
+  rescue => exception
+    raise "#{self.class} Exception: #{exception.to_s}"
+  end
 end

metadata

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