diff options
| author | Eric Anholt <eric@anholt.net> | 2021-03-19 09:38:47 -0700 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2021-03-19 22:07:57 +0000 |
| commit | 1af7be02d796377df877c9cbb1c58216e634fd2a (patch) | |
| tree | 3d89a9ee9030adc9e50e6ededdcf2416db0a0bc3 /.gitlab-ci | |
| parent | 4eb7c4d60cce350da19e0cca0706a652be8c4e94 (diff) | |
ci/bare-metal: Move the db820c lockup detect to the right boot script.
Fixes: 2407952ec99a ("ci/bare-metal: Restart a run on intermittent kernel lockups.")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9715>
Diffstat (limited to '.gitlab-ci')
| -rwxr-xr-x | .gitlab-ci/bare-metal/cros_servo_run.py | 6 | ||||
| -rwxr-xr-x | .gitlab-ci/bare-metal/fastboot_run.py | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/.gitlab-ci/bare-metal/cros_servo_run.py b/.gitlab-ci/bare-metal/cros_servo_run.py index 69902be18aa..dc5014bb283 100755 --- a/.gitlab-ci/bare-metal/cros_servo_run.py +++ b/.gitlab-ci/bare-metal/cros_servo_run.py @@ -139,12 +139,6 @@ class CrosServoRun: self.print_error("Detected cheza power management bus error, restarting run...") return 2 - # db820c sometimes wedges around iommu fault recovery - if re.search("watchdog: BUG: soft lockup - CPU.* stuck", line): - self.print_error( - "Detected kernel soft lockup, restarting run...") - return 2 - result = re.search("bare-metal result: (\S*)", line) if result: if result.group(1) == "pass": diff --git a/.gitlab-ci/bare-metal/fastboot_run.py b/.gitlab-ci/bare-metal/fastboot_run.py index f680d4b02f1..eb0b7d4e8ad 100755 --- a/.gitlab-ci/bare-metal/fastboot_run.py +++ b/.gitlab-ci/bare-metal/fastboot_run.py @@ -74,6 +74,12 @@ class FastbootRun: self.print_error("Detected spontaneous reboot, restarting run...") return 2 + # db820c sometimes wedges around iommu fault recovery + if re.search("watchdog: BUG: soft lockup - CPU.* stuck", line): + self.print_error( + "Detected kernel soft lockup, restarting run...") + return 2 + result = re.search("bare-metal result: (\S*)", line) if result: if result.group(1) == "pass": |