bellows 1.0.10 → 1.0.11

data/CHANGELOG

@@ -1,3 +1,11 @@
+* Mon May 7 2012 Dan Prince <dprince@redhat.com> - 1.0.11
+  - The comment task now uses Gerrit 'verified' to report results.
+    It votes with -1 and +1 based on SmokeStack results.
+  - Add 'projects' config option. Defaults to ['nova', 'keystone', 'glance']
+  - Add 'job_types' config option. The comment task now makes use of
+    configurable job_types when determining when results are present
+    and approved.
+
 * Mon Jan 9 2012 Dan Prince <dan.prince@rackspace.com> - 1.0.10
   - Fix 'undefined method `[]' for nil:NilClass' error that could occur in
     the approved? method of smoke_stack.rb. This error was keeping bellows

data/README.md

@@ -25,6 +25,19 @@ Installation
 
 	test_suite_ids:
 	- 1
+
+	job_types:
+	    - name: job_unit_tester
+	      auto_approved: Yes
+	      description: "Unit"
+
+	    - name: job_puppet_vpc
+	      auto_approved: No
+	      description: "Libvirt (Fedora 16)"
+
+	    - name: job_chef_vpc_xen
+	      auto_approved: No
+	      description: "XenServer (Ubuntu 11.10)"
 	EOF_CAT
 
 

data/VERSION

@@ -1 +1 @@
-1.0.10
+1.0.11

data/lib/bellows/gerrit.rb

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

data/lib/bellows/smoke_stack.rb

@@ -16,7 +16,7 @@ module Bellows
       jobs_found = []
       jobs.each do |job|
         data = job.values[0]
-        ['nova','keystone','glance'].each do |project|
+        Util.projects.each do |project|
           revision = data["#{project}_revision"]
           if revision and revision == git_hash then
             jobs_found << job 
@@ -34,6 +34,16 @@ module Bellows
       nil
     end
 
+    DEFAULT_JOB_TYPES=[{'name' => 'job_unit_tester', 'auto_approved' => false, 'description' => 'Unit'}]
+    def self.job_types()
+      configs=Util.load_configs
+      job_type_list = configs['job_types']
+      if job_type_list.nil? or job_type_list.empty? then
+        job_type_list = DEFAULT_JOB_TYPES
+      end
+      job_type_list
+    end
+
     def self.smoke_tests(project)
       tests = {}
       data = JSON.parse(Bellows::HTTP.get("/smoke_tests.json"))
@@ -67,7 +77,7 @@ module Bellows
     def self.update_smoke_test(id, updates={})
 
       data = JSON.parse(Bellows::HTTP.get("/smoke_tests/#{id}.json"))
-      ['nova', 'glance', 'keystone'].each do |proj|
+      Util.projects.each do |proj|
         if updates["#{proj}_package_builder"]
           data["smoke_test"]["#{proj}_package_builder"].merge!(updates["#{proj}_package_builder"])
           updates.delete("#{proj}_package_builder")
@@ -83,7 +93,7 @@ module Bellows
 
       post_data = { "smoke_test[description]" => description }
 
-      ['nova', 'glance', 'keystone'].each do |proj|
+      Util.projects.each do |proj|
         base_name="smoke_test[#{proj}_package_builder_attributes]"
         if project == proj then
           post_data.store("#{base_name}[url]", "https://review.openstack.org/p/openstack/#{project}")
@@ -109,10 +119,10 @@ module Bellows
     end
 
     #returns true if jobs all passed (green) or all failed results are approved
-    def self.approved?(job_datas)
+    def self.complete?(job_datas)
       approved = true
-      job_datas.each do |data|
-        if data.nil? or (data['status'] == 'Failed' and data['approved_by'].nil?)
+      job_datas.each_pair do |job_type, job_data|
+        if job_data.nil? or (job_data['status'] == 'Failed' and (job_data['approved_by'].nil? and not job_type['auto_approved']))
           approved = false
         end
       end

data/lib/bellows/tasks.rb

@@ -137,17 +137,24 @@ module Bellows
             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 Bellows::SmokeStack.approved?([unit, libvirt, xenserver]) then
+
+              job_types = Bellows::SmokeStack.job_types
+              job_datas = {}
+              job_types.each do |job_type|
+                job_data=Bellows::SmokeStack.job_data_for_type(jobs_for_rev, job_type['name'])
+                job_datas.store(job_type, job_data)
+              end
+
+              if Bellows::SmokeStack.complete?(job_datas) then
                 puts "Commenting ... " + desc if not options[:quiet]
                 message = "SmokeStack Results (patch set #{patchset_num}):\n"
-                message += "\tUnit #{unit['status']}:#{unit['msg']} http://smokestack.openstack.org/?go=/jobs/#{unit['id']}\n"
-                message += "\tLibvirt #{libvirt['status']}:#{libvirt['msg']} http://smokestack.openstack.org/?go=/jobs/#{libvirt['id']}\n"
-                message += "\tXenServer #{xenserver['status']}:#{xenserver['msg']} http://smokestack.openstack.org/?go=/jobs/#{xenserver['id']}"
-puts message
-                out = Bellows::Gerrit.comment(review['currentPatchSet']['revision'], message) if not test
+                verify_vote = 1
+                job_datas.each_pair do |job_type, job_data|
+                    message += "\t#{job_type['description']} #{job_data['status']}:#{job_data['msg']} http://smokestack.openstack.org/?go=/jobs/#{job_data['id']}\n"
+                    verify_vote = -1 if job_data['status'] == 'Failed'
+                end
+                puts message if not options[:quiet]
+                out = Bellows::Gerrit.comment(review['currentPatchSet']['revision'], message, verify_vote) if not test
                 puts out if not options[:quiet] and not test
                 file.write revision + "\n" if not test
               end

data/lib/bellows/util.rb

@@ -3,33 +3,34 @@ require 'yaml'
 module Bellows
   module Util
 
+    DEFAULT_PROJECTS = ['nova', 'glance', 'keystone']
     @@configs=nil
 
     def self.load_configs
 
-    return @@configs if not @@configs.nil?
+      return @@configs if not @@configs.nil?
 
-    config_file=ENV['BELLOWS_CONFIG_FILE']
-    if config_file.nil? then
+      config_file=ENV['BELLOWS_CONFIG_FILE']
+      if config_file.nil? then
 
-      config_file=ENV['HOME']+File::SEPARATOR+".bellows.conf"
-      if not File.exists?(config_file) then
-        config_file="/etc/bellows.conf"
-      end
+        config_file=ENV['HOME']+File::SEPARATOR+".bellows.conf"
+        if not File.exists?(config_file) then
+          config_file="/etc/bellows.conf"
+        end
 
-    end
+      end
 
-    if File.exists?(config_file) then
-      configs = YAML.load_file(config_file) || {}
-      raise_if_nil_or_empty(configs, "smokestack_url")
-      raise_if_nil_or_empty(configs, "smokestack_username")
-      raise_if_nil_or_empty(configs, "smokestack_password")
-      @@configs=configs
-    else
-      raise "Failed to load bellows config file. Please configure /etc/bellows.conf or create a .bellows.conf config file in your HOME directory."
-    end
+      if File.exists?(config_file) then
+        configs = YAML.load_file(config_file) || {}
+        raise_if_nil_or_empty(configs, "smokestack_url")
+        raise_if_nil_or_empty(configs, "smokestack_username")
+        raise_if_nil_or_empty(configs, "smokestack_password")
+        @@configs=configs
+      else
+        raise "Failed to load bellows config file. Please configure /etc/bellows.conf or create a .bellows.conf config file in your HOME directory."
+      end
 
-    @@configs
+      @@configs
 
     end
 
@@ -43,13 +44,26 @@ module Bellows
       refspec.sub(/\/[^\/]*$/, "")
     end
 
-    VALID_PROJECTS = ['nova', 'glance', 'keystone']
     def self.validate_project(project)
-      if not VALID_PROJECTS.include?(project) then
+      configs=self.load_configs
+      projects = configs['projects']
+      if projects.nil? or projects.empty? then
+        projects = DEFAULT_PROJECTS
+      end
+      if not projects.include?(project) then
         puts "ERROR: Please specify a valid project name."
         exit 1
       end
     end
 
+    def self.projects
+      configs=self.load_configs
+      proj_list = configs['projects']
+      if proj_list.nil? or proj_list.empty? then
+        proj_list = DEFAULT_PROJECTS
+      end
+      return proj_list
+    end
+
   end
 end

data/test/fixtures/config.yaml

@@ -0,0 +1,23 @@
+smokestack_url: http://localhost:3000
+smokestack_username: admin
+smokestack_password: cloud
+
+config_template_ids:
+- 1
+- 2
+
+test_suite_ids:
+- 1
+
+job_types:
+    - name: job_unit_tester
+      auto_approved: true
+      description: "Unit"
+
+    - name: job_puppet_vpc
+      auto_approved: false
+      description: "Libvirt (Fedora 16)"
+
+    - name: job_chef_vpc_xen
+      auto_approved: false
+      description: "XenServer 5.6 SP2"

data/test/fixtures/jobs.json

@@ -5,40 +5,12 @@
             "created_at": "2011-11-28T16:40:43-05:00",
             "id": 4182,
             "job_group_id": 2601,
-            "msg": null,
+            "msg": "Unit Tests Failed.",
             "nova_revision": "1234567",
             "glance_revision": "1a2b3c4",
             "keystone_revision": "4a5b7c7",
-            "status": "Success",
+            "status": "Failed",
             "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/test_smoke_stack.rb

@@ -0,0 +1,32 @@
+$:.unshift File.dirname(__FILE__)
+require 'helper'
+require 'yaml'
+
+class SmokeStackTest < Test::Unit::TestCase
+
+  def test_job_types_default
+
+    Bellows::Util.stubs(:load_configs).returns({})
+    assert_equal 1, Bellows::SmokeStack.job_types.size
+
+  end
+
+  def test_job_types_config
+
+    sample_config = fixture('config.yaml')
+    Bellows::Util.stubs(:load_configs).returns(YAML::load(sample_config))
+    assert_equal 3, Bellows::SmokeStack.job_types.size
+
+    unit_tester_type = Bellows::SmokeStack.job_types[0]
+    assert_equal 'job_unit_tester', unit_tester_type['name']
+    assert_equal 'Unit', unit_tester_type['description']
+    assert_equal true, unit_tester_type['auto_approved']
+
+    unit_tester_type = Bellows::SmokeStack.job_types[1]
+    assert_equal 'job_puppet_vpc', unit_tester_type['name']
+    assert_equal 'Libvirt (Fedora 16)', unit_tester_type['description']
+    assert_equal false, unit_tester_type['auto_approved']
+
+  end
+
+end

metadata

@@ -1,141 +1,103 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: bellows
-version: !ruby/object:Gem::Version 
-  hash: 3
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 10
-  version: 1.0.10
+version: !ruby/object:Gem::Version
+  version: 1.0.11
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Dan Prince
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-01-09 00:00:00 -05:00
-default_executable: bellows
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  prerelease: false
+date: 2012-05-08 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: bundler
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &17251620 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.0.0
-  requirement: *id001
   type: :development
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  version_requirements: *17251620
+- !ruby/object:Gem::Dependency
   name: jeweler
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &17191940 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 6
-        - 4
+      - !ruby/object:Gem::Version
         version: 1.6.4
-  requirement: *id002
   type: :development
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  version_requirements: *17191940
+- !ruby/object:Gem::Dependency
   name: thor
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &17190120 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 43
-        segments: 
-        - 0
-        - 14
-        - 6
+      - !ruby/object:Gem::Version
         version: 0.14.6
-  requirement: *id003
   type: :development
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  version_requirements: *17190120
+- !ruby/object:Gem::Dependency
   name: json
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &17188240 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 1
-        - 4
-        - 6
+      - !ruby/object:Gem::Version
         version: 1.4.6
-  requirement: *id004
   type: :development
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  version_requirements: *17188240
+- !ruby/object:Gem::Dependency
   name: mocha
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: &17186340 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 41
-        segments: 
-        - 0
-        - 9
-        - 9
+      - !ruby/object:Gem::Version
         version: 0.9.9
-  requirement: *id005
   type: :development
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  version_requirements: *17186340
+- !ruby/object:Gem::Dependency
   name: json
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: &17167400 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id006
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  version_requirements: *17167400
+- !ruby/object:Gem::Dependency
   name: thor
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  requirement: &17164440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id007
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-description: CLI to drive SmokeStack test creation and maintenance based on Gerrit reviews.
+  prerelease: false
+  version_requirements: *17164440
+description: CLI to drive SmokeStack test creation and maintenance based on Gerrit
+  reviews.
 email: dan.prince@rackspace.com
-executables: 
+executables:
 - bellows
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.md
-files: 
+files:
 - .document
 - CHANGELOG
 - Gemfile
@@ -151,45 +113,40 @@ files:
 - lib/bellows/smoke_stack.rb
 - lib/bellows/tasks.rb
 - lib/bellows/util.rb
+- test/fixtures/config.yaml
 - test/fixtures/gerrit.json
 - test/fixtures/jobs.json
 - test/fixtures/nova_smoke_tests.json
 - test/helper.rb
+- test/test_smoke_stack.rb
 - test/test_task.rb
 - test/test_util.rb
-has_rdoc: true
 homepage: http://github.com/dprince/bellows
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 3288239817883980822
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Fire it up! SmokeStack automation w/ Gerrit.
 test_files: []
-