Skip to content

Commit 936b163

Browse files
CI Fixes Part 4 (#2219)
* fixing depricated API * converting types on substitutions * removing warnings from std buffer parameterization
1 parent a5a7772 commit 936b163

File tree

13 files changed

+25
-13
lines changed

13 files changed

+25
-13
lines changed

.circleci/config.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,8 @@ _environments:
360360
CCACHE_LOGFILE: "/tmp/ccache.log"
361361
CCACHE_MAXSIZE: "200M"
362362
MAKEFLAGS: "-j 1 -l 2"
363-
RCUTILS_CONSOLE_STDOUT_LINE_BUFFERED: "0"
363+
RCUTILS_LOGGING_BUFFERED_STREAM: "0"
364+
RCUTILS_LOGGING_USE_STDOUT: "0"
364365
RETEST_UNTIL_PASS: "2"
365366
DEBIAN_FRONTEND: "noninteractive"
366367

nav2_common/nav2_common/launch/rewritten_yaml.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ def substitute_params(self, yaml, param_rewrites):
117117
for path in yaml_paths:
118118
if path in param_rewrites:
119119
# this is an absolute path (ex. 'key.keyA.keyB.val')
120-
rewrite_val = param_rewrites[path]
120+
rewrite_val = self.convert(param_rewrites[path])
121121
yaml_keys = path.split('.')
122122
yaml = self.updateYamlPathVals(yaml, yaml_keys, rewrite_val)
123123

nav2_system_tests/src/costmap_filters/test_keepout_launch.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,8 @@ def generate_launch_description():
5858
context = LaunchContext()
5959
new_yaml = configured_params.perform(context)
6060
return LaunchDescription([
61-
SetEnvironmentVariable('RCUTILS_CONSOLE_STDOUT_LINE_BUFFERED', '1'),
61+
SetEnvironmentVariable('RCUTILS_LOGGING_BUFFERED_STREAM', '1'),
62+
SetEnvironmentVariable('RCUTILS_LOGGING_USE_STDOUT', '1'),
6263

6364
# Launch gazebo server for simulation
6465
ExecuteProcess(

nav2_system_tests/src/costmap_filters/test_speed_launch.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@ def generate_launch_description():
5656
context = LaunchContext()
5757
new_yaml = configured_params.perform(context)
5858
return LaunchDescription([
59-
SetEnvironmentVariable('RCUTILS_CONSOLE_STDOUT_LINE_BUFFERED', '1'),
59+
SetEnvironmentVariable('RCUTILS_LOGGING_BUFFERED_STREAM', '1'),
60+
SetEnvironmentVariable('RCUTILS_LOGGING_USE_STDOUT', '1'),
6061

6162
# Launch gazebo server for simulation
6263
ExecuteProcess(

nav2_system_tests/src/recoveries/backup/test_backup_recovery_launch.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@ def generate_launch_description():
4747
convert_types=True)
4848

4949
return LaunchDescription([
50-
SetEnvironmentVariable('RCUTILS_CONSOLE_STDOUT_LINE_BUFFERED', '1'),
50+
SetEnvironmentVariable('RCUTILS_LOGGING_BUFFERED_STREAM', '1'),
51+
SetEnvironmentVariable('RCUTILS_LOGGING_USE_STDOUT', '1'),
5152

5253
# Launch gazebo server for simulation
5354
ExecuteProcess(

nav2_system_tests/src/recoveries/spin/test_spin_recovery_fake_launch.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,8 @@ def generate_launch_description():
6363
('/tf_static', 'tf_static')]
6464

6565
return LaunchDescription([
66-
SetEnvironmentVariable('RCUTILS_CONSOLE_STDOUT_LINE_BUFFERED', '1'),
66+
SetEnvironmentVariable('RCUTILS_LOGGING_BUFFERED_STREAM', '1'),
67+
SetEnvironmentVariable('RCUTILS_LOGGING_USE_STDOUT', '1'),
6768

6869
DeclareLaunchArgument(
6970
'namespace', default_value='',

nav2_system_tests/src/recoveries/spin/test_spin_recovery_launch.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@ def generate_launch_description():
4747
convert_types=True)
4848

4949
return LaunchDescription([
50-
SetEnvironmentVariable('RCUTILS_CONSOLE_STDOUT_LINE_BUFFERED', '1'),
50+
SetEnvironmentVariable('RCUTILS_LOGGING_BUFFERED_STREAM', '1'),
51+
SetEnvironmentVariable('RCUTILS_LOGGING_USE_STDOUT', '1'),
5152

5253
# Launch gazebo server for simulation
5354
ExecuteProcess(

nav2_system_tests/src/recoveries/wait/test_wait_recovery_launch.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@ def generate_launch_description():
4747
convert_types=True)
4848

4949
return LaunchDescription([
50-
SetEnvironmentVariable('RCUTILS_CONSOLE_STDOUT_LINE_BUFFERED', '1'),
50+
SetEnvironmentVariable('RCUTILS_LOGGING_BUFFERED_STREAM', '1'),
51+
SetEnvironmentVariable('RCUTILS_LOGGING_USE_STDOUT', '1'),
5152

5253
# Launch gazebo server for simulation
5354
ExecuteProcess(

nav2_system_tests/src/system/test_multi_robot_launch.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,8 @@ def generate_launch_description():
109109
nav_instances_cmds.append(group)
110110

111111
ld = LaunchDescription()
112-
ld.add_action(SetEnvironmentVariable('RCUTILS_CONSOLE_STDOUT_LINE_BUFFERED', '1'),)
112+
ld.add_action(SetEnvironmentVariable('RCUTILS_LOGGING_BUFFERED_STREAM', '1'),)
113+
ld.add_action(SetEnvironmentVariable('RCUTILS_LOGGING_USE_STDOUT', '1'),)
113114
ld.add_action(start_gazebo_cmd)
114115
for spawn_robot in spawn_robots_cmds:
115116
ld.add_action(spawn_robot)

nav2_system_tests/src/system/test_system_launch.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,8 @@ def generate_launch_description():
6767
new_yaml = configured_params.perform(context)
6868

6969
return LaunchDescription([
70-
SetEnvironmentVariable('RCUTILS_CONSOLE_STDOUT_LINE_BUFFERED', '1'),
70+
SetEnvironmentVariable('RCUTILS_LOGGING_BUFFERED_STREAM', '1'),
71+
SetEnvironmentVariable('RCUTILS_LOGGING_USE_STDOUT', '1'),
7172

7273
# Launch gazebo server for simulation
7374
ExecuteProcess(

0 commit comments

Comments
 (0)