boxgrinder-build 0.9.1 → 0.9.2

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

@@ -203,6 +203,23 @@ module BoxGrinder
         File.should_receive(:open).with('a/disk', 'rb').and_yield(f)
         @plugin.upload_chunks
       end
+
+      it "should not compress the data before uploading the chunks if we use CloudSigma" do
+        merge_config('endpoint' => 'api.cloudsigma.com')
+        @plugin.instance_variable_set(:@previous_deliverables, {:disk => 'a/disk'})
+
+        f = mock(File)
+        f.should_receive(:eof?).ordered.and_return(false)
+        f.should_receive(:seek).ordered.with(0, File::SEEK_SET)
+        f.should_receive(:read).ordered.with(67108864).and_return("data")
+        f.should_receive(:eof?).ordered.and_return(true)
+
+        @plugin.should_not_receive(:compress)
+        @plugin.should_receive(:upload_chunk).ordered.with("data", 0)
+
+        File.should_receive(:open).with('a/disk', 'rb').and_yield(f)
+        @plugin.upload_chunks
+      end
     end
 
     describe ".upload_chunk" do
@@ -247,6 +264,15 @@ module BoxGrinder
           @plugin.upload_chunk("data", 0)
         }.should raise_error(PluginError, "Couldn't upload appliance, boom.")
       end
+
+      it "should not specify add content-encoding header if uplaoding to cloudsigma" do
+        merge_config('endpoint' => 'api.cloudsigma.com')
+
+        @plugin.should_receive(:api_url).with('/drives/drive-uuid/write/0').and_return('url')
+        RestClient.should_receive(:post).with('url', 'data', :content_type=>"application/octet-stream")
+
+        @plugin.upload_chunk("data", 0)
+      end
     end
 
     describe ".create_server" do

data/spec/plugins/os/rpm-based/rpm-based-os-plugin-spec.rb

@@ -29,10 +29,12 @@ module BoxGrinder
       plugins.stub!(:[]).with('rpm_based').and_return({})
       @config.stub!(:[]).with(:plugins).and_return(plugins)
       @config.stub!(:dir).and_return(OpenCascade.new(:tmp => 'tmpdir', :cache => 'cachedir'))
+      @config.stub!(:os).and_return(OpenCascade.new(:name => 'fedora', :version => '14'))
 
       @appliance_config.stub!(:name).and_return('full')
       @appliance_config.stub!(:version).and_return(1)
       @appliance_config.stub!(:release).and_return(0)
+      @appliance_config.stub!(:post).and_return({})
       @appliance_config.stub!(:os).and_return(OpenCascade.new({:name => 'fedora', :version => '11'}))
       @appliance_config.stub!(:hardware).and_return(OpenCascade.new(:cpus => 1, :memory => 512, :partitions => {'/' => nil, '/home' => nil}))
       @appliance_config.stub!(:path).and_return(OpenCascade.new(:build => 'build/path', :main => 'mainpath'))
@@ -106,6 +108,50 @@ module BoxGrinder
           @plugin.read_kickstart("#{File.dirname(__FILE__)}/src/jeos-f13-without-version.ks")
         }.should raise_error("No operating system version specified, please add comment to you kickstrt file like this: # bg_os_version: 14")
       end
+
+      it "should read kickstart and populate partitions" do
+        appliance_config = @plugin.read_kickstart("#{File.dirname(__FILE__)}/src/jeos-f13.ks")
+        appliance_config.should be_an_instance_of(ApplianceConfig)
+        appliance_config.hardware.partitions.should == {'/' => {'size' => 2.0, 'type' => 'ext4'}, '/home' => {'size' => 3.0, 'type' => 'ext3', "options" => "abc,def,gef"}}
+      end
+
+      it "should read kickstart and populate partitions" do
+        appliance_config = @plugin.read_kickstart("#{File.dirname(__FILE__)}/src/jeos-f13.ks")
+        appliance_config.should be_an_instance_of(ApplianceConfig)
+        appliance_config.hardware.partitions.should == {'/' => {'size' => 2.0, 'type' => 'ext4'}, '/home' => {'size' => 3.0, 'type' => 'ext3', "options" => "abc,def,gef"}}
+      end
+
+      it "should read kickstart and raise because of no partition size specified" do
+        File.should_receive(:read).with("jeos-f13.ks").and_return("# bg_os_name: fedora\n# bg_os_version: 14\npart /")
+
+        lambda {
+          @plugin.read_kickstart("jeos-f13.ks")
+        }.should raise_error("Partition size not specified for / partition in jeos-f13.ks")
+      end
+
+      it "should read kickstart and raise because no os name is specified" do
+        File.should_receive(:read).with("jeos-f13.ks").and_return("")
+
+        lambda {
+          @plugin.read_kickstart("jeos-f13.ks")
+        }.should raise_error("No operating system name specified, please add comment to you kickstrt file like this: # bg_os_name: fedora")
+      end
+
+      it "should read kickstart and raise because no os version is specified" do
+        File.should_receive(:read).with("jeos-f13.ks").and_return("# bg_os_name: rhel")
+
+        lambda {
+          @plugin.read_kickstart("jeos-f13.ks")
+        }.should raise_error("No operating system version specified, please add comment to you kickstrt file like this: # bg_os_version: 14")
+      end
+
+      it "should read kickstart and raise because no partitions are specified" do
+        File.should_receive(:read).with("jeos-f13.ks").and_return("# bg_os_name: fedora\n# bg_os_version: 14")
+
+        lambda {
+          @plugin.read_kickstart("jeos-f13.ks")
+        }.should raise_error("No partitions specified in your kickstart file jeos-f13.ks")
+      end
     end
 
     describe ".use_labels_for_partitions" do
@@ -150,7 +196,7 @@ module BoxGrinder
     end
 
     describe ".build_with_appliance_creator" do
-      it "should build appliance" do
+      def do_build
         kickstart = mock(Kickstart)
         kickstart.should_receive(:create).and_return('kickstart.ks')
 
@@ -165,7 +211,42 @@ module BoxGrinder
         FileUtils.should_receive(:mv)
         FileUtils.should_receive(:rm_rf)
 
-        @image_helper.should_receive(:customize).with(["build/path/rpm_based-plugin/tmp/full-sda.raw"])
+        guestfs = mock("GuestFS")
+        guestfs_helper = mock("GuestFSHelper")
+
+        @image_helper.should_receive(:customize).with(["build/path/rpm_based-plugin/tmp/full-sda.raw"]).and_yield(guestfs, guestfs_helper)
+
+        guestfs.should_receive(:upload).with("/etc/resolv.conf", "/etc/resolv.conf")
+
+        @plugin.should_receive(:change_configuration).with(guestfs_helper)
+        @plugin.should_receive(:apply_root_password).with(guestfs)
+        @plugin.should_receive(:use_labels_for_partitions).with(guestfs)
+        @plugin.should_receive(:disable_firewall).with(guestfs)
+        @plugin.should_receive(:set_motd).with(guestfs)
+        @plugin.should_receive(:install_repos).with(guestfs)
+
+        guestfs.should_receive(:exists).with('/etc/init.d/firstboot').and_return(1)
+        guestfs.should_receive(:sh).with('chkconfig firstboot off')
+
+        yield guestfs, guestfs_helper if block_given?
+      end
+
+      it "should build appliance" do
+        @appliance_config.stub!(:os).and_return(OpenCascade.new({:name => 'fedora', :version => '14'}))
+        do_build
+        @plugin.build_with_appliance_creator('jeos.appl')
+      end
+
+      it "should execute additional steps for Fedora 15" do
+        @appliance_config.stub!(:os).and_return(OpenCascade.new({:name => 'fedora', :version => '15'}))
+
+        do_build do |guestfs, guestfs_helper|
+          @plugin.should_receive(:disable_biosdevname).with(guestfs)
+          @plugin.should_receive(:change_runlevel).with(guestfs)
+          @plugin.should_receive(:disable_netfs).with(guestfs)
+          @plugin.should_receive(:link_mtab).with(guestfs)
+          @plugin.should_receive(:recreate_rpm_database).with(guestfs, guestfs_helper)
+        end
 
         @plugin.build_with_appliance_creator('jeos.appl')
       end
@@ -217,6 +298,47 @@ module BoxGrinder
         @plugin.cleanup_after_appliance_creator(12345)
       end
     end
+
+    describe ".recreate_rpm_database" do
+      it "should recreate RPM database" do
+        guestfs = mock("GuestFS")
+        guestfs_helper = mock("GuestFSHelper")
+
+        guestfs.should_receive(:download).with("/var/lib/rpm/Packages", "build/path/rpm_based-plugin/tmp/Packages")
+        @exec_helper.should_receive(:execute).with("/usr/lib/rpm/rpmdb_dump build/path/rpm_based-plugin/tmp/Packages > build/path/rpm_based-plugin/tmp/Packages.dump")
+        guestfs.should_receive(:upload).with("build/path/rpm_based-plugin/tmp/Packages.dump", "/tmp/Packages.dump")
+        guestfs.should_receive(:sh).with("rm -rf /var/lib/rpm/*")
+        guestfs_helper.should_receive(:sh).with("cd /var/lib/rpm/ && cat /tmp/Packages.dump | /usr/lib/rpm/rpmdb_load Packages")
+        guestfs_helper.should_receive(:sh).with("rpm --rebuilddb")
+
+        @plugin.recreate_rpm_database(guestfs, guestfs_helper)
+      end
+    end
+
+    context "BGBUILD-204" do
+      it "should disable bios device name hints" do
+        guestfs = mock("GuestFS")
+        guestfs.should_receive(:sh).with("sed -i \"s/kernel\\(.*\\)/kernel\\1 biosdevname=0/g\" /boot/grub/grub.conf")
+        @plugin.disable_biosdevname(guestfs)
+      end
+
+      it "should change to runlevel 3 by default" do
+        guestfs = mock("GuestFS")
+        guestfs.should_receive(:rm).with("/etc/systemd/system/default.target")
+        guestfs.should_receive(:ln_sf).with("/lib/systemd/system/multi-user.target", "/etc/systemd/system/default.target")
+        @plugin.change_runlevel(guestfs)
+      end
+
+      it "should disable netfs" do
+        guestfs = mock("GuestFS")
+        guestfs.should_receive(:sh).with("chkconfig netfs off")
+        @plugin.disable_netfs(guestfs)
+      end
+    end
+    it "should link /etc/mtab to /proc/self/mounts" do
+      guestfs = mock("GuestFS")
+      guestfs.should_receive(:ln_sf).with("/proc/self/mounts", "/etc/mtab")
+      @plugin.link_mtab(guestfs)
+    end
   end
 end
-

data/spec/plugins/os/rpm-based/src/jeos-f13.ks

@@ -14,6 +14,7 @@ services --enabled=network
 rootpw boxgrinder
 
 part / --size 2048 --fstype ext4  --ondisk sda
+part /home --size 3072 --fstype ext3 --fsoptions=abc,def,gef  --ondisk sda
 
 repo --name=fedora-14-base --cost=40 --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-13&arch=x86_64
 repo --name=fedora-14-updates --cost=41 --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f13&arch=x86_64

data/spec/plugins/platform/ec2/ec2-plugin-spec.rb

@@ -244,7 +244,6 @@ module BoxGrinder
         @plugin.should_receive(:create_devices).with(guestfs)
         @plugin.should_receive(:upload_fstab).with(guestfs)
 
-        @plugin.should_receive(:recreate_journal).with(guestfs)
         @plugin.should_receive(:enable_networking)
         @plugin.should_receive(:upload_rc_local).with(guestfs)
         @plugin.should_receive(:add_ec2_user).with(guestfs)
@@ -292,15 +291,6 @@ module BoxGrinder
         @plugin.execute_post(guestfs_helper)
       end
     end
-
-    it "should recreate journal" do
-      guestfs = mock("guestfs")
-
-      guestfs.should_receive(:list_devices).and_return(['/dev/sda'])
-      guestfs.should_receive(:sh).with("tune2fs -j /dev/sda")
-
-      @plugin.recreate_journal(guestfs)
-    end
   end
 end
 

data/spec/plugins/platform/vmware/vmware-plugin-spec.rb

@@ -65,9 +65,11 @@ module BoxGrinder
     end
 
     it "should calculate good CHS value for 0.5GB disk" do
-      prepare_image({'thin_disk' => false, 'type' => 'enterprise'})
+      prepare_image({'thin_disk' => false, 'type' => 'enterprise'}, :previous_deliverables => OpenStruct.new({:disk => 'a/base/image/path.raw'}))
+
+      File.should_receive(:stat).with("a/base/image/path.raw").and_return(OpenStruct.new(:size => 536870912))
 
-      c, h, s, total_sectors = @plugin.generate_scsi_chs(0.5)
+      c, h, s, total_sectors = @plugin.generate_scsi_chs
 
       c.should == 512
       h.should == 64
@@ -76,9 +78,11 @@ module BoxGrinder
     end
 
     it "should calculate good CHS value for 1GB disk" do
-      prepare_image({'thin_disk' => false, 'type' => 'enterprise'})
+      prepare_image({'thin_disk' => false, 'type' => 'enterprise'}, :previous_deliverables => OpenStruct.new({:disk => 'a/base/image/path.raw'}))
+
+      File.should_receive(:stat).with("a/base/image/path.raw").and_return(OpenStruct.new(:size => 1073741824))
 
-      c, h, s, total_sectors = @plugin.generate_scsi_chs(1)
+      c, h, s, total_sectors = @plugin.generate_scsi_chs
 
       c.should == 512
       h.should == 128
@@ -87,9 +91,11 @@ module BoxGrinder
     end
 
     it "should calculate good CHS value for 40GB disk" do
-      prepare_image({'thin_disk' => false, 'type' => 'enterprise'})
+      prepare_image({'thin_disk' => false, 'type' => 'enterprise'}, :previous_deliverables => OpenStruct.new({:disk => 'a/base/image/path.raw'}))
+
+      File.should_receive(:stat).with("a/base/image/path.raw").and_return(OpenStruct.new(:size => 42949672960))
 
-      c, h, s, total_sectors = @plugin.generate_scsi_chs(40)
+      c, h, s, total_sectors = @plugin.generate_scsi_chs
 
       c.should == 5221
       h.should == 255
@@ -98,9 +104,11 @@ module BoxGrinder
     end
 
     it "should calculate good CHS value for 160GB disk" do
-      prepare_image({'thin_disk' => false, 'type' => 'enterprise'})
+      prepare_image({'thin_disk' => false, 'type' => 'enterprise'}, :previous_deliverables => OpenStruct.new({:disk => 'a/base/image/path.raw'}))
 
-      c, h, s, total_sectors = @plugin.generate_scsi_chs(160)
+      File.should_receive(:stat).with("a/base/image/path.raw").and_return(OpenStruct.new(:size => 171798691840))
+
+      c, h, s, total_sectors = @plugin.generate_scsi_chs
 
       c.should == 20886
       h.should == 255
@@ -110,7 +118,9 @@ module BoxGrinder
 
     describe ".change_vmdk_values" do
       it "should change vmdk data (vmfs)" do
-        prepare_image({'thin_disk' => false, 'type' => 'enterprise'})
+        prepare_image({'thin_disk' => false, 'type' => 'enterprise'}, :previous_deliverables => OpenStruct.new({:disk => 'a/base/image/path.raw'}))
+
+        File.should_receive(:stat).with("a/base/image/path.raw").and_return(OpenStruct.new(:size => 5368709120))
 
         vmdk_image = @plugin.change_vmdk_values("vmfs")
 
@@ -131,7 +141,9 @@ module BoxGrinder
       end
 
       it "should change vmdk data (flat)" do
-        prepare_image({'thin_disk' => false, 'type' => 'enterprise'})
+        prepare_image({'thin_disk' => false, 'type' => 'enterprise'}, :previous_deliverables => OpenStruct.new({:disk => 'a/base/image/path.raw'}))
+
+        File.should_receive(:stat).with("a/base/image/path.raw").and_return(OpenStruct.new(:size => 5368709120))
 
         vmdk_image = @plugin.change_vmdk_values("monolithicFlat")
 
@@ -153,13 +165,14 @@ module BoxGrinder
       end
 
       it "should change vmdk data (flat) enabling thin disk" do
-        prepare_image({'thin_disk' => true, 'type' => 'enterprise'})
+        prepare_image({'thin_disk' => true, 'type' => 'enterprise'}, :previous_deliverables => OpenStruct.new({:disk => 'a/base/image/path.raw'}))
+
+        File.should_receive(:stat).with("a/base/image/path.raw").and_return(OpenStruct.new(:size => 5368709120))
 
         vmdk_image = @plugin.change_vmdk_values("monolithicFlat")
 
         vmdk_image.scan(/^ddb.thinProvisioned = "(.*)"\s?$/).to_s.should == "1"
       end
-
     end
 
     it "should change vmx data" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: boxgrinder-build
 version: !ruby/object:Gem::Version 
-  hash: 57
+  hash: 63
   prerelease: false
   segments: 
   - 0
   - 9
-  - 1
-  version: 0.9.1
+  - 2
+  version: 0.9.2
 platform: ruby
 authors: 
 - Marek Goldmann
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-27 00:00:00 +02:00
+date: 2011-05-17 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -137,6 +137,7 @@ extra_rdoc_files:
 - lib/boxgrinder-build/helpers/linux-helper.rb
 - lib/boxgrinder-build/helpers/package-helper.rb
 - lib/boxgrinder-build/helpers/plugin-helper.rb
+- lib/boxgrinder-build/helpers/qemu.wrapper
 - lib/boxgrinder-build/managers/plugin-manager.rb
 - lib/boxgrinder-build/plugins/base-plugin.rb
 - lib/boxgrinder-build/plugins/delivery/ebs/ebs-plugin.rb
@@ -183,6 +184,7 @@ files:
 - lib/boxgrinder-build/helpers/linux-helper.rb
 - lib/boxgrinder-build/helpers/package-helper.rb
 - lib/boxgrinder-build/helpers/plugin-helper.rb
+- lib/boxgrinder-build/helpers/qemu.wrapper
 - lib/boxgrinder-build/managers/plugin-manager.rb
 - lib/boxgrinder-build/plugins/base-plugin.rb
 - lib/boxgrinder-build/plugins/delivery/ebs/ebs-plugin.rb