From patchwork Wed Sep 4 20:30:11 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: 173045 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp431174ilq; Wed, 4 Sep 2019 13:59:15 -0700 (PDT) X-Google-Smtp-Source: APXvYqwenLC++yFVXpF/wajT2KZfqTwFMYbmFFDSg5Opx+6mEFG4SZyyr73Qe0spFsGjP2e3QGLa X-Received: by 2002:ac8:301b:: with SMTP id f27mr38703qte.83.1567630755708; Wed, 04 Sep 2019 13:59:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567630755; cv=none; d=google.com; s=arc-20160816; b=nNbUX8WpfEHjnjBG0HfW5uGlAAnCpj5s0l1EHW3SxEiaWTNSdUeGsYT1a/VMO90NKr TY67kcO5R6EzoFd4ib8saVcFgu8UoVYSIuMLcvM6UdiliTHIXOp23DAZNi6ZutF8gAIj GOH3/ZlkPRloMZx5aGnchb/zmyikG7iddXXBoWnpXgP9v2fI08YutRfHsRp29NSYqnXj CHikpcGTNBm0XmIYNoMz0+OhpPub+Y7m82uGz4wC55wdY8uS0WFJ9g8LQzvz/7/MSKU2 mnVXQz0bQP8jt5PMOVyPZ7mw9RWLMkqfBu2yS/MmM1N9Nevr+7IyoEfQ7/xteanDP0I/ 5e+A== 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:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=JTL/FheK7UxEeMxwOW9JyHS60K9JSq+RkXWJ74ocsQk=; b=I210Yadd0x+tPS7Gqk1OnSUsbITy9kz4Y/547asSB+4PEzM0scTsJAIDwrXWmIdI9s uUeTsb2r67NMEyuN/RReWAFkxkiUMnO9fVCo6mtr51mPtEu35TDELEcqBYDEH3H1V8L1 D+w7xbM4o8WUCHcYFiXYPdWdC67c+E/KVZT1uKFVEJ7REg1Tfgy1elYCeFQNQAy/lFn2 Z9V+uoa4IDjmuqiqfxqsCq2Veld97yMQMBgnXxxWzmZcPAZtyETvQhL00lhV9ki+grd2 EJ/8JTiMyjcquwTatCDQO0OV9Bi2Q62VHzTGEQ9KFZxYjsxxi4pBXI5Maf/Til21KUEY 2BcA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=holC5qKN; 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 z42si56458qve.158.2019.09.04.13.59.15 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Sep 2019 13:59:15 -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=holC5qKN; 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]:39684 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5cN0-0003zp-Dx for patch@linaro.org; Wed, 04 Sep 2019 16:59:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51609) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5c3x-0000xy-AN for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:39:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i5c3v-0003Vo-6T for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:39:33 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:52318) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i5c3u-0003UF-MK for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:39:30 -0400 Received: by mail-wm1-x334.google.com with SMTP id t17so221542wmi.2 for ; Wed, 04 Sep 2019 13:39:30 -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 :mime-version:content-transfer-encoding; bh=JTL/FheK7UxEeMxwOW9JyHS60K9JSq+RkXWJ74ocsQk=; b=holC5qKN5z20UzdvT6rEJ9Vj/2iK4ltydUxH6hoAFwNpriOfmGLxgwfKi9UkG6Gk1l blg4cFHHJ4P+NzbQZA4C4IK9qCf2fVsppKJL6C+KgMmypUbcR8Gqim5CbL/r5Gdt9Z7A Tx/1zVOe2KROncYtSGJEycUOFS49oO4AD7b81FI8hYFF56TyHvD21pbohBWNw9Z2tXLF RMNZV9PiaTk9Q9IkgFYtyFyIRIV4n8ZnED8C4ElgvVpFVzMS44JmW9SRXV9eRZ7UKlh/ ChkIJMr5SDhUfLlC1JgI3I8OiDZu6HEsjNWWawhcum4rKKHaUXdejj3mRy0XeOFvIONK qEQQ== 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=JTL/FheK7UxEeMxwOW9JyHS60K9JSq+RkXWJ74ocsQk=; b=ZYEjixCgzSE4SnIHYRYnmjrXIk/Gajcq+lh9hUnU5nQfXSoY0FBeojzgXyStSzyEyt /4439nM4aRn2Dt6/WUB0+eDNY6CwnqwlQtRDF3U9qAKRfngVwhOXU+rSqm7X/orkAovv KBdnT1jtdjXQ8jsJW6M8U4llnzSfcnLTNy+ui8PzZaQPS/KIvHxpf6g5IDKmOGRKkzWB 6tVx5etsutVeUTNdes5rdHr243fWehSNOMs36uFeB6DhuNGhp0H8HZ1xHZtJqoRWMbft ujV8TnW5Uc2OsLrizPFCB2+ufv7HlXu6uj2YXNBzlrA1IcxFDWkHf10s8KeOaTohpL/i YX2w== X-Gm-Message-State: APjAAAVTnWN6fyZU88lkbsAUrzzqgjPM/kJSbkIxJb6exIgOgpTRGHTJ 2E4JKtKqZDM1S28A5FwxfOD4vQ== X-Received: by 2002:a1c:9ecb:: with SMTP id h194mr111228wme.35.1567629569522; Wed, 04 Sep 2019 13:39:29 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id s26sm19428810wrs.63.2019.09.04.13.39.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Sep 2019 13:39:26 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 0C7B51FFC0; Wed, 4 Sep 2019 21:30:17 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 4 Sep 2019 21:30:11 +0100 Message-Id: <20190904203013.9028-41-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190904203013.9028-1-alex.bennee@linaro.org> References: <20190904203013.9028-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::334 Subject: [Qemu-devel] [PATCH v1 40/42] Fedora images: use URLs from stable "archives.fedoraproject.org" 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@euphon.net, Yash Mankad , berrange@redhat.com, stefanb@linux.vnet.ibm.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Cleber Rosa , richard.henderson@linaro.org, f4bug@amsat.org, =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= , cota@braap.org, stefanha@redhat.com, marcandre.lureau@redhat.com, pbonzini@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Cleber Rosa The LinuxInitrd.test_with_2gib_file_should_work_with_linux_v4_16 test, from tests/acceptance/linux_initrd.py, is currently failing to fetch the "vmlinuz" file. The reason for the failure is that the Fedora project retires older versions from the "dl.fedoraproject.org" URL, and keeps them in "archives.fedoraproject.org". As an added note, that test uses a Fedora 28 image, because of the specific Linux kernel version requirements of the test. For the sake of stability, let's use URLs from the archived and supposedely ever stable URLs. The good news is that the currently supported versions are also hosted on the later. This change limits itself to change the URLs, while keeping the fetched files the same (as can be evidenced by the unchanged hashes). Documentation and the "vm tests" fedora definition were also updated. Signed-off-by: Cleber Rosa Reviewed-by: Yash Mankad Message-Id: <20190904005218.12536-1-crosa@redhat.com> Signed-off-by: Alex Bennée --- qemu-doc.texi | 6 +++--- tests/acceptance/boot_linux_console.py | 25 +++++++++++++++---------- tests/acceptance/linux_initrd.py | 5 +++-- tests/vm/fedora | 2 +- 4 files changed, 22 insertions(+), 16 deletions(-) -- 2.20.1 Reviewed-by: Philippe Mathieu-Daudé diff --git a/qemu-doc.texi b/qemu-doc.texi index 577d1e83764..37795f86fb6 100644 --- a/qemu-doc.texi +++ b/qemu-doc.texi @@ -440,15 +440,15 @@ of . Example: boot from a remote Fedora 20 live ISO image @example -qemu-system-x86_64 --drive media=cdrom,file=http://dl.fedoraproject.org/pub/fedora/linux/releases/20/Live/x86_64/Fedora-Live-Desktop-x86_64-20-1.iso,readonly +qemu-system-x86_64 --drive media=cdrom,file=https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/20/Live/x86_64/Fedora-Live-Desktop-x86_64-20-1.iso,readonly -qemu-system-x86_64 --drive media=cdrom,file.driver=http,file.url=http://dl.fedoraproject.org/pub/fedora/linux/releases/20/Live/x86_64/Fedora-Live-Desktop-x86_64-20-1.iso,readonly +qemu-system-x86_64 --drive media=cdrom,file.driver=http,file.url=http://archives.fedoraproject.org/pub/archive/fedora/linux/releases/20/Live/x86_64/Fedora-Live-Desktop-x86_64-20-1.iso,readonly @end example Example: boot from a remote Fedora 20 cloud image using a local overlay for writes, copy-on-read, and a readahead of 64k @example -qemu-img create -f qcow2 -o backing_file='json:@{"file.driver":"http",, "file.url":"https://dl.fedoraproject.org/pub/fedora/linux/releases/20/Images/x86_64/Fedora-x86_64-20-20131211.1-sda.qcow2",, "file.readahead":"64k"@}' /tmp/Fedora-x86_64-20-20131211.1-sda.qcow2 +qemu-img create -f qcow2 -o backing_file='json:@{"file.driver":"http",, "file.url":"http://archives.fedoraproject.org/pub/archive/fedora/linux/releases/20/Images/x86_64/Fedora-x86_64-20-20131211.1-sda.qcow2",, "file.readahead":"64k"@}' /tmp/Fedora-x86_64-20-20131211.1-sda.qcow2 qemu-system-x86_64 -drive file=/tmp/Fedora-x86_64-20-20131211.1-sda.qcow2,copy-on-read=on @end example diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot_linux_console.py index 2504ef01507..8a9a314ab49 100644 --- a/tests/acceptance/boot_linux_console.py +++ b/tests/acceptance/boot_linux_console.py @@ -76,8 +76,9 @@ class BootLinuxConsole(Test): :avocado: tags=arch:x86_64 :avocado: tags=machine:pc """ - kernel_url = ('https://download.fedoraproject.org/pub/fedora/linux/' - 'releases/29/Everything/x86_64/os/images/pxeboot/vmlinuz') + kernel_url = ('https://archives.fedoraproject.org/pub/archive/fedora' + '/linux/releases/29/Everything/x86_64/os/images/pxeboot' + '/vmlinuz') kernel_hash = '23bebd2680757891cf7adedb033532163a792495' kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash) @@ -250,8 +251,9 @@ class BootLinuxConsole(Test): :avocado: tags=arch:aarch64 :avocado: tags=machine:virt """ - kernel_url = ('https://download.fedoraproject.org/pub/fedora/linux/' - 'releases/29/Everything/aarch64/os/images/pxeboot/vmlinuz') + kernel_url = ('https://archives.fedoraproject.org/pub/archive/fedora' + '/linux/releases/29/Everything/aarch64/os/images/pxeboot' + '/vmlinuz') kernel_hash = '8c73e469fc6ea06a58dc83a628fc695b693b8493' kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash) @@ -271,8 +273,9 @@ class BootLinuxConsole(Test): :avocado: tags=arch:arm :avocado: tags=machine:virt """ - kernel_url = ('https://download.fedoraproject.org/pub/fedora/linux/' - 'releases/29/Everything/armhfp/os/images/pxeboot/vmlinuz') + kernel_url = ('https://archives.fedoraproject.org/pub/archive/fedora' + '/linux/releases/29/Everything/armhfp/os/images/pxeboot' + '/vmlinuz') kernel_hash = 'e9826d741b4fb04cadba8d4824d1ed3b7fb8b4d4' kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash) @@ -318,8 +321,9 @@ class BootLinuxConsole(Test): :avocado: tags=arch:s390x :avocado: tags=machine:s390_ccw_virtio """ - kernel_url = ('https://download.fedoraproject.org/pub/fedora-secondary/' - 'releases/29/Everything/s390x/os/images/kernel.img') + kernel_url = ('https://archives.fedoraproject.org/pub/archive' + '/fedora-secondary/releases/29/Everything/s390x/os/images' + '/kernel.img') kernel_hash = 'e8e8439103ef8053418ef062644ffd46a7919313' kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash) @@ -360,8 +364,9 @@ class BootLinuxConsole(Test): :avocado: tags=arch:ppc64 :avocado: tags=machine:pseries """ - kernel_url = ('https://download.fedoraproject.org/pub/fedora-secondary/' - 'releases/29/Everything/ppc64le/os/ppc/ppc64/vmlinuz') + kernel_url = ('https://archives.fedoraproject.org/pub/archive' + '/fedora-secondary/releases/29/Everything/ppc64le/os' + '/ppc/ppc64/vmlinuz') kernel_hash = '3fe04abfc852b66653b8c3c897a59a689270bc77' kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash) diff --git a/tests/acceptance/linux_initrd.py b/tests/acceptance/linux_initrd.py index 23be5a63aa8..c61d9826a45 100644 --- a/tests/acceptance/linux_initrd.py +++ b/tests/acceptance/linux_initrd.py @@ -54,8 +54,9 @@ class LinuxInitrd(Test): QEMU has supported up to 4 GiB initrd for recent kernel Expect guest can reach 'Unpacking initramfs...' """ - kernel_url = ('https://mirrors.kernel.org/fedora/releases/28/' - 'Everything/x86_64/os/images/pxeboot/vmlinuz') + kernel_url = ('https://archives.fedoraproject.org/pub/archive/fedora' + '/linux/releases/28/Everything/x86_64/os/images/pxeboot/' + 'vmlinuz') kernel_hash = '238e083e114c48200f80d889f7e32eeb2793e02a' kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash) max_size = 2 * (1024 ** 3) + 1 diff --git a/tests/vm/fedora b/tests/vm/fedora index e8fa5bf0d21..7fec1479fb7 100755 --- a/tests/vm/fedora +++ b/tests/vm/fedora @@ -23,7 +23,7 @@ class FedoraVM(basevm.BaseVM): name = "fedora" arch = "x86_64" - base = "http://dl.fedoraproject.org/pub/fedora/linux/releases/30/" + base = "https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/30/" link = base + "Server/x86_64/iso/Fedora-Server-netinst-x86_64-30-1.2.iso" repo = base + "Server/x86_64/os/" full = base + "Everything/x86_64/os/"