Merge lp:~lool/lava-dispatcher/part-offset into lp:lava-dispatcher

[Loïc Minier]

Main goal was to fix a test for mx51evk in the middle of cmd_deploy_linaro_image but I came across some parted bug on natty and fixed some other small things along the way in separate commits.

[Paul Larson (pwlars)]

Approve, but oddly enough, abbreviating p for print works just fine for me on natty that has been updated in the last few days.

review: Approve

[Loïc Minier (lool)]

That's odd indeed; I have parted 2.3-5ubuntu3 here; seems to be around since several weeks and built on all architectures

=== modified file 'lava/actions/deploy.py'
--- lava/actions/deploy.py	2011-03-22 19:48:41 +0000
+++ lava/actions/deploy.py	2011-03-24 17:54:55 +0000
@@ -11,14 +11,15 @@
 
 class cmd_deploy_linaro_image(BaseAction):
     def run(self, hwpack, rootfs):
-        print "deploying on %s" % self.client.hostname
+        client = self.client
+        print "deploying on %s" % client.hostname
         print "  hwpack: %s" % hwpack
         print "  rootfs: %s" % rootfs
         print "Booting master image"
-        self.client.boot_master_image()
+        client.boot_master_image()
 
         print "Waiting for network to come up"
-        self.client.wait_network_up()
+        client.wait_network_up()
         boot_tgz, root_tgz = self.generate_tarballs(hwpack, rootfs)
         boot_tarball = boot_tgz.replace(LAVA_IMAGE_TMPDIR, '')
         root_tarball = root_tgz.replace(LAVA_IMAGE_TMPDIR, '')
@@ -34,13 +35,14 @@
             raise
 
     def _get_partition_offset(self, image, partno):
-        cmd = 'parted %s -s unit b p' % image
+        cmd = 'parted %s -m -s unit b print' % image
         part_data = getoutput(cmd)
-        pattern = re.compile(' %d\s+([0-9]+)' % partno)
+        pattern = re.compile('%d:([0-9]+)B:' % partno)
         for line in part_data.splitlines():
             found = re.match(pattern, line)
             if found:
                 return found.group(1)
+        return None
 
     def _extract_partition(self, image, offset, tarfile):
         """Mount a partition and produce a tarball of it
@@ -90,73 +92,71 @@
         :param rootfs_url: url of the Linaro image to download
         """
         self.tarball_dir = mkdtemp(dir=LAVA_IMAGE_TMPDIR)
-        os.chmod(self.tarball_dir, 0755)
-        hwpack_path = self._download(hwpack_url, self.tarball_dir)
-        rootfs_path = self._download(rootfs_url, self.tarball_dir)
-        image_file = os.path.join(self.tarball_dir, "lava.img")
+        tarball_dir = self.tarball_dir
+        os.chmod(tarball_dir, 0755)
+        hwpack_path = self._download(hwpack_url, tarball_dir)
+        rootfs_path = self._download(rootfs_url, tarball_dir)
+        image_file = os.path.join(tarball_dir, "lava.img")
+        board = self.client.board
         cmd = ("linaro-media-create --hwpack-force-yes --dev %s "
                "--image_file %s --binary %s --hwpack %s" % (
-                self.client.board.type, image_file, rootfs_path,
-                hwpack_path))
+                board.type, image_file, rootfs_path, hwpack_path))
         rc, output = getstatusoutput(cmd)
         if rc:
-            shutil.rmtree(self.tarball_dir)
+            shutil.rmtree(tarball_dir)
             raise RuntimeError("linaro-media-create failed: %s" % output)
-        #mx51evk has a different partition layout
-        if self.client.board.type == "mx51evk":
-            boot_offset = self._get_partition_offset(image_file, 2)
-            root_offset = self._get_partition_offset(image_file, 3)
-        else:
-            boot_offset = self._get_partition_offset(image_file, 1)
-            root_offset = self._get_partition_offset(image_file, 2)
-        boot_tgz = os.path.join(self.tarball_dir, "boot.tgz")
-        root_tgz = os.path.join(self.tarball_dir, "root.tgz")
+        boot_offset = self._get_partition_offset(image_file, board.boot_part)
+        root_offset = self._get_partition_offset(image_file, board.root_part)
+        boot_tgz = os.path.join(tarball_dir, "boot.tgz")
+        root_tgz = os.path.join(tarball_dir, "root.tgz")
         try:
             self._extract_partition(image_file, boot_offset, boot_tgz)
             self._extract_partition(image_file, root_offset, root_tgz)
         except:
-            shutil.rmtree(self.tarball_dir)
+            shutil.rmtree(tarball_dir)
             raise
         return boot_tgz, root_tgz
 
     def deploy_linaro_rootfs(self, rootfs):
+        client = self.client
         print "Deploying linaro image"
-        self.client.run_shell_command(
+        client.run_shell_command(
             'mkfs.ext3 -q /dev/disk/by-label/testrootfs -L testrootfs',
             response = MASTER_STR)
-        self.client.run_shell_command(
+        client.run_shell_command(
             'udevadm trigger',
             response = MASTER_STR)
-        self.client.run_shell_command(
+        client.run_shell_command(
             'mkdir -p /mnt/root',
             response = MASTER_STR)
-        self.client.run_shell_command(
+        client.run_shell_command(
             'mount /dev/disk/by-label/testrootfs /mnt/root',
             response = MASTER_STR)
-        self.client.run_shell_command(
+        client.run_shell_command(
             'wget -qO- %s |tar --numeric-owner -C /mnt/root -xzf -' % rootfs,
             response = MASTER_STR, timeout = 600)
-        self.client.run_shell_command(
+        client.run_shell_command(
             'umount /mnt/root',
             response = MASTER_STR)
 
     def deploy_linaro_bootfs(self, bootfs):
-        self.client.run_shell_command(
+        client = self.client
+        client.run_shell_command(
             'mkfs.vfat /dev/disk/by-label/testboot -n testboot',
             response = MASTER_STR)
-        self.client.run_shell_command(
+        client.run_shell_command(
             'udevadm trigger',
             response = MASTER_STR)
-        self.client.run_shell_command(
+        client.run_shell_command(
             'mkdir -p /mnt/boot',
             response = MASTER_STR)
-        self.client.run_shell_command(
+        client.run_shell_command(
             'mount /dev/disk/by-label/testboot /mnt/boot',
             response = MASTER_STR)
-        self.client.run_shell_command(
+        client.run_shell_command(
             'wget -qO- %s |tar --numeric-owner -C /mnt/boot -xzf -' % bootfs,
             response = MASTER_STR)
-        self.client.run_shell_command(
+        client.run_shell_command(
             'umount /mnt/boot',
             response = MASTER_STR)
 

=== modified file 'lava/config.py'
--- lava/config.py	2011-03-22 19:48:41 +0000
+++ lava/config.py	2011-03-24 17:54:55 +0000
@@ -6,7 +6,12 @@
 """
 
 class Board:
-    pass
+    uboot_cmds = None
+    type = None
+    # boot partition number, counting from 1
+    boot_part = 1
+    # root partition number, counting from 1
+    root_part = 2
 
 class BeagleBoard(Board):
     uboot_cmds = ["mmc init",
@@ -29,6 +34,8 @@
     type = "panda"
 
 class Mx51evkBoard(Board):
+    boot_part = 2
+    root_part = 3
     uboot_cmds = ["mmc init",
         "setenv bootcmd 'fatload mmc 0:5 0x90800000 uImage; fatload mmc "
         "0:5 0x90800000 uInitrd; bootm 0x90000000 0x90800000'",