Merge branch 'ros-industrial:master' into patch-7

ros-industrial · Dec 27, 2024 · c61c938 · c61c938
2 parents 88e1950 + 53cd3f1
commit c61c938
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/industrial_ci/src/isolation/docker.env b/industrial_ci/src/isolation/docker.env
@@ -29,6 +29,8 @@ HASHKEY_SKS
 IMMEDIATE_TEST_OUTPUT
 NOT_TEST_BUILD
 NOT_TEST_DOWNSTREAM
+OS_NAME
+OS_CODE_NAME
 PARALLEL_BUILDS
 PARALLEL_TESTS
 PIP_BREAK_SYSTEM_PACKAGES

diff --git a/industrial_ci/src/ros.sh b/industrial_ci/src/ros.sh
@@ -63,6 +63,10 @@ function _set_ros_defaults {
     "noetic")
         _ros1_defaults "focal"
         export ROS_PYTHON_VERSION=3
+        if [ "$OS_NAME" = "debian" ]; then
+            _ros_is_eol "noetic/2023-03-02"
+            export ROS_VERSION_FINAL_DEBIAN=true
+        fi
         ;;
     "ardent")
         _ros2_defaults "xenial"
@@ -123,7 +127,11 @@ function _set_ros_defaults {
 }
 
 function _use_snapshot() {
-    export ROS_REPOSITORY_PATH="http://snapshots.ros.org/${ROS_DISTRO?ROS_DISTRO needs to be set}/$1/ubuntu"
+    local osname="ubuntu"
+    if [ "$1" = "$ROS_VERSION_FINAL" ] && [ "${ROS_VERSION_FINAL_DEBIAN:-false}" = true ]; then
+        osname="debian"
+    fi
+    export ROS_REPOSITORY_PATH="http://snapshots.ros.org/${ROS_DISTRO?ROS_DISTRO needs to be set}/$1/$osname"
     export ROS_REPOSITORY_KEY="$ICI_SRC_PATH/keys/snapshots.asc"
 }