hive-runner 2.0.1 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d78f772fbb762e90253f3b4ce45ed962ebb7d0e
-  data.tar.gz: b9b3b9148ac42e9ce2a4b9d3af313f136cf4ccee
+  metadata.gz: e207ec510637bfa6487c519394b19e812d0b8cb7
+  data.tar.gz: bf62fa9fdcd02e893bf1c774c72f106684d343dc
 SHA512:
-  metadata.gz: 5ab5632889804523ae54e5735af3a2f026aa4885835a416527c0f9ca743cba8a5552565be5e5acb5907faece36b472d330c9c4cd44e607db62206b6798b29e01
-  data.tar.gz: d882cc93fa6db6128d5bb3019dbcad8d5a14e20ec57b559be94dc63c8d3cc0a0aeeaf8c1fba565c6bfa557dc99f4e4ff67766c2fbc15d6e176e9a3a403d924c7
+  metadata.gz: fe11351de90fc9333ef2c16c1fd67bb24795c3cc0539716d37f6026ba20c229d6abff2e749a5802834a97871b13d60347ac12bed5b8f904ff310ee37483b91f8
+  data.tar.gz: 038c7db4752776eee051e410ce40b7ec65fc3b024113fe5bff48bfea692b0853565b2ac305496394de7e5d113ce9693602f7422ede8357000f727f879ba8b0ba

data/bin/hive_setup

@@ -134,10 +134,11 @@ File.open("#{dir}/config/settings.yml", 'w') do |f|
   f.puts ''
   f.puts '  # Configuration for various network options'
   f.puts '  network:'
-  f.puts '    scheduler: https://scheduler'
-  f.puts '    devicedb: https://devicedb'
-  f.puts '    cert: /path/to/certificate.pem'
-  f.puts '    cafile: /path/to/certificate-authorities.pem'
+  f.puts '    scheduler: http://scheduler'
+  f.puts '    devicedb: http://devicedb'
+  f.puts '    #hive_mind: http://hive_mind'
+  f.puts '    # cert: /path/to/certificate.pem'
+  f.puts '    # cafile: /path/to/certificate-authorities.pem'
   f.puts ''
   f.puts '  # Configuration for diagnostic plugins'
   f.puts '  diagnostics:'

data/lib/hive.rb

@@ -2,6 +2,7 @@ require 'chamber'
 require 'hive/log'
 require 'hive/register'
 require 'devicedb_comms'
+require 'mind_meld'
 require 'macaddr'
 require 'socket'
 
@@ -29,7 +30,9 @@ module Hive
   else
     fail 'Missing logging section in configuration file'
   end
-
+  @hive_mind = MindMeld.new(
+    url: Chamber.env.network.hive_mind? ? Chamber.env.network.hive_mind : nil
+  )
   DeviceDBComms.configure do |config|
     config.url = Chamber.env.network.devicedb
     config.pem_file = Chamber.env.network.cert
@@ -59,12 +62,35 @@ module Hive
     @devicedb[section] ||= Object.const_get('DeviceDBComms').const_get(section).new()
   end
 
+  def self.hive_mind
+    @hive_mind
+  end
+
   def self.register
     @register ||= Hive::Register.new
   end
 
   # Get the id of the hive from the device database
-  def self.id
+  def self.hive_mind_id
+    if ! @hive_mind_id
+      Hive.logger.info "About to poll"
+      reg = @hive_mind.register(
+        hostname: Hive.hostname,
+        version: Gem::Specification.find_by_name('hive-runner').version.to_s,
+        runner_plugins: Hash[Gem::Specification.find_all_by_name(/hive-runner-*/).map { |p| [p.name, p.version.to_s] }],
+        macs: [Hive.mac_address],
+        ips: [Hive.ip_address],
+        brand: Hive.config.brand? ? Hive.config.brand : 'BBC',
+        model: Hive.config.model? ? Hive.config.model : 'Hive',
+        device_type: 'Hive'
+       )
+      @hive_mind_id = reg['id']
+    end
+    @hive_mind_id || -1
+  end
+
+   # Get the id of the hive from the device database
+   def self.id
     if ! @devicedb_id
       Hive.logger.info "Attempting to register the hive as #{Hive.hostname}"
       register_response = self.devicedb('Hive').register(Hive.hostname, Hive.mac_address, Hive.ip_address)
@@ -81,6 +107,7 @@ module Hive
 
   # Poll the device database
   def self.poll
+    # DeviceDB
     id = self.id
     if id and  id > 0
       Hive.logger.debug "Polling hive: #{id}"
@@ -98,6 +125,25 @@ module Hive
         Hive.logger.warn "Unable to poll hive"
       end
     end
+
+    # Hive Mind
+    id = self.hive_mind_id
+    if id and  id > 0
+      Hive.logger.debug "Polling hive: #{id}"
+#      rtn = @hivemind.poll(id)
+#      Hive.logger.debug "Return data: #{rtn}"
+#      if rtn['error'].present?
+#        Hive.logger.warn "Hive polling failed: #{rtn['error']}"
+#      else
+#        Hive.logger.info "Successfully polled hive"
+#      end
+    else
+      if id
+        Hive.logger.debug "Skipping polling of hive"
+      else
+        Hive.logger.warn "Unable to poll hive"
+      end
+    end
   end
 
   # Get the IP address of the Hive

data/lib/hive/file_system.rb

@@ -39,33 +39,19 @@ module Hive
     end
 
     def fetch_build(build_url, destination_path)
-      if !fetch_build_with_curl(build_url, destination_path)
-        @log.info( "Initial build fetch failed -- trying again shortly")
-        sleep 5
-        if !fetch_build_with_curl(build_url, destination_path)
-          raise "Build could not be downloaded"
-        end
-      end
-    end
-
-    def fetch_build_with_curl(build_url, destination_path)
-      cert_path     = Hive.config.network['cert']
-      cabundle_path = Hive.config.network['cafile']
       base_url      = Hive.config.network['scheduler']
       apk_url       = base_url + '/' + build_url
-      curl_line     = "curl -L -m 60 #{apk_url} --cert #{cert_path} --cacert #{cabundle_path} --retry 3 -o #{destination_path}"
+      
+      job = Hive::Messages::Job.new
+      response = job.fetch(apk_url)
 
-      @log.info("Fetching build from hive-scheduler: #{curl_line}")
-      @log.debug("CURL line: #{curl_line}")
-      response = `#{curl_line}`
-      if $? != 0
-        @log.info("Curl error #{$?}: #{response.to_s}")
-        false
-        Hive::Messages
-      else
-        @log.info("Curl seems happy, checking integrity of downloaded file")
-        check_build_integrity( destination_path )
+      tempfile = Tempfile.new('build.apk')
+        File.open(tempfile.path,'w') do |f|
+        f.write response.body
       end
+
+      copy_file(tempfile.path, destination_path)
+      check_build_integrity( destination_path )
     end
 
     def check_build_integrity( destination_path )

data/lib/hive/worker.rb

@@ -124,9 +124,7 @@ module Hive
         # Upload results
         @file_system.finalise_results_directory
         upload_files(@job, @file_system.results_path, @file_system.logs_path)
-        File.open("#{@file_system.home_path}/job_info", 'w') do |f|
-          f.puts "#{Process.pid} completed"
-        end
+        set_job_state_to :completed
         @job.error('Worker killed')
         @log.info "Worker terminated"
         exit
@@ -139,9 +137,7 @@ module Hive
       begin
         @log.info "Setting job paths"
         @file_system = Hive::FileSystem.new(@job.job_id, Hive.config.logging.home, @log)
-        File.open("#{@file_system.home_path}/job_info", 'w') do |f|
-          f.puts "#{Process.pid} running"
-        end
+        set_job_state_to :preparing
 
         if ! @job.repository.to_s.empty?
           @log.info "Checking out the repository"
@@ -175,6 +171,7 @@ module Hive
         @log.info "Appending test script to execution script"
         @script.append_bash_cmd @job.command
 
+        set_job_state_to :running
         @job.start
 
         @log.info "Pre-execution setup"
@@ -189,6 +186,7 @@ module Hive
 
       begin
         @log.info "Post-execution cleanup"
+        set_job_state_to :uploading
         post_script(@job, @file_system, @script)
 
         # Upload results
@@ -202,6 +200,7 @@ module Hive
 
       if exception
         @job.error( exception.message )
+        set_job_state_to :completed
         raise exception
       else
         @job.complete
@@ -212,9 +211,7 @@ module Hive
         exit
       end
 
-      File.open("#{@file_system.home_path}/job_info", 'w') do |f|
-        f.puts "#{Process.pid} completed"
-      end
+      set_job_state_to :completed
       exit_value == 0
     end
 
@@ -396,5 +393,12 @@ module Hive
       @log.warn("Use @port_allocator.release_all_ports instead")
       @port_allocator.release_all_ports
     end
+
+    # Set job info file
+    def set_job_state_to state
+      File.open("#{@file_system.home_path}/job_info", 'w') do |f|
+        f.puts "#{Process.pid} #{state}"
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hive-runner
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.3
 platform: ruby
 authors:
 - Joe Haig
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-17 00:00:00.000000000 Z
+date: 2015-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chamber
@@ -112,16 +112,22 @@ dependencies:
   name: hive-messages
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.0.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.0.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: devicedb_comms
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +142,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: mind_meld
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: code_cache
   requirement: !ruby/object:Gem::Requirement