From nobody Tue Feb 10 01:14:49 2026 Delivered-To: importer@patchew.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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1603992396; cv=none; d=zohomail.com; s=zohoarc; b=RIe7uINXnc/a6I8tHkwrQSNRuISsypDvn+lr/DKZRNT0QZP2UDdqZVfhwkWRDInYqlCr1JcvJFY28vKKoZ9BynPL9DlWRlnTryA4Rv5PKQcOwNiY0VfI3EpomMOUD4s68o+NN9h2V84504L8jbvo+Pi9/yDl78e8t11n6q5ZBu8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603992396; 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=/aWKbAAhu9frPZQrNWey5VyZKlxANhwMMHb0/A+kqlg=; b=j+5HFPKPDIAFmvsV4tc2oRCvwgxJbxswzXNaZ71euow4FneXg0gbyHXCDNaj2h3Jh4iP/RglsajYDm4NgZbKn1TNNN/H4S6st9fKJX+JciJgL4Z5BSD2E8dFvYKsucGbR3UMx7bqJH2Tms56CZUOcLxcLQAClMxVEnAgcolG9r0= 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 1603992396352214.24583808287127; Thu, 29 Oct 2020 10:26:36 -0700 (PDT) Received: from localhost ([::1]:46278 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kYBh5-00033A-BG for importer@patchew.org; Thu, 29 Oct 2020 13:26:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37484) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kYBZm-0001WX-PY for qemu-devel@nongnu.org; Thu, 29 Oct 2020 13:19:02 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:23872) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kYBZj-0003bl-F2 for qemu-devel@nongnu.org; Thu, 29 Oct 2020 13:19:02 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-551-ArQxIT5KNTW3RkPKSACkaw-1; Thu, 29 Oct 2020 13:18:48 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 366D910A0B86 for ; Thu, 29 Oct 2020 17:18:47 +0000 (UTC) Received: from localhost (unknown [10.40.194.70]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A9A625C22D; Thu, 29 Oct 2020 17:18:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603991938; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/aWKbAAhu9frPZQrNWey5VyZKlxANhwMMHb0/A+kqlg=; b=cz1XviR5gl+6/bMrHtgeD6U7NSMIb1wxQWYEVLhdC6TDhOuGzGsHX1a4lJpiZlZt0ozWDF wzIihyZQMAAaXnFmrTsniEWgvfnLeITjOj2Re7uYdD4/t2IqzY5s+8pYaDrtTWA8dXRhXP 2XdQ/t/NWQLzMT/NOkJNhsllMmWxjUQ= X-MC-Unique: ArQxIT5KNTW3RkPKSACkaw-1 From: Max Reitz To: qemu-devel@nongnu.org Subject: [PATCH v2 6/7] tests/acceptance/boot_linux: Accept SSH pubkey Date: Thu, 29 Oct 2020 18:17:43 +0100 Message-Id: <20201029171744.150726-7-mreitz@redhat.com> In-Reply-To: <20201029171744.150726-1-mreitz@redhat.com> References: <20201029171744.150726-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=mreitz@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=216.205.24.124; envelope-from=mreitz@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/29 00:47:54 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_FILL_THIS_FORM_SHORT=0.01 autolearn=ham autolearn_force=no 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: virtio-fs@redhat.com, Miklos Szeredi , "Dr . David Alan Gilbert" , Stefan Hajnoczi , Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Let download_cloudinit() take an optional pubkey, which subclasses of BootLinux can pass through setUp(). Signed-off-by: Max Reitz Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Willian Rampazzo Reviewed-by: Stefan Hajnoczi --- tests/acceptance/boot_linux.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/tests/acceptance/boot_linux.py b/tests/acceptance/boot_linux.py index c743e231f4..1da4a53d6a 100644 --- a/tests/acceptance/boot_linux.py +++ b/tests/acceptance/boot_linux.py @@ -57,7 +57,7 @@ class BootLinuxBase(Test): self.cancel('Failed to download/prepare boot image') return boot.path =20 - def download_cloudinit(self): + def download_cloudinit(self, ssh_pubkey=3DNone): self.log.info('Preparing cloudinit image') try: cloudinit_iso =3D os.path.join(self.workdir, 'cloudinit.iso') @@ -67,7 +67,8 @@ class BootLinuxBase(Test): password=3D'password', # QEMU's hard coded usermode router address phone_home_host=3D'10.0.2.2', - phone_home_port=3Dself.phone_home_port) + phone_home_port=3Dself.phone_home_port, + authorized_key=3Dssh_pubkey) except Exception: self.cancel('Failed to prepared cloudinit image') return cloudinit_iso @@ -80,19 +81,19 @@ class BootLinux(BootLinuxBase): timeout =3D 900 chksum =3D None =20 - def setUp(self): + def setUp(self, ssh_pubkey=3DNone): super(BootLinux, self).setUp() self.vm.add_args('-smp', '2') self.vm.add_args('-m', '1024') self.prepare_boot() - self.prepare_cloudinit() + self.prepare_cloudinit(ssh_pubkey) =20 def prepare_boot(self): path =3D self.download_boot() self.vm.add_args('-drive', 'file=3D%s' % path) =20 - def prepare_cloudinit(self): - cloudinit_iso =3D self.download_cloudinit() + def prepare_cloudinit(self, ssh_pubkey=3DNone): + cloudinit_iso =3D self.download_cloudinit(ssh_pubkey) self.vm.add_args('-drive', 'file=3D%s,format=3Draw' % cloudinit_is= o) =20 def launch_and_wait(self): --=20 2.26.2