bellows 1.0.4 → 1.0.5

data/CHANGELOG

@@ -1,3 +1,7 @@
+* Thu Dec 3 2011 Dan Prince <dan.prince@rackspace.com> - 1.0.5
+  - Add 'fire' task to run jobs for reviews without results.
+  - Add --quiet option to all tasks.
+
 * Thu Nov 17 2011 Dan Prince <dan.prince@rackspace.com> - 1.0.4
   - Explicitly set config templates and tests on sync.
   - All --all option to sync command. Remove 'reconfig' task.

data/Gemfile

@@ -10,4 +10,5 @@ group :development do
   gem "jeweler", "~> 1.6.4"
   gem "thor", "~> 0.14.6"
   gem "json", "~> 1.4.6"
+  gem "mocha", "~> 0.9.9"
 end

data/README.md

@@ -34,6 +34,7 @@ Examples
 Available bellows tasks:
 
 	Tasks:
+	  bellows fire PROJECT   # Run jobs for reviews without results.
 	  bellows help [TASK]     # Describe available tasks or one specific task
 	  bellows purge PROJECT   # Purge merged reviews from SmokeStack
 	  bellows sync PROJECT    # Create tests & update refspecs for active reviews.
@@ -50,6 +51,10 @@ Sync test suite choices for active reviews in SmokeStack (based on the selection
 
 	bellows sync nova --all
 
+Fire tests for reviews without results (3 at a time):
+
+	bellows fire nova --limit=3
+
 All commands support creating and maintaining test configs for nova, glance, and keystone.
 
 License

data/VERSION

@@ -1 +1 @@
-1.0.4
+1.0.5

data/lib/bellows/gerrit.rb

@@ -3,9 +3,13 @@ require 'json'
 module Bellows
   class Gerrit
 
+    def self.run_cmd(command)
+      return %x{ssh review gerrit #{command}}
+    end
+
     def self.reviews(project, status="open", branch="master")
       reviews = []
-      out=%x{ssh review gerrit query "status: #{status}" --current-patch-set --format JSON}
+      out=Gerrit.run_cmd(%{query "status: #{status}" --current-patch-set --format JSON})
       out.each_line do |line|
         data = JSON.parse(line)
         if data['project'] and data['project'] == "openstack/#{project}" and data['branch'] and data['branch'] == branch

data/lib/bellows/smoke_stack.rb

@@ -5,16 +5,20 @@ require 'bellows/util'
 module Bellows
   class SmokeStack
 
-    def self.get_smoke_tests(project)
-      smoke_tests = {}
+    def self.jobs()
+      JSON.parse(Bellows::HTTP.get("/jobs.json?limit=10000"))
+    end
+
+    def self.smoke_tests(project)
+      tests = {}
       data = JSON.parse(Bellows::HTTP.get("/smoke_tests.json"))
       data.each do |item|
         branch = item['smoke_test']["#{project}_package_builder"]['branch']
         if branch and not branch.empty? then
-          smoke_tests.store(Bellows::Util.short_spec(branch), item['smoke_test'])
+          tests.store(Bellows::Util.short_spec(branch), item['smoke_test'])
         end
       end
-      smoke_tests
+      tests
     end
 
     def self.format_request(smoke_test)
@@ -36,7 +40,7 @@ module Bellows
     end
 
     def self.update_smoke_test(id, updates={})
-  
+
       data = JSON.parse(Bellows::HTTP.get("/smoke_tests/#{id}.json"))
       ['nova', 'glance', 'keystone'].each do |proj|
         if updates["#{proj}_package_builder"]

data/lib/bellows/tasks.rb

@@ -1,4 +1,5 @@
 require 'json'
+require 'set'
 require 'bellows/http'
 require 'bellows/util'
 require 'bellows/gerrit'
@@ -10,14 +11,12 @@ module Bellows
     desc "sync PROJECT", "Create tests & update refspecs for active reviews."
     method_options :test => :boolean
     method_options :all => :boolean
-    def sync(project)
-      if not ['nova', 'glance', 'keystone'].include?(project) then
-        puts "ERROR: Please specify a valid project name."
-        exit 1
-      end
+    method_options :quiet => :boolean
+    def sync(project, options=(options or {}))
+      Util.validate_project(project)
       test = options[:test]
       all = options[:all]
-      smoke_tests = Bellows::SmokeStack.get_smoke_tests(project)
+      smoke_tests = Bellows::SmokeStack.smoke_tests(project)
       configs=Util.load_configs
       test_suite_ids = configs['test_suite_ids'].collect {|x| x.to_s }
       config_template_ids = configs['config_template_ids'].collect {|x| x.to_s }
@@ -33,11 +32,11 @@ module Bellows
           Bellows::SmokeStack.create_smoke_test(project, desc, refspec, config_template_ids, test_suite_ids) if not test
         else
           if smoke_test["#{project}_package_builder"]['branch'] != refspec then
-            puts "Updating... " + desc
-            puts "refspec: " + refspec
+            puts "Updating... " + desc if not options[:quiet]
+            puts "refspec: " + refspec if not options[:quiet]
             Bellows::SmokeStack.update_smoke_test(smoke_test['id'], {"#{project}_package_builder" => { "branch" => refspec}, "description" => desc, "status" => "Updated", "test_suite_ids" => test_suite_ids, "config_template_ids" => config_template_ids}) if not test
           elsif all then
-            puts "Updating (all)... " + desc
+            puts "Updating (all)... " + desc if not options[:quiet]
             Bellows::SmokeStack.update_smoke_test(smoke_test['id'], {"#{project}_package_builder" => { "branch" => refspec}, "description" => desc, "test_suite_ids" => test_suite_ids, "config_template_ids" => config_template_ids}) if not test
           end
         end
@@ -46,13 +45,11 @@ module Bellows
 
     desc "purge PROJECT", "Purge merged reviews from SmokeStack"
     method_options :test => :boolean
-    def purge(project)
-      if not ['nova', 'glance', 'keystone'].include?(project) then
-        puts "ERROR: Please specify a valid project name."
-        exit 1
-      end
+    method_options :quiet => :boolean
+    def purge(project, options=(options or {}))
+      Util.validate_project(project)
       test = options[:test]
-      smoke_tests = Bellows::SmokeStack.get_smoke_tests(project)
+      smoke_tests = Bellows::SmokeStack.smoke_tests(project)
       reviews = Bellows::Gerrit.reviews(project, "merged")
       reviews += Bellows::Gerrit.reviews(project, "abandoned") 
       reviews.each do |review|
@@ -61,11 +58,54 @@ module Bellows
         smoke_test = smoke_tests[review_id]
         desc = review['owner']['name'] + ": " +review['subject']
         if smoke_test
-          puts "Deleting... " + desc
+          puts "Deleting... " + desc if not options[:quiet]
           Bellows::HTTP.delete("/smoke_tests/#{smoke_test['id']}") if not test
         end
       end
     end
 
+    desc "fire PROJECT", "Run jobs for reviews without results."
+    method_options :test => :boolean
+    method_options :quiet => :boolean
+    method_options :limit => :integer
+    def fire(project, options=(options or {}))
+      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]
+          if data
+              revision = data["#{project}_revision"]
+              if revision and not revision.empty?
+                  jobs.add(revision)
+              end
+          end
+      end
+      smoke_tests = Bellows::SmokeStack.smoke_tests(project)
+
+      count=0
+      Bellows::Gerrit.reviews(project) do |review|
+        revision = review['currentPatchSet']['revision'][0,7]
+        desc = review['owner']['name'] + ": " +review['subject']
+        if not jobs.include? revision
+          puts "Running ... " + desc if not options[:quiet]
+          refspec = review['currentPatchSet']['ref']
+          review_id = Bellows::Util.short_spec(refspec)
+          smoke_test = smoke_tests[review_id]
+          if smoke_test then
+            count += 1
+            Bellows::HTTP.post("/smoke_tests/#{smoke_test['id']}/run_jobs", {}) if not test
+          else
+            puts "WARNING: no smoke test exists for: #{refspec}" if not options[:quiet]
+          end
+          if count >= limit.to_i then
+            break
+          end
+        end
+      end
+    end
+
   end
 end

data/lib/bellows/util.rb

@@ -43,5 +43,13 @@ module Bellows
       refspec.sub(/\/[^\/]*$/, "")
     end
 
+    VALID_PROJECTS = ['nova', 'glance', 'keystone']
+    def self.validate_project(project)
+      if not VALID_PROJECTS.include?(project) then
+        puts "ERROR: Please specify a valid project name."
+        exit 1
+      end
+    end
+
   end
 end

data/test/fixtures/gerrit.json

@@ -0,0 +1,2 @@
+{"project":"openstack/nova","branch":"master","id":"I111111185925d2bab882a34c237819b51838dfae","number":"1234","subject":"Test branch 1","owner":{"name":"Dan Prince","email":"dan.prince@rackspace.com","username":"dprince"},"url":"https://review.openstack.org/1234","lastUpdated":1321970185,"sortKey":"001937240000072e","open":true,"status":"NEW","currentPatchSet":{"number":"1","revision":"1234567b2f935a0626b8de75360ce5d15f01758c","ref":"refs/changes/38/1234/1","uploader":{"name":"Dan Prince","email":"dan.prince@rackspace.com","username":"dprince"},"approvals":[{"type":"CRVW","description":"Code Review","value":"2","grantedOn":1321970185,"by":{"name":"Jimmy Barnes","email":"jimmy.barnes@openstack.com","username":"jbarnes"}},{"type":"CRVW","description":"Code Review","value":"1","grantedOn":1321942411,"by":{"name":"John Smith","email":"john.smith@openstack.org","username":"jsmity"}}]}}
+{"project":"openstack/nova","branch":"master","id":"I222222285925d2bab882a34c237819b51838dfae","number":"5678","subject":"Test branch 2","owner":{"name":"Dan Prince","email":"dan.prince@rackspace.com","username":"dprince"},"url":"https://review.openstack.org/5678","lastUpdated":1321970185,"sortKey":"001937240000072e","open":true,"status":"NEW","currentPatchSet":{"number":"1","revision":"zzzzzzzb2f935a0626b8de75360ce5d15f01758c","ref":"refs/changes/38/5678/1","uploader":{"name":"Dan Prince","email":"dan.prince@rackspace.com","username":"dprince"},"approvals":[{"type":"CRVW","description":"Code Review","value":"2","grantedOn":1321970185,"by":{"name":"Jimmy Barnes","email":"jimmy.barnes@openstack.com","username":"jbarnes"}},{"type":"CRVW","description":"Code Review","value":"1","grantedOn":1321942411,"by":{"name":"John Smith","email":"john.smith@openstack.org","username":"jsmity"}}]}}

data/test/fixtures/jobs.json

@@ -0,0 +1,44 @@
+[
+    {
+        "job_unit_tester": {
+            "config_template_id": null,
+            "created_at": "2011-11-28T16:40:43-05:00",
+            "id": 4182,
+            "job_group_id": 2601,
+            "msg": null,
+            "nova_revision": "1234567",
+            "glance_revision": "1a2b3c4",
+            "keystone_revision": "4a5b7c7",
+            "status": "Success",
+            "updated_at": "2011-11-28T16:40:15-05:00"
+        }
+    },
+    {
+        "job_xen_hybrid": {
+            "config_template_id": 4,
+            "created_at": "2011-11-28T16:40:43-05:00",
+            "id": 4181,
+            "job_group_id": 2601,
+            "msg": null,
+            "nova_revision": "1234567",
+            "glance_revision": "1a2b3c4",
+            "keystone_revision": "4a5b7c7",
+            "status": "Success",
+            "updated_at": "2011-11-28T16:40:43-05:00"
+        }
+    },
+    {
+        "job_vpc": {
+            "config_template_id": 1,
+            "created_at": "2011-11-28T16:40:42-05:00",
+            "id": 4180,
+            "job_group_id": 2601,
+            "msg": null,
+            "nova_revision": "1234567",
+            "glance_revision": "1a2b3c4",
+            "keystone_revision": "4a5b7c7",
+            "status": "Success",
+            "updated_at": "2011-11-28T16:40:46-05:00"
+        }
+    }
+]

data/test/fixtures/nova_smoke_tests.json

@@ -0,0 +1,3 @@
+[{"smoke_test":{"cookbook_url":"","created_at":"2011-09-27T14:51:35-04:00","description":"Nova trunk","id":331,"status":"Success","unit_tests":false,"updated_at":"2011-12-03T15:09:01-05:00","nova_package_builder":{"branch":"master","created_at":"2011-09-27T14:51:35-04:00","id":681,"merge_trunk":false,"packager_url":"","revision_hash":"","smoke_test_id":331,"updated_at":"2011-09-27T14:51:35-04:00","url":"git://github.com/openstack/nova.git"},"glance_package_builder":{"branch":"master","created_at":"2011-09-27T14:51:35-04:00","id":682,"merge_trunk":false,"packager_url":"","revision_hash":"","smoke_test_id":331,"updated_at":"2011-10-26T13:07:10-04:00","url":"git://github.com/openstack/glance.git"},"keystone_package_builder":{"branch":"master","created_at":"2011-09-27T14:51:35-04:00","id":683,"merge_trunk":false,"packager_url":"","revision_hash":"","smoke_test_id":331,"updated_at":"2011-09-27T14:51:35-04:00","url":"git://github.com/openstack/keystone.git"}}},
+{"smoke_test":{"cookbook_url":"","created_at":"2011-09-27T14:51:35-04:00","description":"Test 1","id":331,"status":"Pending","unit_tests":false,"updated_at":"2011-12-03T15:09:01-05:00","nova_package_builder":{"branch":"refs/changes/38/5678/1","created_at":"2011-09-27T14:51:35-04:00","id":681,"merge_trunk":false,"packager_url":"","revision_hash":"","smoke_test_id":331,"updated_at":"2011-09-27T14:51:35-04:00","url":"git://github.com/openstack/nova.git"},"glance_package_builder":{"branch":"master","created_at":"2011-09-27T14:51:35-04:00","id":682,"merge_trunk":false,"packager_url":"","revision_hash":"","smoke_test_id":331,"updated_at":"2011-10-26T13:07:10-04:00","url":"git://github.com/openstack/glance.git"},"keystone_package_builder":{"branch":"master","created_at":"2011-09-27T14:51:35-04:00","id":683,"merge_trunk":false,"packager_url":"","revision_hash":"","smoke_test_id":331,"updated_at":"2011-09-27T14:51:35-04:00","url":"git://github.com/openstack/keystone.git"}}}
+]

data/test/helper.rb

@@ -1,6 +1,7 @@
 require 'rubygems'
 require 'bundler'
 require 'thor'
+
 begin
   Bundler.setup(:default, :development)
 rescue Bundler::BundlerError => e
@@ -13,6 +14,12 @@ require 'test/unit'
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'bellows'
+require 'mocha'
+
+def fixture_path
+  File.expand_path("../fixtures", __FILE__)
+end
 
-class Test::Unit::TestCase
+def fixture(file)
+  File.read(fixture_path + '/' + file)
 end

data/test/test_task.rb

@@ -0,0 +1,24 @@
+$:.unshift File.dirname(__FILE__)
+require 'helper'
+
+class TaskTest < Test::Unit::TestCase
+
+  def test_fire
+
+    jobs_data = fixture('jobs.json')
+    Bellows::SmokeStack.stubs(:jobs).returns(JSON.parse(jobs_data))
+    
+    smoke_tests_data = fixture('nova_smoke_tests.json')
+    Bellows::HTTP.stubs(:get).returns(smoke_tests_data)
+
+    gerrit_data = fixture('gerrit.json')
+    Bellows::Gerrit.stubs(:run_cmd).returns(gerrit_data)
+
+    response = mock()
+    Bellows::HTTP.stubs(:post).returns(response)
+    tasks = Bellows::Tasks.new
+    tasks.fire('nova', options={:quiet => true})
+
+  end
+
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bellows
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 1
   - 0
-  - 4
-  version: 1.0.4
+  - 5
+  version: 1.0.5
 platform: ruby
 authors: 
 - Dan Prince
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-17 00:00:00 -05:00
+date: 2011-12-03 00:00:00 -05:00
 default_executable: bellows
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -84,8 +84,24 @@ dependencies:
   type: :development
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: json
+  name: mocha
   version_requirements: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 41
+        segments: 
+        - 0
+        - 9
+        - 9
+        version: 0.9.9
+  requirement: *id005
+  type: :development
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: json
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -94,12 +110,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id005
+  requirement: *id006
   type: :runtime
 - !ruby/object:Gem::Dependency 
   prerelease: false
   name: thor
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -108,7 +124,7 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id006
+  requirement: *id007
   type: :runtime
 description: CLI to drive SmokeStack test creation and maintenance based on Gerrit reviews.
 email: dan.prince@rackspace.com
@@ -135,7 +151,11 @@ files:
 - lib/bellows/smoke_stack.rb
 - lib/bellows/tasks.rb
 - lib/bellows/util.rb
+- test/fixtures/gerrit.json
+- test/fixtures/jobs.json
+- test/fixtures/nova_smoke_tests.json
 - test/helper.rb
+- test/test_task.rb
 - test/test_util.rb
 has_rdoc: true
 homepage: http://github.com/dprince/bellows