From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.3 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3D823C07E96 for ; Thu, 8 Jul 2021 15:02:01 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 21EF1613C1 for ; Thu, 8 Jul 2021 15:02:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 21EF1613C1 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:53888 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1VXL-0006g9-28 for qemu-devel@archiver.kernel.org; Thu, 08 Jul 2021 11:01:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48236) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1VUy-0005Ph-S1 for qemu-devel@nongnu.org; Thu, 08 Jul 2021 10:59:32 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:38928) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1VUw-00028x-Ip for qemu-devel@nongnu.org; Thu, 08 Jul 2021 10:59:32 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1625756369; h=from:from:reply-to: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=NRYHu++jwLkHUMTYZjLfa3+ISjR4I11QfpQKDU3vlRY=; b=BImSgM/HNv9/wKYd2nGArJYloclKS9kB5wp6wueV/ApnETr+tpT8r2ECYo5Pvs2a5Ei0jf pxffoCCqfJeREXjUgyihrPyUUBMNgKk4xXco7NJDy4OOkEwh6LpAkLBrq1O2cCWPCyyxEv p77HLosBbrnPyxMSgPsLG61mdaFJ+CA= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-561-CkQHZlLeNPSH00NmopCXog-1; Thu, 08 Jul 2021 10:59:28 -0400 X-MC-Unique: CkQHZlLeNPSH00NmopCXog-1 Received: by mail-wm1-f72.google.com with SMTP id k8-20020a05600c1c88b02901b7134fb829so1163948wms.5 for ; Thu, 08 Jul 2021 07:59:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:reply-to:subject:to:cc:references:from :message-id:date:user-agent:mime-version:in-reply-to :content-transfer-encoding:content-language; bh=NRYHu++jwLkHUMTYZjLfa3+ISjR4I11QfpQKDU3vlRY=; b=Ce50VBGKqVZ0kGOesD2ENwTZmgNGimSiNsAE98bdr4/diYRpBsjjOlxg51iVyyvuu1 mUcJnVwASa6prhCD19iaU7StK4/o2QpubHwPknUtEpBXv9AYXBjROSPem36YAHZE4u0X Bkda3hPfY7RkSbUD5bPUEXP9x5iJ015z8AVHfnSu0QKzxhLVlNrZ0qpObJTUyGUqwJ9I 4HOEdRP5wWwoBMOlCBeaHFjBkkzNRXfTG0g5gKCuaALTj0h0URn+JvjK4ZSY7r4909xp tPU2Ooq6ncGHoXyQq4qy4zYyWTNQtIhlPFn3k2h4tCZ0kxP85rHKe8G1GU4PvZ929TzG dPeg== X-Gm-Message-State: AOAM531+sZdT+g5l6XTLX5SR058UdEN7KhyEw102CACmtmE/BayyZQ2T 1/UDxbVbn4kykhYk+ZKfCeApLjgzEOFt6/jq7MXXz3ICysCCNLGWs3f8/y7jcPWwsLvmPkhYKTS AxBV7Gk8CSTbt/WA= X-Received: by 2002:a5d:4bca:: with SMTP id l10mr35379499wrt.236.1625756365160; Thu, 08 Jul 2021 07:59:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyv96UiWRNlEB5FklZ1gLf51qbN/2aMVfJQ7MbsOjslTTp4m6mxfJvhnLLomYSUBsstSnweSw== X-Received: by 2002:a5d:4bca:: with SMTP id l10mr35379486wrt.236.1625756365007; Thu, 08 Jul 2021 07:59:25 -0700 (PDT) Received: from ?IPv6:2a01:e0a:59e:9d80:527b:9dff:feef:3874? ([2a01:e0a:59e:9d80:527b:9dff:feef:3874]) by smtp.gmail.com with ESMTPSA id u1sm9792508wmn.23.2021.07.08.07.59.23 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 08 Jul 2021 07:59:24 -0700 (PDT) Subject: Re: [PATCH 2/3] Acceptance Tests: move definition of distro checksums to the framework To: Cleber Rosa , qemu-devel@nongnu.org References: <20210414221457.1653745-1-crosa@redhat.com> <20210414221457.1653745-3-crosa@redhat.com> From: Eric Auger Message-ID: Date: Thu, 8 Jul 2021 16:59:23 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.10.1 MIME-Version: 1.0 In-Reply-To: <20210414221457.1653745-3-crosa@redhat.com> Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=eric.auger@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Content-Language: en-US Received-SPF: pass client-ip=216.205.24.124; envelope-from=eric.auger@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.45, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, NICE_REPLY_A=-0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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: , Reply-To: eric.auger@redhat.com Cc: Thomas Huth , Eduardo Habkost , =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= , Wainer dos Santos Moschetta , Willian Rampazzo , =?UTF-8?Q?Alex_Benn=c3=a9e?= , Beraldo Leal Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Hi Cleber, On 4/15/21 12:14 AM, Cleber Rosa wrote: > Instead of having, by default, the checksum in the tests, and the > definition of tests in the framework, let's keep them together. > > A central definition for distributions is available, and it should > allow other known distros to be added more easily. > > No behavior change is expected here, and tests can still define > a distro_checksum value if for some reason they want to override > the known distribution information. > > Signed-off-by: Cleber Rosa Acked-by: Eric Auger Thanks Eric > --- > tests/acceptance/avocado_qemu/__init__.py | 34 +++++++++++++++++++++-- > tests/acceptance/boot_linux.py | 8 ------ > 2 files changed, 32 insertions(+), 10 deletions(-) > > diff --git a/tests/acceptance/avocado_qemu/__init__.py b/tests/acceptance/avocado_qemu/__init__.py > index aae1e5bbc9..97093614d9 100644 > --- a/tests/acceptance/avocado_qemu/__init__.py > +++ b/tests/acceptance/avocado_qemu/__init__.py > @@ -299,6 +299,30 @@ def ssh_command(self, command): > return stdout_lines, stderr_lines > > > +#: A collection of known distros and their respective image checksum > +KNOWN_DISTROS = { > + 'fedora': { > + '31': { > + 'x86_64': > + {'checksum': 'e3c1b309d9203604922d6e255c2c5d098a309c2d46215d8fc026954f3c5c27a0'}, > + 'aarch64': > + {'checksum': '1e18d9c0cf734940c4b5d5ec592facaed2af0ad0329383d5639c997fdf16fe49'}, > + 'ppc64': > + {'checksum': '7c3528b85a3df4b2306e892199a9e1e43f991c506f2cc390dc4efa2026ad2f58'}, > + 's390x': > + {'checksum': '4caaab5a434fd4d1079149a072fdc7891e354f834d355069ca982fdcaf5a122d'}, > + } > + } > + } > + > + > +def get_known_distro_checksum(distro, distro_version, arch): > + try: > + return KNOWN_DISTROS.get(distro).get(distro_version).get(arch).get('checksum') > + except AttributeError: > + return None > + > + > class LinuxTest(Test, LinuxSSHMixIn): > """Facilitates having a cloud-image Linux based available. > > @@ -348,14 +372,20 @@ def download_boot(self): > vmimage.QEMU_IMG = qemu_img > > self.log.info('Downloading/preparing boot image') > + distro = 'fedora' > + distro_version = '31' > + known_distro_checksum = get_known_distro_checksum(distro, > + distro_version, > + self.arch) > + distro_checksum = self.distro_checksum or known_distro_checksum > # Fedora 31 only provides ppc64le images > image_arch = self.arch > if image_arch == 'ppc64': > image_arch = 'ppc64le' > try: > boot = vmimage.get( > - 'fedora', arch=image_arch, version='31', > - checksum=self.distro_checksum, > + distro, arch=image_arch, version=distro_version, > + checksum=distro_checksum, > algorithm='sha256', > cache_dir=self.cache_dirs[0], > snapshot_dir=self.workdir) > diff --git a/tests/acceptance/boot_linux.py b/tests/acceptance/boot_linux.py > index c7bc3a589e..9e618c6daa 100644 > --- a/tests/acceptance/boot_linux.py > +++ b/tests/acceptance/boot_linux.py > @@ -20,8 +20,6 @@ class BootLinuxX8664(LinuxTest): > :avocado: tags=arch:x86_64 > """ > > - distro_checksum = 'e3c1b309d9203604922d6e255c2c5d098a309c2d46215d8fc026954f3c5c27a0' > - > def test_pc_i440fx_tcg(self): > """ > :avocado: tags=machine:pc > @@ -66,8 +64,6 @@ class BootLinuxAarch64(LinuxTest): > :avocado: tags=machine:gic-version=2 > """ > > - distro_checksum = '1e18d9c0cf734940c4b5d5ec592facaed2af0ad0329383d5639c997fdf16fe49' > - > def add_common_args(self): > self.vm.add_args('-bios', > os.path.join(BUILD_DIR, 'pc-bios', > @@ -119,8 +115,6 @@ class BootLinuxPPC64(LinuxTest): > :avocado: tags=arch:ppc64 > """ > > - distro_checksum = '7c3528b85a3df4b2306e892199a9e1e43f991c506f2cc390dc4efa2026ad2f58' > - > def test_pseries_tcg(self): > """ > :avocado: tags=machine:pseries > @@ -136,8 +130,6 @@ class BootLinuxS390X(LinuxTest): > :avocado: tags=arch:s390x > """ > > - distro_checksum = '4caaab5a434fd4d1079149a072fdc7891e354f834d355069ca982fdcaf5a122d' > - > @skipIf(os.getenv('GITLAB_CI'), 'Running on GitLab') > def test_s390_ccw_virtio_tcg(self): > """