From patchwork Fri Apr 26 01:44:17 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yongqin Liu X-Patchwork-Id: 16413 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qe0-f71.google.com (mail-qe0-f71.google.com [209.85.128.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 8E0642395D for ; Fri, 26 Apr 2013 01:45:14 +0000 (UTC) Received: by mail-qe0-f71.google.com with SMTP id b4sf6914990qen.6 for ; Thu, 25 Apr 2013 18:44:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-beenthere:x-received:received-spf:x-received :x-forwarded-to:x-forwarded-for:delivered-to:x-received:received-spf :mime-version:x-launchpad-project:x-launchpad-branch :x-launchpad-message-rationale:x-launchpad-branch-revision-number :x-launchpad-notification-type:to:from:subject:message-id:date :reply-to:sender:errors-to:precedence:x-generated-by :x-launchpad-hash:x-gm-message-state:x-original-sender :x-original-authentication-results:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe :content-type; bh=h3pI+5rko9NJk4NUDQ+Z+Wq307d0059R9yE215I13PU=; b=SuQljdc4YOKcjy7b+1wituf7ZKIqGGEijm5ZMQW9Jmd//1EfcCbBsQgE1AjK/poo24 cXFMPbl83I9739fy5gKA5QXd9FHK5k1O9aoVuvQ7pAUrlV+7BIAjJGmagWgtS+fuzlm4 FVss+yUcRMxw3P3KKAkRt3NE28VOMfy0TXzAPyTYYOCvgRnmdTv6at8VoxxQeiDI1mWi CAd5HZ5DBt/H9bI5pmlLvj6DBJYlL8MxieLAasxCWCmibvYuwQp7q/zhcg3FMO0dX+IO TilwJQDCdw2XT62myQ3+A9Qm1+Rw+Xd6WqkgzY8UAn5CcC0xE6PcUBxpnGDfzDs/LN3p 2B/A== X-Received: by 10.236.115.170 with SMTP id e30mr21619106yhh.7.1366940659728; Thu, 25 Apr 2013 18:44:19 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.120.229 with SMTP id lf5ls1587601qeb.23.gmail; Thu, 25 Apr 2013 18:44:19 -0700 (PDT) X-Received: by 10.220.202.138 with SMTP id fe10mr25666706vcb.26.1366940659555; Thu, 25 Apr 2013 18:44:19 -0700 (PDT) Received: from mail-vc0-f179.google.com (mail-vc0-f179.google.com [209.85.220.179]) by mx.google.com with ESMTPS id wl5si4450674vec.34.2013.04.25.18.44.19 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 25 Apr 2013 18:44:19 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.179 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.179; Received: by mail-vc0-f179.google.com with SMTP id hz10so859285vcb.10 for ; Thu, 25 Apr 2013 18:44:19 -0700 (PDT) X-Received: by 10.220.189.9 with SMTP id dc9mr14733516vcb.8.1366940659382; Thu, 25 Apr 2013 18:44:19 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.58.127.98 with SMTP id nf2csp47360veb; Thu, 25 Apr 2013 18:44:18 -0700 (PDT) X-Received: by 10.180.108.176 with SMTP id hl16mr968834wib.25.1366940657973; Thu, 25 Apr 2013 18:44:17 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id kq5si3288343wjb.178.2013.04.25.18.44.17 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 25 Apr 2013 18:44:17 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) client-ip=91.189.90.7; Received: from ackee.canonical.com ([91.189.89.26]) by indium.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1UVXhx-0003oS-EB for ; Fri, 26 Apr 2013 01:44:17 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 5B3E6E4D0D for ; Fri, 26 Apr 2013 01:44:17 +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: 590 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-dispatcher/trunk] Rev 590: merge with the branch that support multiple fastmodel intances in one machine Message-Id: <20130426014417.3763.80680.launchpad@ackee.canonical.com> Date: Fri, 26 Apr 2013 01:44:17 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: list X-Generated-By: Launchpad (canonical.com); Revision="16580"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 7d0f0787e634f64ad86336cd0cf5e4a4ef7bd214 X-Gm-Message-State: ALoCoQkNwhNR5kNdTJ/F7YQ2IlRAuXejOzlmJ6orWRSgM/uGR2CTbVlESAaeAgY79JZEmXZGV+xC X-Original-Sender: noreply@launchpad.net X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.179 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Merge authors: Yongqin Liu (liuyq0307) Related merge proposals: https://code.launchpad.net/~liuyq0307/lava-dispatcher/multiple-fastmoel-instances/+merge/160347 proposed by: Yongqin Liu (liuyq0307) review: Approve - Tyler Baker (tyler-baker) review: Needs Fixing - Antonio Terceiro (terceiro) https://code.launchpad.net/~liuyq0307/lava-dispatcher/check-adb-at-boot/+merge/155881 proposed by: Yongqin Liu (liuyq0307) ------------------------------------------------------------ revno: 590 [merge] committer: Yongqin Liu branch nick: lava-dispatcher timestamp: Fri 2013-04-26 09:43:13 +0800 message: merge with the branch that support multiple fastmodel intances in one machine modified: lava_dispatcher/client/base.py lava_dispatcher/client/targetdevice.py lava_dispatcher/config.py lava_dispatcher/default-config/lava-dispatcher/device-types/fastmodel_A15x4-A7x4.conf lava_dispatcher/default-config/lava-dispatcher/device-types/fastmodel_v8.conf --- 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 'lava_dispatcher/client/base.py' --- lava_dispatcher/client/base.py 2013-04-15 16:15:45 +0000 +++ lava_dispatcher/client/base.py 2013-04-23 11:34:45 +0000 @@ -241,7 +241,8 @@ pattern2 = "already connected to (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}:\d{1,5})" pattern3 = "unable to connect to" - cmd = "adb connect %s" % dev_ip + adb_port = self._client.config.android_adb_port + cmd = "adb connect %s:%s" % (dev_ip, adb_port) logging.info("Execute adb command on host: %s" % cmd) adb_proc = pexpect.spawn(cmd, timeout=300, logfile=sys.stdout) match_id = adb_proc.expect([pattern1, pattern2, pattern3, pexpect.EOF]) @@ -253,7 +254,8 @@ def android_adb_over_tcp_disconnect(self): dev_ip = self.dev_ip - cmd = "adb disconnect %s" % dev_ip + adb_port = self._client.config.android_adb_port + cmd = "adb disconnect %s:%s" % (dev_ip, adb_port) logging.info("Execute adb command on host: %s" % cmd) pexpect.run(cmd, timeout=300, logfile=sys.stdout) @@ -507,7 +509,8 @@ def _enable_adb_over_tcp(self): logging.info("Enabling ADB over TCP") session = AndroidTesterCommandRunner(self) - session.run('setprop service.adb.tcp.port 5555') + adb_port = self.config.android_adb_port + session.run('setprop service.adb.tcp.port %s' % adb_port) session.run('stop adbd') session.run('start adbd') === modified file 'lava_dispatcher/client/targetdevice.py' --- lava_dispatcher/client/targetdevice.py 2013-03-25 20:29:23 +0000 +++ lava_dispatcher/client/targetdevice.py 2013-04-23 09:06:25 +0000 @@ -74,8 +74,9 @@ """Booting android or ubuntu style images don't differ much""" logging.info('ensuring ADB port is ready') - while self.context.run_command("sh -c 'netstat -an | grep 5555.*TIME_WAIT'") == 0: - logging.info("waiting for TIME_WAIT 5555 socket to finish") + adb_port = self.target_device.config.android_adb_port + while self.context.run_command("sh -c 'netstat -an | grep %s.*TIME_WAIT'" % adb_port) == 0: + logging.info("waiting for TIME_WAIT %s socket to finish" % adb_port) time.sleep(3) self._boot_linaro_image() === modified file 'lava_dispatcher/config.py' --- lava_dispatcher/config.py 2013-04-22 09:39:22 +0000 +++ lava_dispatcher/config.py 2013-04-23 10:47:45 +0000 @@ -83,6 +83,7 @@ android_disable_suspend = schema.BoolOption(default=True) android_adb_over_usb = schema.BoolOption(default=False) android_adb_over_tcp = schema.BoolOption(default=True) + android_adb_port = schema.StringOption(default="5555") android_wait_for_home_screen = schema.BoolOption(default=True) android_wait_for_home_screen_activity = schema.StringOption(default="Displayed com.android.launcher/com.android.launcher2.Launcher:") android_home_screen_timeout = schema.IntOption(default=1800) === modified file 'lava_dispatcher/default-config/lava-dispatcher/device-types/fastmodel_A15x4-A7x4.conf' --- lava_dispatcher/default-config/lava-dispatcher/device-types/fastmodel_A15x4-A7x4.conf 2013-01-11 18:25:26 +0000 +++ lava_dispatcher/default-config/lava-dispatcher/device-types/fastmodel_A15x4-A7x4.conf 2013-04-24 05:15:37 +0000 @@ -19,18 +19,23 @@ license_file = 8224@localhost sim_bin = /opt/arm/RTSM_A15-A7x14_VE/Linux64_RTSM_VE_Cortex-A15x4-A7x4/RTSM_VE_Cortex-A15x4-A7x4 +android_adb_port = 6555 simulator_version_command = %(sim_bin)s --version | grep "Fast Models" | sed 's/Fast Models \[//' | sed 's/\]//' -simulator_command = sudo -u www-data ARMLMD_LICENSE_FILE="%(license_file)s" %(sim_bin)s -a coretile.cluster0.*={AXF} -C motherboard.mmc.p_mmc_file={IMG} -C motherboard.hostbridge.userNetPorts='5555=5555' +simulator_command = sudo -u www-data ARMLMD_LICENSE_FILE="%(license_file)s" %(sim_bin)s -a coretile.cluster0.*={AXF} -C motherboard.mmc.p_mmc_file={IMG} boot_options = + motherboard.hostbridge.userNetPorts motherboard.smsc_91c111.enabled motherboard.hostbridge.userNetworking coretile.cache_state_modelled coretile.cluster0.cpu0.semihosting-enable coretile.cluster0.cpu0.semihosting-cmd_line +[motherboard.hostbridge.userNetPorts] +default="%(android_adb_port)s=%(android_adb_port)s" + [motherboard.smsc_91c111.enabled] default = 1 allowed = 0,1 === modified file 'lava_dispatcher/default-config/lava-dispatcher/device-types/fastmodel_v8.conf' --- lava_dispatcher/default-config/lava-dispatcher/device-types/fastmodel_v8.conf 2013-01-11 17:56:29 +0000 +++ lava_dispatcher/default-config/lava-dispatcher/device-types/fastmodel_v8.conf 2013-04-23 10:30:27 +0000 @@ -18,6 +18,7 @@ license_file = 8224@localhost sim_bin = /opt/arm/RTSMv8_VE/bin/model_shell64 sim_model = /opt/arm/RTSMv8_VE/models/Linux64_GCC-4.1/RTSM_VE_AEMv8A.so +android_adb_port = 5555 simulator_version_command = %(sim_bin)s --version | grep "Model Shell" | sed 's/Model Shell //' @@ -39,7 +40,7 @@ cluster.take_ccfail_undef [motherboard.hostbridge.userNetPorts] -default="5555=5555" +default="%(android_adb_port)s=%(android_adb_port)s" [motherboard.hostbridge.userNetworking] default = 1