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

Jump to bottom

Revert "Run manual jobs with sequential executor by default" #779

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Revert "Run manual jobs with sequential executor by default" #779

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e86d657
Revert "Run manual jobs with sequential executor by default (#757)"
cottsay May 14, 2024
b23f8b0
Use sequential executor for testing Humble and Iron
cottsay May 14, 2024
b5caf4d
Revert "Use sequential executor for testing Humble and Iron"
cottsay May 16, 2024
1ef55d7
Default to sequential execution for tests on Humble/Iron
cottsay May 16, 2024
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: 2 additions & 4 deletions create_jenkins_job.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,6 @@ def create_job(os_name, job_name, template_file, additional_dict):
# configure manual triggered job
create_job(os_name, 'ci_' + os_name, 'ci_job.xml.em', {
'cmake_build_type': 'None',
'test_args_default': os_configs.get(os_name, {}).get('test_args_default', data['test_args_default']) + ' --executor sequential',
})
# configure test jobs for experimenting with job config changes
# Keep parameters the same as the manual triggered job above.
Expand Down Expand Up @@ -295,7 +294,7 @@ def create_job(os_name, job_name, template_file, additional_dict):
'cmake_build_type': 'None',
'compile_with_clang_default': 'true',
'build_args_default': clang_libcxx_build_args,
'test_args_default': clang_libcxx_test_args + ' --executor sequential',
'test_args_default': clang_libcxx_test_args,
})

# configure nightly job for testing rmw/rcl based packages with thread sanitizer on linux
Expand Down Expand Up @@ -431,7 +430,7 @@ def create_job(os_name, job_name, template_file, additional_dict):
'build_args_default': data['build_args_default'] + ' --packages-skip qt_gui_cpp --packages-skip-by-dep qt_gui_cpp ' +
'--packages-up-to ' + ' '.join(quality_level_pkgs + testing_pkgs_for_quality_level),
'test_args_default': data['test_args_default'] + ' --packages-skip qt_gui_cpp --packages-skip-by-dep qt_gui_cpp ' +
'--packages-up-to ' + ' '.join(quality_level_pkgs + testing_pkgs_for_quality_level) + ' --executor sequential',
'--packages-up-to ' + ' '.join(quality_level_pkgs + testing_pkgs_for_quality_level),
})
create_job(os_name, 'test_' + os_name + '_coverage', 'ci_job.xml.em', {
'cmake_build_type': 'Debug',
Expand Down Expand Up @@ -548,7 +547,6 @@ def create_job(os_name, job_name, template_file, additional_dict):
job_data['label_expression'] = 'built-in || master'
job_data['os_specific_data'] = os_specific_data
job_data['cmake_build_type'] = 'None'
job_data['test_args_default'] += ' --executor sequential'
job_data.update(retention_data_by_job_type(launcher_job_name))
job_config = expand_template('ci_launcher_job.xml.em', job_data)
configure_job(jenkins, launcher_job_name, job_config, **jenkins_kwargs)
Expand Down
6 changes: 5 additions & 1 deletion ros2_batch_job/__main__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,11 @@ def build_and_test(args, job, colcon_script):
test_cmd.append('--pytest-with-coverage')
test_cmd.extend(args.test_args)

ret_test = job.run(test_cmd, exit_on_error=False, shell=True)
test_env = dict(os.environ)
if args.ros_distro in ('humble', 'iron'):
test_env['COLCON_DEFAULT_EXECUTOR'] = 'sequential'

ret_test = job.run(test_cmd, exit_on_error=False, shell=True, env=test_env)
info("colcon test returned: '{0}'".format(ret_test))
print('# END SUBSECTION')
if ret_test:
Expand Down