Skip to content

Add --ros-distro batch job argument from CI parameter. #455

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
nuclearsandwich merged 2 commits into from
Jul 9, 2020
Merged

Add --ros-distro batch job argument from CI parameter. #455

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
f4960ca
Add --ros-distro batch job argument from CI parameter.
nuclearsandwich May 20, 2020
24523b7
Make the parameter required rather than set a default.
nuclearsandwich May 20, 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
6 changes: 6 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 @@ -186,6 +186,9 @@ fi
@[ if os_name in ['linux', 'linux-aarch64', 'linux-armhf'] and turtlebot_demo]@
export CI_ARGS="$CI_ARGS --ros1-path /opt/ros/$CI_ROS1_DISTRO"
@[ end if]@
if [ -n "${CI_ROS_DISTRO+x}" ]; then
export CI_ARGS="$CI_ARGS --ros-distro $CI_ROS_DISTRO"
fi
if [ -n "${CI_BUILD_ARGS+x}" ]; then
export CI_ARGS="$CI_ARGS --build-args $CI_BUILD_ARGS"
fi
Expand Down Expand Up @@ -384,6 +387,9 @@ if "!CI_BRANCH_TO_TEST!" NEQ "" (
if "!CI_COLCON_BRANCH!" NEQ "" (
set "CI_ARGS=!CI_ARGS! --colcon-branch !CI_COLCON_BRANCH!"
)
if "!CI_ROS_DISTRO!" NEQ "" (
set "CI_ARGS=!CI_ARGS! --ros-distro !CI_ROS_DISTRO!"
)
if "!CI_USE_WHITESPACE_IN_PATHS!" == "true" (
set "CI_ARGS=!CI_ARGS! --white-space-in sourcespace buildspace installspace workspace"
)
Expand Down
6 changes: 6 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 @@ -193,6 +193,9 @@ export CI_ARGS="$CI_ARGS --ros1-path /opt/ros/$CI_ROS1_DISTRO"
echo "not building/testing the ros1_bridge on MacOS"
# export CI_ARGS="$CI_ARGS --ros1-path /Users/osrf/melodic/install_isolated"
@[ end if]@
if [ -n "${CI_ROS_DISTRO+x}" ]; then
export CI_ARGS="$CI_ARGS --ros-distro $CI_ROS_DISTRO"
fi
if [ -n "${CI_COLCON_MIXIN_URL+x}" ]; then
export CI_ARGS="$CI_ARGS --colcon-mixin-url $CI_COLCON_MIXIN_URL"
fi
Expand Down Expand Up @@ -370,6 +373,9 @@ if "!CI_BRANCH_TO_TEST!" NEQ "" (
if "!CI_COLCON_BRANCH!" NEQ "" (
set "CI_ARGS=!CI_ARGS! --colcon-branch !CI_COLCON_BRANCH!"
)
if "!CI_ROS_DISTRO!" NEQ "" (
set "CI_ARGS=!CI_ARGS! --ros-distro !CI_ROS_DISTRO!"
)
set "CI_ARGS=!CI_ARGS! --ignore-rmw"
if "!CI_USE_CONNEXT_STATIC!" == "false" (
set "CI_ARGS=!CI_ARGS! rmw_connext_cpp"
Expand Down
3 changes: 3 additions & 0 deletions ros2_batch_job/__main__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,9 @@ def get_args(sysargv=None):
parser.add_argument(
'--force-ansi-color', default=False, action='store_true',
help="forces this program to output ansi color")
parser.add_argument(
'--ros-distro', required=True
help="The ROS distribution being built")
parser.add_argument(
'--ros1-path', default=None,
help="path of ROS 1 workspace to be sourced")
Expand Down