From nobody Thu Nov 13 21:52:19 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1583248038; cv=none; d=zohomail.com; s=zohoarc; b=oBIeUf7l+ZWdm9fbgbw+aD6iZ/pFlXTfq+udo4z7ca4CXIKaeoYvrtvJyjSeb+LzDLHbh6KrMN5ExD/9wEq5NwVFqlFgZyuod0wptjasqS8BpHUW3xl+QsrDeXxaa2Dj7tkW73i5MVHM4hxZSV+wzNqSXMGZwbYYLYoxbj26ZgE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1583248038; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=L2sHHUzShlYr/EmtNOXj/kdHEDLGbc34wsNmyk67wtI=; b=NawYEtielr9sivablfzndM04tgUqSt+5KNrxWjsCebIogf/owSyt8R/VHjKeBY3XUt3m5KYVd+Cb8NA3NYBx0Jrrvpis6P9DwX4cz3WB1j+UlNazNgc/t81yfEZ00+TQPdIsjCovYoacm0T+VGikgjdlfiZIeCcqKtvb6J/D8wA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1583248038003536.6669363817107; Tue, 3 Mar 2020 07:07:18 -0800 (PST) Received: from localhost ([::1]:48638 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j998e-0003x6-Ie for importer@patchew.org; Tue, 03 Mar 2020 10:07:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42550) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j997r-00035z-0a for qemu-devel@nongnu.org; Tue, 03 Mar 2020 10:06:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j997q-0001ih-3x for qemu-devel@nongnu.org; Tue, 03 Mar 2020 10:06:26 -0500 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:46771) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j997p-0001iZ-TL for qemu-devel@nongnu.org; Tue, 03 Mar 2020 10:06:26 -0500 Received: by mail-wr1-x42e.google.com with SMTP id j7so4692911wrp.13 for ; Tue, 03 Mar 2020 07:06:25 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id f207sm5381887wme.9.2020.03.03.07.06.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Mar 2020 07:06:23 -0800 (PST) Received: from zen.home.arpa (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 98C291FF8C; Tue, 3 Mar 2020 15:06:22 +0000 (GMT) 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 :mime-version:content-transfer-encoding; bh=L2sHHUzShlYr/EmtNOXj/kdHEDLGbc34wsNmyk67wtI=; b=TgtBNqGbIExMpsBz3F9dOIbtXTSqCezJbjAij0wSCAMR21tQwXbAYaHK0Jit1nAChl FTl/EKLGvOKYsz+aKeK5TQ4N9j1rhmzUJHrZD1mynerT+Re4uXSo/Bx0ekABXcrC7Zmz EK9Ox8DIbyDzXo0NZdnEAzdWJM6sgBQFNI28kE+bsthKBmSMpkGeNfsE61UQg+kJ1w2l wsR9IbzsKhT9ZHExOQyZKM1KA7RUMsQmDb8+Fuv74ibnG/fM6xyCYxZzUs2bjJZd+jCY nswlMwC0brC55D7ZzNzAq87On7Pv02H6IKHf2C5Ago9xh+BTfKw0ok0e9ZGclvWlwVBd 6YZQ== 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:mime-version:content-transfer-encoding; bh=L2sHHUzShlYr/EmtNOXj/kdHEDLGbc34wsNmyk67wtI=; b=UGUhCdSz2+SlDlokOiroWAmXT7j3g5Zjb4RcwLdD0AvAoXV75ox1qwLcrTgMj/pwUT dWgpuMrKqj6dYkXIO2x5TIBZsCOpqo3TkZ1fYjX12CODkYh106chgDR8VwzOMLlviNQw 4rlehv0I2MR7KJXZmUPShJvhNhWhM1o2AdyapdyynjrMFG02JqX8XeEvDHmW0oxMGNMn NizTsqpl9i3qbB20RtxjAxyefqKdpv5CwA0CaEh83UE1tKU6KxP6IAkn7vDqvOBl16SJ 02qzyUF9RLxX/jjU8fAzIcFpvOZvWkKf2RnqGLOAsw2Ny0PXBRmJpEvchQtNr+tqhFvP QuPQ== X-Gm-Message-State: ANhLgQ1+MivruHF5lnlCcLA4/qI/07SPHKDbrIK2/qeMO7HAiBVIlz6Y TP6tPApZztFdHAe8z8GHrYX6Ow== X-Google-Smtp-Source: ADFU+vunUXwitjXPW9cTG88lGEmJvE8mSVr2ircRXVUu6cREJWr2LnzIw9W0LKpBYx7kv69OMHgFLw== X-Received: by 2002:adf:ded2:: with SMTP id i18mr5847588wrn.173.1583247984514; Tue, 03 Mar 2020 07:06:24 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 1/9] tests/vm: use $(PYTHON) consistently Date: Tue, 3 Mar 2020 15:06:14 +0000 Message-Id: <20200303150622.20133-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200303150622.20133-1-alex.bennee@linaro.org> References: <20200303150622.20133-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42e 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 , Peter Puhov , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Robert Foley , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Robert Foley Change Makefile.include to use $(PYTHON) so for vm-boot-ssh to be consistent with other cases like vm-build. Signed-off-by: Robert Foley Reviewed-by: Alex Benn=C3=A9e Reviewed-by: Peter Puhov Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20200219163537.22098-2-robert.foley@linaro.org> --- tests/vm/Makefile.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/vm/Makefile.include b/tests/vm/Makefile.include index 9e7c46a4735..778e5067554 100644 --- a/tests/vm/Makefile.include +++ b/tests/vm/Makefile.include @@ -80,7 +80,7 @@ vm-boot-serial-%: $(IMAGES_DIR)/%.img =20 vm-boot-ssh-%: $(IMAGES_DIR)/%.img $(call quiet-command, \ - $(SRC_PATH)/tests/vm/$* \ + $(PYTHON) $(SRC_PATH)/tests/vm/$* \ $(if $(J),--jobs $(J)) \ --image "$<" \ --interactive \ --=20 2.20.1 From nobody Thu Nov 13 21:52:19 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1583248130; cv=none; d=zohomail.com; s=zohoarc; b=nBHQws6aNvZcoD4rC0fP8dpC+dC77NxZZH5h+vCywsWlxp4cLyM+HYCszHl5KhbgrRzKRK0qZumluB9wdsUqY00itmaZ4Re1T81EaFlp9uMcqFaiLaco26tnvl+qrHF7Kimvx8Ap3ys3ycjAZGWZ49nfT7ceZg+ln1WWxNyOVfg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1583248130; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=PvyE/wDJzCAUXXdIR5tpKONlcMYLdIwfZqfJA8Zfq+Y=; b=nLzOhmJ9yzxerRozFD0OKD3Cym8mWZUOn5U+EW4Jx+FvYllgQ2NkIH4U+h9PT+p2AOfje8nK3huiqXQV0qB1Z4JT+HVi05zMpkksKeotA6MRRVOOnXn24T8MMJFyTkKXTMczZBPZvNOLpXoVHdzD4aiaMKC8RdesdkC3cEfO5Fw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1583248130797724.8508369558554; Tue, 3 Mar 2020 07:08:50 -0800 (PST) Received: from localhost ([::1]:48686 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j99A9-0007Qq-I8 for importer@patchew.org; Tue, 03 Mar 2020 10:08:49 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42574) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j997s-000367-P7 for qemu-devel@nongnu.org; Tue, 03 Mar 2020 10:06:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j997r-0001jG-R9 for qemu-devel@nongnu.org; Tue, 03 Mar 2020 10:06:28 -0500 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:42133) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j997r-0001j2-Km for qemu-devel@nongnu.org; Tue, 03 Mar 2020 10:06:27 -0500 Received: by mail-wr1-x444.google.com with SMTP id z11so4737445wro.9 for ; Tue, 03 Mar 2020 07:06:27 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id z13sm6040160wrv.94.2020.03.03.07.06.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Mar 2020 07:06:24 -0800 (PST) Received: from zen.home.arpa (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C40951FF8F; Tue, 3 Mar 2020 15:06:22 +0000 (GMT) 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 :mime-version:content-transfer-encoding; bh=PvyE/wDJzCAUXXdIR5tpKONlcMYLdIwfZqfJA8Zfq+Y=; b=VCcgBaZ5LBRJDSn7859AL+dCLtFIfNwRjC+jBQ0RqPU16qRT/rUloXc2UhyktKDQ8O qq71ZWlohGEUI8wjGPwgQ+LH1kmc2r15vkucTwd8YoVbhsOKpOZNrAozy/sSYOINfLO/ Ax4qF0PSJwZ4MWkhYjwtcmYRcauXRqI8xrtV6q9ZL94W8XL7FXDO9s8wlJLfHwkloA7B 1ipIMOsfTZfyNnzpJjYOuuzr7OIlHMKA6lCXa7zkYL2PWSY/b+nBqSRlDYbGa6A0pKUD RbZZj6GtLTLsJoypknTTHkvlql14VBviDcdwVHAy+oq7UD5wUnqB9f1T4LDADFIDasjM w9Yw== 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:mime-version:content-transfer-encoding; bh=PvyE/wDJzCAUXXdIR5tpKONlcMYLdIwfZqfJA8Zfq+Y=; b=I+unIddXZFfxJj2ebPBSlDQ5qI64edbauuzmTkpbxGsIPKlkNWr4jPBqUab1Bc9xXF qS2WwQKsz9YzJFfdr/nYeRjmrL/vHuzVWmOwCOnSUmp2bJnI32Urv/cXQx4Yueu5/P4z vggs3yB14HOQ17qWnOq9TIBA8AXREgOKJfXXHKeZWnkveTU5os+Tgs+jMkvLJWcwrs+l WGOBVvwFRhS+wyQg5IWnHRbXXIMz+Sbuia1FCuAak288sUr9xSYD7RdXYXpip6osDiDN pJ3peAwg+9U5eukcDgoJPlIwlUIy8RJNbO5DbCcTsY46w77eoU2D+/cmyN+0gUFd0ZwQ 4ufw== X-Gm-Message-State: ANhLgQ3Xd9K9Pr1+uy60JjQk4t7LozZvAJXqs1NgpRDsyylfRafYO73p F4a7E44QjpWHz3j/L7eDAPUlgQ== X-Google-Smtp-Source: ADFU+vtbBq24WphECc0DQ3H+r/8fjtzq4rO+pdBZk+SnKMG/ngygqzfkn1NKeTHgEkZwVXUDxSeXyQ== X-Received: by 2002:a5d:42c6:: with SMTP id t6mr6253621wrr.394.1583247986633; Tue, 03 Mar 2020 07:06:26 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 2/9] tests/vm: Debug mode shows ssh output. Date: Tue, 3 Mar 2020 15:06:15 +0000 Message-Id: <20200303150622.20133-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200303150622.20133-1-alex.bennee@linaro.org> References: <20200303150622.20133-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::444 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 , Peter Puhov , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Robert Foley , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Robert Foley Add changes to tests/vm/basevm.py so that during debug mode we show ssh out= put. Signed-off-by: Robert Foley Reviewed-by: Peter Puhov Reviewed-by: Alex Benn=C3=A9e Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20200219163537.22098-3-robert.foley@linaro.org> --- tests/vm/basevm.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index 4dee6647e6e..c99725b8c0d 100644 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -120,11 +120,16 @@ class BaseVM(object): return fname =20 def _ssh_do(self, user, cmd, check): - ssh_cmd =3D ["ssh", "-q", "-t", + ssh_cmd =3D ["ssh", + "-t", "-o", "StrictHostKeyChecking=3Dno", "-o", "UserKnownHostsFile=3D" + os.devnull, "-o", "ConnectTimeout=3D1", "-p", self.ssh_port, "-i", self._ssh_key_file] + # If not in debug mode, set ssh to quiet mode to + # avoid printing the results of commands. + if not self.debug: + ssh_cmd.append("-q") for var in self.envvars: ssh_cmd +=3D ['-o', "SendEnv=3D%s" % var ] assert not isinstance(cmd, str) --=20 2.20.1 From nobody Thu Nov 13 21:52:19 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1583248224; cv=none; d=zohomail.com; s=zohoarc; b=TTVm2QOFJF27aFhkBsqKNGXY/IqFpsCM0EvCqD7YOKQKob4MxM362f52jQ7+SNi9/NHhRuyuRjfXCukImP+fRBUAupZ0ebBhLiix7RGjgZt+wlm2+xr3ajzdPJmnWXieLsAhDIxNzJOpnaoflNN92RHzdBZE+E073LO902Pnx58= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1583248224; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=dCr0Z8PfAqS4rx+S0HXKAf2zVkW9ZlqRt2oF49qU2FA=; b=TjdiPlNY2NpGZSssfF1BD94MBglC4BKedX8vcaudIY/pge4ISoubJImRkTyWOI5xyjhYTcIQfXbPJarMosllYUH2BQAB6XB9cQ9DXhYPRdqSBc/WrqXFO4VdRn6/ShIYfLVKEXJqZzFoB40Xycx2bb2DckQjyn9ELvkrOQS3cPc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1583248224739603.0888334223292; Tue, 3 Mar 2020 07:10:24 -0800 (PST) Received: from localhost ([::1]:48734 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j99Bf-0002eT-EX for importer@patchew.org; Tue, 03 Mar 2020 10:10:23 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42586) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j997u-00036I-2X for qemu-devel@nongnu.org; Tue, 03 Mar 2020 10:06:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j997t-0001jd-5e for qemu-devel@nongnu.org; Tue, 03 Mar 2020 10:06:30 -0500 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]:51447) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j997t-0001jP-0N for qemu-devel@nongnu.org; Tue, 03 Mar 2020 10:06:29 -0500 Received: by mail-wm1-x331.google.com with SMTP id a132so3628158wme.1 for ; Tue, 03 Mar 2020 07:06:28 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id v16sm16264948wrp.84.2020.03.03.07.06.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Mar 2020 07:06:25 -0800 (PST) Received: from zen.home.arpa (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id F26351FF90; Tue, 3 Mar 2020 15:06:22 +0000 (GMT) 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 :mime-version:content-transfer-encoding; bh=dCr0Z8PfAqS4rx+S0HXKAf2zVkW9ZlqRt2oF49qU2FA=; b=wOl9ImkwaY3Uqjx0tIh0Q63lHkfUPR6yweTUt9tJHAqBQ5v9Y4ko5P/5CsurSJA4Sq uUuH4NeHPSzoAK/uIXymRvMdJLxF1o0IVlTXvYKTqFdWdEl8A+IZs/emEvoY6XDD9Tbu HL/N/bvnALbE2cRwquf5OBtHkD/fYdH9Mn1K9vMX+hIVsR5AvjoTCl2HQGUX/xqjUNrg 3pFkyzwUR3PtYs64tGdES+bpKwm7xUaalr0vloknaXwaX+a6dPk6VPqk9QFODwKvlAGz 0fTTS62U3ywqV5qWO96WjAT/5JNnVSbJa/PMlFH1pD9s2QKgbD9kWjdeNgidupVfRSJK 8G6g== 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:mime-version:content-transfer-encoding; bh=dCr0Z8PfAqS4rx+S0HXKAf2zVkW9ZlqRt2oF49qU2FA=; b=MJE71CAkEOqe73zuSnCJlFemj+QukWK1hzhH4gOWGilDe+ZAceiutbL04MXIZkuRAp Prr3NF5jSOoM+43IvLMXabyNjz+jwAcPT881ACquUbeUEk/jrqxbvfGyvSO+QWfaFgHg 2RooJL5GHcqMjW+CZpIhrVNxjJEzLGAmHXH+TOkXjDFVe+okO6J4bQUOguRYTItN/Yd3 yf74bNKHTuUeMEi7CAjUJmpKH4tWEbYDLVH39Ty5t/rDEd1ZyfPHUE+LWsqBj6sJ2pux +yQXkmOJD0/gEc5WrsshPzxOUv4iOkkB1BhQBfzAcNYlrlQvYNhCf/gQ0vhQxC+PMF5T PA+w== X-Gm-Message-State: ANhLgQ3k8WAgIDDwbK4O0bdPPZpM7uSa/z6eyHmDhjYvwO0YTtExTmjQ lBdA3I+prYqTCTn05gvo+5DMWQ== X-Google-Smtp-Source: ADFU+vu6vflnd0d4QlJjgvPsUQAN7AYLQm66RsQDhuVvuZzyiU39BuHGVMR6kqiP1OvLfdWq8Y5XHw== X-Received: by 2002:a7b:c183:: with SMTP id y3mr4455926wmi.45.1583247987858; Tue, 03 Mar 2020 07:06:27 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 3/9] tests/vm: increased max timeout for vm boot. Date: Tue, 3 Mar 2020 15:06:16 +0000 Message-Id: <20200303150622.20133-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200303150622.20133-1-alex.bennee@linaro.org> References: <20200303150622.20133-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::331 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 , Peter Puhov , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Robert Foley , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Robert Foley Add change to increase timeout waiting for VM to boot. Needed for some emulation cases where it can take longer than 5 minutes to boot. Signed-off-by: Robert Foley Reviewed-by: Alex Benn=C3=A9e Reviewed-by: Peter Puhov Signed-off-by: Alex Benn=C3=A9e Message-Id: <20200219163537.22098-4-robert.foley@linaro.org> --- tests/vm/basevm.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index c99725b8c0d..5ca445e29af 100644 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -57,6 +57,10 @@ class BaseVM(object): poweroff =3D "poweroff" # enable IPv6 networking ipv6 =3D True + # Scale up some timeouts under TCG. + # 4 is arbitrary, but greater than 2, + # since we found we need to wait more than twice as long. + tcg_ssh_timeout_multiplier =3D 4 def __init__(self, debug=3DFalse, vcpus=3DNone): self._guest =3D None self._tmpdir =3D os.path.realpath(tempfile.mkdtemp(prefix=3D"vm-te= st-", @@ -309,6 +313,9 @@ class BaseVM(object): sys.stderr.write("### %s ...\n" % text) =20 def wait_ssh(self, seconds=3D300): + # Allow more time for VM to boot under TCG. + if not kvm_available(self.arch): + seconds *=3D self.tcg_ssh_timeout_multiplier starttime =3D datetime.datetime.now() endtime =3D starttime + datetime.timedelta(seconds=3Dseconds) guest_up =3D False --=20 2.20.1 From nobody Thu Nov 13 21:52:19 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1583248065; cv=none; d=zohomail.com; s=zohoarc; b=Mi3e+mixWP7gNAY6Z466/ABl//ZR+yq7ZIM9ofN3oqsKydheLA2Wl119RDvxtQxGvPvGyLxj7XIb1w/+fA+PAEuwMXz7BHBxC8mFy6whPPVrFFWM2EdB7McPoJjH6vqcK85fY+W9MhYsGTzVodI6Zc/ZB66xkc68QwCIokHM/0c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1583248065; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Z7tiVgE0/FNumYwGDaf9+n6Hr38jcg9tS9OSWzqMpF0=; b=AmIv2hFQUuX13CMLYbD4QMJC8gPnI12jKmdrxwlXoFiCDTz0yM/+Y5eCSecACW9BiDdS9Upn3saKOTTVovMb5tiapwixM7VPCIQVtglgLJkLQqiALXDRiCV3p0CeCGaOLW6tiSdzZvQIBTIlpCrpGpzycgeRgmWdhzzG2QNueZ8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1583248065303668.8883257327794; Tue, 3 Mar 2020 07:07:45 -0800 (PST) Received: from localhost ([::1]:48646 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9996-0004xh-7B for importer@patchew.org; Tue, 03 Mar 2020 10:07:44 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42598) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j997v-00036J-50 for qemu-devel@nongnu.org; Tue, 03 Mar 2020 10:06:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j997u-0001k2-62 for qemu-devel@nongnu.org; Tue, 03 Mar 2020 10:06:31 -0500 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:46506) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j997u-0001jn-05 for qemu-devel@nongnu.org; Tue, 03 Mar 2020 10:06:30 -0500 Received: by mail-wr1-x444.google.com with SMTP id j7so4693251wrp.13 for ; Tue, 03 Mar 2020 07:06:29 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id k7sm34676625wrq.12.2020.03.03.07.06.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Mar 2020 07:06:25 -0800 (PST) Received: from zen.home.arpa (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 2B1E91FF91; Tue, 3 Mar 2020 15:06:23 +0000 (GMT) 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 :mime-version:content-transfer-encoding; bh=Z7tiVgE0/FNumYwGDaf9+n6Hr38jcg9tS9OSWzqMpF0=; b=puCW+K7M1qDXOA3YLGijkY6E9syrW2o8IpoNtWh2TilgVJtBR+laDUtM9TNcp3mrMf VJjB8+gKNj9A+Bwp+8F0K0OZEJLCJFAI4lnOWHl3jekXZ7KUKnX0Mtq3DqKG7lgbZxsb Ta3sYvoz9cCre8XpRcYhfaJcjpvKNlaL6CpTX5cA5K3gT4qwMBixa/SoMFjpO5uuK9lj m0XqH3kM5lXGWOe2+AB8axXpIKP2209PEnYQfXYzjQjAUt5TMxJ4vxkX42Cw+nS3QGuU RRudoNHiqyKe4xD1iEMozwQcbHCgdg87QEEe6VV/HVsCFGibhWMQMnGTd5wUzkzSGcAe ZQPw== 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:mime-version:content-transfer-encoding; bh=Z7tiVgE0/FNumYwGDaf9+n6Hr38jcg9tS9OSWzqMpF0=; b=sHQCggy3M3/VgJAdvksAvYKUiSdy9uRlJyqcURiz3qa+0a6azKiiCzlTHWmenXXVgD K6GIaq3XFWIepbHNhHAVkVHgkVFjpsvDP/Qt6nFYicWmYp6SAZrooijiD6RecmQyjKRX QjKcj25uSp7wgFsBc2vRFeOKuiMecodwJU0nEHAOQAKZ78s8bCtsPvP6gxiu/WZY1IHz GAY+bNAJBvNVE8hPakgDtpBDb6kLh90YQNTUgNM53/PA6rhEhJ46157U/hiOlh9XXaqj L7Vo8ub13j22nwr6XgZDwsikCfWM6HCY8Iz7Bn8DmOUiUcu6GWydTCKbfE3b6AfA9lvl 3wOA== X-Gm-Message-State: ANhLgQ3cijTvHQzZXxCujcIDB2le/GJwzrMkHY+hnNoPk3SyXRkpA9dj zkiN+BdA48gy2TUz8oEaiRiBPw== X-Google-Smtp-Source: ADFU+vuWA08vxfWswosPclcGySdBcm04AlrFc0IPOvHidTGwfUpgDkv5IZvNxPqOy0ZqdAqzZlojKw== X-Received: by 2002:a5d:66cc:: with SMTP id k12mr5720823wrw.72.1583247988944; Tue, 03 Mar 2020 07:06:28 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 4/9] tests/vm: give wait_ssh() option to wait for root Date: Tue, 3 Mar 2020 15:06:17 +0000 Message-Id: <20200303150622.20133-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200303150622.20133-1-alex.bennee@linaro.org> References: <20200303150622.20133-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::444 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 , Peter Puhov , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Robert Foley , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Robert Foley Allow wait_ssh to wait for root user to be ready. This solves the issue where we perform a wait_ssh() successfully, but the root user is not yet ready to be logged in. Signed-off-by: Robert Foley Reviewed-by: Alex Benn=C3=A9e Reviewed-by: Peter Puhov Signed-off-by: Alex Benn=C3=A9e Message-Id: <20200219163537.22098-5-robert.foley@linaro.org> --- tests/vm/basevm.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index 5ca445e29af..7f268922685 100644 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -312,7 +312,7 @@ class BaseVM(object): def print_step(self, text): sys.stderr.write("### %s ...\n" % text) =20 - def wait_ssh(self, seconds=3D300): + def wait_ssh(self, wait_root=3DFalse, seconds=3D300): # Allow more time for VM to boot under TCG. if not kvm_available(self.arch): seconds *=3D self.tcg_ssh_timeout_multiplier @@ -320,7 +320,10 @@ class BaseVM(object): endtime =3D starttime + datetime.timedelta(seconds=3Dseconds) guest_up =3D False while datetime.datetime.now() < endtime: - if self.ssh("exit 0") =3D=3D 0: + if wait_root and self.ssh_root("exit 0") =3D=3D 0: + guest_up =3D True + break + elif self.ssh("exit 0") =3D=3D 0: guest_up =3D True break seconds =3D (endtime - datetime.datetime.now()).total_seconds() --=20 2.20.1 From nobody Thu Nov 13 21:52:19 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1583248168; cv=none; d=zohomail.com; s=zohoarc; b=iG/wZVU40lDdiNHd5Gk5S1O9nM/f6LaUVk286ByOBYQ4kY/+Zd8D+YgLVrXL/t0Nrxxp541YlfGk/A2Zp5AfKkipiuasLExe3bNTUiObqvw6JdIMuAkK3DraKyvfj0iCYSr9j+dECmUCcB2NyAo8LAraLBzUC6fONXoShQ4rKKQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1583248168; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ijdyySbr5Pr5tu/6iL3NJ3hKubBXGURsFPuH6qfE7XM=; b=Bizz2z/whkNVROcARkND9KbC1XYqJYW/83SfXN2bUF/5BCuldFTwbkzLSNJjCya08VcsKWl11y2+Z+8Mzkmh5LwS4xjLm3BlzgV2pl1O4KQL2AqNyodF4+I47h9Exw0WNNd27uXljPXf6cyBJOuJPBxR0qN3gys9543fRupHhLk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1583248168089180.93035500524456; Tue, 3 Mar 2020 07:09:28 -0800 (PST) Received: from localhost ([::1]:48700 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j99Ak-0000Oq-Tq for importer@patchew.org; Tue, 03 Mar 2020 10:09:26 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42649) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9981-0003CD-4T for qemu-devel@nongnu.org; Tue, 03 Mar 2020 10:06:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j997z-0001lS-GL for qemu-devel@nongnu.org; Tue, 03 Mar 2020 10:06:37 -0500 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:40411) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j997z-0001l8-9L for qemu-devel@nongnu.org; Tue, 03 Mar 2020 10:06:35 -0500 Received: by mail-wr1-x432.google.com with SMTP id r17so4770281wrj.7 for ; Tue, 03 Mar 2020 07:06:35 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id o9sm35544399wrw.20.2020.03.03.07.06.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Mar 2020 07:06:29 -0800 (PST) Received: from zen.home.arpa (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 5B66A1FF92; Tue, 3 Mar 2020 15:06:23 +0000 (GMT) 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 :mime-version:content-transfer-encoding; bh=ijdyySbr5Pr5tu/6iL3NJ3hKubBXGURsFPuH6qfE7XM=; b=qj+3xr+fsB+VVYDJp7yguPBDXZ2CPns1k4bvMqkNBRasJKC7XtLejnvjCZ6L5yADVe ARsEp53j51XANsj49YT80pXLpfOb7EpARfV7Te+CjElR1DHdmj9+guuMksifTgAeD6Rm EZEWmyCjDekMkWz4dzWy9BoRwSqp9cZVaJQu+0ylx3z2RA8q3cqQEkKJYo/nAUUS7UTG wPkp2SNqlQuy/Vlb39BkiTpLyAOyjFNRCqF+GJFy1PcENSzKCnOCt6UA0dApn67IBwds rla3smyMlF3K7FewUGOqcLC+Pc+DR+6qbvvhzRz5uoes3mwWF+5hjb6MWKU2bjUxzSw3 R3Mw== 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:mime-version:content-transfer-encoding; bh=ijdyySbr5Pr5tu/6iL3NJ3hKubBXGURsFPuH6qfE7XM=; b=UDnMaG4J5CZhL6Xwij73UYZCWXQZqcJc/eEGyDkREzljU8N/u9sJlATKJt67eFC35d 9+DHtZWHqqxarndJUG3dy1wn4LAPlMgLk3pjkKIfRdOhzH1l7sX8HUzHeyNrJGQsJX68 L4Eu+GYGHhbUQvC/WL9/Wn7+jyZ/H+ukrWcUv5wxy5ad4Q0bRnp0//kWFbYRtYQQ2i0W Z1Tix2zCTq/+71qTlR5Mi8WJVzPr9945K4YQm9ZLJPP5BaDKWvSDI/+N/K06W3z8j5k+ bbcwi5zo2GnRfmGBMNfkmtJIJeW6DDqBiKtsv/XP6k5pmsDo7pH9vPwscAj6MSQrCBhn hnfQ== X-Gm-Message-State: ANhLgQ3LjiYNnzZcsNgE1xfwX2Z8hPPFReNHj9N9UTMYhd2Bqvubm0FJ y6cWjG9nccEjAXZwKiY/zMGIwg== X-Google-Smtp-Source: ADFU+vsKSDK8ONYTDJmdardp5wKG26yZvWUsrKY8G2xq9SW5agFZ3ygryZ3xd4JDpmtj7hU4+Dd4PA== X-Received: by 2002:adf:a114:: with SMTP id o20mr5834864wro.7.1583247994125; Tue, 03 Mar 2020 07:06:34 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 5/9] tests/vm: Added gen_cloud_init_iso() to basevm.py Date: Tue, 3 Mar 2020 15:06:18 +0000 Message-Id: <20200303150622.20133-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200303150622.20133-1-alex.bennee@linaro.org> References: <20200303150622.20133-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::432 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 , Peter Puhov , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Robert Foley , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Robert Foley This method was located in both centos and ubuntu.i386. Signed-off-by: Robert Foley Reviewed-by: Alex Benn=C3=A9e Reviewed-by: Peter Puhov Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20200219163537.22098-6-robert.foley@linaro.org> --- tests/vm/basevm.py | 40 ++++++++++++++++++++++++++++++++++++++++ tests/vm/centos | 33 +-------------------------------- tests/vm/ubuntu.i386 | 37 +------------------------------------ 3 files changed, 42 insertions(+), 68 deletions(-) diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index 7f268922685..8400b0e07f6 100644 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -345,6 +345,46 @@ class BaseVM(object): def qmp(self, *args, **kwargs): return self._guest.qmp(*args, **kwargs) =20 + def gen_cloud_init_iso(self): + cidir =3D self._tmpdir + mdata =3D open(os.path.join(cidir, "meta-data"), "w") + name =3D self.name.replace(".","-") + mdata.writelines(["instance-id: {}-vm-0\n".format(name), + "local-hostname: {}-guest\n".format(name)]) + mdata.close() + udata =3D open(os.path.join(cidir, "user-data"), "w") + print("guest user:pw {}:{}".format(self._config['guest_user'], + self._config['guest_pass'])) + udata.writelines(["#cloud-config\n", + "chpasswd:\n", + " list: |\n", + " root:%s\n" % self._config['root_pass'], + " %s:%s\n" % (self._config['guest_user'], + self._config['guest_pass']), + " expire: False\n", + "users:\n", + " - name: %s\n" % self._config['guest_user'], + " sudo: ALL=3D(ALL) NOPASSWD:ALL\n", + " ssh-authorized-keys:\n", + " - %s\n" % self._config['ssh_pub_key'], + " - name: root\n", + " ssh-authorized-keys:\n", + " - %s\n" % self._config['ssh_pub_key'], + "locale: en_US.UTF-8\n"]) + proxy =3D os.environ.get("http_proxy") + if not proxy is None: + udata.writelines(["apt:\n", + " proxy: %s" % proxy]) + udata.close() + subprocess.check_call(["genisoimage", "-output", "cloud-init.iso", + "-volid", "cidata", "-joliet", "-rock", + "user-data", "meta-data"], + cwd=3Dcidir, + stdin=3Dself._devnull, stdout=3Dself._stdou= t, + stderr=3Dself._stdout) + + return os.path.join(cidir, "cloud-init.iso") + def parse_args(vmcls): =20 def get_default_jobs(): diff --git a/tests/vm/centos b/tests/vm/centos index a41ff109eb5..0ad4ecf4190 100755 --- a/tests/vm/centos +++ b/tests/vm/centos @@ -31,37 +31,6 @@ class CentosVM(basevm.BaseVM): make docker-test-mingw@fedora {verbose} J=3D{jobs} NETWORK=3D1; """ =20 - def _gen_cloud_init_iso(self): - cidir =3D self._tmpdir - mdata =3D open(os.path.join(cidir, "meta-data"), "w") - mdata.writelines(["instance-id: centos-vm-0\n", - "local-hostname: centos-guest\n"]) - mdata.close() - udata =3D open(os.path.join(cidir, "user-data"), "w") - udata.writelines(["#cloud-config\n", - "chpasswd:\n", - " list: |\n", - " root:%s\n" % self.ROOT_PASS, - " %s:%s\n" % (self.GUEST_USER, self.GUEST_PAS= S), - " expire: False\n", - "users:\n", - " - name: %s\n" % self.GUEST_USER, - " sudo: ALL=3D(ALL) NOPASSWD:ALL\n", - " ssh-authorized-keys:\n", - " - %s\n" % basevm.SSH_PUB_KEY, - " - name: root\n", - " ssh-authorized-keys:\n", - " - %s\n" % basevm.SSH_PUB_KEY, - "locale: en_US.UTF-8\n"]) - udata.close() - subprocess.check_call(["genisoimage", "-output", "cloud-init.iso", - "-volid", "cidata", "-joliet", "-rock", - "user-data", "meta-data"], - cwd=3Dcidir, - stdin=3Dself._devnull, stdout=3Dself._stdou= t, - stderr=3Dself._stdout) - return os.path.join(cidir, "cloud-init.iso") - def build_image(self, img): cimg =3D self._download_with_cache("https://cloud.centos.org/cento= s/7/images/CentOS-7-x86_64-GenericCloud-1802.qcow2.xz") img_tmp =3D img + ".tmp" @@ -69,7 +38,7 @@ class CentosVM(basevm.BaseVM): subprocess.check_call(["ln", "-f", cimg, img_tmp + ".xz"]) subprocess.check_call(["xz", "--keep", "-dvf", img_tmp + ".xz"]) self.exec_qemu_img("resize", img_tmp, "50G") - self.boot(img_tmp, extra_args =3D ["-cdrom", self._gen_cloud_init_= iso()]) + self.boot(img_tmp, extra_args =3D ["-cdrom", self.gen_cloud_init_i= so()]) self.wait_ssh() self.ssh_root_check("touch /etc/cloud/cloud-init.disabled") self.ssh_root_check("yum update -y") diff --git a/tests/vm/ubuntu.i386 b/tests/vm/ubuntu.i386 index 48e9cb1ad3d..3266038fbde 100755 --- a/tests/vm/ubuntu.i386 +++ b/tests/vm/ubuntu.i386 @@ -29,41 +29,6 @@ class UbuntuX86VM(basevm.BaseVM): make --output-sync {target} -j{jobs} {verbose}; """ =20 - def _gen_cloud_init_iso(self): - cidir =3D self._tmpdir - mdata =3D open(os.path.join(cidir, "meta-data"), "w") - mdata.writelines(["instance-id: ubuntu-vm-0\n", - "local-hostname: ubuntu-guest\n"]) - mdata.close() - udata =3D open(os.path.join(cidir, "user-data"), "w") - udata.writelines(["#cloud-config\n", - "chpasswd:\n", - " list: |\n", - " root:%s\n" % self.ROOT_PASS, - " %s:%s\n" % (self.GUEST_USER, self.GUEST_PAS= S), - " expire: False\n", - "users:\n", - " - name: %s\n" % self.GUEST_USER, - " sudo: ALL=3D(ALL) NOPASSWD:ALL\n", - " ssh-authorized-keys:\n", - " - %s\n" % basevm.SSH_PUB_KEY, - " - name: root\n", - " ssh-authorized-keys:\n", - " - %s\n" % basevm.SSH_PUB_KEY, - "locale: en_US.UTF-8\n"]) - proxy =3D os.environ.get("http_proxy") - if not proxy is None: - udata.writelines(["apt:\n", - " proxy: %s" % proxy]) - udata.close() - subprocess.check_call(["genisoimage", "-output", "cloud-init.iso", - "-volid", "cidata", "-joliet", "-rock", - "user-data", "meta-data"], - cwd=3Dcidir, - stdin=3Dself._devnull, stdout=3Dself._stdou= t, - stderr=3Dself._stdout) - return os.path.join(cidir, "cloud-init.iso") - def build_image(self, img): cimg =3D self._download_with_cache( "https://cloud-images.ubuntu.com/releases/bionic/release-20191= 114/ubuntu-18.04-server-cloudimg-i386.img", @@ -71,7 +36,7 @@ class UbuntuX86VM(basevm.BaseVM): img_tmp =3D img + ".tmp" subprocess.check_call(["cp", "-f", cimg, img_tmp]) self.exec_qemu_img("resize", img_tmp, "50G") - self.boot(img_tmp, extra_args =3D ["-cdrom", self._gen_cloud_init_= iso()]) + self.boot(img_tmp, extra_args =3D ["-cdrom", self.gen_cloud_init_i= so()]) self.wait_ssh() self.ssh_root_check("touch /etc/cloud/cloud-init.disabled") self.ssh_root_check("apt-get update") --=20 2.20.1 From nobody Thu Nov 13 21:52:19 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1583248061; cv=none; d=zohomail.com; s=zohoarc; b=S5UeqVCXeJX4j/tTPJNgkeyLbsbWUoewL/ZsbGxoJaWshzPyPDpGCCPd3DCMafO00vqPZvNfwG568k8RqSG+aA5n0hVqt5X8ubugwKcIOOUwQ6KJnNQPAJKzTtJOtBNPbV6ILlejaMFyGPgObFKJhKOFttbCzEs1oUK6evekpGA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1583248061; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Gxmks0/YVneY+yAMKMWYzrWKCmyXGN/IawhpnRsRhk8=; b=EdL5OZeI11pxaFIR9r6yrtvnH//P5d78wAZD+7EabRjt6SLZ7OHauzfTz6vhD5oWfQLZuMLVtseZN+HZmONLbxlCf7UOa6dGYolgRogsoSwdzXSmg8tTJx9UkBgU88TSCI7QPPUtYmYmgEeMao3+VwfmgdH+YSKvXhRMs9v+sp0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1583248061857262.9746250985428; Tue, 3 Mar 2020 07:07:41 -0800 (PST) Received: from localhost ([::1]:48642 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9992-0004nm-PE for importer@patchew.org; Tue, 03 Mar 2020 10:07:40 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42614) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j997x-00037i-1f for qemu-devel@nongnu.org; Tue, 03 Mar 2020 10:06:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j997w-0001kQ-2s for qemu-devel@nongnu.org; Tue, 03 Mar 2020 10:06:32 -0500 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]:53847) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j997v-0001kH-TD for qemu-devel@nongnu.org; Tue, 03 Mar 2020 10:06:32 -0500 Received: by mail-wm1-x32a.google.com with SMTP id g134so2273640wme.3 for ; Tue, 03 Mar 2020 07:06:31 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id l5sm4536717wml.3.2020.03.03.07.06.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Mar 2020 07:06:29 -0800 (PST) Received: from zen.home.arpa (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 8B1591FF93; Tue, 3 Mar 2020 15:06:23 +0000 (GMT) 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 :mime-version:content-transfer-encoding; bh=Gxmks0/YVneY+yAMKMWYzrWKCmyXGN/IawhpnRsRhk8=; b=hPnOGRPjAyz+iDQO4a8Oz5SO8wsXpmo3zKA00vt3p4bBMyaK/6JE8meBgLUQ8ZmV2R 9ThnoDBNDZM7LjoAQ3B72xOyuxm3naJMbnh6pXd0HdQFhExmK/RjRQ+MnwBZIR0caXKW lb0lQbgODIDULgpb+TVtRmlOWNkN+NwVQlMBcKQPfAM9hUDRJMKSI267HZsJnMxRR9Lx sIlVmAzA5TV+kV98fqrtYX5XYjUyMgr2Yu4LSxUyADiBDEheeRow98xljVizlXUu8r/c Y84H3JaLfu02Q1aNMNLfL2Q3Ohg+o4LybYInRYPQ1fjafSxJB/CdTMqAkN0ZLfJZzkoT tkrw== 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:mime-version:content-transfer-encoding; bh=Gxmks0/YVneY+yAMKMWYzrWKCmyXGN/IawhpnRsRhk8=; b=rVo33EDY94zNX5f69cTu1MQKLeUQWgR0QHpkl4dCFyQKicL5B4pYlJaN8HqZ4NlIvT IJBQVoSNy4WveQMmnmf0WUARgt7AkzuW28btOfHPO2aezlhWjYYU4jZE6YgUmCkppaUj b7DFoes/l64LVrgECnGNlcSWdA9wTlBMz/UdIO1dIO9+KGHRjMdv+sOXfyQ2lbgG0r6R idScdjHlQ09vi/IfBFenW7F80ygbbKiEHOe/zj/3fE5JoUwt8KsLDRt73DB0bsxx7+dM vjBaUcNmH2yfYFTh2+im74F6F7oORizJTXqxTtfncPkorboWzmmr9G859VYsKkcMUBh3 xJkQ== X-Gm-Message-State: ANhLgQ2/4hr8MXxyAb98EcVIIgVcBxGFzwhWcu/AV/PJrc1avZsoUJbE eZtvTeedF9ZSZ0PWrdS8SO2vmA== X-Google-Smtp-Source: ADFU+vv9iNsYd0ygf+v9iF1F4cvH3ahIUGWDROlxGcsuNVLmwXAkjS/+0ENc1L1pbUyII1NesSK5qQ== X-Received: by 2002:a05:600c:2c13:: with SMTP id q19mr4849057wmg.144.1583247990822; Tue, 03 Mar 2020 07:06:30 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 6/9] travis: enable tools build on OS X Date: Tue, 3 Mar 2020 15:06:19 +0000 Message-Id: <20200303150622.20133-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200303150622.20133-1-alex.bennee@linaro.org> References: <20200303150622.20133-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32a 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: Laurent Vivier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Fam Zheng , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Laurent Vivier As we can build tools on OS X we should check we don't break build when we submit new codes. Signed-off-by: Laurent Vivier Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20200302154630.45620-3-lvivier@redhat.com> --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 9867272177d..70a24bf2fc8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -273,6 +273,7 @@ jobs: =20 - name: "OSX Xcode 10.3" env: + - BASE_CONFIG=3D"--disable-docs --enable-tools" - CONFIG=3D"--target-list=3Di386-softmmu,ppc-softmmu,ppc64-softmmu= ,m68k-softmmu,x86_64-softmmu" os: osx osx_image: xcode10.3 --=20 2.20.1 From nobody Thu Nov 13 21:52:19 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1583248157; cv=none; d=zohomail.com; s=zohoarc; b=S4to2VJU3etIADWsAEMBAlvkLOe1tw8hvzBzEiW5A8DScuGJWA+BvvSsDwb9MFBRhdVibw7AYMPVwrcF252ppR7gIxojI0gBbcAmVqALCasu6kLUDHt0WAwkVyXZ2WqTi1n115TYTg5fR3BAVYdYSswFz7M4/SxVYeA9ud+4gzY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1583248157; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=T+UmvkcuJ29VTcRDaXTcG4zdKU9zWXLmw7iHIS3VZmQ=; b=h4v7sQ+zBE7RL/EisCYjkcij1sI+xRKEpdC5runozfGhOJt3XWzhYlzQYqB/hQZ/p28NCxaasQ8gQlmeObGlrBixBL8XpceimPaI3EKUZSlaAf0cZ+nb9sigfFZDHnTIiItHvH89uVx5y34ZFxnck0RA1+hWkQzMawn1sE1dOhE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1583248157233239.50170695815234; Tue, 3 Mar 2020 07:09:17 -0800 (PST) Received: from localhost ([::1]:48690 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j99AZ-0008H7-LF for importer@patchew.org; Tue, 03 Mar 2020 10:09:15 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42633) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j997z-0003AP-FG for qemu-devel@nongnu.org; Tue, 03 Mar 2020 10:06:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j997y-0001l4-8p for qemu-devel@nongnu.org; Tue, 03 Mar 2020 10:06:35 -0500 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:51447) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j997y-0001ku-2X for qemu-devel@nongnu.org; Tue, 03 Mar 2020 10:06:34 -0500 Received: by mail-wm1-x330.google.com with SMTP id a132so3628532wme.1 for ; Tue, 03 Mar 2020 07:06:34 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id k2sm2742354wrn.57.2020.03.03.07.06.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Mar 2020 07:06:29 -0800 (PST) Received: from zen.home.arpa (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id BDE731FF96; Tue, 3 Mar 2020 15:06:23 +0000 (GMT) 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 :mime-version:content-transfer-encoding; bh=T+UmvkcuJ29VTcRDaXTcG4zdKU9zWXLmw7iHIS3VZmQ=; b=FV0fEUwROdajTV63RAMJFTV3YkHSn4tZjI5p5jhFFKGi3U+ymEyOxDVT9ez+iocjEO NBNiIWwtj/qIP8HenuK5Dmm4cK79Dj3Pi0M16MoKnzHpKMAKaxNqdIALK35AGMSphgZV 7K1Rfru+BeD/HrSBgDHZgBVHlm5zw1+ZZMmAsf79nRKQ7do/VjaroBu5jWORoSmb3UbN RKrWFSCMY06sNmMjcW4Pv17K5O3JFM7CqEvMeurruIXLdnDNmGDGNl4r/dLHQZg0h36U ZvFtVq2sGKvaXX/NRbF02MGGza5Vh8WnXZbu4zdhi0tdU8UllvwrD6nAamBBMZ5J9diK wM8w== 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:mime-version:content-transfer-encoding; bh=T+UmvkcuJ29VTcRDaXTcG4zdKU9zWXLmw7iHIS3VZmQ=; b=lkePZmu/UtQ8DB8wMSY0iIx+2ZiMUHt6tL3YJNVNobGD1CpAC5o+OJycTKwVbuLw44 X9giTkb3p3vIhwqaFL/1Az6UC3SuPlgeVf+ogioA78w3GvKgRQSHmcjfr6Q1xO8vQX2o kwsmWCTXAVs2BUY7ngXMYy6YCW3z+VgyrEagytPk5OCdLfwpXzdUgyOduYmtbVfMNtyi f/OIqPyhBSyzkXmIPc0qEyZtjV6VYPx7Hs/AOugryd47j/KHTl+oxekbASEbjJlkk71Y AduxRpDvz391ePOwTNI2kYv35uO5UtwqC8c5Z+r/DRwKkceHxh64sxj9gelLd/VYyDru dYlg== X-Gm-Message-State: ANhLgQ3Aqk21IxwjUACnYCkdZ4wGYTOY+t5Eo7GLoLHHhN7w48ZMt3xr HNs7I+ohDp7hiJ8k1v7kTBbi5A== X-Google-Smtp-Source: ADFU+vucmtOB1DOyUA+ZfWws/AkC9jEPWl579nAtzPenSVnZOb+9OBkEF6lSBH5bc04C2dSzS5lMBw== X-Received: by 2002:a1c:3d46:: with SMTP id k67mr4991314wma.177.1583247992974; Tue, 03 Mar 2020 07:06:32 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 7/9] configure: detect and report genisoimage Date: Tue, 3 Mar 2020 15:06:20 +0000 Message-Id: <20200303150622.20133-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200303150622.20133-1-alex.bennee@linaro.org> References: <20200303150622.20133-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::330 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 , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) This is used for some of the vm-build tests so lets detect it and behave sanely when it is not installed. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Richard Henderson --- configure | 13 +++++++++++++ tests/vm/Makefile.include | 14 +++++++++++--- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 7b373bc0bb8..fab6281eb70 100755 --- a/configure +++ b/configure @@ -936,6 +936,17 @@ do fi done =20 +# Check for ancillary tools used in testing +genisoimage=3D +for binary in genisoimage +do + if has $binary + then + genisoimage=3D$(command -v "$binary") + break + fi +done + : ${smbd=3D${SMBD-/usr/sbin/smbd}} =20 # Default objcc to clang if available, otherwise use CC @@ -6567,6 +6578,7 @@ echo "python $python ($python_version)" if test "$docs" !=3D "no"; then echo "sphinx-build $sphinx_build" fi +echo "genisoimage $genisoimage" echo "slirp support $slirp $(echo_version $slirp $slirp_version)" if test "$slirp" !=3D "no" ; then echo "smbd $smbd" @@ -7616,6 +7628,7 @@ echo "INSTALL_PROG=3D$install -c -m 0755" >> $config_= host_mak echo "INSTALL_LIB=3D$install -c -m 0644" >> $config_host_mak echo "PYTHON=3D$python" >> $config_host_mak echo "SPHINX_BUILD=3D$sphinx_build" >> $config_host_mak +echo "GENISOIMAGE=3D$genisoimage" >> $config_host_mak echo "CC=3D$cc" >> $config_host_mak if $iasl -h > /dev/null 2>&1; then echo "IASL=3D$iasl" >> $config_host_mak diff --git a/tests/vm/Makefile.include b/tests/vm/Makefile.include index 778e5067554..1bf9693d195 100644 --- a/tests/vm/Makefile.include +++ b/tests/vm/Makefile.include @@ -2,7 +2,11 @@ =20 .PHONY: vm-build-all vm-clean-all =20 -IMAGES :=3D ubuntu.i386 freebsd netbsd openbsd centos fedora +IMAGES :=3D freebsd netbsd openbsd centos fedora +ifneq ($(GENISOIMAGE),) +IMAGES +=3D ubuntu.i386 centos +endif + IMAGES_DIR :=3D $(HOME)/.cache/qemu-vm/images IMAGE_FILES :=3D $(patsubst %, $(IMAGES_DIR)/%.img, $(IMAGES)) =20 @@ -12,12 +16,16 @@ IMAGE_FILES :=3D $(patsubst %, $(IMAGES_DIR)/%.img, $(I= MAGES)) vm-help vm-test: @echo "vm-help: Test QEMU in preconfigured virtual machines" @echo - @echo " vm-build-ubuntu.i386 - Build QEMU in ubuntu i386 VM" @echo " vm-build-freebsd - Build QEMU in FreeBSD VM" @echo " vm-build-netbsd - Build QEMU in NetBSD VM" @echo " vm-build-openbsd - Build QEMU in OpenBSD VM" - @echo " vm-build-centos - Build QEMU in CentOS VM, with = Docker" @echo " vm-build-fedora - Build QEMU in Fedora VM" +ifneq ($(GENISOIMAGE),) + @echo " vm-build-centos - Build QEMU in CentOS VM, with = Docker" + @echo " vm-build-ubuntu.i386 - Build QEMU in ubuntu i386 VM" +else + @echo " (install genisoimage to build centos/ubuntu images)" +endif @echo "" @echo " vm-build-all - Build QEMU in all VMs" @echo " vm-clean-all - Clean up VM images" --=20 2.20.1 From nobody Thu Nov 13 21:52:19 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1583248245; cv=none; d=zohomail.com; s=zohoarc; b=gvc66zbRlEchgpud8KcHxp7wDsUiC+f/DwGAhUws3pjdDfLDLvfb1vgGC8hWIYk+AUh4ucMERdqyxhUFy599oMhFNFcmXb2tKmt+2rjTDdwctLyfIR1eacgC0DOvKa8xmwRg/SyDVHDUbd1l82cApw+CScco8oupneNRIGxEnJY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1583248245; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=mdvWh9OrF/L9iRiaqnANinaDnfQj3vHE3kNBKnfVJSk=; b=Og7FbKzo2vwk8S+7+PnKypztq2rE0fSJdaElswjlDOysUxaGzcSLjODdeQcbG6CrZ2xnvIpQl/kXY6V1ayF3j1mtvBVh0p0k3OryfuidLnE1d1w8bTEkQsry83QZIH0y/5Xq7LHE+5gyi/MAiYzwOTEZOr2GbzCsgsH9kX5v20U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 158324824526968.127585303214; Tue, 3 Mar 2020 07:10:45 -0800 (PST) Received: from localhost ([::1]:48742 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j99C0-0003NV-3h for importer@patchew.org; Tue, 03 Mar 2020 10:10:44 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42653) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9981-0003Cs-Or for qemu-devel@nongnu.org; Tue, 03 Mar 2020 10:06:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j997w-0001ki-Vn for qemu-devel@nongnu.org; Tue, 03 Mar 2020 10:06:37 -0500 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:55510) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j997w-0001kU-Pv for qemu-devel@nongnu.org; Tue, 03 Mar 2020 10:06:32 -0500 Received: by mail-wm1-x343.google.com with SMTP id 6so3615596wmi.5 for ; Tue, 03 Mar 2020 07:06:32 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id p16sm33887682wrw.15.2020.03.03.07.06.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Mar 2020 07:06:29 -0800 (PST) Received: from zen.home.arpa (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E82981FF98; Tue, 3 Mar 2020 15:06:23 +0000 (GMT) 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 :mime-version:content-transfer-encoding; bh=mdvWh9OrF/L9iRiaqnANinaDnfQj3vHE3kNBKnfVJSk=; b=m2BbtaOOZtbEjLhCMqvpzY7KwujwpNKZs1+WNNgZJ6W7Jf6l+MeOIHJJQLGS+E+LOp 2Ne/pn7rj0aaNaviasNlWk+UiUgXnKD2ZsYHLnmnkLDQAKV/Hb+e+1bq//DWOH4VFGDd zI0xQr0pvjTA7KcXZ7X7/fJMjX/rCCE85nXj1csaSkJoT2FCoeY+/xODrfNPAfwJsZVO kiW+/d11d3FkWQTT4+n128IAittVT1XwmEHPRQMFph8ug2dYWht7e+cBf1IRJ+kVNwfQ TFLMZ9hDPv76oUJwzz/oQLRkljNCMrm+mDgOfxjIP7A3+l8rxjMGDaCuW7mEa/OerPs8 BzdA== 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:mime-version:content-transfer-encoding; bh=mdvWh9OrF/L9iRiaqnANinaDnfQj3vHE3kNBKnfVJSk=; b=QRyBgaQXJmnSIePf7UR9UY6quy+Ll83JSQbTp6SjfNmKghM/OCsv1H7CVOgKWnR85V rdsNXBMncPz0JmLyxn8k54JARR9BBPo5luS6qg3mv4JVpfZ+hI88wPVEqt3cuCGB1ene 2BAzcaes4TUwYFAnM+GiZPmukkt+xr8v96Hq1R/5GwFhxr5nq0qx52hizDI9jGYweewO /iwNUERoMGrJPW95KrRbVRJmGVmt7ItY1Z3COEmIwRiICpRVsO+Nx/MEfonKx+ASJGQX mcBg3PCfunEhqFtxYktmrkE4YdJ/N8jo0Ke6fsgY3ogC7b4tdymHXmwfocp4JsS669Ud FjFg== X-Gm-Message-State: ANhLgQ1qCcBbh6E+7oMuxabb61U/s7wlXDjxoIMaAKGm6rqzNntAjQTZ SLwV0SRtJBvBtudemkqTXxMib8FafKM= X-Google-Smtp-Source: ADFU+vuJyjxYdCDdwbw+C+NrDQ+mXRSBggKNIEMlY0qO5WJW8lNnPXHS7ta/kBu8ynB0GDdi/BXmbw== X-Received: by 2002:a1c:6884:: with SMTP id d126mr4539032wmc.38.1583247991682; Tue, 03 Mar 2020 07:06:31 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 8/9] tests/acceptance: bump avocado requirements to 76.0 Date: Tue, 3 Mar 2020 15:06:21 +0000 Message-Id: <20200303150622.20133-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200303150622.20133-1-alex.bennee@linaro.org> References: <20200303150622.20133-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::343 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: =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) If we want to use @skipUnless decorations on the class we need a newer version of avocado. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Richard Henderson --- tests/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/requirements.txt b/tests/requirements.txt index a2a587223a9..f4f1736a086 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -1,4 +1,4 @@ # Add Python module requirements, one per line, to be installed # in the tests/venv Python virtual environment. For more info, # refer to: https://pip.pypa.io/en/stable/user_guide/#id1 -avocado-framework=3D=3D72.0 +avocado-framework=3D=3D76.0 --=20 2.20.1 From nobody Thu Nov 13 21:52:19 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1583248159; cv=none; d=zohomail.com; s=zohoarc; b=mYd9C3jzzJDYsxqOk/KBFvlJs071I74do7STQECfpkg3n4ngss6vBq4cvICcieeppWegPaxTWYi8G9VP7DSWSaO6Rb8gQGFWfShnxifayVBcu+8ZIYQhDyJg3JVNAzAEILebt/M7Sq56F5qfwO317hf65s+r+U86KU/NjDgEaok= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1583248159; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=kM9hBY7eIh07kImPzKsu/Kar9U4il+ooFKtjpsl4u+s=; b=EdCGjMpTDdXBxS933msHphR/w+zogQUGEn7AnBbW5a3k4kFWKOd3bRNV3BLWIp2PCU0ZVt4snu9cK9V4M+FXbC8zRG7+vHS7JNos0hyYAF+zQRzGmwxPLGUP0GRfVX0ikMXqF2rMV/D38ARj+8S5B4eMmk+qwKnFk7nkqg/Bamc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1583248159390786.9438612057799; Tue, 3 Mar 2020 07:09:19 -0800 (PST) Received: from localhost ([::1]:48696 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j99Ac-0008Sp-7x for importer@patchew.org; Tue, 03 Mar 2020 10:09:18 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42660) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9982-0003DL-5h for qemu-devel@nongnu.org; Tue, 03 Mar 2020 10:06:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j9981-0001lv-16 for qemu-devel@nongnu.org; Tue, 03 Mar 2020 10:06:38 -0500 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:39140) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j9980-0001lb-Qn for qemu-devel@nongnu.org; Tue, 03 Mar 2020 10:06:36 -0500 Received: by mail-wr1-x441.google.com with SMTP id y17so4773934wrn.6 for ; Tue, 03 Mar 2020 07:06:36 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id v16sm16265232wrp.84.2020.03.03.07.06.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Mar 2020 07:06:29 -0800 (PST) Received: from zen.home.arpa (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 1EE4A1FF99; Tue, 3 Mar 2020 15:06:24 +0000 (GMT) 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 :mime-version:content-transfer-encoding; bh=kM9hBY7eIh07kImPzKsu/Kar9U4il+ooFKtjpsl4u+s=; b=Yh2az2SRjAwIjznOGOkJ7HqYNYLNUQ7AN5n0D7Rom4RyvmFESwLb47sfJI5Z8Tg2Iw 4Srouw4aCB/SFr7XvP8taU8xydvUgB4/UqtUcgPG/mqll0LV1qVSy31l2vM5OZvxiOiR rV/CH0T6VfSd6LcK8G2gKdzxs5mmGxyDYAZWE+g9JJ5A7q5kaoeti0CNW710/RsvTq3s l5rmwTZJnyAjU239f4aR2b8W+1GTx2YSSb9m+U2CRwtNSNoDNaePpUpe1KXrerBru+vB a6OejfTGywCbA0C0mQeHv/dANFQqTr3Iw454oIuL36b0FiNDa0kG6kwrDg7HI0O+8+4c Dkyg== 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:mime-version:content-transfer-encoding; bh=kM9hBY7eIh07kImPzKsu/Kar9U4il+ooFKtjpsl4u+s=; b=RCCkY7/IMArZ1JPCX4VkCJkxJiRNvJA+x3p3O8t5OWrT9ymeD52UAtzZbUN53rfM6B nZQYLnNzcavt7dkxA5xLd8JsX/yfnb41M+iNX2R6ICiznUzlcWQ/YyCJ6KSLLwHLV5GL DCGq/qOk8tQan33XSHxq3joIW4YjzHQdZG0+JVz/Jd7V6bhlUfS1hscx0bt1rWI6yNG8 1MuW+tBMdq0p37Aw/Cfv8wo7/9eUlaFjbeXf1vcUetVSrvj08P9ehhnCztJeaBoDKM34 pIlP6WzSVI0TB4sII+dHIeaYBM1GLwOfQBJKgYwkEB/BnldDUknGs02IPwp2CMIW6xry MRnQ== X-Gm-Message-State: ANhLgQ0N0dP5Q16mRTU/juDKm7+Xqd3gQq3KkimluR7HC+mqOS4kNduk hN0PM9ekXSPSzhZ99H4NgyDKCQ== X-Google-Smtp-Source: ADFU+vuLNYXJgtowbWSrlTl3RsijOgzoAWpCkR9E3ib71ZjNpIZH7D4mpa3IbpAh0VZN+IHM+kMOtw== X-Received: by 2002:a5d:608b:: with SMTP id w11mr5377328wrt.366.1583247995826; Tue, 03 Mar 2020 07:06:35 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 9/9] travis.yml: install python3 numpy and opencv libraries Date: Tue, 3 Mar 2020 15:06:22 +0000 Message-Id: <20200303150622.20133-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200303150622.20133-1-alex.bennee@linaro.org> References: <20200303150622.20133-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::441 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 , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) These are used for the acceptance framebuffer tests to count Tux. As we need slightly newer python3 for opencv we bump up to bionic. Signed-off-by: Alex Benn=C3=A9e --- v2 - bump to bionic --- .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 70a24bf2fc8..b92798ac3b9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -313,6 +313,7 @@ jobs: =20 # Acceptance (Functional) tests - name: "GCC check-acceptance" + dist: bionic env: - CONFIG=3D"--target-list=3Daarch64-softmmu,alpha-softmmu,arm-soft= mmu,m68k-softmmu,microblaze-softmmu,mips-softmmu,mips64el-softmmu,nios2-sof= tmmu,or1k-softmmu,ppc-softmmu,ppc64-softmmu,s390x-softmmu,sparc-softmmu,x86= _64-softmmu,xtensa-softmmu" - TEST_CMD=3D"make check-acceptance" @@ -323,7 +324,9 @@ jobs: packages: - python3-pil - python3-pip - - python3.5-venv + - python3-numpy + - python3-opencv + - python3-venv - rpm2cpio - tesseract-ocr - tesseract-ocr-eng --=20 2.20.1