Skip to content

set default ROS distro to rolling #478

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

Merged
dirk-thomas merged 2 commits into from
Jun 17, 2020
Merged

set default ROS distro to rolling #478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d8f17f1
set default ROS distro to rolling
dirk-thomas Jun 16, 2020
e420270
Use the foxy Dockerfile for rolling on Windows.
nuclearsandwich Jun 17, 2020
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
2 changes: 1 addition & 1 deletion create_jenkins_job.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ def main(argv=None):
'turtlebot_demo': False,
'build_timeout_mins': 0,
'ubuntu_distro': 'focal',
'ros_distro': 'foxy',
'ros_distro': 'rolling',
}

jenkins = connect(args.jenkins_url)
Expand Down
4 changes: 4 additions & 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 @@ -358,6 +358,10 @@ setlocal enableDelayedExpansion
rmdir /S /Q ws workspace "work space"

echo "# BEGIN SECTION: Build DockerFile"
@# Rolling uses the Foxy Dockerfile.
if "!CI_ROS_DISTRO!" == "rolling" (
set "CI_ROS_DISTRO=foxy"
)
@# Eloquent uses the Dashing Dockerfile.
if "!CI_ROS_DISTRO!" == "eloquent" (
set "CI_ROS_DISTRO=dashing"
Expand Down
4 changes: 4 additions & 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 @@ -344,6 +344,10 @@ setlocal enableDelayedExpansion
rmdir /S /Q ws workspace

echo "# BEGIN SECTION: Build DockerFile"
@# Rolling uses the Foxy Dockerfile.
if "!CI_ROS_DISTRO!" == "rolling" (
set "CI_ROS_DISTRO=foxy"
)
@# Eloquent uses the Dashing Dockerfile.
if "!CI_ROS_DISTRO!" == "eloquent" (
set "CI_ROS_DISTRO=dashing"
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -60,7 +60,7 @@ choices.remove(ubuntu_distro)
<a class="string-array">
<string>@ros_distro</string>
@{
choices = ['dashing', 'eloquent', 'foxy']
choices = ['dashing', 'eloquent', 'foxy', 'rolling]
choices.remove(ros_distro)
}@
@[for choice in choices]@
Expand Down