boxgrinder-build 0.9.8 → 0.10.0

data/lib/boxgrinder-build/plugins/os/rpm-based/rpm-dependency-validator.rb

@@ -72,7 +72,8 @@ module BoxGrinder
         arches = "x86_64"
       end
 
-      repoquery_output = @exec_helper.execute( "repoquery --quiet --disablerepo=* --enablerepo=#{@appliance_config.repos.collect {|r| "#{@magic_hash}#{r['name']}"}.join(",")} -c '#{@yum_config_file}' list available #{package_list.join( ' ' )} --nevra --archlist=#{arches},noarch" )
+      root = (@config.dir.root.end_with?('/') ? '' : @config.dir.root)
+      repoquery_output = @exec_helper.execute( "repoquery --quiet --disablerepo=* --enablerepo=#{@appliance_config.repos.collect {|r| "#{@magic_hash}#{r['name']}"}.join(",")} -c '#{root}/#{@yum_config_file}' list available #{package_list.join( ' ' )} --nevra --archlist=#{arches},noarch" )
 
       invalid_names = []
 

data/lib/boxgrinder-build/plugins/os/sl/sl-plugin.rb

@@ -20,6 +20,7 @@ require 'boxgrinder-build/plugins/os/rhel/rhel-plugin'
 
 module BoxGrinder
   class ScientificLinuxPlugin < RHELPlugin
+    plugin :type => :os, :name => :sl, :full_name  => "Scientific Linux", :versions   => ["5", "6"]
 
     SL_REPOS = {
      "5" => {
@@ -52,5 +53,3 @@ module BoxGrinder
   end
 end
 
-plugin :class => BoxGrinder::ScientificLinuxPlugin, :type => :os, :name => :sl, :full_name  => "Scientific Linux", :versions   => ["5", "6"]
-

data/lib/boxgrinder-build/plugins/platform/ec2/ec2-plugin.rb

@@ -22,6 +22,8 @@ require 'tempfile'
 
 module BoxGrinder
   class EC2Plugin < BasePlugin
+    plugin :type => :platform, :name => :ec2, :full_name => "Amazon Elastic Compute Cloud (Amazon EC2)"
+
     def after_init
       register_deliverable(:disk => "#{@appliance_config.name}.ec2")
 
@@ -148,11 +150,24 @@ module BoxGrinder
       @log.debug "Nosegneg enabled."
     end
 
+    # Adds ec2-user will full sudo access without password per Fedora security guidelines.
+    # We should not use root access on AMIs as it is not secure and prohibited by AWS.
+    #
     # https://issues.jboss.org/browse/BGBUILD-110
     def add_ec2_user(guestfs)
       @log.debug "Adding ec2-user user..."
+
+      # We need to add ec2-user only when it doesn't exists
+      #
+      # https://issues.jboss.org/browse/BGBUILD-313
+      unless guestfs.fgrep("ec2-user", "/etc/passwd").empty?
+        @log.debug("ec2-user already exists, skipping.")
+        return
+      end
+
       guestfs.sh("useradd ec2-user")
       guestfs.sh("echo -e 'ec2-user\tALL=(ALL)\tNOPASSWD: ALL' >> /etc/sudoers")
+
       @log.debug "User ec2-user added."
     end
 
@@ -209,4 +224,3 @@ module BoxGrinder
   end
 end
 
-plugin :class => BoxGrinder::EC2Plugin, :type => :platform, :name => :ec2, :full_name => "Amazon Elastic Compute Cloud (Amazon EC2)"

data/lib/boxgrinder-build/plugins/platform/virtualbox/virtualbox-plugin.rb

@@ -21,6 +21,8 @@ require 'boxgrinder-build/helpers/linux-helper'
 
 module BoxGrinder
   class VirtualBoxPlugin < BasePlugin
+    plugin :type => :platform, :name => :virtualbox, :full_name => "VirtualBox"
+
     def after_init
       register_deliverable(:disk => "#{@appliance_config.name}.vmdk")
     end
@@ -70,4 +72,3 @@ module BoxGrinder
   end
 end
 
-plugin :class => BoxGrinder::VirtualBoxPlugin, :type => :platform, :name => :virtualbox, :full_name => "VirtualBox"

data/lib/boxgrinder-build/plugins/platform/virtualpc/virtualpc-plugin.rb

@@ -0,0 +1,58 @@
+#
+# Copyright 2010 Red Hat, Inc.
+#
+# This is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 3 of
+# the License, or (at your option) any later version.
+#
+# This software is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this software; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+
+require 'boxgrinder-build/plugins/base-plugin'
+
+module BoxGrinder
+  class VirtualPCPlugin < BasePlugin
+    plugin :type => :platform, :name => :virtualpc, :full_name => "VirtualPC"
+
+    def after_init
+      register_deliverable(:disk => "#{@appliance_config.name}.vhd")
+    end
+
+    def execute
+      @log.info "Converting image to VirtualPC format..."
+
+      convert
+      customize_image
+
+      @log.info "Image converted to VirtualPC format."
+    end
+
+    def customize_image
+      unless @appliance_config.post['virtualpc'].nil? or @appliance_config.post['virtualpc'].empty?
+        @image_helper.customize(@deliverables.disk) do |guestfs, guestfs_helper|
+          @appliance_config.post['virtualpc'].each do |cmd|
+            guestfs_helper.sh(cmd, :arch => @appliance_config.hardware.arch)
+          end
+          @log.debug "Post commands from appliance definition file executed."
+        end
+      else
+        @log.debug "No commands specified, skipping."
+      end
+    end
+
+    def convert
+      @log.debug "Using qemu-img to convert the image..."
+      @image_helper.convert_disk(@previous_deliverables.disk, :vpc, @deliverables.disk)
+      @log.debug "Conversion done."
+    end
+  end
+end
+

data/lib/boxgrinder-build/plugins/platform/vmware/vmware-plugin.rb

@@ -20,6 +20,8 @@ require 'boxgrinder-build/plugins/base-plugin'
 
 module BoxGrinder
   class VMwarePlugin < BasePlugin
+    plugin :type => :platform, :name => :vmware, :full_name => "VMware"
+
     def after_init
       register_deliverable(:vmx => "#{@appliance_config.name}.vmx",
                            :readme => "README")
@@ -190,4 +192,3 @@ module BoxGrinder
   end
 end
 
-plugin :class => BoxGrinder::VMwarePlugin, :type => :platform, :name => :vmware, :full_name => "VMware"

data/rubygem-boxgrinder-build.spec

@@ -5,7 +5,7 @@
 
 Summary: A tool for creating appliances from simple plain text files
 Name: rubygem-%{gemname}
-Version: 0.9.8
+Version: 0.10.0
 Release: 1%{?dist}
 Group: Development/Languages
 License: LGPLv3+
@@ -42,6 +42,15 @@ BuildRequires: rubygem(net-sftp)
 BuildRequires: rubygem(net-ssh)
 BuildRequires: rubygem(progressbar)
 
+# libvirt
+Requires: ruby-libvirt
+Requires: rubygem(nokogiri)
+Requires: rubygem(builder)
+
+BuildRequires: ruby-libvirt
+BuildRequires: rubygem(nokogiri)
+BuildRequires: rubygem(builder)
+
 # RPM-BASED
 Requires: appliance-tools
 Requires: yum-utils
@@ -130,6 +139,21 @@ popd
 %{gemdir}/doc/%{gemname}-%{version}
 
 %changelog
+* Tue Nov 29 2011 Marek Goldmann <mgoldman@redhat.com> - 0.10.0-1
+- Upstream release: 0.10.0
+- [BGBUILD-313] boxgrinder build fails to build ec2 image if ec2-user already exists
+- [BGBUILD-318] Add support for us-west-2 region
+- [BGBUILD-308] Clearer error message when unrecognised file extension is used
+- [BGBUILD-322] Allow selection of kernel and ramdisk for ec2 and ebs plugins
+- [BGBUILD-302] Add support for VirtualPC platform
+- [BGBUILD-195] Add support for OpenStack
+- [BGBUILD-304] Standarize plugin callbacks
+- [BGBUILD-325] Remove kickstart support
+- [BGBUILD-323] Invalid kernel version recognition makes recreating initrd impossible
+- [BGBUILD-326] Ensure building from root directory is successful
+- [BGBUILD-211] Support for registering appliances with libvirt
+- [BGBUILD-331] Add support for sa-east-1 EC2 region
+
 * Fri Oct 14 2011 Marc Savy <msavy@redhat.com> - 0.9.8-1
 - Upstream release: 0.9.8
 - [BGBUILD-312] Only use root privileges when necessary

data/spec/appliance-spec.rb

@@ -81,7 +81,7 @@ module BoxGrinder
         PluginManager.stub(:instance).and_return(OpenCascade.new(:plugins => {:os => {:centos => {}}}))
         lambda {
           @appliance.validate_definition
-        }.should raise_error(RuntimeError, "Not supported operating system selected: fedora. Make sure you have installed right operating system plugin, see http://boxgrinder.org/tutorials/boxgrinder-build-plugins/#Operating_system_plugins. Supported OSes are: centos")
+        }.should raise_error(RuntimeError, "Unsupported operating system selected: fedora. Make sure you have installed right operating system plugin, see http://boxgrinder.org/tutorials/boxgrinder-build-plugins/#Operating_system_plugins. Supported OSes are: centos")
       end
 
       it "should NOT raise if we use supported OS" do
@@ -160,63 +160,6 @@ module BoxGrinder
 
         @appliance.read_definition
       end
-
-      it "should read definition with kickstart appliance definition file" do
-        prepare_appliance({}, "#{File.dirname(__FILE__)}/rspec/src/appliances/jeos-f13.ks")
-
-        appliance_config = ApplianceConfig.new
-
-        appliance_helper = mock(ApplianceDefinitionHelper)
-        appliance_helper.should_receive(:read_definitions).with("#{File.dirname(__FILE__)}/rspec/src/appliances/jeos-f13.ks")
-        appliance_helper.should_receive(:appliance_configs).and_return([])
-
-        clazz = mock('PluginClass')
-
-        plugin_manager = mock(PluginManager)
-        plugin_manager.should_receive(:plugins).and_return({:os => {:fedora => {:class => clazz, :type => :os, :name => :fedora, :full_name => "Fedora", :versions => ["11", "12", "13", "14", "rawhide"]}}})
-
-        plugin = mock('Plugin')
-        plugin.should_receive(:respond_to?).with(:read_file).and_return(true)
-        plugin.should_receive(:read_file).and_return(appliance_config)
-
-        clazz.should_receive(:new).and_return(plugin)
-
-        PluginManager.should_receive(:instance).and_return(plugin_manager)
-
-        ApplianceDefinitionHelper.should_receive(:new).with(:log => @log).and_return(appliance_helper)
-
-        appliance_config_helper = mock(ApplianceConfigHelper)
-
-        appliance_config.should_receive(:clone).and_return(appliance_config)
-        appliance_config.should_receive(:init_arch).and_return(appliance_config)
-        appliance_config.should_receive(:initialize_paths).and_return(appliance_config)
-
-        appliance_config_helper.should_receive(:merge).with(appliance_config).and_return(appliance_config)
-
-        ApplianceConfigHelper.should_receive(:new).with([appliance_config]).and_return(appliance_config_helper)
-
-        @appliance.read_definition
-      end
-
-      it "should read definition with kickstart appliance definition file and fail because there was no plugin able to read .ks" do
-        prepare_appliance({}, "#{File.dirname(__FILE__)}/rspec/src/appliances/jeos-f13.ks")
-
-        appliance_helper = mock(ApplianceDefinitionHelper)
-        appliance_helper.should_receive(:read_definitions).with("#{File.dirname(__FILE__)}/rspec/src/appliances/jeos-f13.ks")
-        appliance_helper.should_receive(:appliance_configs).and_return([])
-
-        plugin_manager = mock(PluginManager)
-        plugin_manager.should_receive(:plugins).and_return({:os => {}})
-
-
-        PluginManager.should_receive(:instance).and_return(plugin_manager)
-
-        ApplianceDefinitionHelper.should_receive(:new).with(:log => @log).and_return(appliance_helper)
-
-        lambda {
-          @appliance.read_definition
-        }.should raise_error(ValidationError, "Couldn't read appliance definition file: jeos-f13.ks.")
-      end
     end
 
     it "should remove old builds" do

data/spec/helpers/linux-helper-spec.rb

@@ -29,6 +29,12 @@ module BoxGrinder
       @log = @helper.instance_variable_get(:@log)
     end
 
+    it "should not fail when no versions are found" do
+      guestfs = mock("guestfs")
+      guestfs.should_receive(:ls).with('/lib/modules').and_return([])
+      @helper.kernel_version(guestfs).should == nil
+    end
+
     it "should return valid kernel version" do
       guestfs = mock("guestfs")
       guestfs.should_receive(:ls).with('/lib/modules').and_return(['2.6.33.6-147.fc13.i686'])
@@ -41,6 +47,24 @@ module BoxGrinder
       @helper.kernel_version(guestfs).should == '2.6.33.6-147.fc13.i686.PAE'
     end
 
+    it "should return valid xen kernel version" do
+      guestfs = mock("guestfs")
+      guestfs.should_receive(:ls).with('/lib/modules').and_return(['2.6.33.6-147.fc13.i686.xen', '2.6.40.6-147.fc13.i686'])
+      @helper.kernel_version(guestfs).should == '2.6.33.6-147.fc13.i686.xen'
+    end
+
+    it "should return valid xen kernel version" do
+      guestfs = mock("guestfs")
+      guestfs.should_receive(:ls).with('/lib/modules').and_return(['2.6.45.6-147.fc13.i686', '2.6.40.6-147.fc13.i686'])
+      @helper.kernel_version(guestfs).should == '2.6.45.6-147.fc13.i686'
+    end
+
+    it "should fail when no kernel images could be found" do
+      @helper.should_receive(:kernel_version).and_return(nil)
+
+      lambda { @helper.recreate_kernel_image("guestfs", ['xennet']) }.should raise_error("Cannot find valid kernel installs in the appliance. Make sure you have your kernel installed in '/lib/modules'.")
+    end
+
     it "should recreate initramfs kernel image using dracut and add xennet module" do
       guestfs = mock("guestfs")
 
@@ -91,6 +115,52 @@ module BoxGrinder
         @helper.partition_mount_points(hash).should == ['/', '/tmp-config', '/tmp-eventlog', '/var/www']
       end
     end
+
+    context "RPMVersion" do
+      before(:each) do
+        @version = RPMVersion.new
+      end
+
+      it "should split the version" do
+        @version.split('2.6.18-274.7.1.el5').should == ["2", "6", "18", "274", "7", "1", "el5"]
+      end
+
+      describe ".compare" do
+        it "should compare two versions and return -1" do
+          @version.compare("2.6.18-274.7.1.el5", "2.6.18-8.el5").should == 1
+        end
+
+        it "should compare two versions and return 1" do
+          @version.compare("2.6.18-8.el5", "2.6.18-274.7.1.el5").should == -1
+        end
+
+        it "should compare two versions and return 0" do
+          @version.compare("2.6.18-8.el5", "2.6.18-8.el5").should == 0
+        end
+
+        it "should compare two very similar versions" do
+          @version.compare("2.6.18-8.el5", "2.6.18-8.1.el5").should == -1
+        end
+
+        it "should compare two very similar versions other way around" do
+          @version.compare("2.6.18-8.1.el5", "2.6.18-8.el5").should == 1
+        end
+      end
+
+      describe ".newest" do
+        it "should return first one as newer" do
+          @version.newest(["2.6.18-274.7.1.el5", "2.6.18-8.el5"]).should == "2.6.18-274.7.1.el5"
+        end
+
+        it "should return last one as newer" do
+          @version.newest(["2.6.18-8.el5", "2.6.18-274.7.1.el5"]).should == "2.6.18-274.7.1.el5"
+        end
+
+        it "should return version 3 as newer" do
+          @version.newest(["3.1.0-0.rc1", "2.6.18-274.7.1.el5"]).should == "3.1.0-0.rc1"
+        end
+      end
+    end
   end
 end
 

data/spec/managers/plugin-manager-spec.rb

@@ -28,16 +28,16 @@ module BoxGrinder
     end
 
     it "should register simple plugin" do
-      @manager.register_plugin({:class => PluginManager, :type => :delivery, :name => :abc, :full_name => "Amazon Simple Storage Service (Amazon S3)"})
+      @manager.register_plugin(PluginManager, {:type => :delivery, :name => :abc, :full_name => "Amazon Simple Storage Service (Amazon S3)"})
 
-      @manager.plugins[:delivery].size.should == 8
+      @manager.plugins[:delivery].size.should == 10
       @manager.plugins[:delivery][:abc][:class].should == PluginManager
     end
 
     it "should register plugin with many types" do
-      @manager.register_plugin({:class => PluginManager, :type => :delivery, :name => :def, :full_name => "Amazon Simple Storage Service (Amazon S3)", :types => [:aaa, :bbb, :ccc]})
+      @manager.register_plugin(PluginManager, {:type => :delivery, :name => :def, :full_name => "Amazon Simple Storage Service (Amazon S3)", :types => [:aaa, :bbb, :ccc]})
 
-      @manager.plugins[:delivery].size.should == 11
+      @manager.plugins[:delivery].size.should == 13
       @manager.plugins[:delivery][:abc][:class].should == PluginManager
       @manager.plugins[:delivery][:aaa][:class].should == PluginManager
       @manager.plugins[:delivery][:bbb][:class].should == PluginManager
@@ -65,14 +65,5 @@ module BoxGrinder
         @manager.initialize_plugin(:os, :fedora)
       }.should raise_error("Error while initializing 'Fedora' plugin.")
     end
-
-    it "should register the plugin with 'plugin' method" do
-      plugin_manager = mock(PluginManager)
-      plugin_manager.should_receive(:register_plugin).with(:class => String, :type => :platform, :name => :ec2, :full_name  => "Amazon Elastic Compute Cloud (Amazon EC2)")
-
-      PluginManager.should_receive(:instance).and_return(plugin_manager)
-
-      plugin :class => String, :type => :platform, :name => :ec2, :full_name  => "Amazon Elastic Compute Cloud (Amazon EC2)"
-    end
   end
 end

data/spec/plugins/delivery/ebs/ebs-plugin-spec.rb

@@ -31,10 +31,6 @@ module BoxGrinder
     end
 
     def prepare_plugin
-      @plugin = EBSPlugin.new
-
-      yield @plugin if block_given?
-
       @config = Config.new('plugins' => { 'ebs' => {
         'access_key' => 'access_key',
         'secret_access_key' => 'secret_access_key',
@@ -50,14 +46,10 @@ module BoxGrinder
       @appliance_config.stub!(:hardware).and_return(OpenCascade.new({:arch => 'x86_64', :base_arch => 'x86_64'}))
       @appliance_config.stub!(:path).and_return(OpenCascade.new({:build => '/a/build/path'}))
 
-      @plugin.stub!(:validate)
-
-      @plugin.init(
-          @config,
-          @appliance_config,
-          {:class => BoxGrinder::EBSPlugin, :type => :delivery, :name => :ebs, :full_name => "Elastic Block Storage"},
-          :log => LogHelper.new(:level => :trace, :type => :stdout)
-      )
+      @plugin = RSpecPluginHelper.new(EBSPlugin, :skip => [:validate]).prepare(@config, @appliance_config,
+        :previous_plugin => OpenCascade.new(:type => :os, :deliverables => {:disk => "a_disk.raw", :metadata => 'metadata.xml'}),
+        :plugin_info => {:class => BoxGrinder::EBSPlugin, :type => :delivery, :name => :ebs, :full_name => "Elastic Block Storage"}
+      ) { |plugin| yield plugin if block_given? }
 
       #Set convenient dummies
       @ec2 = mock(AWS::EC2)
@@ -125,7 +117,7 @@ module BoxGrinder
       it "should return true if on EC2" do
         prepare_plugin do |plugin|
           plugin.stub!(:after_init)
-          @plugin.instance_variable_set(:@ec2_endpoints, EC2Helper::endpoints)
+          plugin.instance_variable_set(:@ec2_endpoints, EC2Helper::endpoints)
           EC2Helper::stub!(:current_availability_zone).and_return('eu-west-1a')
           EC2Helper::stub!(:availability_zone_to_region).with('eu-west-1a').and_return('eu-west-1')
         end
@@ -135,7 +127,7 @@ module BoxGrinder
       it "should return false if NOT on EC2" do
         prepare_plugin do |plugin|
           plugin.stub!(:after_init)
-          @plugin.instance_variable_set(:@ec2_endpoints, EC2Helper::endpoints)
+          plugin.instance_variable_set(:@ec2_endpoints, EC2Helper::endpoints)
           EC2Helper::stub!(:current_availability_zone).and_raise(Timeout::Error)
         end
         @plugin.valid_platform?.should == false