Update to validate detecting multiple packages

Also parameterize tests automatically
osrf · Feb 3, 2025 · b1f6af7 · b1f6af7
1 parent 3885a3f
commit b1f6af7
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 9 deletions.
diff --git a/src/rocker/rmw_extension.py b/src/rocker/rmw_extension.py
@@ -25,7 +25,8 @@ class RMW(RockerExtension):
     rmw_map = {
         'cyclonedds': ['ros-${ROS_DISTRO}-rmw-cyclonedds-cpp'],
         'fastrtps'  : ['ros-${ROS_DISTRO}-rmw-fastrtps-cpp'],
-        'zenoh'  : ['ros-${ROS_DISTRO}-rmw-zenoh-cpp'],
+        'zenoh'  : ['ros-${ROS_DISTRO}-rmw-zenoh-cpp', 'ros-${ROS_DISTRO}-zenoh-vendor'],
+        # Second dependency not 100% necessary but validates dual package detection in tests.
         # TODO(tfoote) Enable connext with license acceptance method
         # 'connextdds': ['ros-${ROS_DISTRO}-rmw-connextdds'],
     }

diff --git a/src/rocker/templates/rmw_snippet.Dockerfile.em b/src/rocker/templates/rmw_snippet.Dockerfile.em
@@ -4,13 +4,16 @@
 @[ if rmw ]@
 RUN \
   if [ -z "${ROS_DISTRO}" ]; then echo "ROS_DISTRO is unset cannot override RMW" ; exit 1 ; fi ;\
-  if ! dpkg -l @(' '.join(packages)) | grep -q ^ii ; then \
-   apt-get update \
-   && DEBIAN_FRONTENT=non-interactive apt-get install -qy --no-install-recommends\
-     @(' '.join(packages)) \
-   && apt-get clean ;\
+@[for package in packages]@
+  apt-get update ;\
+  if ! dpkg -l @(packages) | grep -q ^ii ; then \
+  DEBIAN_FRONTENT=non-interactive apt-get install -qy --no-install-recommends\
+    @(package) \
+  && apt-get clean ;\
   else \
-   echo "Found rmw packages @(' '.join(packages)) no need to install" ; \
-  fi
+  echo "Found rmw package @(package) no need to install" ; \
+  fi ; \
+@[end for]@
+echo "Done detecting packages for rmw"
 @[ end if ]@
 
diff --git a/test/test_rmw_extension.py b/test/test_rmw_extension.py
@@ -26,6 +26,7 @@
 
 from test_extension import plugin_load_parser_correctly
 
+from rocker.rmw_extension import RMW
 
 
 class rmwExtensionTest(unittest.TestCase):
@@ -84,7 +85,7 @@ def test_rmw_extension(self):
         plugins = list_plugins()
         rmw_plugin = plugins['rmw']
 
-        rmws_to_test = ['fastrtps', 'cyclonedds', 'zenoh']
+        rmws_to_test = RMW.rmw_map.keys()
 
         p = rmw_plugin()
         self.assertTrue(plugin_load_parser_correctly(rmw_plugin))