Merge pull request #552 from asorbini/asorbini/rmw_connextdds

Address reviewer comments for #549
ros2 · Mar 19, 2021 · e057b18 · e057b18
2 parents df3a4dc + c92a328
commit e057b18
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/create_jenkins_job.py b/create_jenkins_job.py
@@ -216,7 +216,7 @@ def create_job(os_name, job_name, template_file, additional_dict):
             packaging_label_expression = 'macos &amp;&amp; mojave'
 
         # configure a manual version of the packaging job
-        ignore_rmw_default_packaging = set()
+        ignore_rmw_default_packaging = { 'rmw_opensplice_cpp' }
         if os_name in ['linux-aarch64', 'linux-armhf']:
             ignore_rmw_default_packaging |= {'rmw_connext_cpp', 'rmw_connext_dynamic_cpp', 'rmw_connextdds'}
         create_job(os_name, 'ci_packaging_' + os_name, 'packaging_job.xml.em', {

diff --git a/job_templates/ci_job.xml.em b/job_templates/ci_job.xml.em
@@ -138,7 +138,7 @@ if [ -n "$CI_ROS_DISTRO" -a \( "$CI_ROS_DISTRO" = dashing -o "$CI_ROS_DISTRO" =
     export CI_ARGS="$CI_ARGS rmw_connext_cpp"
   fi
 else
-  # Always ignore `rmw_connext_cpp` in favor of `rmw_connextdds` for older releases.
+  # Always ignore `rmw_connext_cpp` in favor of `rmw_connextdds` for newer releases.
   export CI_ARGS="$CI_ARGS rmw_connext_cpp"
   if [ "$CI_USE_CONNEXTDDS" = "false" ]; then
     export CI_ARGS="$CI_ARGS rmw_connextdds"
@@ -293,7 +293,7 @@ if "!CI_CONNEXTDDS_RMW!" == "rmw_connext_cpp" (
     set "CI_ARGS=!CI_ARGS! rmw_connext_cpp"
   )
 ) else (
-  :: Always ignore `rmw_connext_cpp` in favor of `rmw_connextdds` for older releases.
+  :: Always ignore `rmw_connext_cpp` in favor of `rmw_connextdds` for newer releases.
   set "CI_ARGS=!CI_ARGS! rmw_connext_cpp"
   if "!CI_USE_CONNEXTDDS!" == "false" (
     set "CI_ARGS=!CI_ARGS! rmw_connextdds"
@@ -406,7 +406,7 @@ if "!CI_CONNEXTDDS_RMW!" == "rmw_connext_cpp" (
     set "CI_ARGS=!CI_ARGS! rmw_connext_cpp"
   )
 ) else (
-  :: Always ignore `rmw_connext_cpp` in favor of `rmw_connextdds` for older releases.
+  :: Always ignore `rmw_connext_cpp` in favor of `rmw_connextdds` for newer releases.
   set "CI_ARGS=!CI_ARGS! rmw_connext_cpp"
   if "!CI_USE_CONNEXTDDS!" == "false" (
     set "CI_ARGS=!CI_ARGS! rmw_connextdds"

diff --git a/job_templates/packaging_job.xml.em b/job_templates/packaging_job.xml.em
@@ -152,7 +152,7 @@ if [ -n "$CI_ROS_DISTRO" -a \( "$CI_ROS_DISTRO" = dashing -o "$CI_ROS_DISTRO" =
     export CI_ARGS="$CI_ARGS rmw_connext_cpp"
   fi
 else
-  # Always ignore `rmw_connext_cpp` in favor of `rmw_connextdds` for older releases.
+  # Always ignore `rmw_connext_cpp` in favor of `rmw_connextdds` for newer releases.
   export CI_ARGS="$CI_ARGS rmw_connext_cpp"
   if [ "$CI_USE_CONNEXTDDS" = "false" ]; then
     export CI_ARGS="$CI_ARGS rmw_connextdds"
@@ -306,7 +306,7 @@ if "!CI_CONNEXTDDS_RMW!" == "rmw_connext_cpp" (
     set "CI_ARGS=!CI_ARGS! rmw_connext_cpp"
   )
 ) else (
-  :: Always ignore `rmw_connext_cpp` in favor of `rmw_connextdds` for older releases.
+  :: Always ignore `rmw_connext_cpp` in favor of `rmw_connextdds` for newer releases.
   set "CI_ARGS=!CI_ARGS! rmw_connext_cpp"
   if "!CI_USE_CONNEXTDDS!" == "false" (
     set "CI_ARGS=!CI_ARGS! rmw_connextdds"
@@ -409,7 +409,7 @@ if "!CI_CONNEXTDDS_RMW!" == "rmw_connext_cpp" (
     set "CI_ARGS=!CI_ARGS! rmw_connext_cpp"
   )
 ) else (
-  :: Always ignore `rmw_connext_cpp` in favor of `rmw_connextdds` for older releases.
+  :: Always ignore `rmw_connext_cpp` in favor of `rmw_connextdds` for newer releases.
   set "CI_ARGS=!CI_ARGS! rmw_connext_cpp"
   if "!CI_USE_CONNEXTDDS!" == "false" (
     set "CI_ARGS=!CI_ARGS! rmw_connextdds"