diff --git a/.airstack/modules/ready.sh b/.airstack/modules/ready.sh index a0e96046d..9e58bb2e1 100644 --- a/.airstack/modules/ready.sh +++ b/.airstack/modules/ready.sh @@ -32,7 +32,7 @@ # name is robot_, so behavior is identical to the old domain-derived # paths — but fleets with custom robot names now gate on the right graph. READY_SENTINEL_TEMPLATES=( - "/%s/interface/mavros/mavros" + "/%s/interface/mavros" "/%s/robot_state_publisher" "/%s/trajectory_controller/trajectory_control_node" ) diff --git a/.env b/.env index 070e7f471..e433c1802 100644 --- a/.env +++ b/.env @@ -12,7 +12,7 @@ PROJECT_NAME="airstack" # If you've run ./airstack.sh setup, then this will auto-generate from the git commit hash every time a change is made # to a Dockerfile or docker-compose.yaml file. Otherwise this can also be set explicitly to make a release version. # auto-generated from git commit hash -VERSION="0.20.8" +VERSION="0.20.11" # Image-tag discriminator ONLY (appears in the image tag suffix, e.g. ..._robot-x86-64_dev). # No Dockerfile consumes it: "prebuilt" does NOT bake the built ros_ws into the image today — # a real prebuilt (workspace-baked) stage is future work. Keep "dev" (mounted code, built live). diff --git a/docs/release_notes/index.md b/docs/release_notes/index.md index 5fb6e7398..203dbfeee 100644 --- a/docs/release_notes/index.md +++ b/docs/release_notes/index.md @@ -21,6 +21,30 @@ its own notes. --> - Nothing yet. +## 0.20.11 — 2026-11-17 + +- **MAVROS is pinned to 2.16.0 in the robot and GCS images, and its launch + namespace is empty.** MAVROS 2.15.0 creates its plugin nodes without the + global remaps, so with the old `namespace` default of `mavros` their topics + and services moved from `.../mavros/` to `.../mavros/mavros/` + on images built since 2026-09-11. `mavros_px4.launch.xml` now defaults + `namespace` to empty, as MAVROS's own `node.launch` has since 2.15.1, which + restores the names. The main node is now `//interface/mavros` (was + `//interface/mavros/mavros`); the readiness check and the liveliness + test follow. The images install `mavros`, `mavros-msgs`, `libmavconn` and + `mavlink` from the ROS snapshot of 2026-10-05, because 2.15.0 and 2.15.1 + drop the `px4_config.yaml` plugin settings. Remove the pin once newer + MAVROS releases are verified. + +## 0.20.10 — 2026-11-17 + +- **The test requirements pin pytest below 9.2.** pytest 9.2.0 stops at + collection with an `INTERNALERROR` in `tests/harness/collection.py` + (`pytest_collection_modifyitems`) before any test runs, so the Python unit + and harness contracts check failed on every pull request. + `tests/requirements.txt` now installs `pytest<9.2`. Remove the pin once + `collection.py` works with pytest 9.2 and later. + ## 0.20.8 — 2026-09-04 - **Docs builds no longer copy AirSim scene binaries.** The `same-dir` diff --git a/gcs/docker/Dockerfile.gcs b/gcs/docker/Dockerfile.gcs index 1320aa769..a9c939782 100644 --- a/gcs/docker/Dockerfile.gcs +++ b/gcs/docker/Dockerfile.gcs @@ -2,13 +2,18 @@ FROM osrf/ros:jazzy-desktop-full SHELL ["/bin/bash", "-c"] +# Add the ROS snapshot to pin MAVROS to 2.16 +RUN curl -sSL "https://keyserver.ubuntu.com/pks/lookup?op=get&options=mr&search=0x4B63CF8FDE49746E98FA01DDAD19BAB3CBF125EA" -o /usr/share/keyrings/ros-snapshots.asc \ + && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/ros-snapshots.asc] http://snapshots.ros.org/jazzy/2026-10-05/ubuntu $(. /etc/os-release && echo $UBUNTU_CODENAME) main" > /etc/apt/sources.list.d/ros2-snapshot.list + # Install system dependencies RUN apt-get -o Acquire::AllowInsecureRepositories=true -o Acquire::AllowDowngradeToInsecureRepositories=true update && \ apt-get -o APT::Get::AllowUnauthenticated=true install -y \ vim nano emacs wget curl tree sshpass \ iperf3 iftop iputils-ping net-tools htop \ cmake build-essential less jq python3-pip tmux gdb \ - ros-dev-tools ros-jazzy-mavros ros-jazzy-tf2* ros-jazzy-stereo-image-proc \ + ros-dev-tools ros-jazzy-mavros=2.16.0-1* ros-jazzy-tf2* ros-jazzy-stereo-image-proc \ + ros-jazzy-mavros-msgs=2.16.0-1* ros-jazzy-libmavconn=2.16.0-1* ros-jazzy-mavlink=2026.9.9-1* \ ros-jazzy-image-view ros-jazzy-topic-tools ros-jazzy-grid-map \ ros-jazzy-domain-bridge ros-jazzy-ros2cli python3-colcon-common-extensions \ libglib2.0-dev libcgal-dev openssh-server \ diff --git a/robot/docker/Dockerfile.robot b/robot/docker/Dockerfile.robot index b904ac301..f25a33f40 100644 --- a/robot/docker/Dockerfile.robot +++ b/robot/docker/Dockerfile.robot @@ -251,6 +251,10 @@ RUN python3 -m pip install --no-cache-dir --break-system-packages --ignore-insta "setuptools==79.0.1" \ wheel +# Add the ROS snapshot to pin MAVROS to 2.16 +RUN curl -sSL "https://keyserver.ubuntu.com/pks/lookup?op=get&options=mr&search=0x4B63CF8FDE49746E98FA01DDAD19BAB3CBF125EA" -o /usr/share/keyrings/ros-snapshots.asc \ + && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/ros-snapshots.asc] http://snapshots.ros.org/${ROS_DISTRO}/2026-10-05/ubuntu $(. /etc/os-release && echo $UBUNTU_CODENAME) main" > /etc/apt/sources.list.d/ros2-snapshot.list + # Install runtime ROS2 packages. ros-dev-tools pulls in the compile toolchain # (cmake, build-essential) — deliberate, since `bws` builds in-container. # (ros-*-grid-map pulls CGAL in as a transitive dependency where it needs it.) @@ -258,8 +262,9 @@ RUN python3 -m pip install --no-cache-dir --break-system-packages --ignore-insta # own); per-robot Foxglove returns later as an opt-in stack include. RUN apt update -y && apt install -y --no-install-recommends \ ros-dev-tools \ - ros-${ROS_DISTRO}-mavros \ - ros-${ROS_DISTRO}-mavros-extras \ + ros-${ROS_DISTRO}-mavros=2.16.0-1* \ + ros-${ROS_DISTRO}-mavros-extras=2.16.0-1* \ + ros-${ROS_DISTRO}-mavros-msgs=2.16.0-1* ros-${ROS_DISTRO}-libmavconn=2.16.0-1* ros-${ROS_DISTRO}-mavlink=2026.9.9-1* \ ros-${ROS_DISTRO}-tf2* \ ros-${ROS_DISTRO}-stereo-image-proc \ ros-${ROS_DISTRO}-image-view \ diff --git a/robot/ros_ws/src/interface/interface_bringup/launch/mavros_px4.launch.xml b/robot/ros_ws/src/interface/interface_bringup/launch/mavros_px4.launch.xml index 5117034c2..881fb12c4 100644 --- a/robot/ros_ws/src/interface/interface_bringup/launch/mavros_px4.launch.xml +++ b/robot/ros_ws/src/interface/interface_bringup/launch/mavros_px4.launch.xml @@ -19,7 +19,7 @@ description="MAVLink protocol version" /> - diff --git a/tests/requirements.txt b/tests/requirements.txt index 757d1ebdb..ffdd2af3c 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -1,4 +1,4 @@ -pytest +pytest<9.2 pytest-timeout pytest-dependency pyyaml diff --git a/tests/system/test_liveliness.py b/tests/system/test_liveliness.py index ac0675e96..929baf274 100644 --- a/tests/system/test_liveliness.py +++ b/tests/system/test_liveliness.py @@ -28,7 +28,7 @@ SENTINEL_NODE_TEMPLATES = [ - "/robot_{N}/interface/mavros/mavros", + "/robot_{N}/interface/mavros", "/robot_{N}/robot_state_publisher", "/robot_{N}/trajectory_controller/trajectory_control_node", ]