From af289e38bd8ab747af0cba2ee7f5dbacec732842 Mon Sep 17 00:00:00 2001 From: Mathias Hauser Date: Tue, 23 Feb 2021 21:36:59 +0100 Subject: [PATCH 1/7] Upstream CI: limit runtime --- .github/workflows/upstream-dev-ci.yaml | 2 +- ci/install-upstream-wheels.sh | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/upstream-dev-ci.yaml b/.github/workflows/upstream-dev-ci.yaml index bba7c04a9c2..f2d3784f1d7 100644 --- a/.github/workflows/upstream-dev-ci.yaml +++ b/.github/workflows/upstream-dev-ci.yaml @@ -77,7 +77,7 @@ jobs: id: status run: | set -euo pipefail - python -m pytest -rf | tee output-${{ matrix.python-version }}-log || ( + python -m pytest --timeout=7200 -rf | tee output-${{ matrix.python-version }}-log || ( echo '::set-output name=ARTIFACTS_AVAILABLE::true' && false ) - name: Upload artifacts diff --git a/ci/install-upstream-wheels.sh b/ci/install-upstream-wheels.sh index fe3e706f6a6..8458a8df352 100755 --- a/ci/install-upstream-wheels.sh +++ b/ci/install-upstream-wheels.sh @@ -16,6 +16,8 @@ conda uninstall -y --force \ pint \ bottleneck \ sparse +# to limit the runtime of Upstream CI +python -m pip install pytest-timeout python -m pip install \ -i https://pypi.anaconda.org/scipy-wheels-nightly/simple \ --no-deps \ From 59fdf6782565dc8e900053208fc9c8172bd8d7a1 Mon Sep 17 00:00:00 2001 From: Mathias Hauser Date: Tue, 23 Feb 2021 21:38:48 +0100 Subject: [PATCH 2/7] [test-upstream] run upstream From 6168d130adf656427b881b0a2dde954eb8d7f88b Mon Sep 17 00:00:00 2001 From: Mathias Hauser Date: Tue, 23 Feb 2021 21:47:06 +0100 Subject: [PATCH 3/7] Update .github/workflows/upstream-dev-ci.yaml --- .github/workflows/upstream-dev-ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/upstream-dev-ci.yaml b/.github/workflows/upstream-dev-ci.yaml index f2d3784f1d7..4e1c7b324d9 100644 --- a/.github/workflows/upstream-dev-ci.yaml +++ b/.github/workflows/upstream-dev-ci.yaml @@ -77,7 +77,7 @@ jobs: id: status run: | set -euo pipefail - python -m pytest --timeout=7200 -rf | tee output-${{ matrix.python-version }}-log || ( + python -m pytest --timeout=5400 -rf | tee output-${{ matrix.python-version }}-log || ( echo '::set-output name=ARTIFACTS_AVAILABLE::true' && false ) - name: Upload artifacts From 0ee3308308ebb58562920e2587adfd4f6f2f9ee4 Mon Sep 17 00:00:00 2001 From: Mathias Hauser Date: Tue, 23 Feb 2021 21:47:45 +0100 Subject: [PATCH 4/7] [test-upstream] run upstream From 840fd147e59188d7bfc244c3c89928df026636cb Mon Sep 17 00:00:00 2001 From: Mathias Hauser Date: Tue, 23 Feb 2021 22:13:46 +0100 Subject: [PATCH 5/7] [test-upstream] limit to 60 s --- .github/workflows/upstream-dev-ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/upstream-dev-ci.yaml b/.github/workflows/upstream-dev-ci.yaml index 4e1c7b324d9..e55be4da329 100644 --- a/.github/workflows/upstream-dev-ci.yaml +++ b/.github/workflows/upstream-dev-ci.yaml @@ -77,7 +77,7 @@ jobs: id: status run: | set -euo pipefail - python -m pytest --timeout=5400 -rf | tee output-${{ matrix.python-version }}-log || ( + python -m pytest --timeout=60 -rf | tee output-${{ matrix.python-version }}-log || ( echo '::set-output name=ARTIFACTS_AVAILABLE::true' && false ) - name: Upload artifacts From aab59a2b5e2c54afbb9f0846188cc38ff8306435 Mon Sep 17 00:00:00 2001 From: Mathias Hauser Date: Tue, 23 Feb 2021 22:18:45 +0100 Subject: [PATCH 6/7] [test-upstream] update parse_logs.py --- .github/workflows/parse_logs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/parse_logs.py b/.github/workflows/parse_logs.py index 4d3bea54e50..545beaa4167 100644 --- a/.github/workflows/parse_logs.py +++ b/.github/workflows/parse_logs.py @@ -18,7 +18,7 @@ def extract_short_test_summary_info(lines): ) up_to_section_content = itertools.islice(up_to_start_of_section, 1, None) section_content = itertools.takewhile( - lambda l: l.startswith("FAILED"), up_to_section_content + lambda l: l.startswith("FAILED") or l.startswith("ERROR"), up_to_section_content ) content = "\n".join(section_content) From b4c170e2436ccfaafd33226c5ea2efaca4607efa Mon Sep 17 00:00:00 2001 From: Mathias Hauser Date: Tue, 23 Feb 2021 22:19:41 +0100 Subject: [PATCH 7/7] [test-upstream] run upstream