From: Ian Jackson <iwj@xenproject.org>
To: xen-devel@lists.xenproject.org
Cc: Ian Jackson <ian.jackson@eu.citrix.com>,
Ian Jackson <iwj@xenproject.org>
Subject: [OSSTEST PATCH v2 11/17] Introduce real-retry blessing
Date: Thu, 15 Oct 2020 16:50:13 +0100 [thread overview]
Message-ID: <20201015155019.20705-12-iwj@xenproject.org> (raw)
In-Reply-To: <20201015155019.20705-1-iwj@xenproject.org>
From: Ian Jackson <ian.jackson@eu.citrix.com>
Nothing produces this yet. (There's play-retry as well of course but
we don't need to document that really.)
Signed-off-by: Ian Jackson <iwj@xenproject.org>
---
README.dev | 9 +++++----
cr-daily-branch | 3 ++-
cr-disk-report | 2 +-
cr-try-bisect | 4 ++--
cr-try-bisect-adhoc | 2 +-
cs-bisection-step | 4 ++--
sg-report-flight | 2 +-
7 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/README.dev b/README.dev
index 2cbca109..3d09b3c6 100644
--- a/README.dev
+++ b/README.dev
@@ -381,10 +381,11 @@ These are the principal (intended) blessings:
commissioning, and that blessing removed and replaced with `real'
when the hosts are ready.
- * `real-bisect' and `adhoc-bisect': These are found only as the
- blessing of finished flights. (This is achieved by passing
- *-bisect to sg-execute-flight.) This allows the archaeologist
- tools to distinguish full flights from bisection steps.
+ * `real-bisect', `real-retry', `adhoc-bisect': These are found only
+ as the blessing of finished flights. (This is achieved by passing
+ *-bisect or *-retry to sg-execute-flight.) This allows the
+ archaeologist tools to distinguish full flights from bisection
+ steps and retries.
The corresponding intended blessing (as found in the `intended'
column of the flights table) is `real'. So the hosts used by the
diff --git a/cr-daily-branch b/cr-daily-branch
index 23060588..285ea361 100755
--- a/cr-daily-branch
+++ b/cr-daily-branch
@@ -76,7 +76,8 @@ case $branch in
treeurl=`./ap-print-url $branch`;;
esac
-blessings_arg=--blessings=${DAILY_BRANCH_TESTED_BLESSING:-real}
+blessings_arg=${DAILY_BRANCH_TESTED_BLESSING:-real}
+blessings_arg=--blessings=${blessings_arg},${blessings_arg}-retest
sgr_args+=" $blessings_arg"
force_baseline='' # Non-empty = indication why we are forcing baseline.
diff --git a/cr-disk-report b/cr-disk-report
index 543d35bf..d76fd72f 100755
--- a/cr-disk-report
+++ b/cr-disk-report
@@ -38,7 +38,7 @@ our $graphs_px=0;
our $graphs_py=0;
open DEBUG, ">/dev/null" or die $!;
-our @blessings = qw(real real-bisect);
+our @blessings = qw(real real-retry real-bisect);
# for these blessings column is "<blessing> <branch>"
# for other blessings column is "<intended> [<blessing>]"
diff --git a/cr-try-bisect b/cr-try-bisect
index a2b77b9a..6adc2bcc 100755
--- a/cr-try-bisect
+++ b/cr-try-bisect
@@ -59,7 +59,7 @@ compute_state_done_callback () {
compute_state_callback () {
compute_state_core \
--basis-template=$basisflight \
- --blessings=$OSSTEST_BLESSING,$OSSTEST_BLESSING-bisect \
+ --blessings=$OSSTEST_BLESSING,$OSSTEST_BLESSING-bisect,$OSSTEST_BLESSING-retry \
"$@" $branch $job $testid
}
@@ -78,7 +78,7 @@ perhaps_bisect_step () {
echo "already completed $branch $job $testid"
return
fi
- perhaps_bisect_step_core $OSSTEST_BLESSING $OSSTEST_BLESSING-bisect
+ perhaps_bisect_step_core $OSSTEST_BLESSING $OSSTEST_BLESSING-bisect $OSSTEST_BLESSING-real
}
subject_prefix="[$branch bisection]"
diff --git a/cr-try-bisect-adhoc b/cr-try-bisect-adhoc
index caadfd80..c2cfa475 100755
--- a/cr-try-bisect-adhoc
+++ b/cr-try-bisect-adhoc
@@ -49,7 +49,7 @@ export OSSTEST_BLESSING=adhoc
compute_state_callback () {
compute_state_core \
- --blessings=real,real-bisect,adhoc-bisect \
+ --blessings=real,real-retry,real-bisect,adhoc-bisect \
$bisect "$@" $branch $job $testid
}
diff --git a/cs-bisection-step b/cs-bisection-step
index 762966da..8b391448 100755
--- a/cs-bisection-step
+++ b/cs-bisection-step
@@ -7,7 +7,7 @@
# usage:
# ./cs-bisection-setup [<options>] <branch> <job> <testid>
# options, usually:
-# --blessings=real,real-bisect
+# --blessings=real,real-retry,real-bisect
#
# First entry in --blessings list is the blessing of the basis
# (non-bisection) flights. This should not be the same as the
@@ -45,7 +45,7 @@ use HTML::Entities;
use Osstest::Executive;
use URI::Escape;
-our @blessings= qw(real real-bisect);
+our @blessings= qw(real real-retry real-bisect);
our @revtuplegenargs= ();
our $broken;
diff --git a/sg-report-flight b/sg-report-flight
index cbd39599..51a409ed 100755
--- a/sg-report-flight
+++ b/sg-report-flight
@@ -120,7 +120,7 @@ die if defined $specver{this}{flight};
die if defined $specver{that}{flight} &&
grep { $_ ne 'flight' } keys %{ $specver{that} };
-push @blessings, 'real', 'real-bisect' unless @blessings;
+push @blessings, 'real', 'real-retry', 'real-bisect' unless @blessings;
csreadconfig();
--
2.20.1
next prev parent reply other threads:[~2020-10-15 16:09 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-15 15:50 [OSSTEST PATCH v2 00/13] Immediately retry failing tests Ian Jackson
2020-10-15 15:50 ` [OSSTEST PATCH v2 01/17] Honour OSSTEST_SIMULATE=2 to actually run dummy flight Ian Jackson
2020-10-15 15:50 ` [OSSTEST PATCH v2 02/17] Honour OSSTEST_SIMULATE_FAIL in sg-run-job Ian Jackson
2020-10-15 15:50 ` [OSSTEST PATCH v2 03/17] sg-report-flight: Consider all blessings for "never pass" Ian Jackson
2020-10-15 15:50 ` [OSSTEST PATCH v2 04/17] mg-execute-flight: Do not include the transcript in reports Ian Jackson
2020-10-15 15:50 ` [OSSTEST PATCH v2 05/17] sg-report-job-history: eval $DAILY_BRANCH_PREEXEC_HOOK Ian Jackson
2020-10-15 15:50 ` [OSSTEST PATCH v2 06/17] cri-args-hostlists: New debug var $OSSTEST_REPORT_JOB_HISTORY_RUN Ian Jackson
2020-10-15 15:50 ` [OSSTEST PATCH v2 07/17] cri-args-hostlists: Break out report_flight and publish_logs Ian Jackson
2020-10-15 15:50 ` [OSSTEST PATCH v2 08/17] sg-report-flight: Break out printout_flightheader Ian Jackson
2020-10-15 15:50 ` [OSSTEST PATCH v2 09/17] sg-report-flight: Provide --refer-to-flight option Ian Jackson
2020-10-15 15:50 ` [OSSTEST PATCH v2 10/17] sg-report-flight: Nicer output for " Ian Jackson
2020-10-15 15:50 ` Ian Jackson [this message]
2020-10-15 15:50 ` [OSSTEST PATCH v2 12/17] cri-args-hostlists: Move flight_html_dir variable Ian Jackson
2020-10-15 15:50 ` [OSSTEST PATCH v2 13/17] cr-daily-branch: Immediately retry failing tests Ian Jackson
2020-10-15 15:50 ` [OSSTEST PATCH v2 14/17] Honour OSSTEST_SIMULATE_FAIL_RETRY for immediate retries Ian Jackson
2020-10-15 15:50 ` [OSSTEST PATCH v2 15/17] cr-daily-branch: Do not do immediate retry of failing xtf flights Ian Jackson
2020-10-15 15:50 ` [OSSTEST PATCH v2 16/17] sg-report-flight: Include count of blockers, and of jobs, in mro Ian Jackson
2020-10-15 15:50 ` [OSSTEST PATCH v2 17/17] cr-daily-branch: Heuristics for when to do immediate retest flight Ian Jackson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201015155019.20705-12-iwj@xenproject.org \
--to=iwj@xenproject.org \
--cc=ian.jackson@eu.citrix.com \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).