From patchwork Fri May 29 20:34:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Robert Foley X-Patchwork-Id: 187320 Delivered-To: patch@linaro.org Received: by 2002:a92:5b0a:0:0:0:0:0 with SMTP id p10csp928435ilb; Fri, 29 May 2020 13:43:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxiozwcKffwMhOYC7RWtzxBIYpFDz6KpBPOBRQpCeW3y8PsjXahccRe2II66rPiDTqdxLsT X-Received: by 2002:a25:d04c:: with SMTP id h73mr16817891ybg.358.1590785024353; Fri, 29 May 2020 13:43:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1590785024; cv=none; d=google.com; s=arc-20160816; b=FCNCXSgTpF9spspGjyD+aC0AA1B8hMcwogUhISvqGmsZXOHhDKiEHJWcUIKdtxcYBS OKiAKvZZ/dJcGL//HZTNoJ0klkkb58dOJUYhY2Wl2CGgOGBOZMQvFWvZ8Pv96r8+Hd7z 6wk2zZbtuk2fSRSvr3Wf6V8O6OmTnYZJL66N9frJDrztYze+MQ243WFvJWVaPf8tRq9w WDu9Nu8Y+1R1rwh0d7oiMpJ6rZ7Kbs/7IEnB5kHLgKnF1X8A7P2cFLeShvBA+eKiwbrD IGuzgbPYXn20QAox3fxt6i+Az7BD+3UjC2JMzHc9Na6PO8qonoLo2YCgn1cx78vNTsb6 cXTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:references:in-reply-to :message-id:date:subject:to:from:dkim-signature; bh=U1T9E3y7ekxmt2kh9rxFnoBTMX0789LZtq9IU4HklTo=; b=aHUb9njIlRAwDhIPI0didp5zTy9kqmrHuE320ATWUSpOrA+9J4OMgaVY+hqatkdzYV SAyDo9rU9PqU6Fjj31vhWTcP5HrNvgQQaat11AgU4vWAYy+gIcq/5wjyeOS70niYhMA2 uY04tKBQ0JA+4kfhfXExXq6y4CQPyvONdoqesARlmawJdZQwTKPYO9pPEYHW5f/3UyiR TgP77w8RXhqZnS+h9JQpD/CRcj0fgUqOg+ZsY6zTSN4f7YwxYYNl4jVG1ZZkP/6UM1tr 13CgJxg05ATPicJ9vl8i3cVMr5L4Vl4+YQQUaTVmhpwB2AeW9jVItH4qLYCb2K2m1zwj I7Fw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=xFlpEecq; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id s94si5980128ybi.173.2020.05.29.13.43.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 May 2020 13:43:44 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=xFlpEecq; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:38518 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jelqx-000611-OR for patch@linaro.org; Fri, 29 May 2020 16:43:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46564) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jelqj-0005xr-HH for qemu-devel@nongnu.org; Fri, 29 May 2020 16:43:29 -0400 Received: from mail-pg1-x534.google.com ([2607:f8b0:4864:20::534]:42715) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jelqi-0000tb-9o for qemu-devel@nongnu.org; Fri, 29 May 2020 16:43:29 -0400 Received: by mail-pg1-x534.google.com with SMTP id 124so467915pgi.9 for ; Fri, 29 May 2020 13:43:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=U1T9E3y7ekxmt2kh9rxFnoBTMX0789LZtq9IU4HklTo=; b=xFlpEecq7Hxhem81IRvFJqh+Qzw2YtmPEIVdLFnD9zHwsU1HeuC6N523/xQ3ArH4Ve lle0XGDBWRWRfUvXiUhCdYHCwL7mqeOREDWDidmh0M8T9UEJ8z8diEPWCwDjq5LktLUx a1N290rOCByfoWpJhkwdDa7ow/3lE9mdaXj3eFEz1ykO6k+mveQMFH34pm53ziLG2jRL yQXE3jq2WMON9BBZxQQKw2uOs1FBWw776H3VcNJBqhbNnnzXzZ+mgX/I88QACIrDM/Q4 cci4b2P2a2YWF+Lt6ux5SI348ixM/jDzylwqDMVioVQ28VBZH7GcIuVRrRwaI1FvszHQ Ujvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=U1T9E3y7ekxmt2kh9rxFnoBTMX0789LZtq9IU4HklTo=; b=Lzzj/9kUWm/txfBlnaY+5/N5PhRQJ+Rp5V+q4FKuhruGEiP6RAV/JOoW1S9D91mKdp U5Ht8RnDRbNUA9RiJ/2Yl4xX90W4+7f2FWPq5k2yC+hLcTIduP42zfv4M0pQ9wGKOPMU jYW4hK3atDwGLot4SIeLbH3k5f4l8HLyONMxhp6mkxdM+P1LlU7ysMevtuvBTT8/LEVL ZxyMxRIuUFQwwnr6q0AAP7BntmtvefyLma/FFxX/h0OI1rLIsmuX4iHo/UJ0j+uCOTdG Fcd61Xa7JW3dWMM0+qfpwne8LKoRVIKdNokpSmCevtN7+NbYKt/EopYHiPc07q7KOT+B R4Iw== X-Gm-Message-State: AOAM530PuqHtAkXH7nEa22Mq2GsZnoKKUEzYghIRUVtq9AmYwsvIzyMQ FaHOxAhP5TdOOJ/I/jjGwgg4y+mkIcH1dA== X-Received: by 2002:a63:7052:: with SMTP id a18mr9831493pgn.39.1590785006450; Fri, 29 May 2020 13:43:26 -0700 (PDT) Received: from Rfoley-MA01.hsd1.ma.comcast.net ([2601:199:4480:60c0:75ac:d268:da04:dde4]) by smtp.gmail.com with ESMTPSA id t12sm282839pjf.3.2020.05.29.13.43.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 May 2020 13:43:25 -0700 (PDT) From: Robert Foley To: qemu-devel@nongnu.org Subject: [PATCH v8 07/12] tests/vm: Add common Ubuntu python module Date: Fri, 29 May 2020 16:34:53 -0400 Message-Id: <20200529203458.1038-8-robert.foley@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200529203458.1038-1-robert.foley@linaro.org> References: <20200529203458.1038-1-robert.foley@linaro.org> Received-SPF: pass client-ip=2607:f8b0:4864:20::534; envelope-from=robert.foley@linaro.org; helo=mail-pg1-x534.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , philmd@redhat.com, alex.bennee@linaro.org, robert.foley@linaro.org, peter.puhov@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Add a common Ubuntu python module and make use of it with the ubuntu.i386 script. This is preparation for adding an Ubuntu script ubuntu.aarch64. Splitting out the common logic such as build_image() will reduce duplication. Signed-off-by: Robert Foley --- tests/vm/ubuntu.i386 | 46 +++++++++-------------------------- tests/vm/ubuntuvm.py | 58 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+), 34 deletions(-) create mode 100644 tests/vm/ubuntuvm.py -- 2.17.1 Tested-by: Philippe Mathieu-Daudé diff --git a/tests/vm/ubuntu.i386 b/tests/vm/ubuntu.i386 index 1570775335..c699eaf8d7 100755 --- a/tests/vm/ubuntu.i386 +++ b/tests/vm/ubuntu.i386 @@ -11,15 +11,22 @@ # the COPYING file in the top-level directory. # -import os import sys -import subprocess import basevm -import time +import ubuntuvm -class UbuntuX86VM(basevm.BaseVM): +DEFAULT_CONFIG = { + 'install_cmds' : "apt-get update,"\ + "apt-get build-dep -y qemu,"\ + "apt-get install -y libfdt-dev flex bison language-pack-en", +} + +class UbuntuX86VM(ubuntuvm.UbuntuVM): name = "ubuntu.i386" arch = "i386" + image_link="https://cloud-images.ubuntu.com/releases/bionic/"\ + "release-20191114/ubuntu-18.04-server-cloudimg-i386.img" + image_sha256="28969840626d1ea80bb249c08eef1a4533e8904aa51a327b40f37ac4b4ff04ef" BUILD_SCRIPT = """ set -e; cd $(mktemp -d); @@ -29,34 +36,5 @@ class UbuntuX86VM(basevm.BaseVM): make --output-sync {target} -j{jobs} {verbose}; """ - def build_image(self, img): - cimg = self._download_with_cache( - "https://cloud-images.ubuntu.com/releases/bionic/release-20191114/ubuntu-18.04-server-cloudimg-i386.img", - sha256sum="28969840626d1ea80bb249c08eef1a4533e8904aa51a327b40f37ac4b4ff04ef") - img_tmp = img + ".tmp" - subprocess.check_call(["cp", "-f", cimg, img_tmp]) - self.exec_qemu_img("resize", img_tmp, "50G") - self.boot(img_tmp, extra_args = [ - "-device", "VGA", - "-cdrom", self.gen_cloud_init_iso() - ]) - self.wait_ssh() - self.ssh_root_check("touch /etc/cloud/cloud-init.disabled") - self.ssh_root_check("apt-get update") - self.ssh_root_check("apt-get install -y cloud-initramfs-growroot") - # Don't check the status in case the guest hang up too quickly - self.ssh_root("sync && reboot") - time.sleep(5) - self.wait_ssh() - # The previous update sometimes doesn't survive a reboot, so do it again - self.ssh_root_check("sed -ie s/^#\ deb-src/deb-src/g /etc/apt/sources.list") - self.ssh_root_check("apt-get update") - self.ssh_root_check("apt-get build-dep -y qemu") - self.ssh_root_check("apt-get install -y libfdt-dev flex bison language-pack-en") - self.ssh_root("poweroff") - self.wait() - os.rename(img_tmp, img) - return 0 - if __name__ == "__main__": - sys.exit(basevm.main(UbuntuX86VM)) + sys.exit(basevm.main(UbuntuX86VM, DEFAULT_CONFIG)) diff --git a/tests/vm/ubuntuvm.py b/tests/vm/ubuntuvm.py new file mode 100644 index 0000000000..96f29dcc15 --- /dev/null +++ b/tests/vm/ubuntuvm.py @@ -0,0 +1,58 @@ +#!/usr/bin/env python3 +# +# Ubuntu VM testing library +# +# Copyright 2020 Linaro +# +# Authors: +# Robert Foley +# +# This code is licensed under the GPL version 2 or later. See +# the COPYING file in the top-level directory. + +import os +import subprocess +import basevm + +class UbuntuVM(basevm.BaseVM): + + def __init__(self, args, config=None): + self.login_prompt = "ubuntu-{}-guest login:".format(self.arch) + basevm.BaseVM.__init__(self, args, config) + + def build_image(self, img): + """Build an Ubuntu VM image. The child class will + define the install_cmds to init the VM.""" + os_img = self._download_with_cache(self.image_link, + sha256sum=self.image_sha256) + img_tmp = img + ".tmp" + subprocess.check_call(["cp", "-f", os_img, img_tmp]) + self.exec_qemu_img("resize", img_tmp, "+50G") + ci_img = self.gen_cloud_init_iso() + + self.boot(img_tmp, extra_args = [ "-device", "VGA", "-cdrom", ci_img, ]) + + # First command we issue is fix for slow ssh login. + self.wait_ssh(wait_root=True, + cmd="chmod -x /etc/update-motd.d/*") + # Wait for cloud init to finish + self.wait_ssh(wait_root=True, + cmd="ls /var/lib/cloud/instance/boot-finished") + self.ssh_root("touch /etc/cloud/cloud-init.disabled") + # Disable auto upgrades. + # We want to keep the VM system state stable. + self.ssh_root('sed -ie \'s/"1"/"0"/g\' '\ + '/etc/apt/apt.conf.d/20auto-upgrades') + self.ssh_root("sed -ie s/^#\ deb-src/deb-src/g /etc/apt/sources.list") + + # If the user chooses not to do the install phase, + # then we will jump right to the graceful shutdown + if self._config['install_cmds'] != "": + # Issue the install commands. + # This can be overriden by the user in the config .yml. + install_cmds = self._config['install_cmds'].split(',') + for cmd in install_cmds: + self.ssh_root(cmd) + self.graceful_shutdown() + os.rename(img_tmp, img) + return 0