bellows 1.1.2 → 1.1.3

data/CHANGELOG

@@ -1,3 +1,6 @@
+* Sun Sep 23 2012 Dan Prince <dprince@redhat.com> - 1.1.3
+  - Add support for per project job types in the config file.
+
 * Sun July 29 2012 Dan Prince <dprince@redhat.com> - 1.1.2
   - Add --branch option to stream task.
 

data/VERSION

@@ -1 +1 @@
-1.1.2
+1.1.3

data/lib/bellows/smoke_stack.rb

@@ -35,13 +35,25 @@ module Bellows
     end
 
     DEFAULT_JOB_TYPES=[{'name' => 'job_unit_tester', 'auto_approved' => false, 'description' => 'Unit'}]
-    def self.job_types()
+    def self.job_types(project=nil)
       configs=Util.load_configs
-      job_type_list = configs['job_types']
+
+      job_type_list = nil
+
+      if not project.nil? and configs[project] then
+        if configs[project]['job_types']
+          job_type_list = configs[project]['job_types']
+        end
+      else
+        job_type_list = configs['job_types']
+      end
+
       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(projects)

data/lib/bellows/tasks.rb

@@ -152,7 +152,7 @@ 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
+                job_types = Bellows::SmokeStack.job_types(project)
                 job_datas = []
                 job_types.each do |job_type|
                   job_data=Bellows::SmokeStack.job_data_for_type(jobs_for_rev, job_type['name'])

data/lib/bellows/util.rb

@@ -78,11 +78,19 @@ module Bellows
       config_template_ids = nil
       # per project configs may be specified in the config file
       if not project.nil? and configs[project] then
-        test_suite_ids = configs[project]['test_suite_ids'].collect {|x| x.to_s }
-        config_template_ids = configs[project]['config_template_ids'].collect {|x| x.to_s }
-      else
-        # if no configs specified use the configured defaults
+        if configs[project]['test_suite_ids'] then
+          test_suite_ids = configs[project]['test_suite_ids'].collect {|x| x.to_s }
+        end
+        if configs[project]['config_template_ids'] then
+          config_template_ids = configs[project]['config_template_ids'].collect {|x| x.to_s }
+        end
+      end
+    
+      # if no configs specified use the configured defaults
+      if test_suite_ids.nil? then
         test_suite_ids = configs['test_suite_ids'].collect {|x| x.to_s }
+      end
+      if config_template_ids.nil? then
         config_template_ids = configs['config_template_ids'].collect {|x| x.to_s }
       end
       return test_suite_ids, config_template_ids

data/test/fixtures/config_custom_project.yaml

@@ -0,0 +1,32 @@
+smokestack_url: http://localhost:3000
+smokestack_username: admin
+smokestack_password: cloud
+
+config_template_ids:
+- 1
+- 2
+
+test_suite_ids:
+- 1
+
+glance:
+  config_template_ids:
+    - 3
+    - 4
+
+  test_suite_ids:
+    - 2
+
+nova:
+  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/test_smoke_stack.rb

@@ -29,4 +29,28 @@ class SmokeStackTest < Test::Unit::TestCase
 
   end
 
+  def test_job_types_custom_project_config
+
+    sample_config = fixture('config_custom_project.yaml')
+    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
+
+    # there should only be 1 set for the glance project
+    assert_equal 1, Bellows::SmokeStack.job_types("glance").size
+
+    # the nova project should have custom job types defined
+    unit_tester_type = Bellows::SmokeStack.job_types("nova")[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("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']
+
+  end
+
 end

data/test/test_util.rb

@@ -7,4 +7,27 @@ class UtilTest < Test::Unit::TestCase
     assert_equal "123/123", Bellows::Util.short_spec("123/123/123")
   end
 
+  # test for Utils.test_configs
+  def test_test_configs
+    sample_config = fixture('config_custom_project.yaml')
+    Bellows::Util.stubs(:load_configs).returns(YAML::load(sample_config))
+
+    # ensure configs are set for a project which specifies them
+    test_suite_ids, config_template_ids = Bellows::Util.test_configs("glance")
+
+    assert_equal "3", config_template_ids[0]
+    assert_equal "4", config_template_ids[1]
+
+    assert_equal "2", test_suite_ids[0]
+
+    # ensure default configs are used for project that doesn't specify them
+    test_suite_ids, config_template_ids = Bellows::Util.test_configs("nova")
+
+    assert_equal "1", config_template_ids[0]
+    assert_equal "2", config_template_ids[1]
+
+    assert_equal "1", test_suite_ids[0]
+
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bellows
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-30 00:00:00.000000000 Z
+date: 2012-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -149,6 +149,7 @@ files:
 - lib/bellows/tasks.rb
 - lib/bellows/util.rb
 - test/fixtures/config.yaml
+- test/fixtures/config_custom_project.yaml
 - test/fixtures/gerrit.json
 - test/fixtures/jobs.json
 - test/fixtures/nova_smoke_tests.json
@@ -172,7 +173,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4254685906647564606
+      hash: -4222018101242764028
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: