From patchwork Fri Jun 10 04:52:14 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Larson X-Patchwork-Id: 1798 Return-Path: Delivered-To: unknown Received: from imap.gmail.com (74.125.45.109) by localhost6.localdomain6 with IMAP4-SSL; 10 Jun 2011 20:11:49 -0000 Delivered-To: patches@linaro.org Received: by 10.52.181.10 with SMTP id ds10cs289849vdc; Thu, 9 Jun 2011 21:52:15 -0700 (PDT) Received: by 10.227.59.78 with SMTP id k14mr1625637wbh.102.1307681534902; Thu, 09 Jun 2011 21:52:14 -0700 (PDT) Received: from adelie.canonical.com (adelie.canonical.com [91.189.90.139]) by mx.google.com with ESMTP id et14si5763126wbb.108.2011.06.09.21.52.14; Thu, 09 Jun 2011 21:52:14 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.139 as permitted sender) client-ip=91.189.90.139; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.139 as permitted sender) smtp.mail=bounces@canonical.com Received: from loganberry.canonical.com ([91.189.90.37]) by adelie.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1QUthe-0000b0-BR for ; Fri, 10 Jun 2011 04:52:14 +0000 Received: from loganberry.canonical.com (localhost [127.0.0.1]) by loganberry.canonical.com (Postfix) with ESMTP id 4D1EA2E8950 for ; Fri, 10 Jun 2011 04:52:14 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: lava-dispatcher X-Launchpad-Branch: ~linaro-validation/lava-dispatcher/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 61 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-dispatcher/trunk] Rev 61: handle abrek -> lava-test rename Message-Id: <20110610045214.3104.31109.launchpad@loganberry.canonical.com> Date: Fri, 10 Jun 2011 04:52:14 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="13175"; Instance="initZopeless config overlay" X-Launchpad-Hash: d37d307643fb6b2fa571818254da7d73623e6fb5 ------------------------------------------------------------ revno: 61 committer: Paul Larson branch nick: lava-dispatcher timestamp: Thu 2011-06-09 23:46:04 -0500 message: handle abrek -> lava-test rename actions related to lava-test have changed name as well abrek_install becomes lava_test_install test_abrek becomes lava_test_run removed: lava/dispatcher/actions/abrek.py renamed: doc/abrek-ltp-job.json => doc/lava-ltp-job modified: doc/QUICKSTART doc/lava-ltp-job --- lp:lava-dispatcher https://code.launchpad.net/~linaro-validation/lava-dispatcher/trunk You are subscribed to branch lp:lava-dispatcher. To unsubscribe from this branch go to https://code.launchpad.net/~linaro-validation/lava-dispatcher/trunk/+edit-subscription === modified file 'doc/QUICKSTART' --- doc/QUICKSTART 2011-04-18 17:53:40 +0000 +++ doc/QUICKSTART 2011-06-10 04:46:04 +0000 @@ -82,7 +82,7 @@ apt-get install launch-control sudo -u www-data python /usr/lib/launch-control/manage.py createsuperuser -Modify the server in job file doc/abrek-ltp-job.json to local launch-control +Modify the server in job file doc/lava-ltp-job.json to local launch-control url, like: http://127.0.0.1/launch-control { @@ -114,5 +114,5 @@ From the toplevel, run (as root): - ./lava-dispatch doc/abrek-ltp-job.json + ./lava-dispatch doc/lava-ltp-job.json === renamed file 'doc/abrek-ltp-job.json' => 'doc/lava-ltp-job' --- doc/abrek-ltp-job.json 2011-04-12 04:23:11 +0000 +++ doc/lava-ltp-job 2011-06-10 04:46:04 +0000 @@ -12,7 +12,7 @@ } }, { - "command": "install_abrek", + "command": "lava_test_install", "parameters": { "tests": ["ltp"] @@ -22,7 +22,7 @@ "command": "boot_linaro_image" }, { - "command": "test_abrek", + "command": "lava_test_run", "parameters": { "test_name": "ltp" @@ -32,8 +32,8 @@ "command": "submit_results", "parameters": { - "server": "http://dashboard.linaro.org", - "stream": "panda01-ltp" + "server": "http://validation.linaro.org/launch-control", + "stream": "/anonymous/panda01-ltp/" } } ] === removed file 'lava/dispatcher/actions/abrek.py' --- lava/dispatcher/actions/abrek.py 2011-05-20 22:41:49 +0000 +++ lava/dispatcher/actions/abrek.py 1970-01-01 00:00:00 +0000 @@ -1,88 +0,0 @@ -#!/usr/bin/python -from lava.dispatcher.actions import BaseAction -from lava.dispatcher.client import OperationFailed -from lava.dispatcher.config import LAVA_RESULT_DIR, MASTER_STR, TESTER_STR - -class cmd_test_abrek(BaseAction): - def run(self, test_name, timeout=-1): - #Make sure in test image now - client = self.client - client.in_test_shell() - client.run_shell_command('mkdir -p %s' % LAVA_RESULT_DIR, - response = TESTER_STR) - client.export_display() - client.run_shell_command( - 'abrek run %s -o %s/%s.bundle' % ( - test_name, LAVA_RESULT_DIR, test_name), - response = TESTER_STR, timeout = timeout) - -class cmd_install_abrek(BaseAction): - """ - abrek test tool deployment to test image rootfs by chroot - """ - def run(self, tests, timeout=2400): - client = self.client - #Make sure in master image - #, or exception can be caught and do boot_master_image() - try: - client.in_master_shell() - except: - client.boot_master_image() - - #install bazaar in tester image - client.run_shell_command( - 'mkdir -p /mnt/root', - response = MASTER_STR) - client.run_shell_command( - 'mount /dev/disk/by-label/testrootfs /mnt/root', - response = MASTER_STR) - client.run_shell_command( - 'cp -f /mnt/root/etc/resolv.conf /mnt/root/etc/resolv.conf.bak', - response = MASTER_STR) - client.run_shell_command( - 'cp -L /etc/resolv.conf /mnt/root/etc', - response = MASTER_STR) - #eliminate warning: Can not write log, openpty() failed - # (/dev/pts not mounted?), does not work - client.run_shell_command( - 'mount --rbind /dev /mnt/root/dev', - response = MASTER_STR) - client.run_shell_command( - 'chroot /mnt/root apt-get update', - response = MASTER_STR) - #Install necessary packages for build abrek - client.run_shell_command( - 'chroot /mnt/root apt-get -y install bzr python-apt python-distutils-extra', - response = MASTER_STR, timeout=2400) - client.run_shell_command( - 'chroot /mnt/root bzr branch lp:abrek', - response = MASTER_STR) - client.run_shell_command( - 'chroot /mnt/root sh -c "cd abrek && python setup.py install"', - response = MASTER_STR) - - #Test if abrek installed - try: - client.run_shell_command( - 'chroot /mnt/root abrek help', - response = "list-tests") - except: - raise OperationFailed("abrek deployment failed") - - for test in tests: - client.run_shell_command( - 'chroot /mnt/root abrek install %s' % test, - response = MASTER_STR) - #clean up - client.run_shell_command( - 'cp -f /mnt/root/etc/resolv.conf.bak /mnt/root/etc/resolv.conf', - response = MASTER_STR) - client.run_shell_command( - 'rm -rf /mnt/root/abrek', - response = MASTER_STR) - client.run_shell_command( - 'cat /proc/mounts | awk \'{print $2}\' | grep "^/mnt/root/dev" | sort -r | xargs umount', - response = MASTER_STR) - client.run_shell_command( - 'umount /mnt/root', - response = MASTER_STR)