Introduce real-retry blessing

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>

diff --git a/README.dev b/README.dev
index 2cbca109634e0328c379d36f8cf61e77a53c39b4..3d09b3c6bf56591e8fb1a1c15d478dac7673a391 100644 (file)
--- 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 23060588db9a56aa6cc986c444b4266a068de582..285ea361ead6bac9d6f9452eefaf65fe1ee8f9b3 100755 (executable)
--- 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 543d35bfb73834066e43f4d22102cf74ae899a36..d76fd72fcdb031e464d70ffea9d1d0180ef1bda4 100755 (executable)
--- 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 a2b77b9a740b177884b76e6e2512aefc9bb32081..6adc2bcc7ec8c00eed52bdee8c286845806fc3e1 100755 (executable)
--- 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 caadfd80c537ce2be39ce4423a8c5928830f5e09..c2cfa475975a61ca62bb888e8d5f1a93bbf3b986 100755 (executable)
--- 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 762966da0d6e6c5dd28be81ce0862ab174fafd40..8b391448d6f1b2a0d05d411ed078d513c4b46cdc 100755 (executable)
--- 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 cbd39599f338b259a79074308cd20e07ed4d70af..51a409ede99862a4c6eb32a53d1aec08eb727d34 100755 (executable)
--- 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();