brpm_content_framework 0.2.30 → 0.2.31

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MWJmZWY0ZWYzZjdiYWQzNjBmMTM5M2ZjNGNlYmU0OGRlNDBjMWU0Mw==
+    ZTEzY2UxYjA2ZWNhZGM2NTRkMzkyNTFkMDFlYjk3NjVkYzFmYmM4Mg==
   data.tar.gz: !binary |-
-    M2RiNzU0N2E1NGZjM2M5OWM5NDg2MmYyNGY3YjQ3Yjc0NDY5NjdkYQ==
+    YTI3MWZmZmIwZGVmYmJkMzYyMmZhMWFlMzQwOWY2NzdiMmFkM2NiYQ==
 SHA512:
   metadata.gz: !binary |-
-    NDA5Y2JlN2Y0ZDc5OTJiYmM5MzEwMmVmNTIyZTMxNjZlMGEwMTUwMjhhYWM1
-    MzFjNzQ5ZjFkMTE3NmY2ZTBkYmZlYjRiM2FmYjQ2MmQyMGZmNWNiNTk0Mjgy
-    MDNjMzY5YmQ1MDgyNDQzYjFiNjE1OTU4OTM4MzVhMWY4ZGNkMTE=
+    MzAzMmNlMTAxZjhlMDU5ODg0ZmY3YzVhYjhjNzJjMjhmYThmNjM4OWE4ZWNl
+    MjBhN2YwMDE4OWM1Njg1Y2FkM2QwYmJkNjUyYzA3NTM4MzE5Y2NjOWQwNTkz
+    Y2IxZGM1NDFmMWYzY2ZjZDNhMjhiZDMyYmUzYWFlZGI2ODQ2YTQ=
   data.tar.gz: !binary |-
-    YWQ4YmM0MmIwMDEwZDhkOWIzZTEyOGM0MWRmNWJiY2NkYjYxYTc4YTc5NTIy
-    MmVlYTBlYTYxYmE1NjVjYjliNWI0MTQ3ZWQ0NDE5MGRkMWMyNmQ4MDdkNTQ4
-    NjA3MjRjNWY0ODkxNTRkOTVkODY0MTdlYjViNjAyNzExZTEzOTA=
+    MzY1NmE4YjdhYmE5MGI4MGVhMWI4NjAzNzUzNmM2MGVjZmY4MzFkOWQ0NmE3
+    NjIyMjlkNGJkOWI0MTJjZjlkNDJmZGEyY2ZhYTQyYWJlZjcxYmZjNDRjYTk4
+    ZGQ4MTE0ZmYyMjc4Njk5YmNlODg0MzI2NWZkY2NjMTE3NmFhZWM=

data/config.yml

@@ -1,4 +1,4 @@
-version: 0.2.30
+version: 0.2.31
 
 author: Niek Bartholomeus
 email: niek.bartholomeus@gmail.com

data/infrastructure/docker/Dockerfile

@@ -1,7 +1,7 @@
 FROM atlashealth/ruby:1.9.3
 MAINTAINER Niek Bartholomeus <niek.bartholomeus@gmail.com>
 
-ENV BRPM_CONTENT_FRAMEWORK_VERSION 0.2.29
+ENV BRPM_CONTENT_FRAMEWORK_VERSION 0.2.31
 ENV GEM_HOME /usr/lib/ruby/gems/1.9.1
 
 RUN gem install brpm_content_framework --ignore-dependencies -v "$BRPM_CONTENT_FRAMEWORK_VERSION" && \
@@ -11,3 +11,4 @@ RUN gem install brpm_content_framework --ignore-dependencies -v "$BRPM_CONTENT_F
 ADD . /
 
 VOLUME [ "/workdir" ]
+VOLUME [ "/automation_results" ]

data/infrastructure/docker/docker_execute_automation

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 module_name = ENV["MODULE"]
 automation_script_name = ARGV[0]
-params_file = "/workdir/#{ARGV[1]}"
+params_path = ARGV[1]
 automation_type = ARGV[2]
 parent_id = ARGV.size > 3 ? ARGV[3] : nil
 offset = ARGV.size > 4 ? ARGV[4] : nil
@@ -17,4 +17,4 @@ if File.exists?(gemfile_path)
 end
 
 require 'brpm_script_executor'
-BrpmScriptExecutor.execute_automation_script_from_other_process(module_name, automation_script_name, params_file, automation_type, parent_id, offset, max_records)
+BrpmScriptExecutor.execute_automation_script_from_other_process(module_name, automation_script_name, params_path, automation_type, parent_id, offset, max_records)

data/lib/brpm_auto.rb

@@ -74,6 +74,8 @@ class BrpmAuto
             SS_project_server_id
         )
       end
+
+      @params
     end
 
     def load_server_params

data/lib/brpm_script_executor.rb

@@ -29,23 +29,33 @@ class BrpmScriptExecutor
         raise "Automation type #{automation_type} is not supported."
       end
 
-      case params["execute_automation_scripts_in_docker"]
+      case BrpmAuto.params["execute_automation_scripts_in_docker"]
       when "always"
         use_docker = true
       when "if_docker_image_exists"
-        output = exec("docker pull bmcrlm/#{modul}:#{module_version}")
-        use_docker = (output =~ /Image is up to date for/)
+        BrpmAuto.log "Checking if a docker image exists for bmcrlm/#{modul}:#{module_version}..."
+        output = `docker history -q bmcrlm/#{modul}:#{module_version} 2>&1 >/dev/null`
+        if output.empty?
+          use_docker = true
+        else
+          BrpmAuto.log "The image doesn't exist locally, checking if we can pull it from the Docker Hub..."
+          output = `docker pull bmcrlm/#{modul}:#{module_version}`
+          use_docker = (output =~ /Image is up to date for/)
+        end
       else
         use_docker = false
       end
 
-      working_path = File.expand_path(params["SS_output_dir"] || params["output_dir"] || Dir.pwd)
+      working_path = File.expand_path(BrpmAuto.params.output_dir)
       params_file = "params_#{params["SS_run_key"] || params["run_key"] || "000"}.yml"
       params_path = "#{working_path}/#{params_file}"
+      automation_results_path = params["SS_automation_results_dir"] || working_path
 
       if use_docker
-        params["SS_output_dir"] = "/workdir" if params.has_key?("SS_output_dir")
-        params["output_dir"] = "/workdir" if params.has_key?("output_dir")
+        params["SS_output_dir"] = "/workdir"
+        params["SS_output_file"].sub!(working_path, "/workdir")
+
+        params["SS_automation_results_dir"] = "/automation_results"
       end
 
       BrpmAuto.log "Temporarily storing the params to #{params_path}..."
@@ -55,12 +65,13 @@ class BrpmScriptExecutor
 
       if use_docker
         BrpmAuto.log "Executing the script in a docker container..."
-        command = "docker run -v #{working_path}:/workdir --rm bmcrlm/#{modul}:#{module_version} /docker_execute_automation \"#{name}\" \"#{params_file}\" \"#{automation_type}\""
+        command = "docker run -v #{working_path}:/workdir -v #{automation_results_path}:/automation_results --rm bmcrlm/#{modul}:#{module_version} /docker_execute_automation \"#{name}\" \"/workdir/#{params_file}\" \"#{automation_type}\""
         if automation_type == "resource_automation"
           command += " \"#{parent_id}\"" if parent_id
           command += " \"#{offset}\"" if offset
           command += " \"#{max_records}\"" if max_records
         end
+        BrpmAuto.log command
         exec(command)
       else
         env_vars = {}

data/lib/params/params.rb

@@ -94,7 +94,7 @@ class Params < ParamsBase
     @run_key = params["SS_run_key"] || params["run_key"]
 
     if params["SS_automation_results_dir"]
-      @home_dir = params["SS_automation_results_dir"].sub("automation_results", "")
+      @home_dir = params["SS_automation_results_dir"].sub("/automation_results", "")
     else
       @home_dir = params["home_dir"] || Dir.pwd
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brpm_content_framework
 version: !ruby/object:Gem::Version
-  version: 0.2.30
+  version: 0.2.31
 platform: ruby
 authors:
 - Niek Bartholomeus
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-28 00:00:00.000000000 Z
+date: 2015-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh