From 139fac292835ad9a87616909408e41375a26dda7 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Tue, 6 Apr 2021 18:05:46 -0500 Subject: [PATCH] Update CI test configurations - Limit test-results step to 1 min in case a test hangs without generating a tapfile, as `make test-results` may re-run it. - Limit Appveyor tests to 20 mins. - Always run `make test-results` on GHA. --- .appveyor.yml | 2 +- .appveyor/epics-base-7.yml | 4 ++-- .github/workflows/ci-scripts-build.yml | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 920dbb2a1..5534df41f 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -111,7 +111,7 @@ test_script: on_finish: - ps: Get-ChildItem *.tap -Recurse -Force | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name } - - cmd: python .ci/cue.py build test-results -s + - cmd: python .ci/cue.py -T 1M test-results on_failure: - cmd: python -m ci_core_dumper report diff --git a/.appveyor/epics-base-7.yml b/.appveyor/epics-base-7.yml index 1a01b35d5..f7e7da511 100644 --- a/.appveyor/epics-base-7.yml +++ b/.appveyor/epics-base-7.yml @@ -113,11 +113,11 @@ build_script: test_script: - cmd: python -m ci_core_dumper install - - cmd: python .ci/cue.py test + - cmd: python .ci/cue.py -T 20M test on_finish: - ps: Get-ChildItem *.tap -Recurse -Force | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name } - - cmd: python .ci/cue.py build test-results -s + - cmd: python .ci/cue.py -T 1M test-results on_failure: - cmd: python -m ci_core_dumper report diff --git a/.github/workflows/ci-scripts-build.yml b/.github/workflows/ci-scripts-build.yml index f9d52e54b..7055238c1 100644 --- a/.github/workflows/ci-scripts-build.yml +++ b/.github/workflows/ci-scripts-build.yml @@ -171,4 +171,5 @@ jobs: name: tapfiles ${{ matrix.name }} path: '**/O.*/*.tap' - name: Collect and show test results - run: python .ci/cue.py test-results + if: ${{ always() }} + run: python .ci/cue.py -T 1M test-results