diff --git a/.github/workflows/ci_pipeline.yml b/.github/workflows/ci_pipeline.yml index d89e19242..bb27595d0 100644 --- a/.github/workflows/ci_pipeline.yml +++ b/.github/workflows/ci_pipeline.yml @@ -37,7 +37,6 @@ jobs: ros_distro: - noetic - humble - - iron - jazzy include: - ros_distro: humble diff --git a/.github/workflows/docker_ci_pipeline.yml b/.github/workflows/docker_ci_pipeline.yml index f6481aae6..635a09a76 100644 --- a/.github/workflows/docker_ci_pipeline.yml +++ b/.github/workflows/docker_ci_pipeline.yml @@ -23,7 +23,6 @@ jobs: ros_distro: - noetic - humble - - iron - jazzy - rolling steps: diff --git a/.github/workflows/weekly_pipeline.yml b/.github/workflows/weekly_pipeline.yml index c80831bfa..841c4ed83 100644 --- a/.github/workflows/weekly_pipeline.yml +++ b/.github/workflows/weekly_pipeline.yml @@ -23,7 +23,6 @@ jobs: ros_distro: - noetic - humble - - iron - jazzy - rolling container: diff --git a/DEVELOPING.md b/DEVELOPING.md index 0318e39e0..334145d6f 100644 --- a/DEVELOPING.md +++ b/DEVELOPING.md @@ -38,7 +38,7 @@ To bring up a development environment: (cd beluga && ROSDISTRO=humble docker/run.sh) ``` - Supported distributions include `noetic`, `humble`, `iron`, `jazzy`, and `rolling`. + Supported distributions include `noetic`, `humble`, `jazzy`, and `rolling`. ## Workflow diff --git a/beluga_tools/package.xml b/beluga_tools/package.xml index 50e1e383a..36337ee8e 100644 --- a/beluga_tools/package.xml +++ b/beluga_tools/package.xml @@ -11,12 +11,12 @@ Apache License 2.0 - - python3-h5py + python3-h5py python3-matplotlib python3-numpy python3-scipy diff --git a/docker/files/iron.repos b/docker/files/iron.repos deleted file mode 100644 index 5216ad4a4..000000000 --- a/docker/files/iron.repos +++ /dev/null @@ -1,5 +0,0 @@ -repositories: - flatland: - type: git - url: https://github.com/avidbots/flatland.git - version: ros2-humble diff --git a/docker/images/iron/Dockerfile b/docker/images/iron/Dockerfile deleted file mode 100644 index 28fa8268f..000000000 --- a/docker/images/iron/Dockerfile +++ /dev/null @@ -1,113 +0,0 @@ -FROM ros:iron-ros-base-jammy AS cacher - -WORKDIR /ws/src - -COPY docker/files/iron.repos . -RUN vcs import < iron.repos - -COPY . beluga/ - -RUN mkdir -p /tmp/ws/src \ - && find ./ -name "package.xml" | xargs cp --parents -t /tmp/ws/src \ - && find ./ -name "COLCON_IGNORE" | xargs cp --parents -t /tmp/ws/src \ - || true - -FROM ros:iron-ros-base-jammy AS timem-builder - -RUN apt-get update \ - && apt-get install --no-install-recommends -y \ - git \ - && rm -rf /var/lib/apt/lists/* - -WORKDIR /opt - -RUN git clone -b develop https://github.com/NERSC/timemory.git \ - && cd timemory \ - && git checkout 415650ee26f358218908983c87212b620c3a0328 \ - && cmake -B ./build \ - -DTIMEMORY_INSTALL_HEADERS=OFF \ - -DTIMEMORY_INSTALL_CONFIG=OFF \ - -DTIMEMORY_INSTALL_ALL=OFF \ - -DTIMEMORY_BUILD_TIMEM=ON \ - . \ - && cmake --build ./build --target timem - -FROM ros:iron-ros-base-jammy AS builder - -ENV DEBIAN_FRONTEND noninteractive - -RUN apt-get update \ - && apt-get install --no-install-recommends -y \ - ccache \ - curl \ - gcovr \ - gdb \ - git \ - lcov \ - linux-tools-common \ - linux-tools-generic \ - python3-colcon-coveragepy-result \ - python3-colcon-lcov-result \ - python3-pip \ - tmux \ - && rm -rf /var/lib/apt/lists/* - -RUN pip install \ - evo==1.21.0 \ - pre-commit==2.20.0 \ - h5py==3.11.0 - -COPY --from=timem-builder --chown=$USER:$GROUP /opt/timemory/ /opt/timemory -RUN cmake --build /opt/timemory/build --target install - -# Check if perf is working, if not replace it with the perf version available -RUN perf help || ( \ - mv /usr/bin/perf /usr/bin/perf.bkp && \ - ln -s $(ls -d /usr/lib/linux-tools/* | tail -n1)/perf /usr/bin/perf) - -ARG USER=developer -ARG GROUP=ekumen - -RUN addgroup --gid 1000 $GROUP \ - && adduser --uid 1000 --ingroup $GROUP --home /home/$USER --shell /bin/sh --disabled-password --gecos "" $USER \ - && adduser $USER sudo \ - && echo "$USER ALL=NOPASSWD: ALL" >> /etc/sudoers.d/$USER - -COPY docker/files/fixuid_config.yml /etc/fixuid/config.yml -RUN /bin/bash -c '\ - ARCH=`uname -m` && if [ "$ARCH" == "aarch64" ]; then FIXUID_ARCH="arm64"; else FIXUID_ARCH="amd64"; fi \ - && curl -SsL https://github.com/boxboat/fixuid/releases/download/v0.6.0/fixuid-0.6.0-linux-$FIXUID_ARCH.tar.gz | tar -C /usr/local/bin -xzf - \ - && chmod 4755 /usr/local/bin/fixuid \ - && cd /etc/fixuid \ - && sed -i "s/_USER_/$USER/" config.yml \ - && sed -i "s/_GROUP_/$GROUP/" config.yml' - -RUN cd /opt && git clone https://github.com/brendangregg/FlameGraph - -USER $USER:$GROUP - -ENV USER_WS /ws - -WORKDIR $USER_WS - -RUN colcon mixin add default https://raw.githubusercontent.com/colcon/colcon-mixin-repository/master/index.yaml \ - && colcon mixin update default -COPY --chown=$USER:$GROUP docker/files/colcon_defaults.yaml /home/$USER/.colcon/defaults.yaml -RUN mkdir -p /home/$USER/.ccache $USER_WS/src - -COPY --from=cacher --chown=$USER:$GROUP /tmp/ws/ $USER_WS/ - -RUN sudo apt-get update \ - && sudo apt-get -y dist-upgrade \ - && . /opt/ros/iron/setup.sh \ - && rosdep update \ - && rosdep install -i -y --from-path src \ - && rosdep install -i -y --from-path src -t doc \ - && sudo rm -rf /var/lib/apt/lists/* - -COPY --from=cacher --chown=$USER:$GROUP /ws/ $USER_WS/ - -ENV WITHIN_DEV 1 - -ENV SHELL /bin/bash -ENTRYPOINT ["fixuid", "-q", "/ros_entrypoint.sh", "/bin/bash"] diff --git a/docs/_images/iron_irwini_logo.jpg b/docs/_images/iron_irwini_logo.jpg deleted file mode 100644 index 06342f3c9..000000000 Binary files a/docs/_images/iron_irwini_logo.jpg and /dev/null differ diff --git a/docs/index.md b/docs/index.md index 1f8dc89f4..fa2f55560 100644 --- a/docs/index.md +++ b/docs/index.md @@ -143,10 +143,6 @@ Beluga is supported on a number of ROS 1 and ROS 2 distributions, primarily on L :text-align: center ![ROS 2 Humble Hawksbill logo](./_images/humble_hawksbill_logo.png) ::: -:::{grid-item-card} ROS 2 Iron Irwini -:text-align: center -![ROS 2 Iron Irwini logo](./_images/iron_irwini_logo.jpg) -::: :::{grid-item-card} ROS 2 Jazzy Jalisco :text-align: center ![ROS 2 Jazzy Jalisco logo](./_images/jazzy_jalisco_logo.png)