diff options
-rw-r--r-- | round-robin.sh | 9 | ||||
-rwxr-xr-x | tcwg_bmk-build.sh | 6 |
2 files changed, 9 insertions, 6 deletions
diff --git a/round-robin.sh b/round-robin.sh index 1fc44842..a1d92963 100644 --- a/round-robin.sh +++ b/round-robin.sh @@ -903,6 +903,15 @@ no_build_regression_p () return 0 fi + # If we are observing a regression with a negative score, consider results as invalid. + # Setting EXTERNAL_FAIL will avoid any bisect, and the run will be marked as UNSTABLE. + # A side-effect of this is lack of reduction to component when a failure to build + # one of the components will just stop the job in UNSTABLE state and not attempt + # to update other components. + if [ $build_result_new -lt 0 ]; then + return $EXTERNAL_FAIL + fi + local last_log last_log=$(find $new_artifacts/ -name console.log.xz | sort -g | tail -n1) # In log scan for errors below diff --git a/tcwg_bmk-build.sh b/tcwg_bmk-build.sh index d3a782a1..88ef5cf9 100755 --- a/tcwg_bmk-build.sh +++ b/tcwg_bmk-build.sh @@ -357,12 +357,6 @@ no_regression_p () # At this stage, there's no score-based regression. # We are now checking metric-based regression. - local score - score=$(grep -v -E "^#|^$" $run_step_top_artifacts/results | tail -n1) - # if score is negative, then benchmarking failed and results aren't valid. - if [ $score -lt 0 ]; then - return 0 - fi assert_with_msg "Benchmarking succeeded, but bmk-data is missing" \ [ -e $run_step_top_artifacts/annex/bmk-data ] |