bellows 1.1.3 → 1.2.0

data/CHANGELOG

@@ -1,3 +1,9 @@
+* Sat Nov 3 2012 Dan Prince <dprince@redhat.com> - 1.2.0
+  - Rename 'job_types' to 'comment_configs' in the config file.
+  - Add 'config_template_id' to 'comment_configs' sections. This
+    supports the ability to report comments when the same runner
+    is used w/ multiple SmokeStack configurations.
+
 * Sun Sep 23 2012 Dan Prince <dprince@redhat.com> - 1.1.3
   - Add support for per project job types in the config file.
 

data/LICENSE.txt

@@ -1,5 +1,5 @@
 Copyright (c) 2011-2012 Dan Prince
-Copyright (c) 2012 Red Hat
+Copyright (c) 2012 Red Hat Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -26,18 +26,20 @@ Installation
 	test_suite_ids:
 	- 1
 
-	job_types:
+	comment_configs:
 	    - name: job_unit_tester
 	      auto_approved: Yes
 	      description: "Unit"
 
-	    - name: job_puppet_vpc
+	    - name: job_puppet_libvirt
+	      config_template_id: 1
 	      auto_approved: No
-	      description: "Libvirt (Fedora 16)"
+	      description: "Fedora 17 Libvirt Quantum w/ OpenvSwitch"
 
-	    - name: job_chef_vpc_xen
+	    - name: job_puppet_xen
+	      config_template_id: 2
 	      auto_approved: No
-	      description: "XenServer (Ubuntu 11.10)"
+	      description: "Fedora 17 Nova w/ XenServer"
 	EOF_CAT
 
 
@@ -47,10 +49,12 @@ 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.
+	  bellows comment PROJECT  # Add gerrit comments for reviews w/ results.
+	  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 stream           # Stream Gerrit events and sync data to SmokeStack.
+	  bellows sync PROJECT     # Create tests & update refspecs for active reviews.
 
 Run bellows sync to create smokestack test configurations and update refspecs for active reviews:
 
@@ -72,4 +76,4 @@ All commands support creating and maintaining test configs for nova, glance, and
 
 License
 -------
-Copyright (c) 2011 Dan Prince. See LICENSE.txt for further details.
+Copyright (c) 2011-2012 Dan Prince. Copyright 2012 Red Hat Inc. See LICENSE.txt for further details.

data/VERSION

@@ -1 +1 @@
-1.1.3
+1.2.0

data/lib/bellows/smoke_stack.rb

@@ -26,33 +26,42 @@ module Bellows
       jobs_found
     end
 
-    #Return a reference to the first job of the specified type.
-    def self.job_data_for_type(jobs, job_type)
+    # Return a reference to the first job matching the criteria for
+    # the specified comment config
+    def self.job_data_for_comments(jobs, comment_config)
       jobs.each do |job|
-        return job.values[0] if job.keys[0] == job_type
+        if job.keys[0] == comment_config['name']
+          job_values = job.values[0]
+          if comment_config['config_template_id'].nil? and job.keys[0] == 'job_unit_tester' then
+            # will be nil for unit tests (which don't use a config template)
+            return job_values
+          elsif comment_config['config_template_id'] and job_values['config_template_id'] == comment_config['config_template_id'] then
+            return job_values
+          end
+        end
       end
       nil
     end
 
-    DEFAULT_JOB_TYPES=[{'name' => 'job_unit_tester', 'auto_approved' => false, 'description' => 'Unit'}]
-    def self.job_types(project=nil)
+    DEFAULT_COMMENT_CONFIGS=[{'name' => 'job_unit_tester', 'auto_approved' => false, 'description' => 'Unit'}]
+    def self.comment_configs(project=nil)
       configs=Util.load_configs
 
-      job_type_list = nil
+      comment_config_list = nil
 
       if not project.nil? and configs[project] then
-        if configs[project]['job_types']
-          job_type_list = configs[project]['job_types']
+        if configs[project]['comment_configs']
+          comment_config_list = configs[project]['comment_configs']
         end
       else
-        job_type_list = configs['job_types']
+        comment_config_list = configs['comment_configs']
       end
 
-      if job_type_list.nil? or job_type_list.empty? then
-        job_type_list = DEFAULT_JOB_TYPES
+      if comment_config_list.nil? or comment_config_list.empty? then
+        comment_config_list = DEFAULT_COMMENT_CONFIGS
       end
 
-      job_type_list
+      comment_config_list
 
     end
 

data/lib/bellows/tasks.rb

@@ -128,6 +128,7 @@ module Bellows
       test = options[:test]
       cache_file = options[:cache_file]
       jobs = Bellows::SmokeStack.jobs
+      configs=Util.load_configs
 
       if cache_file.nil? or cache_file.empty?
         puts "ERROR: cache_file is required."
@@ -152,11 +153,11 @@ module Bellows
               jobs_for_rev = Bellows::SmokeStack.jobs_with_hash(revision, jobs)
               if jobs_for_rev.count > 0 then
   
-                job_types = Bellows::SmokeStack.job_types(project)
+                comment_configs = Bellows::SmokeStack.comment_configs(project)
                 job_datas = []
-                job_types.each do |job_type|
-                  job_data=Bellows::SmokeStack.job_data_for_type(jobs_for_rev, job_type['name'])
-                  job_datas << [job_type, job_data]
+                comment_configs.each do |comment_config|
+                  job_data=Bellows::SmokeStack.job_data_for_comments(jobs_for_rev, comment_config)
+                  job_datas << [comment_config, job_data]
                 end
   
                 if Bellows::SmokeStack.complete?(job_datas) then
@@ -164,9 +165,9 @@ module Bellows
                   message = "SmokeStack Results (patch set #{patchset_num}):\n"
                   verify_vote = 1
                   job_datas.each do |arr|
-                      job_type = arr[0]
+                      comment_config = arr[0]
                       job_data = arr[1]
-                      message += "\t#{job_type['description']} #{job_data['status']}:#{job_data['msg']} http://smokestack.openstack.org/?go=/jobs/#{job_data['id']}\n"
+                      message += "\t#{comment_config['description']} #{job_data['status']}:#{job_data['msg']} #{configs['smokestack_url']}/?go=/jobs/#{job_data['id']}\n"
                       verify_vote = -1 if job_data['status'] == 'Failed'
                   end
                   puts message if not options[:quiet]

data/lib/bellows/util.rb

@@ -3,7 +3,7 @@ require 'yaml'
 module Bellows
   module Util
 
-    DEFAULT_PROJECTS = ['nova', 'glance', 'keystone', 'swift']
+    DEFAULT_PROJECTS = ['nova', 'glance', 'keystone', 'swift', 'cinder', 'quantum']
     @@configs=nil
 
     def self.load_configs

data/test/fixtures/config.yaml

@@ -9,15 +9,17 @@ config_template_ids:
 test_suite_ids:
 - 1
 
-job_types:
+comment_configs:
     - name: job_unit_tester
       auto_approved: true
       description: "Unit"
 
     - name: job_puppet_vpc
+      config_template_id: 1
       auto_approved: false
       description: "Libvirt (Fedora 16)"
 
     - name: job_chef_vpc_xen
+      config_template_id: 2
       auto_approved: false
       description: "XenServer 5.6 SP2"

data/test/fixtures/config_custom_project.yaml

@@ -18,15 +18,17 @@ glance:
     - 2
 
 nova:
-  job_types:
+  comment_configs:
     - name: job_unit_tester
       auto_approved: true
       description: "Unit"
 
     - name: job_puppet_vpc
+      config_template_id: 3
       auto_approved: false
       description: "Libvirt (Fedora 16)"
 
     - name: job_chef_vpc_xen
+      config_template_id: 4
       auto_approved: false
       description: "XenServer 5.6 SP2"

data/test/test_smoke_stack.rb

@@ -4,28 +4,30 @@ require 'yaml'
 
 class SmokeStackTest < Test::Unit::TestCase
 
-  def test_job_types_default
+  def test_comment_configs_default
 
     Bellows::Util.stubs(:load_configs).returns({})
-    assert_equal 1, Bellows::SmokeStack.job_types.size
+    assert_equal 1, Bellows::SmokeStack.comment_configs.size
 
   end
 
-  def test_job_types_config
+  def test_comment_configs_config
 
     sample_config = fixture('config.yaml')
     Bellows::Util.stubs(:load_configs).returns(YAML::load(sample_config))
-    assert_equal 3, Bellows::SmokeStack.job_types.size
+    assert_equal 3, Bellows::SmokeStack.comment_configs.size
 
-    unit_tester_type = Bellows::SmokeStack.job_types[0]
+    unit_tester_type = Bellows::SmokeStack.comment_configs[0]
     assert_equal 'job_unit_tester', unit_tester_type['name']
     assert_equal 'Unit', unit_tester_type['description']
+    assert_nil unit_tester_type['config_template_id']
     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']
+    puppet_vpc_type = Bellows::SmokeStack.comment_configs[1]
+    assert_equal 'job_puppet_vpc', puppet_vpc_type['name']
+    assert_equal 1, puppet_vpc_type['config_template_id']
+    assert_equal 'Libvirt (Fedora 16)', puppet_vpc_type['description']
+    assert_equal false, puppet_vpc_type['auto_approved']
 
   end
 
@@ -35,21 +37,23 @@ class SmokeStackTest < Test::Unit::TestCase
     Bellows::Util.stubs(:load_configs).returns(YAML::load(sample_config))
 
     # there should only be 1 set for the default (no project)
-    assert_equal 1, Bellows::SmokeStack.job_types.size
+    assert_equal 1, Bellows::SmokeStack.comment_configs.size
 
     # there should only be 1 set for the glance project
-    assert_equal 1, Bellows::SmokeStack.job_types("glance").size
+    assert_equal 1, Bellows::SmokeStack.comment_configs("glance").size
 
     # the nova project should have custom job types defined
-    unit_tester_type = Bellows::SmokeStack.job_types("nova")[0]
+    unit_tester_type = Bellows::SmokeStack.comment_configs("nova")[0]
     assert_equal 'job_unit_tester', unit_tester_type['name']
     assert_equal 'Unit', unit_tester_type['description']
+    assert_nil unit_tester_type['config_template_id']
     assert_equal true, unit_tester_type['auto_approved']
 
-    unit_tester_type = Bellows::SmokeStack.job_types("nova")[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']
+    puppet_vpc_type = Bellows::SmokeStack.comment_configs("nova")[1]
+    assert_equal 'job_puppet_vpc', puppet_vpc_type['name']
+    assert_equal 3, puppet_vpc_type['config_template_id']
+    assert_equal 'Libvirt (Fedora 16)', puppet_vpc_type['description']
+    assert_equal false, puppet_vpc_type['auto_approved']
 
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bellows
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-23 00:00:00.000000000 Z
+date: 2012-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -173,7 +173,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4222018101242764028
+      hash: 2150126569573728096
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: