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.

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

Remove ci jobs for Iron irwini #796

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 0 additions & 15 deletions create_jenkins_job.py
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,6 @@ def create_job(os_name, job_name, template_file, additional_dict):
]

humble_testing_pkgs_for_quality_level = copy.copy(testing_pkgs_for_quality_level)
iron_testing_pkgs_for_quality_level = copy.copy(testing_pkgs_for_quality_level)
jazzy_testing_pkgs_for_quality_level = copy.copy(testing_pkgs_for_quality_level)

if os_name == 'linux':
Expand Down Expand Up @@ -463,20 +462,6 @@ def create_job(os_name, job_name, template_file, additional_dict):
'test_args_default': data['test_args_default'] +
' --packages-up-to ' + ' '.join(quality_level_pkgs + humble_testing_pkgs_for_quality_level),
})
# Add a coverage job targeting Iron.
create_job(os_name, 'nightly_' + os_name + '_iron_coverage', 'ci_job.xml.em', {
'cmake_build_type': 'Debug',
'default_repos_url': 'https://raw.githubusercontent.com/ros2/ros2/iron/ros2.repos',
'enable_coverage_default': 'true',
'time_trigger_spec': PERIODIC_JOB_SPEC,
'mailer_recipients': DEFAULT_MAIL_RECIPIENTS,
'ros_distro': 'iron',
'ubuntu_distro': 'jammy',
'build_args_default': data['build_args_default'] +
' --packages-up-to ' + ' '.join(quality_level_pkgs + iron_testing_pkgs_for_quality_level),
'test_args_default': data['test_args_default'] +
' --packages-up-to ' + ' '.join(quality_level_pkgs + iron_testing_pkgs_for_quality_level),
})
# Add a coverage job targeting Jazzy.
create_job(os_name, 'nightly_' + os_name + '_jazzy_coverage', 'ci_job.xml.em', {
'cmake_build_type': 'Debug',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ Note that this only changes some of the underlying system packages installed; it
<a class="string-array">
<string>@ros_distro</string>
@{
choices = ['humble', 'iron', 'jazzy', 'rolling']
choices = ['humble', 'jazzy', 'rolling']
choices.remove(ros_distro)
}@
@[for choice in choices]@
Expand Down
4 changes: 2 additions & 2 deletions ros2_batch_job/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -515,11 +515,11 @@ def need_package_from_pipy(pkg_name):
'https://github.com/ros2/ros2/releases/download/numpy-archives/numpy-1.18.4-cp38-cp38d-win_amd64.whl',
'https://github.com/ros2/ros2/releases/download/psutil-archives/psutil-5.9.5-cp38-cp38d-win_amd64.whl',
]
if args.ros_distro in ('humble', 'iron'):
if args.ros_distro == 'humble':
pip_packages.append('https://github.com/ros2/ros2/releases/download/netifaces-archives/netifaces-0.10.9-cp38-cp38d-win_amd64.whl')
else:
pip_packages += ['cryptography', 'lxml', 'numpy']
if args.ros_distro in ('humble', 'iron'):
if args.ros_distro == 'humble':
pip_packages.append('netifaces')
if sys.platform == 'win32':
# to ensure that the build type specific package is installed
Expand Down
25 changes: 0 additions & 25 deletions windows_docker_resources/install_ros2_iron.json

This file was deleted.