Merge lp:~qzhang/lava-dispatcher/update-lmc into lp:lava-dispatcher

[Spring Zhang]

implementation of updating linaro-media-create to the latest version in master image, to satisfy the option which needs to update to a new l-m-c.

tested on imx51evk, but met timeout 300s error and serial command string truncation issue, others are ok.

[Loïc Minier (lool)]

 Consider using add-apt-repository instead?

--
Loïc Minier

[Spring Zhang (qzhang)]

> Consider using add-apt-repository instead?
I did consider it, but the headless rootfs doesn't support the command add-apt-repository. I don't know if there is an update, will have a check.

[Zygmunt Krynicki (zyga)]

Spring: to get that command you need to install python-software-properties package

[Zygmunt Krynicki (zyga)]

I agree with lool but not strongly enough to block it. I'm not that familiar with the way we interact over the serial line (and all the methods we've built around this to review the code that carefully)

review: Abstain

Unmerged revisions

31. By Spring Zhang on 2011-04-11

add timeout when apt update and remove simple test code

30. By Spring Zhang on 2011-04-11

init update-lmc and simple test

=== modified file 'lava/dispatcher/client.py'
--- lava/dispatcher/client.py	2011-04-08 05:18:09 +0000
+++ lava/dispatcher/client.py	2011-04-11 16:34:39 +0000
@@ -7,6 +7,8 @@
     LAVA_SERVER_IP,
     MASTER_STR,
     TESTER_STR,
+    LINARO_MAINTAINERS_PPA,
+    LINARO_MAINTAINERS_KEY,
     )
 
 
@@ -99,6 +101,31 @@
                 return
         raise NetworkError
 
+    def update_lmc(self):
+        """
+        Update l-m-c to the latest, replace the default installed version
+        """
+        self.in_master_shell()
+        aptcfg="/etc/apt/sources.list"
+        self.proc.sendline("grep linaro-maintainers %s" % aptcfg)
+        try:
+            self.proc.expect(["deb-src"], timeout=5)
+        except pexpect.TIMEOUT:
+            self.proc.expect(MASTER_STR)
+            # add PPA
+            for ppa in LINARO_MAINTAINERS_PPA:
+                self.run_shell_command("echo %s >> %s" % (ppa, aptcfg),
+                        response = MASTER_STR)
+            # add key
+            self.run_shell_command(
+                "apt-key adv --keyserver keyserver.ubuntu.com --recv-keys %s"
+                % LINARO_MAINTAINERS_KEY, response = MASTER_STR)
+
+        self.run_shell_command("apt-get update",
+                response = MASTER_STR, timeout = 1200)
+        self.run_shell_command("apt-get -y install linaro-image-tools",
+                response = MASTER_STR)
+
 
 class NetworkError(Exception):
     """

=== modified file 'lava/dispatcher/config.py'
--- lava/dispatcher/config.py	2011-04-06 15:41:54 +0000
+++ lava/dispatcher/config.py	2011-04-11 16:34:39 +0000
@@ -66,3 +66,9 @@
 MASTER_STR = "root@master:"
 #Test image recognization string
 TESTER_STR = "root@linaro:"
+
+#linaro-maintainers PPA
+LINARO_MAINTAINERS_PPA = [
+    "deb http://ppa.launchpad.net/linaro-maintainers/tools/ubuntu natty main",
+    "deb-src http://ppa.launchpad.net/linaro-maintainers/tools/ubuntu natty main"]
+LINARO_MAINTAINERS_KEY = "7BE1F97B"