Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add ros_distro parameter for CI jobs. #450

Merged
merged 1 commit into from
May 13, 2020
Merged

Add ros_distro parameter for CI jobs. #450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions create_jenkins_job.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions job_templates/ci_job.xml.em
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
1 change: 1 addition & 0 deletions job_templates/ci_launcher_job.xml.em
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
1 change: 1 addition & 0 deletions job_templates/packaging_job.xml.em
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
1 change: 1 addition & 0 deletions job_templates/snippet/property_parameter-definition.xml.em
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
16 changes: 16 additions & 0 deletions job_templates/snippet/property_parameter-definition_common.xml.em
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]@
Expand Down