From a98c8fc4cfc5c5c9918513e1e0105ddb305058b7 Mon Sep 17 00:00:00 2001 From: Yadunund Date: Mon, 9 Dec 2024 20:32:22 +0800 Subject: [PATCH] Remove ci jobs for Iron Signed-off-by: Yadunund --- create_jenkins_job.py | 15 ----------- ...roperty_parameter-definition_common.xml.em | 2 +- ros2_batch_job/__main__.py | 4 +-- .../install_ros2_iron.json | 25 ------------------- 4 files changed, 3 insertions(+), 43 deletions(-) delete mode 100644 windows_docker_resources/install_ros2_iron.json diff --git a/create_jenkins_job.py b/create_jenkins_job.py index 99418c3a..9a762267 100755 --- a/create_jenkins_job.py +++ b/create_jenkins_job.py @@ -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': @@ -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', diff --git a/job_templates/snippet/property_parameter-definition_common.xml.em b/job_templates/snippet/property_parameter-definition_common.xml.em index 90fdaeb8..c305c63f 100644 --- a/job_templates/snippet/property_parameter-definition_common.xml.em +++ b/job_templates/snippet/property_parameter-definition_common.xml.em @@ -80,7 +80,7 @@ Note that this only changes some of the underlying system packages installed; it @ros_distro @{ -choices = ['humble', 'iron', 'jazzy', 'rolling'] +choices = ['humble', 'jazzy', 'rolling'] choices.remove(ros_distro) }@ @[for choice in choices]@ diff --git a/ros2_batch_job/__main__.py b/ros2_batch_job/__main__.py index 6f7b0439..ac5512cb 100644 --- a/ros2_batch_job/__main__.py +++ b/ros2_batch_job/__main__.py @@ -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 diff --git a/windows_docker_resources/install_ros2_iron.json b/windows_docker_resources/install_ros2_iron.json deleted file mode 100644 index bd2d4af8..00000000 --- a/windows_docker_resources/install_ros2_iron.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "ros2_windows": { - "download_sources": "false", - "vs_version": "buildtools", - "vs_release": "@vs_version", - "qt5": { - "installation_method": "offline" - }, - "ros2_ws": "C:/ci", - "ros_distro": "iron", - "rti_connext": { - "target_platform": "x64Win64", - "min_vs_version": "2017", - "license_file": "C:/TEMP/rticonnextdds-license/rti_license.dat", - "installer_dir": "C:/TEMP/rticonnextdds-src", - "version": "6.0.1", - "edition": "pro", - "openssl_version": "1.1.1k" - } - }, - "run_list": [ - "recipe[ros2_windows::ros2]", - "recipe[ros2_windows::rti_connext]" - ] -}