Return-Path: Received: by yocto-www.yoctoproject.org (Postfix, from userid 118) id E99EBE00C4F; Tue, 18 Jul 2017 09:14:09 -0700 (PDT) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on yocto-www.yoctoproject.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 X-Spam-HAM-Report: * -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, * medium trust * [192.55.52.43 listed in list.dnswl.org] * -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% * [score: 0.0000] Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by yocto-www.yoctoproject.org (Postfix) with ESMTP id 3EA6FE00C56 for ; Tue, 18 Jul 2017 09:14:09 -0700 (PDT) Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga105.fm.intel.com with ESMTP; 18 Jul 2017 09:14:09 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.40,378,1496127600"; d="scan'208";a="128830636" Received: from alimonb-mobl1.zpn.intel.com ([10.219.128.142]) by fmsmga006.fm.intel.com with ESMTP; 18 Jul 2017 09:14:08 -0700 From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= To: yocto@yoctoproject.org Date: Tue, 18 Jul 2017 11:14:37 -0500 Message-Id: <20170718161438.31649-5-anibal.limon@linux.intel.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170718161438.31649-1-anibal.limon@linux.intel.com> References: <20170718161438.31649-1-anibal.limon@linux.intel.com> MIME-Version: 1.0 Cc: mikko.ylinen@intel.com, Edwin Plauchu Subject: [yocto-autobuilder][PATCHv3 4/5] autobuilder/buildsteps: Add DAFTFlash buildstep X-BeenThere: yocto@yoctoproject.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Discussion of all things Yocto Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Jul 2017 16:14:10 -0000 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This will execute daft flash cycle without reboot and prepare the dut for sanity tests. [YOCTO #10604] Signed-off-by: Aníbal Limón Signed-off-by: Edwin Plauchu --- config/autobuilder.conf.example | 1 + .../autobuilder/buildsteps/DaftFlash.py | 39 ++++++++++++++++++++++ lib/python2.7/site-packages/autobuilder/config.py | 1 + 3 files changed, 41 insertions(+) create mode 100644 lib/python2.7/site-packages/autobuilder/buildsteps/DaftFlash.py diff --git a/config/autobuilder.conf.example b/config/autobuilder.conf.example index 565a1a31b30..2bda57add83 100644 --- a/config/autobuilder.conf.example +++ b/config/autobuilder.conf.example @@ -99,3 +99,4 @@ PERFORMANCE_MAIL_SIG = "Multiline\nSig\nLine" [Daft] DAFT_WORKER_DEVICES_CFG = "/etc/daft/devices.cfg" +DAFT_WORKER_WORKSPACE = "/home/ab/workspace" diff --git a/lib/python2.7/site-packages/autobuilder/buildsteps/DaftFlash.py b/lib/python2.7/site-packages/autobuilder/buildsteps/DaftFlash.py new file mode 100644 index 00000000000..daf9c374398 --- /dev/null +++ b/lib/python2.7/site-packages/autobuilder/buildsteps/DaftFlash.py @@ -0,0 +1,39 @@ +import os + +from autobuilder.config import DAFT_WORKER_WORKSPACE +from buildbot.steps.shell import ShellCommand + +class DaftFlash(ShellCommand): + haltOnFailure = True + + name = "DaftFlash" + + def __init__(self, factory, argdict=None, **kwargs): + self.tests = None + self.factory = factory + for k, v in argdict.iteritems(): + setattr(self, k, v) + self.description = "DUT Flashing" + self.timeout = 100000 + kwargs['timeout']=self.timeout + ShellCommand.__init__(self, **kwargs) + + def start(self): + workspace_dir = DAFT_WORKER_WORKSPACE + + dut_name = self.getProperty('dut_name') + workdir = self.getProperty('workdir') + image = self.getProperty('BuildImages') + machine = self.getProperty('MACHINE') + + image_path = os.path.join(workdir, 'build', 'build', 'tmp', 'deploy', + 'images', machine, '%s-%s.hddimg' % (image, machine)) + image_name = os.path.basename(image_path) + + # XXX: DAFT needs to have the image in a shared workspace + self.command = "cp %s %s; " % (image_path, workspace_dir) + self.command += "cd %s; " % (workspace_dir) + daft_cmd = "daft --setout %s %s" % (dut_name, image_name) + self.command += "cd {} && {} ".format(workspace_dir, daft_cmd) + + ShellCommand.start(self) diff --git a/lib/python2.7/site-packages/autobuilder/config.py b/lib/python2.7/site-packages/autobuilder/config.py index 5bcf6c6ff9d..fcc08f0a591 100644 --- a/lib/python2.7/site-packages/autobuilder/config.py +++ b/lib/python2.7/site-packages/autobuilder/config.py @@ -24,3 +24,4 @@ IPK_PUBLISH_DIR = os.environ.get("IPK_PUBLISH_DIR") DEB_PUBLISH_DIR = os.environ.get("DEB_PUBLISH_DIR") PERFORMANCE_PUBLISH_DIR = os.environ.get("PERFORMANCE_PUBLISH_DIR") DAFT_WORKER_DEVICES_CFG = os.environ.get("DAFT_WORKER_DEVICES_CFG") +DAFT_WORKER_WORKSPACE = os.environ.get("DAFT_WORKER_WORKSPACE") -- 2.11.0