boxgrinder-build 0.9.4 → 0.9.5

data/spec/plugins/os/fedora/fedora-plugin-spec.rb

@@ -87,6 +87,43 @@ module BoxGrinder
       @plugin.normalize_packages(packages)
       packages.should == ["@core", "system-config-firewall-base", "dhclient", "kernel"]
     end
+
+    context "BGBUILD-204" do
+      it "should disable bios device name hints for GRUB legacy" do
+        guestfs = mock("GuestFS")
+        guestfs.should_receive(:exists).with("/boot/grub2/grub.cfg").and_return(0)
+        guestfs.should_receive(:exists).with("/boot/grub/grub.cfg").and_return(1)
+        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 disable bios device name hints for GRUB2" do
+        guestfs = mock("GuestFS")
+        guestfs.should_receive(:exists).with("/boot/grub2/grub.cfg").and_return(1)
+        guestfs.should_receive(:exists).with("/boot/grub/grub.cfg").and_return(0)
+        guestfs.should_receive(:write).with("/etc/default/grub", "GRUB_CMDLINE_LINUX=\"quiet rhgb biosdevname=0\"\n")
+        @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/rpm-based-os-plugin-spec.rb

@@ -246,10 +246,6 @@ module BoxGrinder
         @plugin.should_receive(:add_repos).ordered.with({})
 
         do_build do |guestfs, guestfs_helper|
-          @plugin.should_receive(:disable_biosdevname).ordered.with(guestfs)
-          @plugin.should_receive(:change_runlevel).ordered.with(guestfs)
-          @plugin.should_receive(:disable_netfs).ordered.with(guestfs)
-          @plugin.should_receive(:link_mtab).ordered.with(guestfs)
           @plugin.should_receive(:recreate_rpm_database).ordered.with(guestfs, guestfs_helper)
           @plugin.should_receive(:execute_post).ordered.with(guestfs_helper)
         end
@@ -345,31 +341,5 @@ module BoxGrinder
         @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/platform/ec2/ec2-plugin-spec.rb

@@ -122,6 +122,31 @@ module BoxGrinder
       @plugin.upload_rc_local(guestfs)
     end
 
+    it "should upload rc_local for Fedora 16 or newer" do
+      @appliance_config.stub!(:os).and_return(OpenCascade.new({:name => 'fedora', :version => '16'}))
+
+      guestfs = mock("guestfs")
+      tempfile = mock("tempfile")
+
+      Tempfile.should_receive(:new).with("rc_local").and_return(tempfile)
+      File.should_receive(:read).with(any_args()).and_return("with other content")
+
+      guestfs.should_receive(:read_file).once.ordered.with("/etc/rc.local").and_return("content ")
+      tempfile.should_receive(:<<).once.ordered.with("content with other content")
+      tempfile.should_receive(:flush).once.ordered
+      tempfile.should_receive(:path).once.ordered.and_return("path")
+      guestfs.should_receive(:upload).once.ordered.with("path", "/etc/rc.local")
+      tempfile.should_receive(:close).once.ordered
+
+      @log.should_receive(:debug).once.with("Uploading '/etc/rc.local' file...")
+      @log.should_receive(:debug).once.with("'/etc/rc.local' file uploaded.")
+
+      guestfs.should_receive(:cp).with("/lib/systemd/system/rc-local.service", "/etc/systemd/system/")
+      guestfs.should_receive(:sh).with("sed -i '/^ConditionFileIsExecutable/a After=network.target' /etc/systemd/system/rc-local.service")
+
+      @plugin.upload_rc_local(guestfs)
+    end
+
     it "should change configuration" do
       guestfs_helper = mock("GuestFSHelper")
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: boxgrinder-build
 version: !ruby/object:Gem::Version 
-  hash: 51
+  hash: 49
   prerelease: false
   segments: 
   - 0
   - 9
-  - 4
-  version: 0.9.4
+  - 5
+  version: 0.9.5
 platform: ruby
 authors: 
 - Marek Goldmann
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-17 00:00:00 +02:00
+date: 2011-08-26 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,10 +42,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 17
         segments: 
-        - 0
-        version: "0"
+        - 1
+        - 1
+        - 1
+        version: 1.1.1
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -180,6 +182,7 @@ files:
 - integ/appliances/_test_base.appl
 - integ/appliances/gnome-fedora.appl
 - integ/appliances/jeos-centos.appl
+- integ/appliances/jeos-f16.appl
 - integ/appliances/jeos-fedora.appl
 - integ/appliances/modular.appl
 - integ/packages/ephemeral-repo-test-0.1-1.noarch.rpm