Merge pull request tier4#1618 from tier4/delete-workaround

Author: HansRobo

.github/workflows/BuildAndRun.yaml

@@ -35,20 +35,7 @@ jobs:
         rosdistro: [humble]
         runs_on: [ubuntu-22.04, ubuntu-22.04-arm]
         cmake_build_type: [RelWithDebInfo, Release] # Debug build type is currently unavailable. @TODO Fix problem and add Debug build.
-    steps:
-# workaround until the fix release in the official ros image
-      - name: Delete old ros2 apt source
-        run: |
-          rm /etc/apt/sources.list.d/ros2-latest.list
-          rm /usr/share/keyrings/ros2-latest-archive-keyring.gpg
-
-      - name: Setup new ros2 apt source
-        run: |
-          sudo apt-get update && sudo apt-get install curl
-          export ROS_APT_SOURCE_VERSION=$(curl -s https://api.github.com/repos/ros-infrastructure/ros-apt-source/releases/latest | grep -F "tag_name" | awk -F\" '{print $4}')
-          curl -L -o /tmp/ros2-apt-source.deb "https://github.com/ros-infrastructure/ros-apt-source/releases/download/${ROS_APT_SOURCE_VERSION}/ros2-apt-source_${ROS_APT_SOURCE_VERSION}.$(. /etc/os-release && echo $VERSION_CODENAME)_all.deb" 
-          sudo apt install /tmp/ros2-apt-source.deb
-      
+    steps:      
       - name: Suppress warnings
         run: git config --global --add safe.directory '*'
 

.github/workflows/Release.yaml

@@ -32,19 +32,6 @@ jobs:
     outputs:
       new_version: ${{ steps.new_version.outputs.new_version }}
     steps:
-# workaround until the fix release in the official ros image
-      - name: Delete old ros2 apt source
-        run: |
-          rm /etc/apt/sources.list.d/ros2-latest.list
-          rm /usr/share/keyrings/ros2-latest-archive-keyring.gpg
-
-      - name: Setup new ros2 apt source
-        run: |
-          sudo apt-get update && sudo apt-get install curl
-          export ROS_APT_SOURCE_VERSION=$(curl -s https://api.github.com/repos/ros-infrastructure/ros-apt-source/releases/latest | grep -F "tag_name" | awk -F\" '{print $4}')
-          curl -L -o /tmp/ros2-apt-source.deb "https://github.com/ros-infrastructure/ros-apt-source/releases/download/${ROS_APT_SOURCE_VERSION}/ros2-apt-source_${ROS_APT_SOURCE_VERSION}.$(. /etc/os-release && echo $VERSION_CODENAME)_all.deb" 
-          sudo apt install /tmp/ros2-apt-source.deb
-
       - name: Restore branch
         if: github.event.pull_request.merged == true
         uses: levonet/action-restore-branch@master

Dockerfile

@@ -4,18 +4,6 @@ SHELL ["/bin/bash", "-c"]
 ENV DEBIAN_FRONTEND=noninteractive
 ENV DEBCONF_NOWARNINGS=yes
 
-# workaround until the fix release in the official ros image
-RUN rm /etc/apt/sources.list.d/ros2-latest.list \
-  && rm /usr/share/keyrings/ros2-latest-archive-keyring.gpg
-RUN apt-get update \
-  && apt-get install -y ca-certificates curl
-
-RUN export ROS_APT_SOURCE_VERSION=$(curl -s https://api.github.com/repos/ros-infrastructure/ros-apt-source/releases/latest | grep -F "tag_name" | awk -F\" '{print $4}') ;\
-  curl -L -s -o /tmp/ros2-apt-source.deb "https://github.com/ros-infrastructure/ros-apt-source/releases/download/${ROS_APT_SOURCE_VERSION}/ros2-apt-source_${ROS_APT_SOURCE_VERSION}.$(. /etc/os-release && echo "$VERSION_CODENAME")_all.deb" \
-  && apt-get update \
-  && apt-get install -y /tmp/ros2-apt-source.deb \
-  && rm -f /tmp/ros2-apt-source.deb
-
 RUN --mount=type=cache,id=apt-cache-amd64,target=/var/cache/apt,sharing=locked \
     --mount=type=cache,id=apt-lib-amd64,target=/var/lib/apt,sharing=locked \
     apt-get update && apt-get -y install python3-pip python3-rospkg python3-rosdep software-properties-common ccache && \

Dockerfile.traffic_simulator

@@ -4,19 +4,6 @@ SHELL ["/bin/bash", "-c"]
 ENV DEBIAN_FRONTEND=noninteractive
 ENV DEBCONF_NOWARNINGS=yes
 
-# workaround until the fix release in the official ros image
-RUN rm /etc/apt/sources.list.d/ros2-latest.list \
-  && rm /usr/share/keyrings/ros2-latest-archive-keyring.gpg
-RUN apt-get update \
-  && apt-get install -y ca-certificates curl
-
-RUN export ROS_APT_SOURCE_VERSION=$(curl -s https://api.github.com/repos/ros-infrastructure/ros-apt-source/releases/latest | grep -F "tag_name" | awk -F\" '{print $4}') ;\
-  curl -L -s -o /tmp/ros2-apt-source.deb "https://github.com/ros-infrastructure/ros-apt-source/releases/download/${ROS_APT_SOURCE_VERSION}/ros2-apt-source_${ROS_APT_SOURCE_VERSION}.$(. /etc/os-release && echo "$VERSION_CODENAME")_all.deb" \
-  && apt-get update \
-  && apt-get install -y /tmp/ros2-apt-source.deb \
-  && rm -f /tmp/ros2-apt-source.deb
-
-# cspell: ignore kisak
 RUN --mount=type=cache,id=apt-cache-amd64,target=/var/cache/apt,sharing=locked \
     --mount=type=cache,id=apt-lib-amd64,target=/var/lib/apt,sharing=locked \
     apt-get update && apt-get -y install python3-pip python3-rospkg python3-rosdep software-properties-common ccache && \