[Xen-devel] [OSSTEST PATCH 09/21] step handling: Preserve step states set by ts-* scripts

[Ian Jackson <ian.jackson@xxxxxxxxxxxxx>]

sg-run-job would unconditionally set the step state to the value it
calculated, which would usually be `pass' or `fail' or
`broken' (according to the recipe).

Relax this interface somewhat to allow a test script to set the step
status itself: specifically, do not overwrite an existing status of
  aborted broken starved

Signed-off-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---
 tcl/JobDB-Executive.tcl | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tcl/JobDB-Executive.tcl b/tcl/JobDB-Executive.tcl
index 70728953..57ded025 100644
--- a/tcl/JobDB-Executive.tcl
+++ b/tcl/JobDB-Executive.tcl
@@ -316,11 +316,14 @@ proc spawn-step-commit {flight job stepno testid} {
 
 proc step-set-status {flight job stepno st} {
     transaction flights {
-        db-update-1 "
+        db-execute "
             UPDATE steps
                SET status='$st',
                    finished=[clock seconds]
              WHERE flight=$flight AND job='$job' AND stepno=$stepno
+               AND status<>'aborted'
+               AND status<>'broken'
+               AND status<>'starved'
         "
         set pause 0
         db-execute-array stopinfo "
-- 
2.11.0


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel