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 \\