From nobody Fri May 3 16:54:06 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1556819686; cv=none; d=zoho.com; s=zohoarc; b=gLS40uJ3jcJPk/aLcXdy/WGz6nOqwMzWjVWk2ePE/biIa4QmpUs1g4NVgZPXrK3ZNZnmjeZ/aVtB3nJZTaIObc1fbrRIviHpA0NWcv8lqYgFj9Bp++U4nnNp0MG5oaZy08qjCNPfNRloUa6xMio1Rh4s/t1Mq1zO2Jn5AA47BlI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556819686; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=7UVSfCnTgxwK27EQ5CxshwVnq3UlAQKDcGaZVMDAF/U=; b=moWtPZ/MyNkMJurjDHr2JN7wwcF1CKqlg21QhydjBz3MOGWGt4SCtq5ipH2w1qpy33fh1fONhyjym8GmjgMFxBLgYv+03iFkSYmsc8Fvfro4BsR2TVLqDnPW/KcfBplV7QbKZVIbS0zIOkrK85vTfjly5F1K0cX1dgasHiCchbQ= ARC-Authentication-Results: i=1; mx.zoho.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1556819686159578.119333593713; Thu, 2 May 2019 10:54:46 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hMFtR-0006h6-Al; Thu, 02 May 2019 17:53:13 +0000 Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hMFtP-0006gM-QE for xen-devel@lists.xenproject.org; Thu, 02 May 2019 17:53:11 +0000 Received: from SMTP03.CITRIX.COM (unknown [162.221.156.55]) by us1-rack-dfw2.inumbo.com (Halon) with ESMTPS id 25a67520-6d03-11e9-843c-bc764e045a96; Thu, 02 May 2019 17:53:10 +0000 (UTC) X-Inumbo-ID: 25a67520-6d03-11e9-843c-bc764e045a96 X-IronPort-AV: E=Sophos;i="5.60,422,1549929600"; d="scan'208";a="84983426" From: Ian Jackson To: Date: Thu, 2 May 2019 18:42:30 +0100 Message-ID: <20190502174238.23848-2-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190502174238.23848-1-ian.jackson@eu.citrix.com> References: <20190502174238.23848-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [OSSTEST PATCH 1/9] mg-execute-flight: Save an mro in tmp/ 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" This may be useful for some things. For example, it will be used in just a moment. Signed-off-by: Ian Jackson --- mg-execute-flight | 1 + 1 file changed, 1 insertion(+) diff --git a/mg-execute-flight b/mg-execute-flight index b3cdf431..391f4810 100755 --- a/mg-execute-flight +++ b/mg-execute-flight @@ -81,6 +81,7 @@ echo >&5 "flight $flight reporting" =20 ./sg-report-flight $basisflightopt \ --html-dir=3D$OSSTEST_HTMLPUB_DIR/$flight/ \ + --machine-readable-output=3Dtmp/$flight.mro \ $flight >tmp/$flight.report =20 subject=3D`sed -n 1p Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1556819685283616.2772643532194; Thu, 2 May 2019 10:54:45 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hMFtS-0006hP-4s; Thu, 02 May 2019 17:53:14 +0000 Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hMFtQ-0006gl-CC for xen-devel@lists.xenproject.org; Thu, 02 May 2019 17:53:12 +0000 Received: from SMTP03.CITRIX.COM (unknown [162.221.156.55]) by us1-rack-dfw2.inumbo.com (Halon) with ESMTPS id 26efc359-6d03-11e9-843c-bc764e045a96; Thu, 02 May 2019 17:53:11 +0000 (UTC) X-Inumbo-ID: 26efc359-6d03-11e9-843c-bc764e045a96 X-IronPort-AV: E=Sophos;i="5.60,422,1549929600"; d="scan'208";a="84983434" From: Ian Jackson To: Date: Thu, 2 May 2019 18:42:31 +0100 Message-ID: <20190502174238.23848-3-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190502174238.23848-1-ian.jackson@eu.citrix.com> References: <20190502174238.23848-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [OSSTEST PATCH 2/9] cs-adjust-flight: Break out copy_jobs_* 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" No functional change. Signed-off-by: Ian Jackson --- cs-adjust-flight | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/cs-adjust-flight b/cs-adjust-flight index ee1d917c..badabeff 100755 --- a/cs-adjust-flight +++ b/cs-adjust-flight @@ -194,10 +194,8 @@ sub do_rm_job ($) { verbose "$dstflight.$job job deleted\n" if $count; } =20 -sub copy_jobs ($$) { - my ($srcflight, $jobs) =3D @_; - prep_rm_jobs(); - my @job_copy_qs =3D map { $dbh_tests->prepare($_) } +sub copy_jobs_qs () { + map { $dbh_tests->prepare($_) } ("INSERT INTO jobs (flight, job, recipe, status)". " SELECT ?, job, recipe, 'queued'". " FROM jobs". @@ -206,12 +204,22 @@ sub copy_jobs ($$) { " SELECT ?, job, name, val, 'f'". " FROM runvars". " WHERE flight =3D ? AND job =3D ? AND NOT synth"); +} +sub copy_jobs_do ($$) { + my ($qs, $srcflight, $srcjob) =3D @_; + $_->execute($dstflight, $srcflight, $job) foreach @$qs; + verbose "$dstflight.$job job created from $srcflight.$job\n"; +} + +sub copy_jobs ($$) { + my ($srcflight, $jobs) =3D @_; + prep_rm_jobs(); + my @job_copy_qs =3D copy_jobs_qs; for_jobs($dstflight, $jobs, \&do_rm_job, 1); for_jobs($srcflight, $jobs, \&do_rm_job); for_jobs($srcflight, $jobs, sub { my ($job) =3D @_; - $_->execute($dstflight, $srcflight, $job) foreach @job_copy_qs; - verbose "$dstflight.$job job created from $srcflight.$job\n"; + copy_jobs_do(\@job_copy_qs, $srcflight, $job); }); } =20 --=20 2.11.0 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel From nobody Fri May 3 16:54:06 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1556819690; cv=none; d=zoho.com; s=zohoarc; b=QGo2404sgTeaJpO7/n1Ilg2AqJMqTKzfY7WRXiKwZjQpMU8P37AMuDJguOy7cQLyahYTFRa1EdSMy/QSyRx9S6hUz0oXGGwNQ82f5aZ6bQd+YYf42CGjU+8US7EYP39qbTlekNK8GxaW/O9HXpTH4XRE91AoufabgRamqJZEJik= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556819690; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=3J2jmg5FVfLzpt00Os08tDkmX393/czNUwN6QR1Z2ts=; b=mfuV4MqUx0Mz67L0gejhItPwQeVfy2vhHagVgiRs7UpGAmHVzPWDVRf++Y3p5Cv/6SH8AYSsXLlS5SYUzNYFpORMp5in5OJBdTnsSTYwO2u1lF3KczthetXwYj6xbc1Sr+WEAl18WtNYLJ9zk9v0IFMGBZ1DMz6/0EqBztpyXL0= ARC-Authentication-Results: i=1; mx.zoho.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1556819690244648.219808329798; Thu, 2 May 2019 10:54:50 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hMFtR-0006gs-18; Thu, 02 May 2019 17:53:13 +0000 Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hMFtP-0006gL-QD for xen-devel@lists.xenproject.org; Thu, 02 May 2019 17:53:11 +0000 Received: from SMTP03.CITRIX.COM (unknown [162.221.156.55]) by us1-rack-dfw2.inumbo.com (Halon) with ESMTPS id 26231b66-6d03-11e9-843c-bc764e045a96; Thu, 02 May 2019 17:53:10 +0000 (UTC) X-Inumbo-ID: 26231b66-6d03-11e9-843c-bc764e045a96 X-IronPort-AV: E=Sophos;i="5.60,422,1549929600"; d="scan'208";a="84983427" From: Ian Jackson To: Date: Thu, 2 May 2019 18:42:32 +0100 Message-ID: <20190502174238.23848-4-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190502174238.23848-1-ian.jackson@eu.citrix.com> References: <20190502174238.23848-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [OSSTEST PATCH 3/9] cs-adjust-flight: Use db_prepare and honour -D -D for sql dumps 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" This makes debugging it easier. No functional change with zero or one occurrences of -D. Signed-off-by: Ian Jackson --- cs-adjust-flight | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/cs-adjust-flight b/cs-adjust-flight index badabeff..cc1684b4 100755 --- a/cs-adjust-flight +++ b/cs-adjust-flight @@ -75,6 +75,7 @@ csreadconfig(); our $debug =3D 0; =20 open VERBOSE, ">/dev/null" or die $!; +open DEBUG, ">/dev/null" or die $!; our $verbose_buffer; =20 while (@ARGV && $ARGV[0] =3D~ m/^\-/) { @@ -83,6 +84,7 @@ while (@ARGV && $ARGV[0] =3D~ m/^\-/) { if (m/^-v$/) { open VERBOSE, ">&STDERR" or die $!; } elsif (m/^-D$/) { + open DEBUG, ">&STDERR" if $debug; $debug =3D 1; } else { die "$_ ?"; @@ -138,9 +140,9 @@ sub for_things ($$$$$$$) { my ($spec, $fn, $ifnone, $table, $keycol, $basecond, $basecondvals) =3D @_; =20 - my $thing_q =3D $dbh_tests->prepare + my $thing_q =3D db_prepare ("SELECT * FROM $table WHERE $basecond AND $keycol =3D ?"); - my $things_q =3D $dbh_tests->prepare + my $things_q =3D db_prepare ("SELECT * FROM $table WHERE $basecond"); =20 my ($specfn,$exact) =3D notspec_exfn("FOR_THINGS $table.$keycol",$spec= ); @@ -182,7 +184,7 @@ our @job_rm_qs; =20 sub prep_rm_jobs () { return if @job_rm_qs; - @job_rm_qs =3D map { $dbh_tests->prepare($_) } + @job_rm_qs =3D map { db_prepare($_) } ("DELETE FROM runvars WHERE flight =3D ? AND job =3D ?", "DELETE FROM jobs WHERE flight =3D ? AND job =3D ?"); } @@ -195,7 +197,7 @@ sub do_rm_job ($) { } =20 sub copy_jobs_qs () { - map { $dbh_tests->prepare($_) } + map { db_prepare($_) } ("INSERT INTO jobs (flight, job, recipe, status)". " SELECT ?, job, recipe, 'queued'". " FROM jobs". @@ -205,8 +207,8 @@ sub copy_jobs_qs () { " FROM runvars". " WHERE flight =3D ? AND job =3D ? AND NOT synth"); } -sub copy_jobs_do ($$) { - my ($qs, $srcflight, $srcjob) =3D @_; +sub copy_jobs_do ($$$) { + my ($qs, $srcflight, $job) =3D @_; $_->execute($dstflight, $srcflight, $job) foreach @$qs; verbose "$dstflight.$job job created from $srcflight.$job\n"; } @@ -253,9 +255,9 @@ sub change__copy_jobs { copy_jobs($srcflight, $jobs); } =20 -our $runvar_rm_q =3D $dbh_tests->prepare +our $runvar_rm_q =3D db_prepare ("DELETE FROM runvars WHERE flight =3D ? AND job =3D ? AND name =3D ?"= ); -our $runvar_insert_q =3D $dbh_tests->prepare +our $runvar_insert_q =3D db_prepare ("INSERT INTO runvars (flight, job, name, val, synth)". " VALUES (?, ?, ?, ?, 'f')"); =20 @@ -430,7 +432,7 @@ sub change__job_status { die unless @changes >=3D 1; my $jobs =3D shift @changes; =20 - my $q =3D $dbh_tests->prepare(<prepare(<prepare(<prepare("SELECT * FROM steps WHERE flight =3D ?"); + db_prepare("SELECT * FROM steps WHERE flight =3D ?"); $steps_q->execute($dstflight); my $step =3D $steps_q->fetchrow_hashref(); if ($step) { --=20 2.11.0 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel From nobody Fri May 3 16:54:06 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1556819685; cv=none; d=zoho.com; s=zohoarc; b=FXcGRLGujrKmNECinCVdhzCoEtXHtAFWdknAZndCwzpjF9JlOkrMx8Dpvu4HcmcYlRXyi7QH/cblfZsSf/rIK50f/nprGNyCOQ+cnVF8aRqDTNj8KLFd7ViOi5li72V5rp2ch+0LGngI3zXxXDM9+MDV5MbDXOj+vHu1klUpsS0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556819685; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=7Ip5pOc1oKutCkqulMxoeBJz3qnE6H+UzKp81hq+vww=; b=XPlstFGYN1lP6JZfQT+IfhnAklkRzBHGT5UcflOL8K+1jls3PTbsfHePBjSuadzvD8NvOht/CO9KYSJtiU5vu9hZvYN3gzh/UBG1mqgQHjSDvflD2N2UKLu0In99CQCe2jIb8Jcw002v3b/P7995v9xH2sxmEdSOogwP7kERD2w= ARC-Authentication-Results: i=1; mx.zoho.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1556819685883166.20206138659307; Thu, 2 May 2019 10:54:45 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hMFtR-0006hJ-SZ; Thu, 02 May 2019 17:53:13 +0000 Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hMFtQ-0006ge-4V for xen-devel@lists.xenproject.org; Thu, 02 May 2019 17:53:12 +0000 Received: from SMTP03.CITRIX.COM (unknown [162.221.156.55]) by us1-rack-dfw2.inumbo.com (Halon) with ESMTPS id 26a51dd8-6d03-11e9-843c-bc764e045a96; Thu, 02 May 2019 17:53:11 +0000 (UTC) X-Inumbo-ID: 26a51dd8-6d03-11e9-843c-bc764e045a96 X-IronPort-AV: E=Sophos;i="5.60,422,1549929600"; d="scan'208";a="84983428" From: Ian Jackson To: Date: Thu, 2 May 2019 18:42:33 +0100 Message-ID: <20190502174238.23848-5-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190502174238.23848-1-ian.jackson@eu.citrix.com> References: <20190502174238.23848-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [OSSTEST PATCH 4/9] mg-repro-setup: Improve a doc message slightly 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" Signed-off-by: Ian Jackson --- mg-repro-setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mg-repro-setup b/mg-repro-setup index 6ed4d85e..c8bcad33 100755 --- a/mg-repro-setup +++ b/mg-repro-setup @@ -33,7 +33,7 @@ usage () { cat < is \`host') =20 OPTIONs - -t estimated duration (default =3D 28d) + -t estimated overall allocation lifetime (default =3D= 28d) --rogue bypass queuing system and allocate now --capture do not suppress log capture -r=3D set runvar --=20 2.11.0 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel From nobody Fri May 3 16:54:06 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1556819685; cv=none; d=zoho.com; s=zohoarc; b=ofAogFSBTnlylk2DIsJT50d97e23YGC3GQc228zcf8aflAmXrJ96YfuJFdVmcKkQ9uYN7aXk+5jNyqee740sv5lp8Bx34EuFOTCEKrCx28vrAFGI2A2VOR7pPm4IKCTQvYDXs1J8V8zWj+nSGnKWcssNojIKzBJmzDGZtQ75uD4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556819685; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=HPE/3Wpb57Kbi7JfEhJ+T9XXV5SOi5mGUOb1WEWoGKo=; b=TW2E2fMHUmH+Z5j+zZmporP4G1+SwOymmD9HNy0Cc4I5pfQqhyJ8TahWBYDrQxLljHXCBsM0xN7i8QB/B7wVwp65wGVyVu87FxDo7g589pcFIUWhXT4TwYmY98a1VwgzaNKnzQ8m0tKyR26ua/ut7QnP02Y4s8GBJSgb4xboEd4= ARC-Authentication-Results: i=1; mx.zoho.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1556819685144210.0233081190837; Thu, 2 May 2019 10:54:45 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hMFtS-0006hX-D4; Thu, 02 May 2019 17:53:14 +0000 Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hMFtQ-0006gq-Sd for xen-devel@lists.xenproject.org; Thu, 02 May 2019 17:53:12 +0000 Received: from SMTP03.CITRIX.COM (unknown [162.221.156.55]) by us1-rack-dfw2.inumbo.com (Halon) with ESMTPS id 2729a1ba-6d03-11e9-843c-bc764e045a96; Thu, 02 May 2019 17:53:12 +0000 (UTC) X-Inumbo-ID: 2729a1ba-6d03-11e9-843c-bc764e045a96 X-IronPort-AV: E=Sophos;i="5.60,422,1549929600"; d="scan'208";a="84983437" From: Ian Jackson To: Date: Thu, 2 May 2019 18:42:34 +0100 Message-ID: <20190502174238.23848-6-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190502174238.23848-1-ian.jackson@eu.citrix.com> References: <20190502174238.23848-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [OSSTEST PATCH 5/9] mg-repro-setup: Break out compute_adjusts 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" No functional change. Signed-off-by: Ian Jackson --- mg-repro-setup | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/mg-repro-setup b/mg-repro-setup index c8bcad33..10ab65a8 100755 --- a/mg-repro-setup +++ b/mg-repro-setup @@ -54,7 +54,6 @@ set -e -o posix =20 mgexecflags=3D() adjustsets=3D() -adjusts=3D() allocs=3D() logfile=3Dtmp/mg-repro-setup.log duration=3D28d @@ -104,14 +103,17 @@ adjrunvar () { delrunvar "$1" adjusts+=3D(runvar-set "$job" "$1" "$2") } - -for arg in "${adjustsets[@]}"; do - case "$arg" in - !*|^*) delrunvar "${arg#?}" ;; - *=3D*) adjrunvar "${arg%%=3D*}" "${arg#*=3D}" ;; - *) bad-adjuistset-pattern ;; - esac -done +compute_adjusts () { + adjusts=3D() + for arg in "$@"; do + case "$arg" in + !*|^*) delrunvar "${arg#?}" ;; + *=3D*) adjrunvar "${arg%%=3D*}" "${arg#*=3D}" ;; + *) bad-adjuistset-pattern ;; + esac + done +} +compute_adjusts "${adjustsets[@]}" =20 while [ $# -ne 0 ]; do arg=3D$1; shift --=20 2.11.0 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel From nobody Fri May 3 16:54:06 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1556819685; cv=none; d=zoho.com; s=zohoarc; b=I2+c4uEGbTWviebNqIZhF0QIwThUE+J5d/jkhlob4oD4TzeItysNznjWHsUliS+P/iEeziRyUnX1h801vgj4BW6GNI6Y/GAvNU9aGduSabynxjXe9F+4cA7QJy8tvrbgw3acmirMldHnWMdiSk77XQrI67IGox4O6myv1ksOB1s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556819685; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=urLZUGoD3iJbI0hG9fIZAkres0u7Rxw4d4oV7OFKtww=; b=FFvZkhl3JSK7OFU9AMPNSzy2GSJND3E7mqEo0Q/q/Jb+oJcxIGMOvFl5zjDA0CEoZlszGcIsbo90YwSyg4vDTGrCJNbznBcwTqmcfNDGCtAzF3vLY6hMApg+erE8ounpqKrkNAlXbHKoXGu+3HbLl/io2bjeoFbryhshpg+KIUk= ARC-Authentication-Results: i=1; mx.zoho.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1556819685603540.4447247571849; Thu, 2 May 2019 10:54:45 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hMFtS-0006hq-Qy; Thu, 02 May 2019 17:53:14 +0000 Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hMFtR-0006gx-4G for xen-devel@lists.xenproject.org; Thu, 02 May 2019 17:53:13 +0000 Received: from SMTP03.CITRIX.COM (unknown [162.221.156.55]) by us1-rack-dfw2.inumbo.com (Halon) with ESMTPS id 2746415b-6d03-11e9-843c-bc764e045a96; Thu, 02 May 2019 17:53:12 +0000 (UTC) X-Inumbo-ID: 2746415b-6d03-11e9-843c-bc764e045a96 X-IronPort-AV: E=Sophos;i="5.60,422,1549929600"; d="scan'208";a="84983439" From: Ian Jackson To: Date: Thu, 2 May 2019 18:42:35 +0100 Message-ID: <20190502174238.23848-7-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190502174238.23848-1-ian.jackson@eu.citrix.com> References: <20190502174238.23848-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [OSSTEST PATCH 6/9] mg-repro-setup: Move logging setup to later 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" No functional change. Signed-off-by: Ian Jackson --- mg-repro-setup | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/mg-repro-setup b/mg-repro-setup index 10ab65a8..b41bf478 100755 --- a/mg-repro-setup +++ b/mg-repro-setup @@ -115,6 +115,13 @@ compute_adjusts () { } compute_adjusts "${adjustsets[@]}" =20 +progressf () { printf >&2 "$@"; } +progress () { progressf "%s\n" "$1"; } + +progress "logging to $logfile" +savelog "$logfile" +exec 3>"$logfile" + while [ $# -ne 0 ]; do arg=3D$1; shift =20 @@ -160,13 +167,6 @@ while [ $# -ne 0 ]; do esac done =20 -progressf () { printf >&2 "$@"; } -progress () { progressf "%s\n" "$1"; } - -progress "logging to $logfile" -savelog "$logfile" -exec 3>"$logfile" - OSSTEST_TASK=3D$(perl -e ' use Osstest; use Osstest::Executive; --=20 2.11.0 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel From nobody Fri May 3 16:54:06 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1556819689; cv=none; d=zoho.com; s=zohoarc; b=HpeThPUhwkJlhZw1RxTCR/WBNOZcsfIxE4iYy+Pi03RmDVL5BvcATLuuX21i50ximp5kCCSW8iigdy1XrTDCG0Zanp714nGbsoOTtYYp+HmMKmO4r2lh/Yf0hFObL/7PQH6jw+HrJ+a3aRNP3aUIR4SqFwcsY2jcczSM6uH4v/8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556819689; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=d5I4QpayYK0mxriTfjiDohC0Ro4MQZkMnuUR9h1zVn0=; b=NdsN5iQMjUt0bibWOruASrP13lWYJRazEOp1V2AaAL2zFhF+LOdM8P9XO4uempGoXDN3Av+rXPwx1q49zPLs/NOLpiMT6U+9WURuVRAMxoqFvVofaWh2ag2j51TaeCKIAlvI4szkULpkVsR/qgUACABdSza2/0VycyXuvFwSUus= ARC-Authentication-Results: i=1; mx.zoho.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 155681968902856.1689970891922; Thu, 2 May 2019 10:54:49 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hMFtk-0006qX-EJ; Thu, 02 May 2019 17:53:32 +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 1hMFtj-0006pk-6j for xen-devel@lists.xenproject.org; Thu, 02 May 2019 17:53:31 +0000 Received: from SMTP03.CITRIX.COM (unknown [162.221.156.55]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 25261d82-6d03-11e9-a09e-dfb3ec347f61; Thu, 02 May 2019 17:53:11 +0000 (UTC) X-Inumbo-ID: 25261d82-6d03-11e9-a09e-dfb3ec347f61 X-IronPort-AV: E=Sophos;i="5.60,422,1549929600"; d="scan'208";a="84983429" From: Ian Jackson To: Date: Thu, 2 May 2019 18:42:36 +0100 Message-ID: <20190502174238.23848-8-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190502174238.23848-1-ian.jackson@eu.citrix.com> References: <20190502174238.23848-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [OSSTEST PATCH 7/9] mg-repro-setup: Allow arguments to badusage 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" No functional change with existing call sites. Signed-off-by: Ian Jackson --- mg-repro-setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mg-repro-setup b/mg-repro-setup index b41bf478..d63e29b6 100755 --- a/mg-repro-setup +++ b/mg-repro-setup @@ -46,7 +46,7 @@ END =20 } =20 -badusage () { echo >&2 "bad usage"; usage >&2; exit 126; } +badusage () { echo >&2 "bad usage$*"; usage >&2; exit 126; } =20 set -e -o posix =20 --=20 2.11.0 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel From nobody Fri May 3 16:54:06 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1556819684; cv=none; d=zoho.com; s=zohoarc; b=L0mWsXggJSw1/k2tF4AmAzuGguqQq3RDJMHhuWZO/omvYU9VXmw1gJnHqrx+0qT6Amc4UBAAijC4SlgJ+eNOXAAwMX6WFG2R7l9qJDms6AHy10aR2N6dK6uoy3zc8WMs1/Ayc8SNMfc672stHpIq1hd6FwzyAbAoSIlGTiFHyF4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556819684; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=L5auyc/M18jAGjbz+dnvzwjLnNwFSRSIGQwsd3VhpwY=; b=E4x1Tk9g9kqCeRikelbL+vCYROhZLHdXrGRjsbcKTQy1L4C5gmfVuxm53N5evGI215SI+Av2SXACh+jS2sEAVPQ7s3zQuUmUtZfp82wzqI4c0mbD7QI+0Nb3okLb4ewVARuNI3lwZ2NulkQJ04Gd7QMkbH2SG7NYTyv9IUgGIAs= ARC-Authentication-Results: i=1; mx.zoho.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 15568196841051.9263375897097603; Thu, 2 May 2019 10:54:44 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hMFtP-0006gO-Oc; Thu, 02 May 2019 17:53:11 +0000 Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hMFtO-0006gF-IG for xen-devel@lists.xenproject.org; Thu, 02 May 2019 17:53:10 +0000 Received: from SMTP03.CITRIX.COM (unknown [162.221.156.55]) by us1-rack-dfw2.inumbo.com (Halon) with ESMTPS id 251f7f15-6d03-11e9-843c-bc764e045a96; Thu, 02 May 2019 17:53:09 +0000 (UTC) X-Inumbo-ID: 251f7f15-6d03-11e9-843c-bc764e045a96 X-IronPort-AV: E=Sophos;i="5.60,422,1549929600"; d="scan'208";a="84983430" From: Ian Jackson To: Date: Thu, 2 May 2019 18:42:37 +0100 Message-ID: <20190502174238.23848-9-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190502174238.23848-1-ian.jackson@eu.citrix.com> References: <20190502174238.23848-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [OSSTEST PATCH 8/9] mg-repro-setup: Move flight creation up before task creation 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" No significant functional change. Signed-off-by: Ian Jackson --- mg-repro-setup | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mg-repro-setup b/mg-repro-setup index d63e29b6..2e1d3b88 100755 --- a/mg-repro-setup +++ b/mg-repro-setup @@ -167,6 +167,9 @@ while [ $# -ne 0 ]; do esac done =20 +flight=3D$(./cs-adjust-flight new:$blessing) +progress "new flight is $flight" + OSSTEST_TASK=3D$(perl -e ' use Osstest; use Osstest::Executive; @@ -176,9 +179,6 @@ OSSTEST_TASK=3D$(perl -e ' ') export OSSTEST_TASK =20 -flight=3D$(./cs-adjust-flight new:$blessing) -progress "new flight is $flight" - if [ "${alloc_idents[*]}" ]; then progress "allocating ${alloc_idents[*]} ..." alloc_output=3Dtmp/$flight.allocations --=20 2.11.0 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel From nobody Fri May 3 16:54:06 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1556819682; cv=none; d=zoho.com; s=zohoarc; b=NVpI664F3apuc2INIegzVfQwVhrSeoxILKXgXrjzG9saK6M7Y7opJgavc7lzPn3CICpZsmsU0siNFa/DnR1x8WsHG1GzKGnfqmexxNkQQKMPmnjlYseDkB93gSw1/lk2pZ0hebjRasV2WaHQO978H8RNuY2CslBFOtxLxh8qAKU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556819682; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=dDbOYZ8xMFl6vDRnhQfpTLt8wCk683IglgGRiaT3cOg=; b=Mbfm9LkiaPW7CkJNbDs3pG1rii8g7/5xol6ZLsb7gjMQUpAN228z9YQaPB+ErM0cR/xDVW29VvRW9QHWT706bmZ4O+olbRRhWvq9heP9VVmsC4XtbwMCSRTGWBy7yO55L0PkuYxvOL/FG9ORudhBqHmZnyZYbCdvnWqTFV9yBm0= ARC-Authentication-Results: i=1; mx.zoho.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1556819681981586.0678902235815; Thu, 2 May 2019 10:54:41 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hMFtU-0006i1-3c; Thu, 02 May 2019 17:53:16 +0000 Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hMFtS-0006hT-Ao for xen-devel@lists.xenproject.org; Thu, 02 May 2019 17:53:14 +0000 Received: from SMTP03.CITRIX.COM (unknown [162.221.156.55]) by us1-rack-dfw2.inumbo.com (Halon) with ESMTPS id 27ab44f2-6d03-11e9-843c-bc764e045a96; Thu, 02 May 2019 17:53:13 +0000 (UTC) X-Inumbo-ID: 27ab44f2-6d03-11e9-843c-bc764e045a96 X-IronPort-AV: E=Sophos;i="5.60,422,1549929600"; d="scan'208";a="84983442" From: Ian Jackson To: Date: Thu, 2 May 2019 18:42:38 +0100 Message-ID: <20190502174238.23848-10-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190502174238.23848-1-ian.jackson@eu.citrix.com> References: <20190502174238.23848-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [OSSTEST PATCH 9/9] mg-repro-flight: Provide --rebuild to make variant build jobs too 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" This allows a single command to repro a particular job with a variety of different source code. The implementation technique is: - run the build job in a separate flight, so that it can run with a separate task which gives its host up after the build - do much of the heavy lifting of runvar fiddling etc. in a new helper routine in cs-adjust-flight Signed-off-by: Ian Jackson --- cs-adjust-flight | 109 +++++++++++++++++++++++++++++++++++++++++++++++++++= ++++ mg-repro-setup | 84 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 192 insertions(+), 1 deletion(-) diff --git a/cs-adjust-flight b/cs-adjust-flight index cc1684b4..5be5af38 100755 --- a/cs-adjust-flight +++ b/cs-adjust-flight @@ -469,6 +469,115 @@ END $runvarq->execute($newjob, $dstflight, $oldjob); }) } + +sub change__repro_buildjobs { + # helper for mg-repro-setup + # arguments to this change are + # EXAMPLE-FLIGHT EXAMPLE-JOB THING... + # where THING is + # .BUILDJOB =3DBUILDJOBRUNVAR +TREE=3DURL#REVISION + # (we eat all until it doesn't start with . =3D +) + # stdout output is + # list of runvar settings for repro job + die unless @changes >=3D 2; + my $eflight =3D shift @changes; + my $ejob =3D shift @changes; + my @refspecs; + my @varspecs; + my %treespecs; + while (@changes && $changes[0] =3D~ m/^[.=3D+]/) { + local $_ =3D shift @changes; + if (m/^[.=3D]/) { + push @refspecs, $_; + } elsif (m/^\+(.*?)\=3D(.*)\#(.*)$/) { + die $1 if $treespecs{$1}; + $treespecs{$1} =3D [$2,$3]; + } elsif (m/^-r/) { + push @varspecs, $_; + } else { + die "bad .BUILDJOB / =3DBUILDJOBRUNVAR / +TREE=3DURL#REVISION): $_\n"; + } + } + my $testq =3D db_prepare(<execute($eflight, $ejob); + while (my ($refvar, $bjobref) =3D $testq->fetchrow_array()) { + my ($bflight, $bjob) =3D flight_otherjob($eflight,$bjobref); + if (@refspecs) { + my $y =3D 0; + foreach my $rs (@refspecs) { + if ($rs eq ".$bjob" || $rs eq "=3D$refvar") { + $y =3D 1; + last; + } + } + next unless $y; + } + $buildq->execute($bflight,$bjob,@buildq_xvars); + my %got; + while (my ($treevar) =3D $buildq->fetchrow_array()) { + $treevar =3D~ m/^tree_/ or die "$treevar ?"; + $got{$'} =3D 1; + next unless $treespecs{$'}; + $treespecs{$'}[2]++; + } + next unless %got || @refspecs; + + $bjobs{$bjob} //=3D { Template =3D> $bflight }; + $bjobs{$bjob}{Template} eq $bflight or + die "inconsistent $bjob: $bjobs{$bjob}{Template} !=3D $bflight"; + push @{ $bjobs{$bjob}{Refs} }, $refvar; + $bjobs{$bjob}{Trees}{$_} =3D 1 foreach keys %got; + } + + foreach my $tree (sort keys %treespecs) { + die "unused tree/revision adjustment $tree" + .(@refspecs + ? " (no tree_$tree var in any of " + .(join ' ', map { "$bjobs{$_}{Template}.$_" } + sort keys %bjobs).")" + : '') + unless $treespecs{$tree}[2]; + } + + my @copy_jobs_qs =3D copy_jobs_qs(); + foreach my $bjob (sort keys %bjobs) { + copy_jobs_do(\@copy_jobs_qs, $bjobs{$bjob}{Template}, $bjob); + foreach my $tree (sort keys %{ $bjobs{$bjob}{Trees} }) { + runvar_set($bjob, "tree_$tree", $treespecs{$tree}[0]); + runvar_set($bjob, "revision_$tree", $treespecs{$tree}[1]); + } + foreach (@varspecs) { + if (m/^-r!|^-r^/) { + $runvar_rm_q->execute($dstflight, $bjob, $'); + } elsif (m/^-r(.*?)=3D/) { + runvar_set($bjob, $1, $'); + } else { + die "bad -r $_ ?"; + } + } + foreach my $refvar (@{ $bjobs{$bjob}{Refs} }) { + die "$bjob $refvar $& ?" if + "$bjob.$refvar" =3D~ m{[^+=3D_./,:0-9a-z-]}i; + print "runvar-set . $refvar $dstflight.$bjob\n" or die $!; + } + } +} + sub changes () { debug("CHANGES...\n"); =20 diff --git a/mg-repro-setup b/mg-repro-setup index 2e1d3b88..abff2ef7 100755 --- a/mg-repro-setup +++ b/mg-repro-setup @@ -19,7 +19,7 @@ =20 usage () { cat <] [-r...] + [.BUILDJOB | =3DBUILDJOBRUNVAR...] + +TREE=3DURL#REVISION... + Also use a different build. Specifically, use URL and REVISION + for certain builds which mention TREE and which are referenced=20 + (directly) in the job JOB in EXAMPLE-FLIGHT. The affected builds + are those referenced by any of the runvars BUILDJOBRUNVAR (in + which case only that job reference is edited) or any whose job + name is any of the BUILDJOB (in which case all references to that + job are adjusted). If no .BUILDJOB and no =3DBUILDJOBRUNVAR are + specified, then all jobs referred to from the example JOB + which mention TREE are affected. + + For example, + --rebuild =3Dxenbuildjob \ + +xen=3Dgit://xenbits.xen.org/people/alice/xen.git#fixes + would look for xenbuild and (say) find that it referred to + build-amd64; it would then copy and use the build-amd64 job + that EXAMPLE-FLIGHT.JOB used, adjusting \`tree_xen' and + \`revision_xen' as specified, and use that for \`xenbuildjob' in + the repro (but not for \`buildjob') + + Whereas + --rebuild .build-amd64 \ + +linux=3Dgit://xenbits.xen.org/people/alice/linux.git#fix= es + would replace all references to any job named build-amd64 + with a new build-amd64 job. + + And + --rebuild \ + +xen=3Dgit://xenbits.xen.org/people/alice/linux.git#fixes + would replace all builds mentioning xen, including for example + build-amd64 (for xenbuildjob) and build-i386 (for buildjob) + in an x86 32-on-64 flight. + + Host allocation for the build is done "normally" (ie, the host + is thrown away after the build is complete), with a default + blessing of \`adhoc'. + + --rebuild is affected by -E or -P but not general -B or -f. + END =20 } @@ -122,10 +165,37 @@ progress "logging to $logfile" savelog "$logfile" exec 3>"$logfile" =20 +rebuilds_flight=3D'' + while [ $# -ne 0 ]; do arg=3D$1; shift =20 case "$arg" in + + --rebuild) + rebuilds_blessing=3Dadhoc + rebuild_specs=3D() + while true; do + case "$1" in + [.=3D+]*|-r) rebuild_specs+=3D("$1"); shift ;; + -B?*) rebuilds_blessing=3D${1#-B}; shift ;; + -*) badusage ': bad --rebuild option' ;; + *) break ;; + esac + done + if [ x$rebuilds_flight =3D x ]; then + rebuilds_flight=3D$( + ./cs-adjust-flight new:$rebuilds_blessing + ) + fi + + adjusts+=3D($( + ./cs-adjust-flight $rebuilds_flight \ + repro-buildjobs $example_flight $job \ + "${rebuild_specs[@]}" + )) + ;; + none:) # provided so we can repro a job with no hosts ;; @@ -170,6 +240,18 @@ done flight=3D$(./cs-adjust-flight new:$blessing) progress "new flight is $flight" =20 +if [ "x$rebuilds_flight" !=3D x ]; then + progress "running build(s) $rebuilds_flight" + ./mg-execute-flight -B$rebuilds_blessing --progress-fd=3D2 \ + "${mgexecflags[@]}" $rebuilds_flight + + mro=3Dtmp/$rebuilds_flight.mro + if ! egrep '^perfect' >/dev/null $mro; then + echo >&2 "build(s) failed (no 'perfect' in $mro)" + exit 1 + fi +fi + OSSTEST_TASK=3D$(perl -e ' use Osstest; use Osstest::Executive; --=20 2.11.0 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel