bellows 1.0.6 → 1.0.7

data/CHANGELOG

@@ -1,3 +1,6 @@
+* Mon Dec 12 2011 Dan Prince <dan.prince@rackspace.com> - 1.0.7
+  - Add 'comment' task to comment on Gerrit reviews w/ test result links.
+
 * Sun Dec 4 2011 Dan Prince <dan.prince@rackspace.com> - 1.0.6
   - Truncate revisions for job git hashes.
 

data/VERSION

@@ -1 +1 @@
-1.0.6
+1.0.7

data/lib/bellows/gerrit.rb

@@ -23,5 +23,9 @@ module Bellows
       reviews
     end
 
+    def self.comment(revision, message)
+      Gerrit.run_cmd(%{review --code-review 0 -m \"'#{message}'\" #{revision}})
+    end
+
   end
 end

data/lib/bellows/smoke_stack.rb

@@ -9,6 +9,31 @@ module Bellows
       JSON.parse(Bellows::HTTP.get("/jobs.json?limit=99999"))
     end
 
+    def self.jobs_with_hash(git_hash, jobs=nil)
+      if jobs.nil?
+        jobs = JSON.parse(Bellows::HTTP.get("/jobs.json?limit=99999"))
+      end
+      jobs_found = []
+      jobs.each do |job|
+        data = job.values[0]
+        ['nova','keystone','glance'].each do |project|
+          revision = data["#{project}_revision"]
+          if revision and revision == git_hash then
+            jobs_found << job 
+          end
+        end
+      end
+      jobs_found
+    end
+
+    #Return a reference to the first job of the specified type.
+    def self.job_data_for_type(jobs, job_type)
+      jobs.each do |job|
+        return job.values[0] if job.keys[0] == job_type
+      end
+      nil
+    end
+
     def self.smoke_tests(project)
       tests = {}
       data = JSON.parse(Bellows::HTTP.get("/smoke_tests.json"))

data/lib/bellows/tasks.rb

@@ -72,7 +72,6 @@ module Bellows
       Util.validate_project(project)
       test = options[:test]
       limit = options[:limit] || 5
-      # jobs indexed by revision
       jobs = Set.new
       Bellows::SmokeStack.jobs.each do |job|
           data = job.values[0]
@@ -107,5 +106,57 @@ module Bellows
       end
     end
 
+    desc "comment PROJECT", "Add gerrit comments for reviews w/ results."
+    method_options :test => :boolean
+    method_options :quiet => :boolean
+    method_options :cache_file => :string, :required => true
+    def comment(project, options=(options or {}))
+      Util.validate_project(project)
+      test = options[:test]
+      cache_file = options[:cache_file]
+      jobs = Bellows::SmokeStack.jobs
+
+      if cache_file.nil? or cache_file.empty?
+        puts "ERROR: cache_file is required."
+        exit 1
+      end
+
+      cached_hashes = Set.new
+      if File.exists?(cache_file) then
+        IO.read(cache_file).each_line do |line|
+          cached_hashes << line.chomp
+        end
+      end
+
+      File.open(cache_file, 'a') do |file|
+        Bellows::Gerrit.reviews(project) do |review|
+          revision = review['currentPatchSet']['revision'][0,7]
+          desc = review['owner']['name'] + ": " +review['subject']
+          if not cached_hashes.include? revision
+            refspec = review['currentPatchSet']['ref']
+            patchset_num = review['currentPatchSet']['number']
+            jobs_for_rev = Bellows::SmokeStack.jobs_with_hash(revision, jobs)
+            if jobs_for_rev.count > 0 then
+              unit=Bellows::SmokeStack.job_data_for_type(jobs_for_rev, 'job_unit_tester')
+              libvirt=Bellows::SmokeStack.job_data_for_type(jobs_for_rev, 'job_vpc')
+              xenserver=Bellows::SmokeStack.job_data_for_type(jobs_for_rev, 'job_xen_hybrid')
+              if unit and libvirt and xenserver then
+                puts "Commenting ... " + desc if not options[:quiet]
+                message = "SmokeStack Results (patch set #{patchset_num}):\n"
+                message += "\tUnit #{unit['status']}: http://smokestack.openstack.org/?go=/jobs/#{unit['id']}\n"
+                message += "\tLibvirt #{libvirt['status']}: http://smokestack.openstack.org/?go=/jobs/#{libvirt['id']}\n"
+                message += "\tXenServer #{xenserver['status']}: http://smokestack.openstack.org/?go=/jobs/#{xenserver['id']}"
+                out = Bellows::Gerrit.comment(review['currentPatchSet']['revision'], message) if not test
+                puts out if not options[:quiet]
+                file.write revision + "\n" if not test
+              end
+
+            end
+
+          end
+        end
+      end
+    end
+
   end
 end

data/test/test_task.rb

@@ -1,5 +1,6 @@
 $:.unshift File.dirname(__FILE__)
 require 'helper'
+require 'tempfile'
 
 class TaskTest < Test::Unit::TestCase
 
@@ -21,4 +22,22 @@ class TaskTest < Test::Unit::TestCase
 
   end
 
+  def test_comment
+
+    jobs_data = fixture('jobs.json')
+    Bellows::SmokeStack.stubs(:jobs).returns(JSON.parse(jobs_data))
+    
+    gerrit_data = fixture('gerrit.json')
+    Bellows::Gerrit.stubs(:run_cmd).returns(gerrit_data)
+
+    cache_file=Tempfile.new('smokestack')
+
+    response = mock()
+    Bellows::HTTP.stubs(:post).returns(response)
+    tasks = Bellows::Tasks.new
+
+    tasks.comment('nova', options={:quiet => true, :cache_file => cache_file.path})
+
+  end
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bellows
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 1
   - 0
-  - 6
-  version: 1.0.6
+  - 7
+  version: 1.0.7
 platform: ruby
 authors: 
 - Dan Prince
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-04 00:00:00 -05:00
+date: 2011-12-12 00:00:00 -05:00
 default_executable: bellows
 dependencies: 
 - !ruby/object:Gem::Dependency