[benchmarker] Add test-benchmarker-minimal make target

.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)

.github/workflows/ci.yml

@@ -129,18 +129,12 @@ 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
       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

Makefile

@@ -46,6 +46,15 @@ shell-lint:
 unit-test:
 	cd monitoring && make unit-test
 
+.PHONY: test-benchmarker-minimal
+test-benchmarker-minimal:
+	uv sync --locked --no-install-project
+	mkdir -p monitoring/benchmarker/output/minimal
+	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
+
 .PHONY: image
 image:
 	cd monitoring && make image

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))