Change installation instructions to use ros-apt-source package (backport #5684) (#5689)

Signed-off-by: Tomoya.Fujita <[email protected]>
Co-authored-by: Tomoya.Fujita <[email protected]>
(cherry picked from commit 9318249)

Signed-off-by: Tomoya Fujita <[email protected]>
Co-authored-by: Clara Berendsen <[email protected]>
Co-authored-by: Tomoya Fujita <[email protected]>

Author: 3 people

source/Installation/RHEL-Install-RPMs.rst

@@ -38,19 +38,16 @@ You will need to enable the EPEL repositories and the PowerTools repository:
 .. note:: This step may be slightly different depending on the distribution you are using.
           `Check the EPEL documentation <https://docs.fedoraproject.org/en-US/epel/#_quickstart>`_
 
-Next, download the ROS 2 ``.repo`` file:
+Next, download the ``ros2-release`` package and install it:
 
 .. code-block:: console
 
    $ sudo dnf install curl
-   $ sudo curl --output /etc/yum.repos.d/ros2.repo http://packages.ros.org/ros2/rhel/ros2.repo
+   $ 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}')
+   $ sudo dnf install "https://github.com/ros-infrastructure/ros-apt-source/releases/download/${ROS_APT_SOURCE_VERSION}/ros2-release-${ROS_APT_SOURCE_VERSION}-1.noarch.rpm"
 
-Then, update your metadata cache.
-DNF may prompt you to verify the GPG key, which should match the location ``https://raw.githubusercontent.com/ros/rosdistro/master/ros.asc``.
-
-.. code-block:: console
-
-   $ sudo dnf makecache
+The `ros2-release <https://github.com/ros-infrastructure/ros-apt-source/>`_ package provides keys and repo configuration for the various ROS repositories.
+Updates to repository configuration will occur automatically when new versions of this package are released to the ROS repositories.
 
 .. _rhel-install-rpms-install-ros-2-packages:
 
@@ -135,3 +132,9 @@ have already installed from binaries, run the following command:
 .. code-block:: console
 
    $ sudo dnf remove ros-{DISTRO}-*
+
+To remove the repository configuration run
+
+.. code-block:: console
+
+   $ sudo dnf remove ros2-release

source/Installation/Ubuntu-Install-Debs.rst

@@ -150,7 +150,7 @@ You may also want to remove the repository:
 
 .. code-block:: console
 
-   $ sudo rm /etc/apt/sources.list.d/ros2.list
+   $ sudo apt remove ros2-apt-source
    $ sudo apt update
    $ sudo apt autoremove
    $ sudo apt upgrade # Consider upgrading for packages previously shadowed.

source/Installation/_Apt-Repositories.rst

@@ -7,15 +7,14 @@ First ensure that the `Ubuntu Universe repository <https://help.ubuntu.com/commu
    $ sudo apt install software-properties-common
    $ sudo add-apt-repository universe
 
-Now add the ROS 2 GPG key with apt.
+The `ros-apt-source <https://github.com/ros-infrastructure/ros-apt-source/>`_ packages provide keys and apt source configuration for the various ROS repositories.
 
-.. code-block:: console
-
-   $ sudo apt update && sudo apt install curl -y
-   $ sudo curl -sSL https://raw.githubusercontent.com/ros/rosdistro/master/ros.key -o /usr/share/keyrings/ros-archive-keyring.gpg
-
-Then add the repository to your sources list.
+Installing the ros2-apt-source package will configure ROS 2 repositories for your system.
+Updates to repository configuration will occur automatically when new versions of this package are released to the ROS repositories.
 
 .. code-block:: console
 
-   $ echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/ros-archive-keyring.gpg] http://packages.ros.org/ros2/ubuntu $(. /etc/os-release && echo $UBUNTU_CODENAME) main" | sudo tee /etc/apt/sources.list.d/ros2.list > /dev/null
+   $ sudo apt update && sudo apt install curl -y
+   $ 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 -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" # If using Ubuntu derivates use $UBUNTU_CODENAME
+   $ sudo apt install /tmp/ros2-apt-source.deb