Add ros_distro parameter for CI jobs. (#450)

ros2 · May 13, 2020 · 23ae3ce · 23ae3ce
1 parent 114a616
commit 23ae3ce
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 0 deletions.
diff --git a/create_jenkins_job.py b/create_jenkins_job.py
@@ -91,6 +91,7 @@ def main(argv=None):
         'turtlebot_demo': False,
         'build_timeout_mins': 0,
         'ubuntu_distro': 'focal',
+        'ros_distro': 'foxy',
     }
 
     jenkins = connect(args.jenkins_url)

diff --git a/job_templates/ci_job.xml.em b/job_templates/ci_job.xml.em
@@ -31,6 +31,7 @@
     use_connext_debs_default=use_connext_debs_default,
     use_isolated_default=use_isolated_default,
     ubuntu_distro=ubuntu_distro,
+    ros_distro=ros_distro,
     cmake_build_type=cmake_build_type,
     colcon_mixin_url=colcon_mixin_url,
     build_args_default=build_args_default,

diff --git a/job_templates/ci_launcher_job.xml.em b/job_templates/ci_launcher_job.xml.em
@@ -23,6 +23,7 @@
     use_connext_debs_default=use_connext_debs_default,
     use_isolated_default=use_isolated_default,
     ubuntu_distro=ubuntu_distro,
+    ros_distro=ros_distro,
     colcon_mixin_url=colcon_mixin_url,
     cmake_build_type=cmake_build_type,
     build_args_default=build_args_default,

diff --git a/job_templates/packaging_job.xml.em b/job_templates/packaging_job.xml.em
@@ -30,6 +30,7 @@
     default_repos_url=default_repos_url,
     supplemental_repos_url=supplemental_repos_url,
     ubuntu_distro=ubuntu_distro,
+    ros_distro=ros_distro,
     colcon_mixin_url=colcon_mixin_url,
     cmake_build_type=cmake_build_type,
     build_args_default=build_args_default,

diff --git a/job_templates/snippet/property_parameter-definition.xml.em b/job_templates/snippet/property_parameter-definition.xml.em
@@ -6,6 +6,7 @@
     default_repos_url=default_repos_url,
     supplemental_repos_url=supplemental_repos_url,
     ubuntu_distro=ubuntu_distro,
+    ros_distro=ros_distro,
     colcon_mixin_url=colcon_mixin_url,
     cmake_build_type=cmake_build_type,
     build_args_default=build_args_default,

diff --git a/job_templates/snippet/property_parameter-definition_common.xml.em b/job_templates/snippet/property_parameter-definition_common.xml.em
@@ -47,6 +47,22 @@ To use the latest released version, use an empty string.</description>
 choices = ['focal', 'bionic']
 choices.remove(ubuntu_distro)
 }@
+@[for choice in choices]@
+              <string>@choice</string>
+@[end for]@
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>CI_ROS_DISTRO</name>
+          <description>Select the ROS distribution to target.</description>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>@ros_distro</string>
+@{
+choices = ['dashing', 'eloquent', 'foxy']
+choices.remove(ros_distro)
+}@
 @[for choice in choices]@
               <string>@choice</string>
 @[end for]@