Changeset 591

Timestamp:

03/29/07 14:38:43 (2 years ago)

Author:

sacha

Message:

updated scritps to clean up chroot after usage.

Files:

• trunk/bin/applications/nightly_build_test_infrastructure/chroot.rb (modified) (2 diffs)
• trunk/bin/applications/nightly_build_test_infrastructure/hefeweizen-test-system.rb (modified) (2 diffs)

trunk/bin/applications/nightly_build_test_infrastructure/chroot.rb

@@ -63 +63 @@
-    run "#{@sudo}mkdir #{@complete_path}"
-    run "#{@sudo}debootstrap #{@release} #{@complete_path} http://ftp.debian.org/debian/  >> #{@log_file}"
+    run "#{@sudo}cp /etc/fstab /root/fstab.orig"
-    run "#{@sudo}echo \"/proc #{@complete_path}/proc proc defaults 0 0\" >> /etc/fstab"
-    run "#{@sudo}echo \"/dev #{@complete_path}/dev dev defaults 0 0\" >> /etc/fstab"
+    run "#{@sudo}echo \"cd /dev; /sbin/MAKEDEV generic; cd -\" >> /#{@complete_path}/root/dev_create"
+    run "#{@sudo]chroot #{@complete_path} sh root/dev_create"
-    run "#{@sudo}mount #{@complete_path}/proc"
---bind /dev #{@complete_path}/dev
+/dev #{@complete_path}/dev -o bind
-
-    return @complete_path
@@ -121 +124 @@
-  end
-
+  # This method unmounts any directories that the chroot mounted previously
+  def clean_up_chroot
+    run "#{@sudo}umount #{@complete_path}/proc"
+    run "#{@sudo}umount #{@complete_path}/dev"
+    run "#{@sudo}mv /root/fstab.orig /etc/fstab"
+  end
+
-  private 
-  

trunk/bin/applications/nightly_build_test_infrastructure/hefeweizen-test-system.rb

@@ -79 +79 @@
-    begin
-
+      @logger.info "Creating new chroot..."
-      path = chroot.create
-      @logger.info "Created new chroot with the name '#{chroot_name}' at the following path: #{path}"
+
+      
-
-      @logger.info "Installing subversion and setting up ssl certificate"
@@ -113 +116 @@
-      chroot.copy_test_result_to "#{@target_path}/#{RESULTS_PATH}", prefix = chroot_name
-      
+      @logger.info "Clean up system"
+      chroot.clean_up_chroot
+
-      @logger.info "No problems reported. Check the result of the test."
-