From patchwork Tue Nov 12 14:50:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 179204 Delivered-To: patch@linaro.org Received: by 2002:ac9:3c86:0:0:0:0:0 with SMTP id w6csp7851012ocf; Tue, 12 Nov 2019 06:54:03 -0800 (PST) X-Google-Smtp-Source: APXvYqy6nKtugVCg3DLDNTv8gACpLFRi0LRWd0CzkQOwZ5K05ejkrpxB0S0LeFIBZPzPLVc7E4dq X-Received: by 2002:ac8:2dc9:: with SMTP id q9mr32681816qta.219.1573570443740; Tue, 12 Nov 2019 06:54:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573570443; cv=none; d=google.com; s=arc-20160816; b=dK2vGwTlmkRaDjhzMVsaCjAbZTADlwWlUt10ys+W++jKoaqtNr174wA+NCJ1Dh3bpd aVFBsVQ3/tl8My2Y4cTsXSr/8zQghhnBCBvqV9G6YUD1CksDqtkbiMZLpmj+EVabDx9R JN2RTD5cMEnSKV5CKnpA4j9i6lORCNqmZkAlHXJi9qavfFTU6k9F7ajxu3ZkLgQ4LPXG qbpWiT86fTfDhJ9hA86DokLsnc6XkjeyPulHHLB46WhoXmLtty22kTERiOWeBic2+Ilt z+cGTyJUJoOs5UG53InYdfAF30TEN6/C/shMEUYJYoql/4uTHwI4cCaBUwMfYUlWPXh9 d9KA== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=OuBID0cJqkigSPofx9+aC0NVHfNM9AtTCEr/b96Ovls=; b=AjzOBXObDLvZ3mPGDIYpDolnAPXKPB9R3h6sw77C5R9f9rNv2JsTg5VvExrAaDAZSz UJU7fSdpvh3S7Dx6/2fICiJrWZtvyvDXpqHPXiYQn3UMuLNidjL8bg9/oqAJUFKeazby aM+KVgE72FQLiLL5vGrq1fVDDS3TrasjgGWfiU8EctHZrsLpb9XOZVMT+lXzOI5ZcdcE Sa6RvdUzT6gNyjAsBH9Ge7ZDmScGK8jbX1cq6x7Fzqt+L6DKL3JO2b2at0VPf+zZlekZ lLFR5ksw9dBG0bv8mWpObS0GW1hMHcoovAj5Q00qaHvw0HOmGNk8sSlIzFiE4uOUOE9i P/5Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=eh4Liq78; 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 z2si10670492qvx.145.2019.11.12.06.54.03 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Nov 2019 06:54:03 -0800 (PST) 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=eh4Liq78; 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]:35922 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iUXYQ-0006vx-SZ for patch@linaro.org; Tue, 12 Nov 2019 09:54:02 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59767) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iUXVC-0003X9-LD for qemu-devel@nongnu.org; Tue, 12 Nov 2019 09:50:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iUXVB-00036j-Af for qemu-devel@nongnu.org; Tue, 12 Nov 2019 09:50:42 -0500 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:39611) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iUXVB-00035s-3v for qemu-devel@nongnu.org; Tue, 12 Nov 2019 09:50:41 -0500 Received: by mail-wr1-x436.google.com with SMTP id l7so7265691wrp.6 for ; Tue, 12 Nov 2019 06:50:41 -0800 (PST) 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=OuBID0cJqkigSPofx9+aC0NVHfNM9AtTCEr/b96Ovls=; b=eh4Liq78aWKNj3ut3flg/QtyGPjidZUrYm/7rObzK7AEItIjVFcq2nEAgXUGIm6nzE olyra1ItCQjBgNIq2Q32/ogAwZlUix/0t8HlMoEfvmgi8GkRpYjYXvONrrH1V4M78pX1 Z/jV5ij7ZShlM4Q3gpmwOLcrwX1oe+mbD6p+jfq7R2wegnRTAKKCe+702lic+JqcHT4n 1038Iv+LbXafXLFe4usUOaS9Kg9zBZ4h/63ccbpO5FC+ND804KJ+HazhZsqw+kRIZScZ OwmdFuaww9VJfr/l8/TkH09Du9fGu4dIXsZwNNmzt55vvw1UHnqr2mcNBM6JO4iUkMzF okxg== 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=OuBID0cJqkigSPofx9+aC0NVHfNM9AtTCEr/b96Ovls=; b=LUkiKEvhr8XVDrsAlM2Bq9tNTwWrWJ9Ab9HwLVTHSAFuphKau+/4qekOMRnlaj8BTy 2MTYftPXYR3jwdKTXSuk2Ki20KsCGUm8qiIdCy2FoewbBIa/7wqdmo84Jc2zys8epcbS AfLB99OXq3RdRHv7+ZoWhUIUChmGHnCMcXI0nSl9IzshbkflMpdIbtMWwWb2ibIj1OP2 cGLMi+dMcINCwX4I8bT/6OGYoaG/ZG1p2BhdmVTq1MjysFJ25opp0oO+220cjLsgndGo nrUWaPHeeKjYxZIb7NmdzUkcz6SfKhM31Uvz4JKm3eaJmDwgJ8ZC1B3FQFLJcahbCSHe 2XOg== X-Gm-Message-State: APjAAAXTytTTc9pUZ1zMyIuOz2+4skHX2uvtW0DBBMuRAHCdNvqYz/fL 6WRVL47voEa/Xmf9bGzIXEyy/Q== X-Received: by 2002:adf:dc06:: with SMTP id t6mr26944129wri.378.1573570238599; Tue, 12 Nov 2019 06:50:38 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id q15sm18905974wrr.82.2019.11.12.06.50.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Nov 2019 06:50:35 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 8E4131FF93; Tue, 12 Nov 2019 14:50:29 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 6/8] tests/vm: support sites with sha512 checksums Date: Tue, 12 Nov 2019 14:50:26 +0000 Message-Id: <20191112145028.26386-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191112145028.26386-1-alex.bennee@linaro.org> References: <20191112145028.26386-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::436 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_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The NetBSD project uses SHA512 for its checksums so lets support that in the download helper. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé -- 2.20.1 diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index 086bfb2c66d..91a9226026d 100755 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -95,19 +95,25 @@ class BaseVM(object): logging.info("KVM not available, not using -enable-kvm") self._data_args = [] - def _download_with_cache(self, url, sha256sum=None): + def _download_with_cache(self, url, sha256sum=None, sha512sum=None): def check_sha256sum(fname): if not sha256sum: return True checksum = subprocess.check_output(["sha256sum", fname]).split()[0] return sha256sum == checksum.decode("utf-8") + def check_sha512sum(fname): + if not sha512sum: + return True + checksum = subprocess.check_output(["sha512sum", fname]).split()[0] + return sha512sum == checksum.decode("utf-8") + cache_dir = os.path.expanduser("~/.cache/qemu-vm/download") if not os.path.exists(cache_dir): os.makedirs(cache_dir) fname = os.path.join(cache_dir, hashlib.sha1(url.encode("utf-8")).hexdigest()) - if os.path.exists(fname) and check_sha256sum(fname): + if os.path.exists(fname) and check_sha256sum(fname) and check_sha512sum(fname): return fname logging.debug("Downloading %s to %s...", url, fname) subprocess.check_call(["wget", "-c", url, "-O", fname + ".download"], diff --git a/tests/vm/netbsd b/tests/vm/netbsd index c48c60853e7..611e6cc5b5c 100755 --- a/tests/vm/netbsd +++ b/tests/vm/netbsd @@ -23,6 +23,7 @@ class NetBSDVM(basevm.BaseVM): arch = "x86_64" link = "https://cdn.netbsd.org/pub/NetBSD/NetBSD-8.1/images/NetBSD-8.1-amd64.iso" + csum = "718f275b7e0879599bdac95630c5e3f2184700032fdb6cdebf3bdd63687898c48ff3f08f57b89f4437a86cdd8ea07c01a39d432dbb37e1e4b008f4985f98da3f" size = "20G" pkgs = [ # tools @@ -70,7 +71,7 @@ class NetBSDVM(basevm.BaseVM): ipv6 = False def build_image(self, img): - cimg = self._download_with_cache(self.link) + cimg = self._download_with_cache(self.link, sha512sum=self.csum) img_tmp = img + ".tmp" iso = img + ".install.iso"