From patchwork Mon Sep 30 14:57:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 11166837 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 63CEF17E1 for ; Mon, 30 Sep 2019 14:58:48 +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 3FE0620679 for ; Mon, 30 Sep 2019 14:58:48 +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="FobrKcn5" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3FE0620679 Authentication-Results: mail.kernel.org; dmarc=none (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 1iEx76-00052p-VL; Mon, 30 Sep 2019 14:57:24 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iEx75-00052g-Qv for xen-devel@lists.xenproject.org; Mon, 30 Sep 2019 14:57:23 +0000 X-Inumbo-ID: 98b91bb8-e392-11e9-b588-bc764e2007e4 Received: from esa3.hc3370-68.iphmx.com (unknown [216.71.145.155]) by localhost (Halon) with ESMTPS id 98b91bb8-e392-11e9-b588-bc764e2007e4; Mon, 30 Sep 2019 14:57:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1569855438; h=from:to:cc:subject:date:message-id:mime-version; bh=VNh2fTbi/lOPcHkAK6ndBh8KjbwDHZcQeGK0Q9x+U84=; b=FobrKcn5GEDVt27qVzCfs2RjUl+PcHxK7JkgscAcYNEazn3f6sEUsYwD 3ZQSdy/ztGA50FR9swI/HHJ3HsGMAw+2AOOMFqYV6FRA3URKMLvjniz/K UJ6B/UaMf0EbbNuZQlio/N2q1i60oXcDHfbIEu09Y7OGvUeJsZk/lJm3l 0=; Authentication-Results: esa3.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 (esa3.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=esa3.hc3370-68.iphmx.com; envelope-from="Ian.Jackson@citrix.com"; x-sender="ian.jackson@eu.citrix.com"; x-conformance=sidf_compatible Received-SPF: Pass (esa3.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=esa3.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 ~all" Received-SPF: None (esa3.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=esa3.hc3370-68.iphmx.com; envelope-from="Ian.Jackson@citrix.com"; x-sender="postmaster@mail.citrix.com"; x-conformance=sidf_compatible IronPort-SDR: L+jj0GUDBDQwJqinpkJM3jD+k33CMUV0q7C7tKSWUryg+cRncV8ZeHP17R0PH59tQL6tclBVB9 o4zkp+N0RPblLUEpOOgvo7OppTIrG73YzKfyxksVHgqrWvz2oxwfIDhITnk+Rda22Jt6kOZJG3 CzeDDMYBGnATXbRmE3aXL/iOsbhXyVUoqME8aKGSbjwfOrjfvPR8Bsr/0a/r2fqUs2VvtPwRYd JDnHDZIqiUbXNPLX9mIUQgdtXi0BRbErOJDveTp5SX3BXYYZaia42sa2ARV1Po3bEg1Yzoa2el Qqw= X-SBRS: 2.7 X-MesageID: 6262188 X-Ironport-Server: esa3.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.64,567,1559534400"; d="scan'208";a="6262188" From: Ian Jackson To: Date: Mon, 30 Sep 2019 15:57:11 +0100 Message-ID: <20190930145712.31389-1-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 Subject: [Xen-devel] [OSSTEST PATCH 1/2] other_revision_job_suffix: Take and pass referring runvar name 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: Ian Jackson , =?utf-8?q?Roger_Pau_Monn=C3=A9?= Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" We are going to need this to sort out bisection for freebsd's recursive builds. Signed-off-by: Ian Jackson --- Osstest.pm | 6 +++--- cs-bisection-step | 17 +++++++++-------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/Osstest.pm b/Osstest.pm index 7ce53fcb..561d584c 100644 --- a/Osstest.pm +++ b/Osstest.pm @@ -374,8 +374,8 @@ sub flight_otherjob ($$) { confess "$otherflightjob ?"; } -sub other_revision_job_suffix ($$) { - my ($jobfield, $separator) = @_; +sub other_revision_job_suffix ($$$) { + my ($jobfield, $refrunvar, $separator) = @_; return <execute($copyflight, $popjob, $treevar, $othrev); + $treeq->execute($copyflight, $popjob, $treevar, $refrunvar, $othrev); my ($treerow) = $treeq->fetchrow_array(); $treeq->finish(); next unless defined $treerow; @@ -1312,7 +1312,8 @@ END print STDERR "Reusing $target for $subjob->{name}". " in $popflight.$popjob\n"; } else { - $target= preparejob($subjob->{job}, $subjob->{orgflight}, 1); + $target= preparejob($subjob->{job}, $subjob->{orgflight}, + $subjob->{name}, 1); } $jobsetq->execute($target, $popflight, $popjob, $subjob->{name}); } @@ -1339,7 +1340,7 @@ END db_retry($popflight,'constructing', $dbh_tests,[qw(flights)], sub { print STDERR "Populating $popflight...\n"; undef %jobs_created; - preparejob($job, $latest_flight, 0); + preparejob($job, $latest_flight, '', 0); foreach my $hostspec (split /,/, $hosts) { # / $hostspec =~ m/=/; $addvar->execute($popflight, $job, $`, $'); # ' From patchwork Mon Sep 30 14:57:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 11166835 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 E0EE614DB for ; Mon, 30 Sep 2019 14:58:47 +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 BD3F820815 for ; Mon, 30 Sep 2019 14:58:47 +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="gKO1FWrq" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BD3F820815 Authentication-Results: mail.kernel.org; dmarc=none (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 1iEx71-00052G-Lo; Mon, 30 Sep 2019 14:57:19 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iEx70-00052B-RJ for xen-devel@lists.xenproject.org; Mon, 30 Sep 2019 14:57:18 +0000 X-Inumbo-ID: 98b30502-e392-11e9-97fb-bc764e2007e4 Received: from esa4.hc3370-68.iphmx.com (unknown [216.71.155.144]) by localhost (Halon) with ESMTPS id 98b30502-e392-11e9-97fb-bc764e2007e4; Mon, 30 Sep 2019 14:57:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1569855438; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=se7YOI3cAhbovTRTiBSH5NWhWLms8C6UPfwUs6DySAQ=; b=gKO1FWrqKejQbWXX5MA3QmKpGS4AzpEjp2yPrA5DelAZLdArFZAqRdI7 mPdkLZiqaLOyoZN/EEceBFqq2Nm+qQnsdqOHnDQ0LChffPSx6clvongrn 5DGVv7C6/gnLbhtrEs0P+lsvpDlfJf/kGNOer620PLzYS4BIGrqkXK1KU o=; Authentication-Results: esa4.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 (esa4.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=esa4.hc3370-68.iphmx.com; envelope-from="Ian.Jackson@citrix.com"; x-sender="ian.jackson@eu.citrix.com"; x-conformance=sidf_compatible Received-SPF: Pass (esa4.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=esa4.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 ~all" Received-SPF: None (esa4.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=esa4.hc3370-68.iphmx.com; envelope-from="Ian.Jackson@citrix.com"; x-sender="postmaster@mail.citrix.com"; x-conformance=sidf_compatible IronPort-SDR: bVVyUnXNMzIjwj/jfzvcXm6oqeG86s7/1tyd9JIX/1bYFkLXACDCXvi06MheKJDUW/Mktw++uw 66AujHWDDrYEBSTpif2rjHiRlVcGO8fO9/CGw9S7KObt4W9m0+I2dkC8MuDsk/MlauzL0PWRin 0Iv1YlW8GwJ4VPPzwe9wM0uNLxCl53N0Qiu4uchMfMckSDNgK3eXgW+gWM0OYT/Z+SkpFrvXzI A9s89pNJkoqacuBqjGKqbB2D32VTnv2xF6ZMFWze8y1g6zwPQOI9PpVhJMLQa8hmz5yROASbdG QIc= X-SBRS: 2.7 X-MesageID: 6608611 X-Ironport-Server: esa4.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.64,567,1559534400"; d="scan'208";a="6608611" From: Ian Jackson To: Date: Mon, 30 Sep 2019 15:57:12 +0100 Message-ID: <20190930145712.31389-2-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190930145712.31389-1-ian.jackson@eu.citrix.com> References: <20190930145712.31389-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [OSSTEST PATCH 2/2] freebsd build job bisection: add special case 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: Ian Jackson , =?utf-8?q?Roger_Pau_Monn=C3=A9?= Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" other_revision_job_suffix contains ad-hoc code which returns an identifier distinguishing certain jobs which are expected to refer to different revisions within their flight. Add the special case for freebsdbuildjob's recursion. After this change we are now willing to tolerate the fact that a freebsd build job has as input multiple different revisions of freebsd. cs-bisection-step has code to avoid creating recursive build jobs: the created top-level job will therefore reuse the same freebsdbuildjob as the template. Hopefully that will be the previously anointed one and still be available. The bisector wants to repro on the same host as before. This means it won't necessarily use the most recent pass as the basis build. So long as the previous build has not been expired, this is fine. It does involve building an earlier freebsd on a later one but this should be OK. Signed-off-by: Ian Jackson --- Osstest.pm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Osstest.pm b/Osstest.pm index 561d584c..c14531e3 100644 --- a/Osstest.pm +++ b/Osstest.pm @@ -379,6 +379,8 @@ sub other_revision_job_suffix ($$$) { return <