Skip to content

Commit

Permalink
Merge branch 'main' into alternative-cpu-utilization-reporting
Browse files Browse the repository at this point in the history
* main:
  Setting run failed always
  Bump tqdm from 4.67.0 to 4.67.1 (#1000)
  Bump playwright/python in /docker/auxiliary-containers/gcb_playwright (#999)
  Bump orjson from 3.10.11 to 3.10.12 (#1001)
  Bump pytest-playwright from 0.5.2 to 0.6.2 (#1004)
  Bump pydantic from 2.10.1 to 2.10.2 (#1005)
  • Loading branch information
ArneTR committed Nov 28, 2024
2 parents f1d3af8 + dec987e commit 1482339
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 5 deletions.
2 changes: 1 addition & 1 deletion docker/auxiliary-containers/gcb_playwright/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/playwright/python:v1.48.0-jammy
FROM mcr.microsoft.com/playwright/python:v1.49.0-jammy

# Install dependencies
RUN apt-get update && apt-get install -y curl wget gnupg && rm -rf /var/lib/apt/lists/*
Expand Down
2 changes: 1 addition & 1 deletion docker/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ uvicorn[standard]==0.32.1
pandas==2.2.3
PyYAML==6.0.2
anybadge==1.14.0
orjson==3.10.11
orjson==3.10.12
scipy==1.14.1
schema==0.7.7
deepdiff==8.0.1
Expand Down
4 changes: 2 additions & 2 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
-r requirements.txt
pydantic==2.10.1
pydantic==2.10.2
pylint==3.3.1
pytest-randomly==3.16.0
pytest-playwright==0.5.2
pytest-playwright==0.6.2
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ schema==0.7.7
aiohttp==3.11.7

# calibration script dep
tqdm==4.67.0
tqdm==4.67.1
plotext==5.3.2
docker==7.1.0
6 changes: 6 additions & 0 deletions runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -1611,30 +1611,35 @@ def run(self):
self.read_container_logs()
except BaseException as exc:
self.add_to_log(exc.__class__.__name__, str(exc))
self.set_run_failed()
raise exc
finally:
try:
self.read_and_cleanup_processes()
except BaseException as exc:
self.add_to_log(exc.__class__.__name__, str(exc))
self.set_run_failed()
raise exc
finally:
try:
self.save_notes_runner()
except BaseException as exc:
self.add_to_log(exc.__class__.__name__, str(exc))
self.set_run_failed()
raise exc
finally:
try:
self.stop_metric_providers()
except BaseException as exc:
self.add_to_log(exc.__class__.__name__, str(exc))
self.set_run_failed()
raise exc
finally:
try:
self.save_stdout_logs()
except BaseException as exc:
self.add_to_log(exc.__class__.__name__, str(exc))
self.set_run_failed()
raise exc
finally:
try:
Expand All @@ -1651,6 +1656,7 @@ def run(self):

except BaseException as exc:
self.add_to_log(exc.__class__.__name__, str(exc))
self.set_run_failed()
raise exc
finally:
self.cleanup() # always run cleanup automatically after each run
Expand Down

0 comments on commit 1482339

Please sign in to comment.