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

Address reviewer comments for #549 #552

Merged
merged 6 commits into from
Mar 19, 2021
Merged

Address reviewer comments for #549 #552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cf63313
Restore rmw_connext_cpp for dashing and foxy
asorbini Mar 17, 2021
14954f9
Initialize variable as set instead of dict
asorbini Mar 18, 2021
03d3e68
Fix syntax of job init scripts
asorbini Mar 18, 2021
81fb79c
Merge branch 'asorbini/rmw_connextdds' of 'asorbini/ci' into 'asorbin…
asorbini Mar 18, 2021
4ea51b6
Address review comments
asorbini Mar 19, 2021
c92a328
Merge remote-tracking branch 'ros2/asorbini/rmw_connextdds' into asor…
asorbini Mar 19, 2021
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 @@ -216,7 +216,7 @@ def create_job(os_name, job_name, template_file, additional_dict):
packaging_label_expression = 'macos && 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', {
Expand Down
6 changes: 3 additions & 3 deletions job_templates/ci_job.xml.em
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions job_templates/packaging_job.xml.em
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down