From patchwork Tue Mar 10 12:08:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 11429225 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 67C4992A for ; Tue, 10 Mar 2020 12:09:27 +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 43EC52467D for ; Tue, 10 Mar 2020 12:09:27 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=citrix.com header.i=@citrix.com header.b="QSyOkYWw" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 43EC52467D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=eu.citrix.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1jBdgD-0003z4-81; Tue, 10 Mar 2020 12:08:13 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1jBdgB-0003yr-Qi for xen-devel@lists.xenproject.org; Tue, 10 Mar 2020 12:08:11 +0000 X-Inumbo-ID: cfaef052-62c7-11ea-ad86-12813bfff9fa Received: from esa5.hc3370-68.iphmx.com (unknown [216.71.155.168]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id cfaef052-62c7-11ea-ad86-12813bfff9fa; Tue, 10 Mar 2020 12:08:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1583842091; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=0Xs4fiV3M+YvZ+yzGv4KDYdD45eOph1korhAXW0BPxo=; b=QSyOkYWwmh6J1lgDNQ3HKkvLXx+Nsk31nW+S4vEdd0KpJik5osy2Xi/V z3LXWB3UWDI7DN0qQwB3KG5jKIjfazWrEpQ4Y2PNtjgn17y1I2LAAJ8pR TRz7O2NAfBRHNuVKjyGaO9H6TTQRxKZsHgJQDyFHSarkxQ6aiVdEZhuFc w=; Authentication-Results: esa5.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none; spf=None smtp.pra=ian.jackson@eu.citrix.com; spf=Pass smtp.mailfrom=Ian.Jackson@citrix.com; spf=None smtp.helo=postmaster@mail.citrix.com Received-SPF: None (esa5.hc3370-68.iphmx.com: no sender authenticity information available from domain of ian.jackson@eu.citrix.com) identity=pra; client-ip=162.221.158.21; receiver=esa5.hc3370-68.iphmx.com; envelope-from="Ian.Jackson@citrix.com"; x-sender="ian.jackson@eu.citrix.com"; x-conformance=sidf_compatible Received-SPF: Pass (esa5.hc3370-68.iphmx.com: domain of Ian.Jackson@citrix.com designates 162.221.158.21 as permitted sender) identity=mailfrom; client-ip=162.221.158.21; receiver=esa5.hc3370-68.iphmx.com; envelope-from="Ian.Jackson@citrix.com"; x-sender="Ian.Jackson@citrix.com"; x-conformance=sidf_compatible; x-record-type="v=spf1"; x-record-text="v=spf1 ip4:209.167.231.154 ip4:178.63.86.133 ip4:195.66.111.40/30 ip4:85.115.9.32/28 ip4:199.102.83.4 ip4:192.28.146.160 ip4:192.28.146.107 ip4:216.52.6.88 ip4:216.52.6.188 ip4:162.221.158.21 ip4:162.221.156.83 ip4:168.245.78.127 ~all" Received-SPF: None (esa5.hc3370-68.iphmx.com: no sender authenticity information available from domain of postmaster@mail.citrix.com) identity=helo; client-ip=162.221.158.21; receiver=esa5.hc3370-68.iphmx.com; envelope-from="Ian.Jackson@citrix.com"; x-sender="postmaster@mail.citrix.com"; x-conformance=sidf_compatible IronPort-SDR: DcIK2qiyICbau3bp5JUYA5QlQUWaDM4O4a4S6OJqvFYJyOgy5ErxpBaEi1h5RLMn0sTfZ7INla LeJKdZrMLVzqVc7YD4juofc3VpmLFsciAng4T98JRL/U2rJylJ9ZftvGlG0Y/kKchzBC0+r4os b79goq3JNJiXPZIzWUVZkuUN/1ms6+f7wwuJnv2bkUi5/UVMgpWFYOdLTfr9LFqzSMIaMAiM84 8/aWliL4UxsvaQ17sLWPQ+UE2kSgeX0/xYeHQFEvAfWlmlvBjc0hkWHUL7Hzy9LH74a+YdCOVy +fE= X-SBRS: 2.7 X-MesageID: 14030104 X-Ironport-Server: esa5.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.70,536,1574139600"; d="scan'208";a="14030104" From: Ian Jackson To: Date: Tue, 10 Mar 2020 12:08:02 +0000 Message-ID: <20200310120802.31625-3-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20200310120802.31625-1-ian.jackson@eu.citrix.com> References: <20200310120802.31625-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [OSSTEST PATCH 3/3] ts-memdisk-try-append: Call selecthost X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Roger_Pau_Monn=C3=A9?= , Ian Jackson Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" In 7f49abaa0ff91d6dc1592ea80f10211c52fb03c4 arch replumbing: Replace many $r{arch} with $[g]ho->{Arch} I accidentally broke this, by not spotting that the perl fragment did not call selecthost and has no $ho. Fix this as follows: * Pass all of the -try-append arguments to the perl rune. * Include a simple replica of the arg parsing of ts-freebsd-host-install (notably, we don't parse options, and instead assume the host comes last). * Call selecthost. Compared to the situation prior to 7f49abaa0ff9, we now check that the host is allocated to us, etc., before looking at what arch the job specifies. Additionally, we would now honour host_arch if it were different to arch. (Currently, it isn't.) CC: Roger Pau Monné Signed-off-by: Ian Jackson --- ts-memdisk-try-append | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ts-memdisk-try-append b/ts-memdisk-try-append index 2fe18f45..4b54eff0 100755 --- a/ts-memdisk-try-append +++ b/ts-memdisk-try-append @@ -23,8 +23,13 @@ arch=`perl -I. -e ' use Osstest::TestSupport; tsreadconfig(); + + our $whhost = pop @ARGV; # arg parsing bodge + $whhost ||= "host"; + our $ho = selecthost($whhost); + print $ho->{Arch} or die $!; - '` + ' "$@"` case "$arch" in amd64)