use ROS melodic

ros2 · May 8, 2018 · c1ccd60 · c1ccd60
1 parent 92284c3
commit c1ccd60
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/job_templates/ci_job.xml.em b/job_templates/ci_job.xml.em
@@ -151,7 +151,7 @@ if [ "$CI_ENABLE_C_COVERAGE" = "true" ]; then
   export CI_ARGS="$CI_ARGS --coverage"
 fi
 @[if os_name in ['linux', 'linux-aarch64'] and turtlebot_demo]@
-export CI_ARGS="$CI_ARGS --ros1-path /opt/ros/kinetic"
+export CI_ARGS="$CI_ARGS --ros1-path /opt/ros/melodic"
 @[end if]@
 if [ -n "${CI_BUILD_ARGS+x}" ]; then
   export CI_ARGS="$CI_ARGS --build-args $CI_BUILD_ARGS"

diff --git a/job_templates/packaging_job.xml.em b/job_templates/packaging_job.xml.em
@@ -135,9 +135,9 @@ if [ "$CI_TEST_BRIDGE" = "true" ]; then
   export CI_ARGS="$CI_ARGS --test-bridge"
 fi
 @[if os_name in ['linux', 'linux-aarch64']]@
-export CI_ARGS="$CI_ARGS --ros1-path /opt/ros/kinetic"
+export CI_ARGS="$CI_ARGS --ros1-path /opt/ros/melodic"
 @[else]@
-export CI_ARGS="$CI_ARGS --ros1-path /Users/osrf/kinetic/install_isolated"
+export CI_ARGS="$CI_ARGS --ros1-path /Users/osrf/melodic/install_isolated"
 @[end if]@
 if [ "${CI_CMAKE_BUILD_TYPE}" != "None" ]; then
   export CI_ARGS="$CI_ARGS --cmake-build-type $CI_CMAKE_BUILD_TYPE"