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 13/17] cr-daily-branch: Immediately retry failing tests
Date: Thu, 15 Oct 2020 16:50:15 +0100 [thread overview]
Message-ID: <20201015155019.20705-14-iwj@xenproject.org> (raw)
In-Reply-To: <20201015155019.20705-1-iwj@xenproject.org>
From: Ian Jackson <ian.jackson@eu.citrix.com>
We exclude the self-tests because we don't want to miss breakage, and
the Xen smoke tests because they will be run again RSN anyway.
Signed-off-by: Ian Jackson <iwj@xenproject.org>
---
cr-daily-branch | 48 +++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 47 insertions(+), 1 deletion(-)
diff --git a/cr-daily-branch b/cr-daily-branch
index 285ea361..bea8734e 100755
--- a/cr-daily-branch
+++ b/cr-daily-branch
@@ -472,12 +472,58 @@ esac
sgr_args+=" $EXTRA_SGR_ARGS"
date >&2
+original_start=`date +%s`
+
: $flight $branch $OSSTEST_BLESSING $sgr_args
eval "$DAILY_BRANCH_PREEXEC_HOOK"
execute_flight $flight $OSSTEST_BLESSING
date >&2
-start_email $flight $branch "$sgr_args" "$subject_prefix"
+default_immediate_retry=$wantpush
+
+case "$branch" in
+*smoke*) default_immediate_retry=false ;;
+osstest) default_immediate_retry=false ;;
+*) ;;
+esac
+
+: ${OSSTEST_IMMEDIATE_RETRY:-$default_immediate_retry}
+
+while true; do
+ start_email $flight $branch "$sgr_args" "$subject_prefix"
+ if grep '^tolerable$' $mrof >/dev/null 2>&1; then break; fi
+ if ! $OSSTEST_IMMEDIATE_RETRY; then break; fi
+ OSSTEST_IMMEDIATE_RETRY=false
+ retry_jobs=$(
+ perl <$mrof -wne '
+ next unless m/^regression (\S+) /;
+ my $j = $1;
+ next if $j =~ m/^build/;
+ $r{$j}++;
+ END {
+ print "copy-jobs '$flight' $_ "
+ foreach sort keys %r;
+ }'
+ )
+ if [ "x$retry_jobs" = x ]; then break; fi
+
+ rflight=$(
+ ./cs-adjust-flight new:$OSSTEST_BLESSING \
+ branch-set $branch \
+ $retry_jobs
+ )
+
+ ./mg-adjust-flight-makexrefs -v $rflight \
+ --branch=$branch --revision-osstest=$narness_rev \
+ '^build-*' --debug --blessings=real
+
+ export OSSTEST_RESOURCE_WAITSTART=$original_start
+ execute_flight $rflight $OSSTEST_BLESSING-retest
+ report_flight $rflight
+ publish_logs $rflight
+
+ sgr_args+=" --refer-to-flight=$rflight"
+done
push=false
if grep '^tolerable$' $mrof >/dev/null 2>&1; then push=$wantpush; fi
--
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 ` [OSSTEST PATCH v2 11/17] Introduce real-retry blessing Ian Jackson
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 ` Ian Jackson [this message]
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-14-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).