boxgrinder-build 0.3.6 → 0.3.7

data/bin/boxgrinder-build

@@ -26,7 +26,7 @@ require 'boxgrinder-core/helpers/log-helper'
 require 'boxgrinder-build/helpers/plugin-helper'
 require 'boxgrinder-build/appliance'
 
-gem 'boxgrinder-core', '>= 0.0.9'
+gem 'boxgrinder-core', '>= 0.0.10'
 gem 'aws-s3', '>= 0.6.2'
 gem 'amazon-ec2', '>= 0.9.6'
 gem 'net-sftp', '>= 2.0.4'
@@ -39,8 +39,8 @@ gem 'commander', '>= 4.0.3'
 
 #$stderr.reopen('/dev/null')
 
-program :name, 'BoxGrinder'
-program :version, '0.3.6'
+program :name, 'BoxGrinder Build'
+program :version, '0.3.7'
 program :description, 'A tool for building VM images from simple definition files.'
 default_command :build
 
@@ -75,7 +75,7 @@ module BoxGrinder
 
       appliance_definition_file = args.shift or raise('Appliance definition file is required. Run boxgrinder-build -h for more info')
 
-      raise("Appliance definition file '#{appliance_definition_file}' could not be found") unless File.exists?( appliance_definition_file )
+      raise "Appliance definition file '#{appliance_definition_file}' could not be found" unless File.exists?( appliance_definition_file )
       raise "Not known platform: #{options.platform}. Available platforms: #{PlatformPluginManager.instance.plugins.keys.join(', ')}." if PlatformPluginManager.instance.plugins[options.platform].nil? and options.platform != :none
       raise "Not known delivery type: #{options.delivery}. Available types: #{DeliveryPluginManager.instance.types.keys.join(', ')}." if DeliveryPluginManager.instance.types.keys.include?(options.delivery).nil?  and options.delivery != :none
 

data/lib/boxgrinder-build/helpers/guestfs-helper.rb

@@ -56,8 +56,14 @@ module BoxGrinder
       @log.debug "Launching guestfs..."
       @guestfs.launch
 
-      mount_partition( @guestfs.list_partitions.first, '/' ) if @guestfs.list_partitions.size == 1
-      mount_partition( @guestfs.list_devices.first, '/' ) if @guestfs.list_partitions.size == 0
+      case @guestfs.list_partitions.size
+        when 0
+          mount_partition( @guestfs.list_devices.first, '/' )
+        when 1
+          mount_partition( @guestfs.list_partitions.first, '/' )
+        else
+          mount_partitions
+      end
 
       @log.debug "Guestfs launched."
     end
@@ -85,5 +91,23 @@ module BoxGrinder
       @guestfs.sh( "rpm --rebuilddb" )
       @log.debug "Cleaning RPM database finished."
     end
+
+    def mount_partitions
+      root_partition = nil
+
+      @guestfs.list_partitions.each do |partition|
+        mount_partition( partition, '/' )
+        if @guestfs.exists( '/sbin/e2label' ) != 0
+          root_partition = partition
+          break
+        end
+        @guestfs.umount( partition )
+      end
+
+      @guestfs.list_partitions.each do |partition|
+        next if partition == root_partition
+        mount_partition( partition, @guestfs.sh( "/sbin/e2label #{partition}" ).chomp.strip )
+      end
+    end
   end
 end

data/lib/boxgrinder-build/plugins/delivery/s3/aws-helper.rb

@@ -39,19 +39,15 @@ module BoxGrinder
     attr_reader :ec2
     attr_reader :s3
 
-    def bucket_key( appliance_name )
-      "#{@plugin_config['bucket']}/#{appliance_name}/#{@appliance_config.version}.#{@appliance_config.release}/#{@appliance_config.hardware.arch}"
+    def bucket_key( appliance_name, path )
+      "#{@plugin_config['bucket']}#{path}/#{appliance_name}/#{@appliance_config.version}.#{@appliance_config.release}/#{@appliance_config.hardware.arch}"
     end
 
-    def bucket_manifest_key( appliance_name )
-      "#{bucket_key( appliance_name )}/#{appliance_name}.ec2.manifest.xml"
+    def bucket_manifest_key( appliance_name, path )
+      "#{bucket_key( appliance_name, path )}/#{appliance_name}.ec2.manifest.xml"
     end
 
-    def appliance_is_registered?( appliance_name )
-      !ami_info( appliance_name ).nil?
-    end
-
-    def ami_info( appliance_name )
+    def ami_info( appliance_name, path )
       ami_info = nil
 
       images = @ec2.describe_images( :owner_id => @plugin_config['account_number'] ).imagesSet
@@ -59,7 +55,7 @@ module BoxGrinder
       return nil if images.nil?
 
       for image in images.item do
-        ami_info = image if (image.imageLocation.eql?( bucket_manifest_key( appliance_name ) ))
+        ami_info = image if (image.imageLocation.eql?( bucket_manifest_key( appliance_name, path ) ))
       end
 
       ami_info

data/lib/boxgrinder-build/plugins/delivery/s3/s3-plugin.rb

@@ -28,7 +28,9 @@ module BoxGrinder
   class S3Plugin < BaseDeliveryPlugin
 
     AMI_OSES = {
-            'fedora' => ["11"]
+            'fedora'  => [ '11' ],
+            'centos'  => [ '5' ],
+            'rhel'    => [ '5' ]
     }
 
     KERNELS = {
@@ -38,6 +40,23 @@ module BoxGrinder
                                     'i386'     => { :aki => 'aki-a71cf9ce', :ari => 'ari-a51cf9cc' },
                                     'x86_64'   => { :aki => 'aki-b51cf9dc', :ari => 'ari-b31cf9da' }
                             }
+                    },
+                    'centos' => {
+                            '5' => {
+                                    'i386'     => { :aki => 'aki-a71cf9ce', :ari => 'ari-a51cf9cc' },
+                                    'x86_64'   => { :aki => 'aki-b51cf9dc', :ari => 'ari-b31cf9da' }
+                            }
+                    },
+                    'rhel' => {
+                            '5' => {
+                                    'i386'     => { :aki => 'aki-a71cf9ce', :ari => 'ari-a51cf9cc' },
+                                    'x86_64'   => { :aki => 'aki-b51cf9dc', :ari => 'ari-b31cf9da' }
+                            }
+#                            '5' => {
+#                                    'i386'     => { :aki => 'aki-e3a54b8a', :ari => 'ari-f9a54b90' },
+#                                    'x86_64'   => { :aki => 'aki-ffa54b96', :ari => 'ari-fda54b94' }
+#                            }
+
                     }
             }
     }
@@ -135,12 +154,12 @@ module BoxGrinder
 
     def image_already_uploaded?
       begin
-        bucket = Bucket.find(@aws_helper.aws_data['bucket_name'])
+        bucket = Bucket.find(@plugin_config['bucket'])
       rescue
         return false
       end
 
-      manifest_location = @aws_helper.bucket_manifest_key(@appliance_config.name)
+      manifest_location = @aws_helper.bucket_manifest_key(@appliance_config.name, @plugin_config['path'])
       manifest_location = manifest_location[manifest_location.index("/") + 1, manifest_location.length]
 
       for object in bucket.objects do
@@ -153,20 +172,19 @@ module BoxGrinder
     def upload_image
       @log.info "Uploading #{@appliance_config.name} AMI to bucket '#{@plugin_config['bucket']}'..."
 
-      @exec_helper.execute("ec2-upload-bundle -b #{@aws_helper.bucket_key(@appliance_config.name)} -m #{@ami_manifest} -a #{@plugin_config['access_key']} -s #{@plugin_config['secret_access_key']} --retry")
+      @exec_helper.execute("ec2-upload-bundle -b #{@aws_helper.bucket_key(@appliance_config.name, @plugin_config['path'])} -m #{@ami_manifest} -a #{@plugin_config['access_key']} -s #{@plugin_config['secret_access_key']} --retry")
     end
 
     def register_image
-      ami_info    = @aws_helper.ami_info(@appliance_config.name)
+      ami_info    = @aws_helper.ami_info(@appliance_config.name, @plugin_config['path'])
 
       if ami_info
         @log.info "Image is registered under id: #{ami_info.imageId}"
         return
       else
-        ami_info = @aws_helper.ec2.register_image(:image_location => @aws_helper.bucket_manifest_key(@appliance_config.name))
+        ami_info = @aws_helper.ec2.register_image(:image_location => @aws_helper.bucket_manifest_key(@appliance_config.name, @plugin_config['path']))
         @log.info "Image successfully registered under id: #{ami_info.imageId}."
       end
     end
-
   end
 end

data/lib/boxgrinder-build/plugins/os/base/rpm-based-os-plugin.rb

@@ -49,8 +49,6 @@ module BoxGrinder
       customize( @deliverables[:disk] ) do |guestfs, guestfs_helper|
         @log.info "Executing post operations after build..."
 
-        mount_partitions( guestfs, guestfs_helper ) if guestfs.list_partitions.size > 1
-
         if @appliance_config.post.base.size > 0
           @appliance_config.post.base.each do |cmd|
             @log.debug "Executing #{cmd}"
@@ -74,24 +72,6 @@ module BoxGrinder
       @log.info "Base image for #{@appliance_config.name} appliance was built successfully."
     end
 
-    def mount_partitions( guestfs, guestfs_helper )
-      root_partition = nil
-
-      guestfs.list_partitions.each do |partition|
-        guestfs_helper.mount_partition( partition, '/' )
-        if guestfs.exists( '/sbin/e2label' ) != 0
-          root_partition = partition
-          break
-        end
-        guestfs.umount( partition )
-      end
-
-      guestfs.list_partitions.each do |partition|
-        next if partition == root_partition
-        guestfs_helper.mount_partition( partition, guestfs.sh( "/sbin/e2label #{partition}" ).chomp.strip )
-      end
-    end
-
     def change_configuration( guestfs )
       @log.debug "Changing configuration files using augeas..."
       guestfs.aug_init( "/", 0 )
@@ -125,7 +105,7 @@ module BoxGrinder
       @log.debug "Installing repositories from appliance definition file..."
       @appliance_config.repos.each do |repo|
         if repo['ephemeral']
-          @log.debug "Repository '#{repo['name']}' is a ephemeral repo. It'll not be installed to appliance."
+          @log.debug "Repository '#{repo['name']}' is an ephemeral repo. It'll not be installed in the appliance."
           next
         end
 

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

@@ -72,7 +72,6 @@ module BoxGrinder
       if invalid_names.size == 0
         @log.info "All additional packages for #{@appliance_config.simple_name} appliance successfully resolved."
       else
-        puts invalid_names.to_yaml
         raise "Package#{invalid_names.size > 1 ? "s" : ""} #{invalid_names.join(', ')} for #{@appliance_config.simple_name} appliance not found in repositories. Please check package names in appliance definition file."
       end
     end

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

@@ -26,6 +26,14 @@ module BoxGrinder
   class FedoraPlugin < RPMBasedOSPlugin
 
     FEDORA_REPOS = {
+            "13" => {
+                    "base" => {
+                            "mirrorlist" => "http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-13&arch=#ARCH#"
+                    },
+                    "updates" => {
+                            "mirrorlist" => "http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f13&arch=#ARCH#"
+                    }
+            },
             "12" => {
                     "base" => {
                             "mirrorlist" => "http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-12&arch=#ARCH#"
@@ -55,7 +63,7 @@ module BoxGrinder
               :name       => :fedora,
               :full_name  => "Fedora",
               :type       => :linux,
-              :versions   => ["11", "12", "rawhide"]
+              :versions   => ["11", "12", "13", "rawhide"]
       }
     end
 

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

@@ -30,7 +30,9 @@ module BoxGrinder
     end
 
     SUPPORTED_OSES = {
-            'fedora' => ["11"]
+            'rhel'    => [ '5' ],
+            'centos'  => [ '5' ],
+            'fedora'  => [ '11' ]
     }
 
     REGIONS = {'us_east' => 'url'}
@@ -41,8 +43,19 @@ module BoxGrinder
                             'i386'     => { :rpm => 'http://repo.oddthesis.org/packages/other/kernel-xen-2.6.21.7-2.fc8.i686.rpm' },
                             'x86_64'   => { :rpm => 'http://repo.oddthesis.org/packages/other/kernel-xen-2.6.21.7-2.fc8.x86_64.rpm' }
                     }
+            },
+            'centos' => {
+                    '5' => {
+                            'i386'     => { :rpm => 'http://repo.oddthesis.org/packages/other/kernel-xen-2.6.21.7-2.fc8.i686.rpm' },
+                            'x86_64'   => { :rpm => 'http://repo.oddthesis.org/packages/other/kernel-xen-2.6.21.7-2.fc8.x86_64.rpm' }
+                    }
+            },
+            'rhel' => {
+                    '5' => {
+                            'i386'     => { :rpm => 'http://repo.oddthesis.org/packages/other/kernel-xen-2.6.21.7-2.fc8.i686.rpm' },
+                            'x86_64'   => { :rpm => 'http://repo.oddthesis.org/packages/other/kernel-xen-2.6.21.7-2.fc8.x86_64.rpm' }
+                    }
             }
-
     }
 
     def after_init
@@ -65,7 +78,7 @@ module BoxGrinder
         return
       end
 
-      unless SUPPORTED_OSES[@appliance_config.os.name].include?(@appliance_config.os.version)
+      unless !SUPPORTED_OSES[@appliance_config.os.name].nil? and SUPPORTED_OSES[@appliance_config.os.name].include?(@appliance_config.os.version)
         @log.error "EC2 platform plugin for Linux operating systems supports: #{supported_os}. Your OS is #{@appliance_config.os.name} #{@appliance_config.os.version}."
         return
       end
@@ -81,23 +94,22 @@ module BoxGrinder
         raise "Error while preparing EC2 disk image. See logs for more info"
       end
 
-      raw_disk_offset = calculate_disk_offset(raw_disk)
-
       ec2_disk_mount_dir = "#{@appliance_config.path.dir.build}/tmp/ec2-#{rand(9999999999).to_s.center(10, rand(9).to_s)}"
       raw_disk_mount_dir = "#{@appliance_config.path.dir.build}/tmp/raw-#{rand(9999999999).to_s.center(10, rand(9).to_s)}"
 
 
       begin
-        ec2_loop_device = mount_image(@deliverables[:disk], ec2_disk_mount_dir)
-        raw_loop_device = mount_image(raw_disk, raw_disk_mount_dir, raw_disk_offset)
+        ec2_mounts = mount_image( @deliverables[:disk], ec2_disk_mount_dir )
+        raw_mounts = mount_image( raw_disk, raw_disk_mount_dir )
       rescue => e
+        @log.debug e
         raise "Error while mounting image. See logs for more info"
       end
 
       sync_files(raw_disk_mount_dir, ec2_disk_mount_dir)
 
-      umount_image(raw_disk, raw_disk_mount_dir, raw_loop_device)
-      umount_image(@deliverables[:disk], ec2_disk_mount_dir, ec2_loop_device)
+      umount_image(raw_disk, raw_disk_mount_dir, raw_mounts)
+      umount_image(@deliverables[:disk], ec2_disk_mount_dir, ec2_mounts)
 
       customize(@deliverables[:disk]) do |guestfs, guestfs_helper|
         create_devices(guestfs)
@@ -154,30 +166,51 @@ module BoxGrinder
       @log.debug "Filesystem created"
     end
 
-    def calculate_disk_offset(disk)
+    def calculate_disk_offsets( disk )
+      @log.debug "Calculating offsets for '#{File.basename(disk)}' disk..."
       loop_device = get_loop_device
 
       @exec_helper.execute("sudo losetup #{loop_device} #{disk}")
-      offset = @exec_helper.execute("sudo parted #{loop_device} 'unit B print' | grep Number -A 1 | tail -n 1 | awk '{ print $2 }'").strip.chop.scan(/^\d+/).to_s
+      offsets = @exec_helper.execute("sudo parted #{loop_device} 'unit B print' | grep -e '^ [0-9]' | awk '{ print $2 }'").scan(/\d+/)
       @exec_helper.execute("sudo losetup -d #{loop_device}")
 
-      offset
+      @log.trace "Offsets:\n#{offsets}"
+
+      offsets
     end
 
-    def mount_image(disk, mount_dir, offset = 0)
-      loop_device = get_loop_device
+    def mount_image(disk, mount_dir)
+      offsets = calculate_disk_offsets( disk )
 
-      @log.debug "Mounting image #{File.basename(disk)} in #{mount_dir} using #{loop_device} with offset #{offset}"
+      @log.debug "Mounting image #{File.basename(disk)} in #{mount_dir}..."
       FileUtils.mkdir_p(mount_dir)
-      @exec_helper.execute("sudo losetup -o #{offset.to_s} #{loop_device} #{disk}")
-      @exec_helper.execute("sudo mount #{loop_device} -t ext3 #{ mount_dir}")
 
-      loop_device
+      mounts = {}
+
+      offsets.each do |offset|
+        loop_device = get_loop_device
+        @exec_helper.execute("sudo losetup -o #{offset.to_s} #{loop_device} #{disk}")
+        label = @exec_helper.execute("e2label #{loop_device}").strip.chomp
+        label = '/' if label == ''
+        mounts[label] = loop_device
+      end
+
+      @exec_helper.execute("sudo mount #{mounts['/']} -t ext3 #{mount_dir}")
+
+      mounts.each { |mount_point, loop_device| @exec_helper.execute("sudo mount #{loop_device} -t ext3 #{mount_dir}/#{mount_point}") unless mount_point == '/' }
+
+      @log.trace "Mounts:\n#{mounts}"
+
+      mounts
     end
 
-    def umount_image(disk, mount_dir, loop_device)
-      @log.debug "Unmounting image #{File.basename(disk)}"
-      @exec_helper.execute("sudo umount -d #{loop_device}")
+    def umount_image(disk, mount_dir, mounts)
+      @log.debug "Unmounting image '#{File.basename(disk)}'..."
+
+      mounts.each { |mount_point, loop_device| @exec_helper.execute("sudo umount -d #{loop_device}") unless mount_point == '/' }
+
+      @exec_helper.execute("sudo umount -d #{mounts['/']}")
+
       FileUtils.rm_rf(mount_dir)
     end
 
@@ -239,8 +272,11 @@ module BoxGrinder
               "ec2-ami-tools.noarch.rpm" => "http://s3.amazonaws.com/ec2-downloads/ec2-ami-tools.noarch.rpm"
       }
 
-      kernel_rpm =  KERNELS[@appliance_config.os.name][@appliance_config.os.version][@appliance_config.hardware.arch][:rpm]
-      rpms[File.basename(kernel_rpm)] = kernel_rpm unless kernel_rpm.nil?
+      begin
+        kernel_rpm =  KERNELS[@appliance_config.os.name][@appliance_config.os.version][@appliance_config.hardware.arch][:rpm]
+        rpms[File.basename(kernel_rpm)] = kernel_rpm
+      rescue
+      end
 
       cache_rpms(rpms)
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 6
-  version: 0.3.6
+  - 7
+  version: 0.3.7
 platform: ruby
 authors: 
 - BoxGrinder Project
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-28 00:00:00 +02:00
+date: 2010-05-30 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,8 +27,8 @@ dependencies:
         segments: 
         - 0
         - 0
-        - 9
-        version: 0.0.9
+        - 10
+        version: 0.0.10
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency