bellows 1.2.0 → 2.0.0

data/CHANGELOG

@@ -1,3 +1,10 @@
+* Mon Apr 29 2013 Dan Prince <dprince@redhat.com> - 2.0.0
+  - Add support for stackforge puppet modules.
+
+    This changes breaks compat with the old config file format
+    in that all projects must now be prefixed with their org.
+    Examples: openstack/nova, stackforge/puppet-nova, etc.
+
 * 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

data/README.md

@@ -21,7 +21,6 @@ Installation
 
 	config_template_ids:
 	- 1
-	- 2
 
 	test_suite_ids:
 	- 1
@@ -58,22 +57,20 @@ Available bellows tasks:
 
 Run bellows sync to create smokestack test configurations and update refspecs for active reviews:
 
-	bellows sync nova
+	bellows sync openstack/nova
 
 Purge 'merged' reviews from SmokeStack:
 
-	bellows purge nova
+	bellows purge openstack/nova
 
 Sync test suite choices for active reviews in SmokeStack (based on the selections in your .bellows.conf file):
 
-	bellows sync nova --all
+	bellows sync openstack/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.
+	bellows fire openstack/nova --limit=3
 
 License
 -------
-Copyright (c) 2011-2012 Dan Prince. Copyright 2012 Red Hat Inc. See LICENSE.txt for further details.
+Copyright (c) 2011-2013 Dan Prince. Copyright 2012 Red Hat Inc. See LICENSE.txt for further details.

data/VERSION

@@ -1 +1 @@
-1.2.0
+2.0.0

data/lib/bellows/gerrit.rb

@@ -14,11 +14,15 @@ module Bellows
     end
 
     def self.reviews(project, status="open", branch="master")
+      # Assume projects without a slash are 'openstack' org projects
+      #if not x =~ /.*\/.*/ then
+      #  project = "openstack/#{project}"
+      #end
       reviews = []
-      out=Gerrit.run_cmd(%{query status:#{status} project:openstack/#{project} branch:#{branch} limit:500 --current-patch-set --format JSON})
+      out=Gerrit.run_cmd(%{query status:#{status} project:#{project} branch:#{branch} limit:500 --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
+        if data['project'] and data['project'] == "#{project}" and data['branch'] and data['branch'] == branch
           if block_given?
             yield data
           else

data/lib/bellows/smoke_stack.rb

@@ -5,6 +5,51 @@ require 'bellows/util'
 module Bellows
   class SmokeStack
 
+    PROJ_REVISIONS = {
+      'openstack/nova' => 'nova_revision',
+      'openstack/glance' => 'glance_revision',
+      'openstack/keystone' => 'keystone_revision',
+      'openstack/swift' => 'swift_revision',
+      'openstack/cinder' => 'cinder_revision',
+      'openstack/quantum' => 'quantum_revision',
+      'stackforge/puppet-nova' => 'nova_conf_module_revision',
+      'stackforge/puppet-glance' => 'glance_conf_module_revision',
+      'stackforge/puppet-keystone' => 'keystone_conf_module_revision',
+      'stackforge/puppet-swift' => 'swift_conf_module_revision',
+      'stackforge/puppet-cinder' => 'cinder_conf_module_revision',
+      'stackforge/puppet-quantum' => 'quantum_conf_module_revision',
+    }
+
+    OBJECT_NAMES = {
+      'openstack/nova' => 'nova_package_builder',
+      'openstack/glance' => 'glance_package_builder',
+      'openstack/keystone' => 'keystone_package_builder',
+      'openstack/swift' => 'swift_package_builder',
+      'openstack/cinder' => 'cinder_package_builder',
+      'openstack/quantum' => 'quantum_package_builder',
+      'stackforge/puppet-nova' => 'nova_config_module',
+      'stackforge/puppet-glance' => 'glance_config_module',
+      'stackforge/puppet-keystone' => 'keystone_config_module',
+      'stackforge/puppet-swift' => 'swift_config_module',
+      'stackforge/puppet-cinder' => 'cinder_config_module',
+      'stackforge/puppet-quantum' => 'quantum_config_module',
+    }
+
+    ATTRIBUTE_NAMES = {
+      'openstack/nova' => 'nova_package_builder_attributes',
+      'openstack/glance' => 'glance_package_builder_attributes',
+      'openstack/keystone' => 'keystone_package_builder_attributes',
+      'openstack/swift' => 'swift_package_builder_attributes',
+      'openstack/cinder' => 'cinder_package_builder_attributes',
+      'openstack/quantum' => 'quantum_package_builder_attributes',
+      'stackforge/puppet-nova' => 'nova_config_module_attributes',
+      'stackforge/puppet-glance' => 'glance_config_module_attributes',
+      'stackforge/puppet-keystone' => 'keystone_config_module_attributes',
+      'stackforge/puppet-swift' => 'swift_config_module_attributes',
+      'stackforge/puppet-cinder' => 'cinder_config_module_attributes',
+      'stackforge/puppet-quantum' => 'quantum_config_module_attributes',
+    }
+
     def self.jobs()
       JSON.parse(Bellows::HTTP.get("/jobs.json?limit=99999"))
     end
@@ -17,7 +62,7 @@ module Bellows
       jobs.each do |job|
         data = job.values[0]
         Util.projects.each do |project|
-          revision = data["#{project}_revision"]
+          revision = data[PROJ_REVISIONS[project]]
           if revision and revision == git_hash then
             jobs_found << job 
           end
@@ -70,7 +115,8 @@ module Bellows
       data = JSON.parse(Bellows::HTTP.get("/smoke_tests.json"))
       data.each do |item|
         projects.each do |project|
-          branch = item['smoke_test']["#{project}_package_builder"]['branch']
+          # core projects use this
+          branch = item['smoke_test'][OBJECT_NAMES[project]]['branch']
           if branch and not branch.empty? then
             tests.store(Bellows::Util.short_spec(branch), item['smoke_test'])
           end
@@ -101,9 +147,9 @@ module Bellows
 
       data = JSON.parse(Bellows::HTTP.get("/smoke_tests/#{id}.json"))
       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")
+        if updates[OBJECT_NAMES[proj]]
+          data["smoke_test"][OBJECT_NAMES[proj]].merge!(updates[OBJECT_NAMES[proj]])
+          updates.delete(OBJECT_NAMES[proj])
         end
       end
       data['smoke_test'].merge!(updates)
@@ -117,15 +163,15 @@ module Bellows
 
       post_data = { "smoke_test[description]" => description }
 
-      Util.projects.each do |proj|
-        base_name="smoke_test[#{proj}_package_builder_attributes]"
+      Util::ALL_PROJECTS.each do |proj|
+        base_name="smoke_test[#{ATTRIBUTE_NAMES[proj]}]"
         if project == proj then
-          post_data.store("#{base_name}[url]", "https://review.openstack.org/p/openstack/#{project}")
+          post_data.store("#{base_name}[url]", "https://review.openstack.org/#{proj}")
           post_data.store("#{base_name}[branch]", refspec)
           post_data.store("#{base_name}[merge_trunk]", "1")
         else
           post_data.store("#{base_name}[merge_trunk]", "0")
-          post_data.store("#{base_name}[url]", "git://github.com/openstack/#{proj}.git")
+          post_data.store("#{base_name}[url]", "git://github.com/#{proj}.git")
           post_data.store("#{base_name}[branch]", "master")
         end
       end

data/lib/bellows/tasks.rb

@@ -31,13 +31,13 @@ module Bellows
             puts "Creating... " + desc
             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
+            if smoke_test[Bellows::SmokeStack::OBJECT_NAMES[project]]['branch'] != refspec then
               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
+              Bellows::SmokeStack.update_smoke_test(smoke_test['id'], {Bellows::SmokeStack::OBJECT_NAMES[project] => { "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 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
+              Bellows::SmokeStack.update_smoke_test(smoke_test['id'], {Bellows::SmokeStack::OBJECT_NAMES[project] => { "branch" => refspec}, "description" => desc, "test_suite_ids" => test_suite_ids, "config_template_ids" => config_template_ids}) if not test
             end
           end
         end # reviews
@@ -86,7 +86,7 @@ module Bellows
           projects.each do |project|
             data = job.values[0]
             if data
-                revision = data["#{project}_revision"]
+                revision = data[Bellows::SmokeStack::PROJ_REVISIONS[project]]
                 if revision and not revision.empty?
                     jobs.add(revision[0,7])
                 end
@@ -197,7 +197,7 @@ module Bellows
       projects = Util.projects
 
       Bellows::Gerrit.stream_events('patchset-created') do |patchset|
-        project = patchset['change']['project'].sub(/.*\//, '')
+        project = patchset['change']['project']
         patch_branch = patchset['change']['branch']
         if projects.include?(project) and patch_branch == branch then
           owner = patchset['change']['owner']['name']
@@ -217,7 +217,7 @@ module Bellows
             # update existing smoke test
             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
+            Bellows::SmokeStack.update_smoke_test(smoke_test['id'], {Bellows::SmokeStack::OBJECT_NAMES[project] => { "branch" => refspec}, "description" => desc, "status" => "Updated", "test_suite_ids" => test_suite_ids, "config_template_ids" => config_template_ids}) if not test
             smoke_test_id = smoke_test['id']
 
           end

data/lib/bellows/util.rb

@@ -3,7 +3,12 @@ require 'yaml'
 module Bellows
   module Util
 
-    DEFAULT_PROJECTS = ['nova', 'glance', 'keystone', 'swift', 'cinder', 'quantum']
+    CORE_PROJECTS = ['openstack/nova', 'openstack/glance', 'openstack/keystone', 'openstack/swift', 'openstack/cinder', 'openstack/quantum']
+
+    PUPPET_PROJECTS = ['stackforge/puppet-nova', 'stackforge/puppet-glance', 'stackforge/puppet-keystone', 'stackforge/puppet-swift', 'stackforge/puppet-cinder', 'stackforge/puppet-quantum']
+
+    ALL_PROJECTS = CORE_PROJECTS + PUPPET_PROJECTS
+
     @@configs=nil
 
     def self.load_configs
@@ -48,7 +53,7 @@ module Bellows
       configs=self.load_configs
       projects = configs['projects']
       if projects.nil? or projects.empty? then
-        projects = DEFAULT_PROJECTS
+        projects = CORE_PROJECTS + PUPPET_PROJECTS
       end
       if not projects.include?(project) then
         puts "ERROR: Please specify a valid project name."
@@ -67,7 +72,7 @@ module Bellows
       configs=self.load_configs
       proj_list = configs['projects']
       if proj_list.nil? or proj_list.empty? then
-        proj_list = DEFAULT_PROJECTS
+        proj_list = CORE_PROJECTS + PUPPET_PROJECTS
       end
       return proj_list
     end

data/test/fixtures/config_custom_project.yaml

@@ -17,7 +17,7 @@ glance:
   test_suite_ids:
     - 2
 
-nova:
+openstack/nova:
   comment_configs:
     - name: job_unit_tester
       auto_approved: true

data/test/test_smoke_stack.rb

@@ -40,16 +40,16 @@ class SmokeStackTest < Test::Unit::TestCase
     assert_equal 1, Bellows::SmokeStack.comment_configs.size
 
     # there should only be 1 set for the glance project
-    assert_equal 1, Bellows::SmokeStack.comment_configs("glance").size
+    assert_equal 1, Bellows::SmokeStack.comment_configs("openstack/glance").size
 
     # the nova project should have custom job types defined
-    unit_tester_type = Bellows::SmokeStack.comment_configs("nova")[0]
+    unit_tester_type = Bellows::SmokeStack.comment_configs("openstack/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']
 
-    puppet_vpc_type = Bellows::SmokeStack.comment_configs("nova")[1]
+    puppet_vpc_type = Bellows::SmokeStack.comment_configs("openstack/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']

data/test/test_task.rb

@@ -18,7 +18,7 @@ class TaskTest < Test::Unit::TestCase
     response = mock()
     Bellows::HTTP.stubs(:post).returns(response)
     tasks = Bellows::Tasks.new
-    tasks.fire('nova', options={:quiet => true})
+    tasks.fire('openstack/nova', options={:quiet => true})
 
   end
 
@@ -39,7 +39,7 @@ class TaskTest < Test::Unit::TestCase
     Bellows::HTTP.stubs(:post).returns(response)
     tasks = Bellows::Tasks.new
 
-    tasks.comment('nova', options={:quiet => true, :cache_file => cache_file.path})
+    tasks.comment('openstack/nova', options={:quiet => true, :cache_file => cache_file.path})
 
   end
 

data/test/test_util.rb

@@ -21,7 +21,7 @@ class UtilTest < Test::Unit::TestCase
     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")
+    test_suite_ids, config_template_ids = Bellows::Util.test_configs("openstack/nova")
 
     assert_equal "1", config_template_ids[0]
     assert_equal "2", config_template_ids[1]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bellows
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-04 00:00:00.000000000 Z
+date: 2013-04-30 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: 2150126569573728096
+      hash: 221927905361736624
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: