From patchwork Tue Feb 9 17:58:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 12078735 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=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT 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 964DBC433E9 for ; Tue, 9 Feb 2021 17:59:29 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 4808E64EC4 for ; Tue, 9 Feb 2021 17:59:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4808E64EC4 Authentication-Results: mail.kernel.org; dmarc=pass (p=none dis=none) header.from=xenproject.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.83372.154993 (Exim 4.92) (envelope-from ) id 1l9XIB-0007eM-SO; Tue, 09 Feb 2021 17:59:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 83372.154993; Tue, 09 Feb 2021 17:59:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l9XIB-0007eF-P6; Tue, 09 Feb 2021 17:59:15 +0000 Received: by outflank-mailman (input) for mailman id 83372; Tue, 09 Feb 2021 17:59:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l9XI9-0007dX-S8 for xen-devel@lists.xenproject.org; Tue, 09 Feb 2021 17:59:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l9XI9-0003yp-OO for xen-devel@lists.xenproject.org; Tue, 09 Feb 2021 17:59:13 +0000 Received: from iwj (helo=mariner.uk.xensource.com) by xenbits.xenproject.org with local-bsmtp (Exim 4.92) (envelope-from ) id 1l9XI9-0004cv-MB for xen-devel@lists.xenproject.org; Tue, 09 Feb 2021 17:59:13 +0000 Received: from [172.18.45.5] (helo=zealot.relativity.greenend.org.uk) by mariner.uk.xensource.com with esmtp (Exim 4.89) (envelope-from ) id 1l9XI7-00065Y-NK; Tue, 09 Feb 2021 17:59:11 +0000 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Content-Transfer-Encoding:MIME-Version: Message-Id:Date:Subject:Cc:To:From; bh=DeylNrZYYK3wMWxKS9RPXvprA8fskbcUy3SMB2/3gZ8=; b=YY4Hz0YJpc+VgI5f4qu8w1f9vh 2B9/AgT9Mod3ed28iSgZMackaFGtssgGVMKlehZ8sX7NEuezlyZnEicsF6yaKmpLAXyS+csxe1nbO eNt/TS4wz2TKzqRYuEfTzLc/WWsKkms6edoaGMYIA4/+6eAYXxRKuHy16LmTqTGmPeCs=; From: Ian Jackson To: xen-devel@lists.xenproject.org Cc: Ian Jackson Subject: [OSSTEST PATCH 1/7] mg-debian-installer-update: Honour redirect for dtbs Date: Tue, 9 Feb 2021 17:58:58 +0000 Message-Id: <20210209175904.28282-1-iwj@xenproject.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 When using snapshots, we can get a redirect and then we don't recurse. There doesn't seem to be a suitable option for wget, so do this by hand before we call wget -m. Signed-off-by: Ian Jackson --- mg-debian-installer-update | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/mg-debian-installer-update b/mg-debian-installer-update index fb4fe2ab..5e890d34 100755 --- a/mg-debian-installer-update +++ b/mg-debian-installer-update @@ -89,7 +89,12 @@ if [ "x$dtbs" != "x" ] ; then # Can't seem to get curl to globs. rm -rf dtbs mkdir dtbs - ( cd dtbs && wget -nv -A README,\*.dtb -nd -nH -np -m $dtbs ) + dtbs_redir="$(curl -sSI -o /dev/null -w '%{redirect_url}' $dtbs)" + if [ "x$dtbs_redir" != x ]; then + dtbs=$dtbs_redir + echo "Redirected for dtbs, to $dtbs" + fi + ( cd dtbs && wget -nv -A README,\*.dtb -nd -nH -np -m "$dtbs" ) tar --mtime=./dtbs/README -cf dtbs.tar dtbs gzip -9nf dtbs.tar fi From patchwork Tue Feb 9 17:58:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 12078743 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=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT 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 19311C4332B for ; Tue, 9 Feb 2021 17:59:30 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 C0CA864EC9 for ; Tue, 9 Feb 2021 17:59:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C0CA864EC9 Authentication-Results: mail.kernel.org; dmarc=pass (p=none dis=none) header.from=xenproject.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.83373.155001 (Exim 4.92) (envelope-from ) id 1l9XIC-0007eo-AX; Tue, 09 Feb 2021 17:59:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 83373.155001; Tue, 09 Feb 2021 17:59:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l9XIC-0007ec-0X; Tue, 09 Feb 2021 17:59:16 +0000 Received: by outflank-mailman (input) for mailman id 83373; Tue, 09 Feb 2021 17:59:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l9XIA-0007dc-92 for xen-devel@lists.xenproject.org; Tue, 09 Feb 2021 17:59:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l9XIA-0003ys-7v for xen-devel@lists.xenproject.org; Tue, 09 Feb 2021 17:59:14 +0000 Received: from iwj (helo=mariner.uk.xensource.com) by xenbits.xenproject.org with local-bsmtp (Exim 4.92) (envelope-from ) id 1l9XIA-0004d9-4H for xen-devel@lists.xenproject.org; Tue, 09 Feb 2021 17:59:14 +0000 Received: from [172.18.45.5] (helo=zealot.relativity.greenend.org.uk) by mariner.uk.xensource.com with esmtp (Exim 4.89) (envelope-from ) id 1l9XI8-00065Y-AQ; Tue, 09 Feb 2021 17:59:12 +0000 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=IJysOWmQHZYngadVXUNXmiph+YVmGyRyOsy43nVdaL8=; b=aDETW7u5hqy8GTIuhW5MBMIuKz hOjzqZ2/xy/zUu1LB7WahmA3a83lzYRy/55wrSHZOM1W2JHmwbrMgyy041Xz5lqmhoXsEvA5zzg6E jZRzPZCiBeYXZxodHsHABFUcxH1flsNQQangJ7Pji8VS+re4iVNeFyrbzKlDt3HZmluY=; From: Ian Jackson To: xen-devel@lists.xenproject.org Cc: Ian Jackson Subject: [OSSTEST PATCH 2/7] Debian mirror selection: Introduce DebianMirror[_[_]] Date: Tue, 9 Feb 2021 17:58:59 +0000 Message-Id: <20210209175904.28282-2-iwj@xenproject.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210209175904.28282-1-iwj@xenproject.org> References: <20210209175904.28282-1-iwj@xenproject.org> MIME-Version: 1.0 No functional change with existing configs. Signed-off-by: Ian Jackson --- Osstest/Debian.pm | 35 ++++++++++++++++++++++++++++++++--- README | 4 ++++ make-distros-flight | 2 ++ production-config | 3 --- ts-debian-install | 4 +++- 5 files changed, 41 insertions(+), 7 deletions(-) diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm index 01930e1f..05cc6e1f 100644 --- a/Osstest/Debian.pm +++ b/Osstest/Debian.pm @@ -22,6 +22,7 @@ use warnings; use POSIX; +use Carp; use IO::File; use File::Copy; use File::Basename; @@ -35,6 +36,8 @@ BEGIN { $VERSION = 1.00; @ISA = qw(Exporter); @EXPORT = qw(debian_boot_setup + debian_mirror_url debian_mirror_host_path + debian_mirror_url_suite_arch di_installer_path di_special_kernel setupboot_bootloader_edited_rune debian_overlays debian_overlays_fixup_cmd @@ -811,12 +814,36 @@ chmod 600 $subdir/etc/ssh/ssh_host_*_key ||: END } +sub debian_mirror_url ($) { + # I think ideally this should handle, and be used for, backports too. + # It would need an optional suite suffix which could be "-backports"? + my ($ho) = @_; + my $suite = $ho->{Suite}; + my $arch = $ho->{Arch}; + my $url = + $c{"DebianMirror_${suite}_${arch}"} // + $c{"DebianMirror_${suite}"} // + $c{"DebianMirror"}; + if (!defined $url) { + $url = "http://$c{DebianMirrorHost}/$c{DebianMirrorSubpath}"; + } + return $url; +} + +sub debian_mirror_host_path ($) { + my ($ho) = @_; + my $url = debian_mirror_url($ho); + $url =~ m{^http://([^/]+)/(.*)$} or + confess "unsupported Debian url (needs to be http://HOST/...): $url"; + return ($1, $2); +} + sub preseed_backports_packages ($$$$@) { my ($ho, $sfx, $xopts, $suite, @pkgs) = @_; if (! $xopts->{BackportsSourcesAlreadyAdded}++) { my $bp_url = $c{"DebianSnapshotBackports_$suite"}; - $bp_url ||= "http://$c{DebianMirrorHost}/$c{DebianMirrorSubpath}"; + $bp_url ||= debian_mirror_url($ho); my $apt_insert=''; my $extra_rune=''; @@ -942,6 +969,8 @@ END preseed_hook_command($ho, 'late_command', $sfx, debian_dhcp_rofs_fix($ho, '/target')); + my ($mhost, $mpath) = debian_mirror_host_path($ho); + my $preseed = <<"END"; d-i debian-installer/locale string en_GB d-i console-keymaps-at/keymap select gb @@ -1001,9 +1030,9 @@ d-i finish-install/keep-consoles boolean true d-i finish-install/reboot_in_progress note d-i cdrom-detect/eject boolean false -d-i mirror/http/hostname string $c{DebianMirrorHost} +d-i mirror/http/hostname string $mhost +d-i mirror/http/directory string /$mpath d-i mirror/http/proxy string $c{DebianMirrorProxy} -d-i mirror/http/directory string /$c{DebianMirrorSubpath} d-i apt-setup/use_mirror boolean yes d-i apt-setup/another boolean false d-i apt-setup/non-free boolean false diff --git a/README b/README index 33c4d2cc..20d9802a 100644 --- a/README +++ b/README @@ -398,6 +398,10 @@ DebianMirrorProxy The apt proxy to specify for Debian (and derivatives), eg http://apt-cacher:3142/ . +DebianMirror[_[_]] + Overrides DebianMirrorHost and DebianMirrorSubpath, optionally + for specific suite and arch. + TestHost TestHost_ Specifies the test box to use. Should be a bare hostname, diff --git a/make-distros-flight b/make-distros-flight index 406d7d64..47094ef5 100755 --- a/make-distros-flight +++ b/make-distros-flight @@ -74,6 +74,8 @@ test_do_one_netboot () { else #local mirror="http://`getconfig DebianMirrorHost`/`getconfig DebianMirrorSubpath`" # XXX local mirror seems to serve up stale files. + # ^ this should use debian_mirror_url, not plain config, so it + # honours suite- and arch- specific settings local mirror="http://ftp.debian.org/debian" diurl="$mirror/dists/$guest_suite/main/installer-$domU/current/images/netboot" gver=$guest_suite diff --git a/production-config b/production-config index df32e863..e7009a55 100644 --- a/production-config +++ b/production-config @@ -126,9 +126,6 @@ CoverityUploadUrl https://scan.coverity.com/builds?project=XenProject CoverityTools cov-analysis-linux64-2019.03.tar.gz CoverityToolsStripComponents 1 -# We use the IP address because Citrix can't manage reliable nameservice -#DebianMirrorHost debian.uk.xensource.com -#DebianMirrorHost 10.80.16.196 DebianMirrorProxy http://cache:3143/ HostProp_DhcpWatchMethod leases dhcp3 infra.t:5556 diff --git a/ts-debian-install b/ts-debian-install index 8caa9d76..c42e8a37 100755 --- a/ts-debian-install +++ b/ts-debian-install @@ -83,12 +83,14 @@ END $cmd .= <{Ether} \\ --memory ${ram_mb}Mb --swap ${swap_mb}Mb \\ --dist $gsuite \\ - --mirror http://$c{DebianMirrorHost}/$c{DebianMirrorSubpath} \\ + --mirror $mirror \\ --hostname $gho->{Name} \\ --lvm $gho->{Vg} --force \\ --kernel $kernpath \\ From patchwork Tue Feb 9 17:59:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 12078733 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=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT 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 61AACC433E0 for ; Tue, 9 Feb 2021 17:59:28 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 123C064EC8 for ; Tue, 9 Feb 2021 17:59:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 123C064EC8 Authentication-Results: mail.kernel.org; dmarc=pass (p=none dis=none) header.from=xenproject.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.83374.155006 (Exim 4.92) (envelope-from ) id 1l9XIC-0007fV-Ia; Tue, 09 Feb 2021 17:59:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 83374.155006; Tue, 09 Feb 2021 17:59:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l9XIC-0007fG-C2; Tue, 09 Feb 2021 17:59:16 +0000 Received: by outflank-mailman (input) for mailman id 83374; Tue, 09 Feb 2021 17:59:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l9XIA-0007dh-LS for xen-devel@lists.xenproject.org; Tue, 09 Feb 2021 17:59:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l9XIA-0003yv-Km for xen-devel@lists.xenproject.org; Tue, 09 Feb 2021 17:59:14 +0000 Received: from iwj (helo=mariner.uk.xensource.com) by xenbits.xenproject.org with local-bsmtp (Exim 4.92) (envelope-from ) id 1l9XIA-0004dP-JD for xen-devel@lists.xenproject.org; Tue, 09 Feb 2021 17:59:14 +0000 Received: from [172.18.45.5] (helo=zealot.relativity.greenend.org.uk) by mariner.uk.xensource.com with esmtp (Exim 4.89) (envelope-from ) id 1l9XI8-00065Y-M7; Tue, 09 Feb 2021 17:59:12 +0000 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=7ptVHVv6hSaLUTOmQvRCmHGiTbV+rGIqKIYD1ZJ897I=; b=Uf6AjtirZWVDuiNlWJEiz0Cjjy M4h4JY1qy4daDHN8uF5lX9ckO5XK99gdLtdZqCE3E1nkF48MdTluyWXQPmPvQIRArF727dkCCU84T X+hEwuKcvhvwyZafykJad7ktpYWMCXK0VWEG9GW2s94Zfxq63g4y0cmjUQ1EGmrm52vk=; From: Ian Jackson To: xen-devel@lists.xenproject.org Cc: Ian Jackson Subject: [OSSTEST PATCH 3/7] Debian mirror selection: Provide debian_archive_url_suite_arch Date: Tue, 9 Feb 2021 17:59:00 +0000 Message-Id: <20210209175904.28282-3-iwj@xenproject.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210209175904.28282-1-iwj@xenproject.org> References: <20210209175904.28282-1-iwj@xenproject.org> MIME-Version: 1.0 mg-debian-installer-update is going to want this. NFC. Signed-off-by: Ian Jackson --- Osstest/Debian.pm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm index 05cc6e1f..dee52b3d 100644 --- a/Osstest/Debian.pm +++ b/Osstest/Debian.pm @@ -814,12 +814,8 @@ chmod 600 $subdir/etc/ssh/ssh_host_*_key ||: END } -sub debian_mirror_url ($) { - # I think ideally this should handle, and be used for, backports too. - # It would need an optional suite suffix which could be "-backports"? - my ($ho) = @_; - my $suite = $ho->{Suite}; - my $arch = $ho->{Arch}; +sub debian_mirror_url_suite_arch ($$) { + my ($suite, $arch) = @_; my $url = $c{"DebianMirror_${suite}_${arch}"} // $c{"DebianMirror_${suite}"} // @@ -830,6 +826,13 @@ sub debian_mirror_url ($) { return $url; } +sub debian_mirror_url ($) { + # I think ideally this should handle, and be used for, backports too. + # It would need an optional suite suffix which could be "-backports"? + my ($ho) = @_; + return debian_mirror_url_suite_arch($ho->{Suite}, $ho->{Arch}); +} + sub debian_mirror_host_path ($) { my ($ho) = @_; my $url = debian_mirror_url($ho); From patchwork Tue Feb 9 17:59:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 12078739 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=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 E4E93C43381 for ; Tue, 9 Feb 2021 17:59:29 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 98C7464EC6 for ; Tue, 9 Feb 2021 17:59:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 98C7464EC6 Authentication-Results: mail.kernel.org; dmarc=pass (p=none dis=none) header.from=xenproject.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.83375.155016 (Exim 4.92) (envelope-from ) id 1l9XIC-0007gS-VB; Tue, 09 Feb 2021 17:59:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 83375.155016; Tue, 09 Feb 2021 17:59:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l9XIC-0007g1-NW; Tue, 09 Feb 2021 17:59:16 +0000 Received: by outflank-mailman (input) for mailman id 83375; Tue, 09 Feb 2021 17:59:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l9XIB-0007e5-6G for xen-devel@lists.xenproject.org; Tue, 09 Feb 2021 17:59:15 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l9XIB-0003yy-5Z for xen-devel@lists.xenproject.org; Tue, 09 Feb 2021 17:59:15 +0000 Received: from iwj (helo=mariner.uk.xensource.com) by xenbits.xenproject.org with local-bsmtp (Exim 4.92) (envelope-from ) id 1l9XIB-0004di-4W for xen-devel@lists.xenproject.org; Tue, 09 Feb 2021 17:59:15 +0000 Received: from [172.18.45.5] (helo=zealot.relativity.greenend.org.uk) by mariner.uk.xensource.com with esmtp (Exim 4.89) (envelope-from ) id 1l9XI9-00065Y-8X; Tue, 09 Feb 2021 17:59:13 +0000 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=ZGibySREmlkdtxh1B3xdTGiAPnSGGHBkgH+xeUe0jfg=; b=ZXghKaLkqZMGrYekheqY7qwBmD 6SbZ629tQKFK7kN0tFA5MEbVOXnOhSdxyaK5G92Bm4f8gMECaSQJGcH04JYRoB+GJLeO9ZA30OeoI W7MfzLxXgPaZ0Vd8bY/HX/wlSUC7GDuxkCNpn5gJm+MGfWMlBuUXMJfIaDPORooZajRw=; From: Ian Jackson To: xen-devel@lists.xenproject.org Cc: Ian Jackson Subject: [OSSTEST PATCH 4/7] mg-debian-installer-update: Use Debian mirror selection Date: Tue, 9 Feb 2021 17:59:01 +0000 Message-Id: <20210209175904.28282-4-iwj@xenproject.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210209175904.28282-1-iwj@xenproject.org> References: <20210209175904.28282-1-iwj@xenproject.org> MIME-Version: 1.0 NFC with existing config. Signed-off-by: Ian Jackson --- mg-debian-installer-update | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/mg-debian-installer-update b/mg-debian-installer-update index 5e890d34..4fb4bc21 100755 --- a/mg-debian-installer-update +++ b/mg-debian-installer-update @@ -28,7 +28,13 @@ suite=$1 arch=$2 packages="$3" -site=http://ftp.debian.org/debian/ +site=$(perl -we ' + use Osstest; + use Osstest::Debian; + readglobalconfig(); + print debian_mirror_url_suite_arch($ARGV[0], $ARGV[1]) or die $!; +' "$suite" "$arch") + sbase=$site/dists/$suite src=$sbase/main/installer-$arch/current/images/netboot/ From patchwork Tue Feb 9 17:59:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 12078731 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=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT 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 69281C433E6 for ; Tue, 9 Feb 2021 17:59:28 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 0739D64EC6 for ; Tue, 9 Feb 2021 17:59:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0739D64EC6 Authentication-Results: mail.kernel.org; dmarc=pass (p=none dis=none) header.from=xenproject.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.83376.155035 (Exim 4.92) (envelope-from ) id 1l9XID-0007hd-Pr; Tue, 09 Feb 2021 17:59:17 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 83376.155035; Tue, 09 Feb 2021 17:59:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l9XID-0007hG-BJ; Tue, 09 Feb 2021 17:59:17 +0000 Received: by outflank-mailman (input) for mailman id 83376; Tue, 09 Feb 2021 17:59:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l9XIB-0007eA-Kf for xen-devel@lists.xenproject.org; Tue, 09 Feb 2021 17:59:15 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l9XIB-0003z4-JF for xen-devel@lists.xenproject.org; Tue, 09 Feb 2021 17:59:15 +0000 Received: from iwj (helo=mariner.uk.xensource.com) by xenbits.xenproject.org with local-bsmtp (Exim 4.92) (envelope-from ) id 1l9XIB-0004e7-I5 for xen-devel@lists.xenproject.org; Tue, 09 Feb 2021 17:59:15 +0000 Received: from [172.18.45.5] (helo=zealot.relativity.greenend.org.uk) by mariner.uk.xensource.com with esmtp (Exim 4.89) (envelope-from ) id 1l9XI9-00065Y-LO; Tue, 09 Feb 2021 17:59:13 +0000 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=/4mHoLOl6nDqU6KIAQm25wzyPgRrf/4mH1E4Sbq3iG4=; b=3uMlFeG9iuaWxstI/MqtDF3r5I ZwYaOHg+2JTXqdkuvzMo95q4LPITbPe89bOVmMhK9H20+RkPE+JyNhLOl3Dws4p8CoYK55ZeKyLTJ GgyW8AYdRkGXrotuiULJxYyMWTgVOCOUsBrMQ+G39mjoWo5OUQXmnmKH/+Bt4hKzfZZ0=; From: Ian Jackson To: xen-devel@lists.xenproject.org Cc: Ian Jackson Subject: [OSSTEST PATCH 5/7] Debian mirror: Disable timestamp verification for snapshot.d.o Date: Tue, 9 Feb 2021 17:59:02 +0000 Message-Id: <20210209175904.28282-5-iwj@xenproject.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210209175904.28282-1-iwj@xenproject.org> References: <20210209175904.28282-1-iwj@xenproject.org> MIME-Version: 1.0 This is kind of duplicative of the logic in preseed_backports_packages but I don't want to mess with that now. Signed-off-by: Ian Jackson --- Osstest.pm | 2 ++ Osstest/Debian.pm | 16 ++++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/Osstest.pm b/Osstest.pm index 809194f0..7776ba88 100644 --- a/Osstest.pm +++ b/Osstest.pm @@ -246,6 +246,8 @@ sub readglobalconfig () { $c{DefaultBranch} ||= 'xen-unstable'; $c{DebianMirrorHost} ||= 'ftp.debian.org' if $c{DebianMirrorProxy}; + $c{DebianMirrorAllowExpiredReleaseRegexp} //= + qr{^\Qhttp://snapshot.debian.org/}; $c{EmailStdHeaders} ||= <<'END'; Content-Type: text/plain; charset="UTF-8" diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm index dee52b3d..d6e0b59d 100644 --- a/Osstest/Debian.pm +++ b/Osstest/Debian.pm @@ -972,6 +972,22 @@ END preseed_hook_command($ho, 'late_command', $sfx, debian_dhcp_rofs_fix($ho, '/target')); + my $murl = debian_mirror_url($ho); + if ($murl =~ m/$c{DebianMirrorAllowExpiredReleaseRegexp}/) { + # Inspired by + # https://stackoverflow.com/questions/25039317/is-there-any-setting-in-the-preseed-file-to-ignore-the-release-valid-until-opt/51396935#51396935 + # In some sense a workaround for the lack of a better way, + # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=771699 + preseed_hook_installscript($ho, $sfx, + '/usr/lib/apt-setup/generators/', '02IgnoreValidUntil', <<'END'); +#!/bin/sh +set -ex +d=/target/etc/apt/apt.conf.d/ +mkdir -p $d +echo 'Acquire::Check-Valid-Until "false";' >$d/02IgnoreValidUntil +END + } + my ($mhost, $mpath) = debian_mirror_host_path($ho); my $preseed = <<"END"; From patchwork Tue Feb 9 17:59:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 12078741 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=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT 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 ECA8CC4332D for ; Tue, 9 Feb 2021 17:59:29 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 A3B9664EC4 for ; Tue, 9 Feb 2021 17:59:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A3B9664EC4 Authentication-Results: mail.kernel.org; dmarc=pass (p=none dis=none) header.from=xenproject.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.83377.155050 (Exim 4.92) (envelope-from ) id 1l9XIE-0007kJ-Nm; Tue, 09 Feb 2021 17:59:18 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 83377.155050; Tue, 09 Feb 2021 17:59:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l9XIE-0007jo-AA; Tue, 09 Feb 2021 17:59:18 +0000 Received: by outflank-mailman (input) for mailman id 83377; Tue, 09 Feb 2021 17:59:16 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l9XIC-0007em-2J for xen-devel@lists.xenproject.org; Tue, 09 Feb 2021 17:59:16 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l9XIC-0003zA-1N for xen-devel@lists.xenproject.org; Tue, 09 Feb 2021 17:59:16 +0000 Received: from iwj (helo=mariner.uk.xensource.com) by xenbits.xenproject.org with local-bsmtp (Exim 4.92) (envelope-from ) id 1l9XIC-0004eY-0O for xen-devel@lists.xenproject.org; Tue, 09 Feb 2021 17:59:16 +0000 Received: from [172.18.45.5] (helo=zealot.relativity.greenend.org.uk) by mariner.uk.xensource.com with esmtp (Exim 4.89) (envelope-from ) id 1l9XIA-00065Y-4X; Tue, 09 Feb 2021 17:59:14 +0000 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=zS5Qpm9EEk8VpYi2KeFWiIa9aufzej4lmRBAOxzJ8fo=; b=iXl7meE5dLhsslURerdtufop65 bz/nnK0lO0CavJvqgI+tBlYjzuUCTg0iLIU769Cli5Zrup6eUCeWBBsmVBXZNAHdip0sUN7q/gxhT ayjr5TVq2F6yRhx9XTHoFwO7GZ5BfHaYIqhL6ZvYMExoWF0HFehuIhEvN2V5t7bWihW0=; From: Ian Jackson To: xen-devel@lists.xenproject.org Cc: Ian Jackson , Julien Grall , Stefano Stabellini Subject: [OSSTEST PATCH 6/7] production-config: Use a snapshot for buster armhf Date: Tue, 9 Feb 2021 17:59:03 +0000 Message-Id: <20210209175904.28282-6-iwj@xenproject.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210209175904.28282-1-iwj@xenproject.org> References: <20210209175904.28282-1-iwj@xenproject.org> MIME-Version: 1.0 The recent Debian update broke some guest setup. Roll back. CC: Julien Grall CC: Stefano Stabellini Signed-off-by: Ian Jackson --- production-config | 2 ++ 1 file changed, 2 insertions(+) diff --git a/production-config b/production-config index e7009a55..126c5d3b 100644 --- a/production-config +++ b/production-config @@ -93,6 +93,8 @@ TftpDiVersion_jessie 2018-06-26 TftpDiVersion_stretch 2020-09-24 TftpDiVersion_buster 2021-02-08 +DebianMirror_buster_armhf http://snapshot.debian.org/archive/debian/20210201T024125Z/ + DebianSnapshotBackports_jessie http://snapshot.debian.org/archive/debian/20190206T211314Z/ # For ISO installs From patchwork Tue Feb 9 17:59:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 12078737 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=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT 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 BC3EEC433DB for ; Tue, 9 Feb 2021 17:59:29 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 7241A64EC8 for ; Tue, 9 Feb 2021 17:59:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7241A64EC8 Authentication-Results: mail.kernel.org; dmarc=pass (p=none dis=none) header.from=xenproject.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.83378.155060 (Exim 4.92) (envelope-from ) id 1l9XIF-0007ly-HY; Tue, 09 Feb 2021 17:59:19 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 83378.155060; Tue, 09 Feb 2021 17:59:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l9XIE-0007lb-Vb; Tue, 09 Feb 2021 17:59:18 +0000 Received: by outflank-mailman (input) for mailman id 83378; Tue, 09 Feb 2021 17:59:16 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l9XIC-0007fs-LS for xen-devel@lists.xenproject.org; Tue, 09 Feb 2021 17:59:16 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l9XIC-0003zG-KT for xen-devel@lists.xenproject.org; Tue, 09 Feb 2021 17:59:16 +0000 Received: from iwj (helo=mariner.uk.xensource.com) by xenbits.xenproject.org with local-bsmtp (Exim 4.92) (envelope-from ) id 1l9XIC-0004f5-JK for xen-devel@lists.xenproject.org; Tue, 09 Feb 2021 17:59:16 +0000 Received: from [172.18.45.5] (helo=zealot.relativity.greenend.org.uk) by mariner.uk.xensource.com with esmtp (Exim 4.89) (envelope-from ) id 1l9XIA-00065Y-I8; Tue, 09 Feb 2021 17:59:14 +0000 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=oG2vXONH0nxvtWXCeybFMwC7yWwCLiEPbKtB71WxGuQ=; b=dPgj101E687RQ7LZrLQcOT7ICt 0l6sBtDIJHrp53fUQ3Bl7FjzR/diEc95s3gJ6XrhYVA36GrUooqoZ9NW0C1Zw2IOfdBf2gs3FzLFC 9k1u0Qjafkc1scz8mAX5WrjhtrDYZUWUY4GlkNi0Z5lPkkaL42vi+LO7IH0S0qQc1fiw=; From: Ian Jackson To: xen-devel@lists.xenproject.org Cc: Ian Jackson Subject: [OSSTEST PATCH 7/7] production-config: Update d-i; use snapshot for buster armhf Date: Tue, 9 Feb 2021 17:59:04 +0000 Message-Id: <20210209175904.28282-7-iwj@xenproject.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210209175904.28282-1-iwj@xenproject.org> References: <20210209175904.28282-1-iwj@xenproject.org> MIME-Version: 1.0 This version was generated by running mg-debian-installer-update-all with the recent changes to handle snapshots, and to use that for buster armhf. Signed-off-by: Ian Jackson --- production-config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/production-config b/production-config index 126c5d3b..f783af3c 100644 --- a/production-config +++ b/production-config @@ -91,7 +91,7 @@ TftpNetbootGroup osstest TftpDiVersion_wheezy 2016-06-08 TftpDiVersion_jessie 2018-06-26 TftpDiVersion_stretch 2020-09-24 -TftpDiVersion_buster 2021-02-08 +TftpDiVersion_buster 2021-02-09 DebianMirror_buster_armhf http://snapshot.debian.org/archive/debian/20210201T024125Z/