From 17727ae6b764efd6f29d780eb762a8f8e180c515 Mon Sep 17 00:00:00 2001 From: Benjamin Pelletier Date: Sun, 25 Oct 2026 11:49:33 -0700 Subject: [PATCH 1/3] Add test-benchmarker-minimal make target --- .github/workflows/CI.md | 4 ++-- .github/workflows/ci.yml | 8 ++------ Makefile | 8 ++++++++ 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.github/workflows/CI.md b/.github/workflows/CI.md index 3ee4f9aeaa..d80e0f207a 100644 --- a/.github/workflows/CI.md +++ b/.github/workflows/CI.md @@ -26,14 +26,14 @@ uss_qualifier [scenario documentation](../../monitoring/uss_qualifier/scenarios/ This repository contains a large number of shell scripts. This check attempts to have these scripts follow best practices and avoid common pitfalls. -### benchmarker minimal configuration +### benchmarker minimal configuration (`make test-benchmarker-minimal`) This job runs [`minimal.jsonnet`](../../monitoring/benchmarker/configurations/interuss/minimal.jsonnet) on the Ubuntu runner with uv (rather than the `monitoring` docker image like most others). Configuration actions bring up and tear down a local DSS deployment within the benchmarker run. To run it locally from the repository root: ```bash -PYTHONPATH=. uv run --locked --no-install-project python monitoring/benchmarker/benchmark.py --config file://monitoring/benchmarker/configurations/interuss/minimal.jsonnet +make test-benchmarker-minimal ``` ### mock_uss tests (`make test` in monitoring/mock_uss) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bb251a49e6..5a925bc47b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -135,12 +135,8 @@ jobs: shell: bash timeout-minutes: 10 run: | - mkdir -p logs monitoring/benchmarker/output/minimal - uv run --no-sync python monitoring/benchmarker/benchmark.py \ - --config file://monitoring/benchmarker/configurations/interuss/minimal.jsonnet \ - --config-output monitoring/benchmarker/output/minimal/config.json \ - --output monitoring/benchmarker/output/minimal \ - 2>&1 | tee logs/benchmarker.log + mkdir -p logs + make test-benchmarker-minimal 2>&1 | tee logs/benchmarker.log - name: Collect remaining container logs if: always() timeout-minutes: 2 diff --git a/Makefile b/Makefile index d4b5ab8738..d302ef4b01 100644 --- a/Makefile +++ b/Makefile @@ -46,6 +46,14 @@ shell-lint: unit-test: cd monitoring && make unit-test +.PHONY: test-benchmarker-minimal +test-benchmarker-minimal: + mkdir -p monitoring/benchmarker/output/minimal + PYTHONPATH=. uv run --locked --no-install-project python monitoring/benchmarker/benchmark.py \ + --config file://monitoring/benchmarker/configurations/interuss/minimal.jsonnet \ + --config-output monitoring/benchmarker/output/minimal/config.json \ + --output monitoring/benchmarker/output/minimal + .PHONY: image image: cd monitoring && make image From 524a83933b8e989549a1fbe4aba0f55cf78592fc Mon Sep 17 00:00:00 2001 From: Benjamin Pelletier Date: Sun, 25 Oct 2026 11:58:07 -0700 Subject: [PATCH 2/3] Fix redundant operation --- .github/workflows/ci.yml | 2 -- Makefile | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5a925bc47b..66a77772db 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -129,8 +129,6 @@ jobs: with: version: '0.12.21' enable-cache: true - - name: Install benchmarker dependencies - run: uv sync --locked --no-install-project - name: Run minimal benchmarker configuration shell: bash timeout-minutes: 10 diff --git a/Makefile b/Makefile index d302ef4b01..a11fa2658f 100644 --- a/Makefile +++ b/Makefile @@ -48,8 +48,9 @@ unit-test: .PHONY: test-benchmarker-minimal test-benchmarker-minimal: + uv sync --locked --no-install-project mkdir -p monitoring/benchmarker/output/minimal - PYTHONPATH=. uv run --locked --no-install-project python monitoring/benchmarker/benchmark.py \ + PYTHONPATH=. uv run --no-sync python monitoring/benchmarker/benchmark.py \ --config file://monitoring/benchmarker/configurations/interuss/minimal.jsonnet \ --config-output monitoring/benchmarker/output/minimal/config.json \ --output monitoring/benchmarker/output/minimal From 1eff34d81fbe52acf8b1562a94340b4a8529754a Mon Sep 17 00:00:00 2001 From: Benjamin Pelletier Date: Sun, 25 Oct 2026 13:34:03 -0700 Subject: [PATCH 3/3] `make format` --- .../uss_qualifier/suites/astm/utm/single_planner.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/monitoring/uss_qualifier/suites/astm/utm/single_planner.md b/monitoring/uss_qualifier/suites/astm/utm/single_planner.md index 227d799698..67a6fc10e7 100644 --- a/monitoring/uss_qualifier/suites/astm/utm/single_planner.md +++ b/monitoring/uss_qualifier/suites/astm/utm/single_planner.md @@ -2,6 +2,16 @@ # Single flight planner testing for ASTM F3548-21 test suite [`suites.astm.utm.single_planner`](./single_planner.yaml) +## [Resource inputs](../../README.md#resources) + +- `tested_uss`: `resources.flight_planning.FlightPlannerResource` +- `invalid_flight_intents`: `resources.flight_planning.FlightIntentsResource` +- `non_conflicting_flights`: `resources.flight_planning.FlightIntentsResource` +- `conflicting_flights`: `resources.flight_planning.FlightIntentsResource` +- `dss`: `resources.astm.f3548.v21.DSSInstanceResource` +- `mock_uss`: `resources.interuss.mock_uss.client.MockUSSResource` (optional) +- `utm_auth`: `resources.communications.AuthAdapterResource` (optional) + ## [Actions](../../README.md#actions) 1. Scenario: [Validation of operational intents](../../../scenarios/astm/utm/flight_intent_validation/flight_intent_validation.md) ([`scenarios.astm.utm.FlightIntentValidation`](../../../scenarios/astm/utm/flight_intent_validation/flight_intent_validation.py))