From 6d0972bd0f6a34adea6897f25a168ff91a17713c Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Wed, 31 Jul 2024 16:34:45 +0200 Subject: [PATCH 01/37] Rework brew install pkgs and add Fortress/Garden jammy (gz-collections.yaml) * Missing Fortress/Garden jammy packaging in gz-collections.yaml * Fix brew install bottle packages --------- Signed-off-by: Jose Luis Rivero --- jenkins-scripts/dsl/gazebo_libs.dsl | 30 +++++++++--------- jenkins-scripts/dsl/gz-collections.yaml | 15 +++++++++ jenkins-scripts/dsl/logs/generated_jobs.txt | 34 +++++++++++++++++++++ 3 files changed, 65 insertions(+), 14 deletions(-) diff --git a/jenkins-scripts/dsl/gazebo_libs.dsl b/jenkins-scripts/dsl/gazebo_libs.dsl index b56f6b99c..5ecd6a915 100644 --- a/jenkins-scripts/dsl/gazebo_libs.dsl +++ b/jenkins-scripts/dsl/gazebo_libs.dsl @@ -560,23 +560,25 @@ pkgconf_per_src_index.each { pkg_src, pkg_src_configs -> def pkg_system = pkg_config.system // - CI-INSTALL jobs ------------------------------------------------ pkg_system.arch.each { arch -> - def linux_install_job_name = generate_linux_install( - pkg_src, - canonical_lib_name, - pkg_system.version, - arch) - def brew_install_job_name = generate_brew_install( - pkg_src, - canonical_lib_name, - arch) - + def install_job_name = "" + if (pkg_system.so == 'linux') { + install_job_name = generate_linux_install( + pkg_src, + canonical_lib_name, + pkg_system.version, + arch) + } else if (pkg_system.so == 'darwin') { + install_job_name = generate_brew_install( + pkg_src, + canonical_lib_name, + arch) + } else { + assert("Unexpected pkg_system.so: " + pkg_system.so) + } pkg_src_config.getValue().each { index_entry -> logging_list['install_ci'].add( [collection: index_entry.collection, - job_name: linux_install_job_name]) - logging_list['install_ci'].add( - [collection: index_entry.collection, - job_name: brew_install_job_name]) + job_name: install_job_name]) } } } diff --git a/jenkins-scripts/dsl/gz-collections.yaml b/jenkins-scripts/dsl/gz-collections.yaml index 7dc3f4f3c..fb1d3a832 100644 --- a/jenkins-scripts/dsl/gz-collections.yaml +++ b/jenkins-scripts/dsl/gz-collections.yaml @@ -100,6 +100,7 @@ collections: packaging: configs: - focal + - brew linux: ignore_major_version: - gz-citadel @@ -181,6 +182,8 @@ collections: packaging: configs: - focal + - jammy + - brew linux: ignore_major_version: - gz-fortress @@ -262,6 +265,8 @@ collections: packaging: configs: - focal + - jammy + - brew linux: ignore_major_version: - gz-garden @@ -344,6 +349,7 @@ collections: packaging: configs: - jammy + - brew linux: ignore_major_version: - gz-harmonic @@ -425,6 +431,7 @@ collections: packaging: configs: - noble + - brew linux: ignore_major_version: - gz-ionic @@ -445,6 +452,7 @@ collections: packaging: configs: - noble + - brew ci_configs: - name: focal system: @@ -734,3 +742,10 @@ packaging_configs: - "export MAKE_JOBS=1" exclude: - __upcoming__ + - name: brew + system: + so: darwin + distribution: macOSX + version: all + arch: + - amd64 diff --git a/jenkins-scripts/dsl/logs/generated_jobs.txt b/jenkins-scripts/dsl/logs/generated_jobs.txt index a41368dcf..0db7b0497 100644 --- a/jenkins-scripts/dsl/logs/generated_jobs.txt +++ b/jenkins-scripts/dsl/logs/generated_jobs.txt @@ -367,72 +367,106 @@ install_ci citadel gz_transport8-install_bottle-homebrew-amd64 install_ci citadel sdformat9-install-pkg-focal-amd64 install_ci citadel sdformat9-install_bottle-homebrew-amd64 install_ci fortress gz_cmake2-install-pkg-focal-amd64 +install_ci fortress gz_cmake2-install-pkg-jammy-amd64 install_ci fortress gz_cmake2-install_bottle-homebrew-amd64 install_ci fortress gz_common4-install-pkg-focal-amd64 +install_ci fortress gz_common4-install-pkg-jammy-amd64 install_ci fortress gz_common4-install_bottle-homebrew-amd64 install_ci fortress gz_fortress-install-pkg-focal-amd64 +install_ci fortress gz_fortress-install-pkg-jammy-amd64 install_ci fortress gz_fortress-install_bottle-homebrew-amd64 install_ci fortress gz_fuel_tools7-install-pkg-focal-amd64 +install_ci fortress gz_fuel_tools7-install-pkg-jammy-amd64 install_ci fortress gz_fuel_tools7-install_bottle-homebrew-amd64 install_ci fortress gz_gui6-install-pkg-focal-amd64 +install_ci fortress gz_gui6-install-pkg-jammy-amd64 install_ci fortress gz_gui6-install_bottle-homebrew-amd64 install_ci fortress gz_launch5-install-pkg-focal-amd64 +install_ci fortress gz_launch5-install-pkg-jammy-amd64 install_ci fortress gz_launch5-install_bottle-homebrew-amd64 install_ci fortress gz_math6-install-pkg-focal-amd64 +install_ci fortress gz_math6-install-pkg-jammy-amd64 install_ci fortress gz_math6-install_bottle-homebrew-amd64 install_ci fortress gz_msgs8-install-pkg-focal-amd64 +install_ci fortress gz_msgs8-install-pkg-jammy-amd64 install_ci fortress gz_msgs8-install_bottle-homebrew-amd64 install_ci fortress gz_physics5-install-pkg-focal-amd64 +install_ci fortress gz_physics5-install-pkg-jammy-amd64 install_ci fortress gz_physics5-install_bottle-homebrew-amd64 install_ci fortress gz_plugin1-install-pkg-focal-amd64 +install_ci fortress gz_plugin1-install-pkg-jammy-amd64 install_ci fortress gz_plugin1-install_bottle-homebrew-amd64 install_ci fortress gz_rendering6-install-pkg-focal-amd64 +install_ci fortress gz_rendering6-install-pkg-jammy-amd64 install_ci fortress gz_rendering6-install_bottle-homebrew-amd64 install_ci fortress gz_sensors6-install-pkg-focal-amd64 +install_ci fortress gz_sensors6-install-pkg-jammy-amd64 install_ci fortress gz_sensors6-install_bottle-homebrew-amd64 install_ci fortress gz_sim6-install-pkg-focal-amd64 +install_ci fortress gz_sim6-install-pkg-jammy-amd64 install_ci fortress gz_sim6-install_bottle-homebrew-amd64 install_ci fortress gz_tools1-install-pkg-focal-amd64 +install_ci fortress gz_tools1-install-pkg-jammy-amd64 install_ci fortress gz_tools1-install_bottle-homebrew-amd64 install_ci fortress gz_transport11-install-pkg-focal-amd64 +install_ci fortress gz_transport11-install-pkg-jammy-amd64 install_ci fortress gz_transport11-install_bottle-homebrew-amd64 install_ci fortress gz_utils1-install-pkg-focal-amd64 +install_ci fortress gz_utils1-install-pkg-jammy-amd64 install_ci fortress gz_utils1-install_bottle-homebrew-amd64 install_ci fortress sdformat12-install-pkg-focal-amd64 +install_ci fortress sdformat12-install-pkg-jammy-amd64 install_ci fortress sdformat12-install_bottle-homebrew-amd64 install_ci garden gz_cmake3-install-pkg-focal-amd64 +install_ci garden gz_cmake3-install-pkg-jammy-amd64 install_ci garden gz_cmake3-install_bottle-homebrew-amd64 install_ci garden gz_common5-install-pkg-focal-amd64 +install_ci garden gz_common5-install-pkg-jammy-amd64 install_ci garden gz_common5-install_bottle-homebrew-amd64 install_ci garden gz_fuel_tools8-install-pkg-focal-amd64 +install_ci garden gz_fuel_tools8-install-pkg-jammy-amd64 install_ci garden gz_fuel_tools8-install_bottle-homebrew-amd64 install_ci garden gz_garden-install-pkg-focal-amd64 +install_ci garden gz_garden-install-pkg-jammy-amd64 install_ci garden gz_garden-install_bottle-homebrew-amd64 install_ci garden gz_gui7-install-pkg-focal-amd64 +install_ci garden gz_gui7-install-pkg-jammy-amd64 install_ci garden gz_gui7-install_bottle-homebrew-amd64 install_ci garden gz_launch6-install-pkg-focal-amd64 +install_ci garden gz_launch6-install-pkg-jammy-amd64 install_ci garden gz_launch6-install_bottle-homebrew-amd64 install_ci garden gz_math7-install-pkg-focal-amd64 +install_ci garden gz_math7-install-pkg-jammy-amd64 install_ci garden gz_math7-install_bottle-homebrew-amd64 install_ci garden gz_msgs9-install-pkg-focal-amd64 +install_ci garden gz_msgs9-install-pkg-jammy-amd64 install_ci garden gz_msgs9-install_bottle-homebrew-amd64 install_ci garden gz_physics6-install-pkg-focal-amd64 +install_ci garden gz_physics6-install-pkg-jammy-amd64 install_ci garden gz_physics6-install_bottle-homebrew-amd64 install_ci garden gz_plugin2-install-pkg-focal-amd64 +install_ci garden gz_plugin2-install-pkg-jammy-amd64 install_ci garden gz_plugin2-install_bottle-homebrew-amd64 install_ci garden gz_rendering7-install-pkg-focal-amd64 +install_ci garden gz_rendering7-install-pkg-jammy-amd64 install_ci garden gz_rendering7-install_bottle-homebrew-amd64 install_ci garden gz_sensors7-install-pkg-focal-amd64 +install_ci garden gz_sensors7-install-pkg-jammy-amd64 install_ci garden gz_sensors7-install_bottle-homebrew-amd64 install_ci garden gz_sim7-install-pkg-focal-amd64 +install_ci garden gz_sim7-install-pkg-jammy-amd64 install_ci garden gz_sim7-install_bottle-homebrew-amd64 install_ci garden gz_tools2-install-pkg-focal-amd64 +install_ci garden gz_tools2-install-pkg-jammy-amd64 install_ci garden gz_tools2-install_bottle-homebrew-amd64 install_ci garden gz_transport12-install-pkg-focal-amd64 +install_ci garden gz_transport12-install-pkg-jammy-amd64 install_ci garden gz_transport12-install_bottle-homebrew-amd64 install_ci garden gz_utils2-install-pkg-focal-amd64 +install_ci garden gz_utils2-install-pkg-jammy-amd64 install_ci garden gz_utils2-install_bottle-homebrew-amd64 install_ci garden sdformat13-install-pkg-focal-amd64 +install_ci garden sdformat13-install-pkg-jammy-amd64 install_ci garden sdformat13-install_bottle-homebrew-amd64 install_ci harmonic gz_cmake3-install-pkg-jammy-amd64 install_ci harmonic gz_cmake3-install_bottle-homebrew-amd64 From bd55a5b497ece96a515532924c9a8de51b681057 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Wed, 31 Jul 2024 17:38:48 +0200 Subject: [PATCH 02/37] Missing spec in triggers is abusing the warning log (#1155) Signed-off-by: Jose Luis Rivero --- jenkins-scripts/dsl/brew_release.dsl | 1 + 1 file changed, 1 insertion(+) diff --git a/jenkins-scripts/dsl/brew_release.dsl b/jenkins-scripts/dsl/brew_release.dsl index e3e22a916..ef69682b5 100644 --- a/jenkins-scripts/dsl/brew_release.dsl +++ b/jenkins-scripts/dsl/brew_release.dsl @@ -187,6 +187,7 @@ bottle_job_builder.with useGitHubHooks(true) onlyTriggerPhrase(true) permitAll(false) + spec() cron() triggerPhrase '.*build bottle.*' extensions { From 77de389b63f2ed47ec2ac39f9ddfc2afc0b20f78 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Thu, 1 Aug 2024 23:50:13 +0200 Subject: [PATCH 03/37] Deal with main branches for the convert_gazebodistro_to_release script (#1156) * Deal with main branches for the convert_gazebodistro_to_release script Signed-off-by: Jose Luis Rivero * Righ fuel-tools Signed-off-by: Jose Luis Rivero --------- Signed-off-by: Jose Luis Rivero --- .../convert_gazebodistro_to_release.py | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/release-repo-scripts/convert_gazebodistro_to_release.py b/release-repo-scripts/convert_gazebodistro_to_release.py index aba484e49..cca115829 100755 --- a/release-repo-scripts/convert_gazebodistro_to_release.py +++ b/release-repo-scripts/convert_gazebodistro_to_release.py @@ -16,8 +16,24 @@ def _load_gazebodistro_file(filepath) -> dict: def _convert_to_release(input_yaml) -> None: repos = {} for repo, repo_info in input_yaml['repositories'].items(): - branch = repo_info['version'].replace('sdf', 'sdformat') - repo_name = f'{branch}-release' + branch = repo_info['version'].replace('sdf', 'sdformat').replace('fuel_tools', 'fuel-tools') + repo_name = '' + if branch == 'main': + import requests + import xml.etree.ElementTree as ET + + url = f"https://raw.githubusercontent.com/gazebosim/{repo}/{branch}/package.xml" + response = requests.get(url) + if response.status_code != 200: + print(f"Error downloading {url}: {response.status_code}. Skipped", + file=sys.stderr) + continue + + root = ET.fromstring(response.content) + name = root.findall("./name")[0].text + repo_name = f'{name}-release' + else: + repo_name = f'{branch}-release' repos[repo_name] = {'type': repo_info['type'], 'url': f'https://github.com/gazebo-release/{repo_name}', 'version': 'main'} From 92674e6d3671ee3c3a82e0be53117bdacf394391 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Fri, 2 Aug 2024 19:10:23 +0200 Subject: [PATCH 04/37] Added ros_buildfarm_config to be used in the Gazebo buildfarm (#1153) ros_buildfarm_config to be used with ros_buildfarm code to generate jobs in the build.o.o Jenkins. --------- Signed-off-by: Jose Luis Rivero Co-authored-by: Scott K Logan --- .../ros_buildfarm_config/README.md | 67 +++++++++++++ .../global/colcon_any-manual.yaml | 92 ++++++++++++++++++ .../global/colcon_gpu_any-manual.yaml | 93 +++++++++++++++++++ .../ros_buildfarm_config/index.yaml | 13 +++ 4 files changed, 265 insertions(+) create mode 100644 jenkins-scripts/ros_buildfarm_config/README.md create mode 100644 jenkins-scripts/ros_buildfarm_config/global/colcon_any-manual.yaml create mode 100644 jenkins-scripts/ros_buildfarm_config/global/colcon_gpu_any-manual.yaml create mode 100644 jenkins-scripts/ros_buildfarm_config/index.yaml diff --git a/jenkins-scripts/ros_buildfarm_config/README.md b/jenkins-scripts/ros_buildfarm_config/README.md new file mode 100644 index 000000000..973be5d6f --- /dev/null +++ b/jenkins-scripts/ros_buildfarm_config/README.md @@ -0,0 +1,67 @@ +# ros_buildfam configuration for the Gazebo buildfarm + +This directory hosts the ros_buildfarm configuration used to create some jobs +in the Gazebo buildfarm. Mostly inspired by the ROS buildfarm configuration +repository: https://github.com/ros2/ros_buildfarm_config/ + +## Rationale + +The [ros_buildfarm](https://github.com/ros-infrastructure/ros_buildfarm) code +is able to generate Jenkins jobs designed mainly for the ROS buildfarm that +are also applicable to other Jenkins buildfarms. In this case the Gazebo +development team was looking for a colcon based jobs able to receive +as an input a VCS file. Instead of creating these jobs from scratch, the use of +ros_buildfarm was chosen to provide the required features and many others more. + +## Jobs generated + +The jobs generated by ros_buildfarm are easily recognizable since they are +placed under the Jenkins views `ci` (non ROS related jobs) or `Xci` +(where X is the initial of a ROS release). The job names also uses these +same prefixes: `ci__` or `Xci__`. + +## Generating jobs + +### Initial setup + +Be sure of going through the +[Setup environment to deploy configuration](https://github.com/ros-infrastructure/ros_buildfarm/blob/master/doc/environment.rst) +document in the ros_buildfarm as the first step to proceed with the jobs +generation. + +### Running job generation + +Note that the Gazebo buildfarm can not execute the script +`ros_buildfarm/scripts/generate_all_jobs.py` since it will create some +maintenance views and jobs that are not in the scope of this buildfarm. + +Instead of that, the job generation is done manually per configuration +file using the following (empty quotes are mandatory): + +``` +# remove the --dry-run for real execution +./generate_ci_jobs.py --dry-run \ + https://raw.githubusercontent.com/gazebo-tooling/release-tools/jrivero/ros_buildfarm/jenkins-scripts/ros_buildfarm_config/index.yaml \ + "" +``` + +The different `` are defined in the index file just before the key +`ci_builds:`. So for example + +``` +# remove the --dry-run for real execution +./generate_ci_jobs.py --dry-run \ + https://raw.githubusercontent.com/gazebo-tooling/release-tools/jrivero/ros_buildfarm/jenkins-scripts/ros_buildfarm_config/index.yaml \ + "" colcon_any-manual +``` + +To automate the process using the `yq` tool: + +``` +wget https://raw.githubusercontent.com/gazebo-tooling/release-tools/master/jenkins-scripts/ros_buildfarm_config/index.yaml +for ci_build in $(yq '.ci_builds | keys' < index.yaml | sed 's:^- ::'); do +./generate_ci_jobs.py --dry-run \ + https://raw.githubusercontent.com/gazebo-tooling/release-tools/jrivero/ros_buildfarm/jenkins-scripts/ros_buildfarm_config/index.yaml \ + "" $ci_build +done +``` diff --git a/jenkins-scripts/ros_buildfarm_config/global/colcon_any-manual.yaml b/jenkins-scripts/ros_buildfarm_config/global/colcon_any-manual.yaml new file mode 100644 index 000000000..be91438e4 --- /dev/null +++ b/jenkins-scripts/ros_buildfarm_config/global/colcon_any-manual.yaml @@ -0,0 +1,92 @@ +%YAML 1.1 +# ROS buildfarm ci-build file +--- +build_tool: colcon +build_tool_args: '--cmake-args -DCMAKE_BUILD_TYPE=Release --no-warn-unused-cli' +build_tool_test_args: '--retest-until-pass 2 --ctest-args -LE xfail --pytest-args -m "not xfail"' +jenkins_job_label: docker +jenkins_job_priority: 200 # same that pr-any +jenkins_job_timeout: 300 +repos_files: +- https://raw.githubusercontent.com/gazebo-tooling/gazebodistro/master/collection-harmonic.yaml +repositories: + keys: + - | + -----BEGIN PGP PUBLIC KEY BLOCK----- + Version: GnuPG v1 + + mQENBFUcKaEBCAD1ajXaWLnow3pZEv44Lypt6s5jAh1rYPN6zpaFZWdkzpwTdYU1 + Rpw/0hPzIoiyOPNwCti4E3+dSrv1ogEBu85P2XSy67RnabxF4/z7mPG/++u0EQav + CwfrsN8OpJTtTxk+nKIhVwpAtob+KOLATerTPETrdrKh7qJ/FE8cw/XXbknjwywf + R8uJqaKTu7mWNrTFaS3P5GZF5ss+ztf0EHcyYFMvzEVnSiOGBBL9pw91P1qpggBa + lKL1Ilmf6zZBPihORJ/iTH5qMCAPDdR5BaxxEUHgz+pg+RkLKd2ENEaO+SCDVRhP + yNdkYHpuIslyMHfXrh4y5nHclJ+bNXKXDcudABEBAAG0R09TUkYgUmVwb3NpdG9y + eSAoT1NSRiBSZXBvc2l0b3J5IEdQRyBrZXkpIDxvc3JmYnVpbGRAb3NyZm91bmRh + dGlvbi5vcmc+iQE4BBMBAgAiBQJVHCmhAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIe + AQIXgAAKCRBnFwWYrySXQ/D4CACVnSdHT/1dEkOrYkCnaFLNBrG2tJdBrbIZOxKy + +xV0yGniqsQFAxLESoy+ygaiKdTnAFlA24ozoNY8ur+oKMFt6CrUY01ItTq/WMA1 + iper0TO935SpDzNIPjPnD2WUSXShISWP0bFg64g0aAD1S7Yg/v7/eOmMSoeMav0T + h8KOo6yhJuhgGp3lHKAKLppH94b77d8JYqGeP03Gv6gcaqNojyKccdXrKTugZui5 + +7V/cOJTo9XqzXjkpfwp24jR8FlKI7EWqCVqtRAXHeqRgo3OaKmuoKLcJ4/8BjSU + +ppmJtEstSaL+qw49P/GQHwUkCHlx1mV5dSdVFLBPreli1ChuQENBFUcKaEBCAC7 + ZgTdYubw1sU/4A6+NvW/poBfh2DDOeh3uHJc0y235JFjr+tC1AwouaxLOUm8FE9k + 7qzwnyXbeklmXAHxw6wXZdE4PEYA/sgBYhTQy+s4PHlI6TGhwgcROkJKlW4Lld+W + IJ/fzW93DXyhEkV3AAhkrVcOLOgCPdpK5EXxJ3p6dCOKC5Vjyz1PxTNcRaLpp9w6 + J0hLIXmmoCN4aoYSXWtL/C9J+B5Cr+HHgrmFsGNrHmmVv1gMXLcVzw5p3Z4d8SuT + g9a1CemSE5bFIoOHKEQRwv/CGpoviAr+T3za3dPFTcSMOoJuYvoheTJ6fhf2sj74 + bp2Fwi4L7am/asfa7xWVABEBAAGJAR8EGAECAAkFAlUcKaECGwwACgkQZxcFmK8k + l0OX9Af+IrzUChXf6H0nZZY77gcjwFgVChRX1RLzHTTHum4WNKGP9Sw1aGdHpmdt + LhypQImxdT2yhCPEyB8EQxhgPHjqZ6UUMeYMw5rAvrcb3/ercy5pG7O8Z+Bea6hu + TAXquJ1tsFessZwMS3RUXp/gtZCHbESR7PeBlZJWBWxG/lOmX7Z4fa88dWRU0Pl/ + nfns7v6eb57HXbf0teCitRRsJwCMhYbHj2m1slZHMjhEc6kv2bgPmAFb04bcyEAP + BAo3BKu2XUVqE1t7Q2EfsItL/0FpfDY6zGKM6NIi+C40CsRl4W0o6egUhiDqsMYX + 9Su5aZdCoxMhzy5QxS3sXcpNAWH2gw== + =YM5F + -----END PGP PUBLIC KEY BLOCK----- + - | + -----BEGIN PGP PUBLIC KEY BLOCK----- + + mQINBF/btn4BEADSD9KhOgzOwDFOw+ivJXt3lw6Ubyo6c2yXEEASnQpzQ2IPJBpQ + zAX+rncd76xNNgtAUmtPFdsWojwIOYvHLnCusmjB5zmpr08alKKUqKfjKI0ALfq8 + xrv2F7AFeaV2FWaCrH8ZrNBxLUnm/1MZbrknvnh4J+1Bpzi4JQvYJ1hb2BUYCPBj + kXTpShj58yzlPvr5oDzmy++evPjVf8Lh5f0LxWtDlYK8NED0dBzHZlL1eeuEmNJP + Iw/UNVlhVgPv3j329sdmGja+uck5JEAlL0uRU4D83f/YndwUUX+I+Um5baGuyJ42 + FXFtw9JHF3DJiERpYd/ZCPP8jQwAxKee2zukxUh/L1MCWBFoZCIuuy30ACq20gWZ + PAnDpqF9H/fzg3FQiwAaeF7ZCZPNvSCnV7myqdZ7C/adgayuRhT6vpMP48WACqV6 + ndmYEJL2WC+eT7eDD6hEZpVnBNeuRA/RnU6aRgybZ2+rB+hhXTfX3xzLxqJeLIZ7 + SWpXGNRZAmOy9Eqt/dKrzUUyrOXfgqHd75mWFlbHrQZ8tt0+1PE76XG4ZgT3pqOk + bHHqywJfJXpy5U62YBy0TruMM7WyKN8IrkvUdYkMGbyfVKudQha0lTIAvX8zeW1z + AHovXBFkdR9NgdggZV1XWdbBlscLOKLcg9t+HT2EKSvgx1sPJEhzBFdahwARAQAB + tFpST1MgQm9vdHN0cmFwIFJlcG9zaXRvcnkgKFNpZ25pbmcgS2V5IGZvciBST1Mg + Qm9vdHN0cmFwIFJlcG9zaXRvcnkpIDxyb3NAb3BlbnJvYm90aWNzLm9yZz6JAk4E + EwEIADgWIQRHMs5wbNexnbD/506O2y72YfyIDgUCX9u2fgIbAwULCQgHAgYVCgkI + CwIEFgIDAQIeAQIXgAAKCRCO2y72YfyIDksLD/9awISK9MlJJZ2W769Fj8D2JOEM + splwtVNBuADyH2rT2TjL5aY+V8/awq/DApl3ty/QpfM8qcybUyi94faAhdvYygMr + AvU3/VusaxexlJHKO9GkdFfFQTtcksWhV7+z21h1omq5RimInJA6eyrhsNjFnOiI + we4SG3Jwi+Scr0xPLIyuboacD+3AXxPaA3mwQjLnMyYMyBCZs7tTtET5FR6hAGIg + eptpm+Fiaosjub35/VB9r/JOjJCuiwKObMye+8jcDdR8umFxzqcgEe1TNQVBj5+V + I4ssbrzKvwAkte3mBEdndEBPbSlTAo0kd4ByMRZ5AWhqRdu4iabw8cz2IpGErUcb + K0ws76+D8PqnqjPqd5GkGxB54zLMMrrBya5+hnzyDifKzvv1M+L2xvFuICBLBTR7 + FnRownLKmDXLXp/EloRpTvchsO9W+Y3cDTkzkKpaUgs8Gl4dI/zPkHEp8iZBZNsk + mEibjJ5g2qBAYr9GbyaUiifdmpUiDoJpCyDq22rKfFkZl7t1+1MVbjz92A8Vjesb + QHt0icnkrvwg7mYfmMcdVF4TVNaR2XzLTkAz62r1kOoXnPbzUTA1uiLakagsUG5G + YXyUVOJlJDTWr784FVSsEQIslvbO8dk3gmiOpurxBrLGn70SdhCnQRqSrjOnvzX7 + 3ih4hgyGHQOJ/7p5Rg== + =v6u9 + -----END PGP PUBLIC KEY BLOCK----- + urls: + - https://packages.osrfoundation.org/gazebo/ubuntu-stable + - http://repos.ros.org/repos/ros_bootstrap # Needed for getting the ROS building tools packages like python3-rosdep +skip_rosdep_keys: +- python3-distutils +targets: + ubuntu: + noble: + amd64: + jammy: + amd64: + _config: + custom_rosdep_urls: + - https://raw.githubusercontent.com/osrf/osrf-rosdep/master/gz/00-gazebo.list +type: ci-build +version: 1 diff --git a/jenkins-scripts/ros_buildfarm_config/global/colcon_gpu_any-manual.yaml b/jenkins-scripts/ros_buildfarm_config/global/colcon_gpu_any-manual.yaml new file mode 100644 index 000000000..9eb0188d2 --- /dev/null +++ b/jenkins-scripts/ros_buildfarm_config/global/colcon_gpu_any-manual.yaml @@ -0,0 +1,93 @@ +%YAML 1.1 +# ROS buildfarm ci-build file +--- +build_tool: colcon +build_tool_args: '--cmake-args -DCMAKE_BUILD_TYPE=Release --no-warn-unused-cli' +build_tool_test_args: '--retest-until-pass 2 --ctest-args -LE xfail --pytest-args -m "not xfail"' +jenkins_job_label: gpu-reliable +jenkins_job_priority: 200 # same than pr-any +jenkins_job_timeout: 300 +repos_files: +- https://raw.githubusercontent.com/gazebo-tooling/gazebodistro/master/collection-harmonic.yaml +repositories: + keys: + - | + -----BEGIN PGP PUBLIC KEY BLOCK----- + Version: GnuPG v1 + + mQENBFUcKaEBCAD1ajXaWLnow3pZEv44Lypt6s5jAh1rYPN6zpaFZWdkzpwTdYU1 + Rpw/0hPzIoiyOPNwCti4E3+dSrv1ogEBu85P2XSy67RnabxF4/z7mPG/++u0EQav + CwfrsN8OpJTtTxk+nKIhVwpAtob+KOLATerTPETrdrKh7qJ/FE8cw/XXbknjwywf + R8uJqaKTu7mWNrTFaS3P5GZF5ss+ztf0EHcyYFMvzEVnSiOGBBL9pw91P1qpggBa + lKL1Ilmf6zZBPihORJ/iTH5qMCAPDdR5BaxxEUHgz+pg+RkLKd2ENEaO+SCDVRhP + yNdkYHpuIslyMHfXrh4y5nHclJ+bNXKXDcudABEBAAG0R09TUkYgUmVwb3NpdG9y + eSAoT1NSRiBSZXBvc2l0b3J5IEdQRyBrZXkpIDxvc3JmYnVpbGRAb3NyZm91bmRh + dGlvbi5vcmc+iQE4BBMBAgAiBQJVHCmhAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIe + AQIXgAAKCRBnFwWYrySXQ/D4CACVnSdHT/1dEkOrYkCnaFLNBrG2tJdBrbIZOxKy + +xV0yGniqsQFAxLESoy+ygaiKdTnAFlA24ozoNY8ur+oKMFt6CrUY01ItTq/WMA1 + iper0TO935SpDzNIPjPnD2WUSXShISWP0bFg64g0aAD1S7Yg/v7/eOmMSoeMav0T + h8KOo6yhJuhgGp3lHKAKLppH94b77d8JYqGeP03Gv6gcaqNojyKccdXrKTugZui5 + +7V/cOJTo9XqzXjkpfwp24jR8FlKI7EWqCVqtRAXHeqRgo3OaKmuoKLcJ4/8BjSU + +ppmJtEstSaL+qw49P/GQHwUkCHlx1mV5dSdVFLBPreli1ChuQENBFUcKaEBCAC7 + ZgTdYubw1sU/4A6+NvW/poBfh2DDOeh3uHJc0y235JFjr+tC1AwouaxLOUm8FE9k + 7qzwnyXbeklmXAHxw6wXZdE4PEYA/sgBYhTQy+s4PHlI6TGhwgcROkJKlW4Lld+W + IJ/fzW93DXyhEkV3AAhkrVcOLOgCPdpK5EXxJ3p6dCOKC5Vjyz1PxTNcRaLpp9w6 + J0hLIXmmoCN4aoYSXWtL/C9J+B5Cr+HHgrmFsGNrHmmVv1gMXLcVzw5p3Z4d8SuT + g9a1CemSE5bFIoOHKEQRwv/CGpoviAr+T3za3dPFTcSMOoJuYvoheTJ6fhf2sj74 + bp2Fwi4L7am/asfa7xWVABEBAAGJAR8EGAECAAkFAlUcKaECGwwACgkQZxcFmK8k + l0OX9Af+IrzUChXf6H0nZZY77gcjwFgVChRX1RLzHTTHum4WNKGP9Sw1aGdHpmdt + LhypQImxdT2yhCPEyB8EQxhgPHjqZ6UUMeYMw5rAvrcb3/ercy5pG7O8Z+Bea6hu + TAXquJ1tsFessZwMS3RUXp/gtZCHbESR7PeBlZJWBWxG/lOmX7Z4fa88dWRU0Pl/ + nfns7v6eb57HXbf0teCitRRsJwCMhYbHj2m1slZHMjhEc6kv2bgPmAFb04bcyEAP + BAo3BKu2XUVqE1t7Q2EfsItL/0FpfDY6zGKM6NIi+C40CsRl4W0o6egUhiDqsMYX + 9Su5aZdCoxMhzy5QxS3sXcpNAWH2gw== + =YM5F + -----END PGP PUBLIC KEY BLOCK----- + - | + -----BEGIN PGP PUBLIC KEY BLOCK----- + + mQINBF/btn4BEADSD9KhOgzOwDFOw+ivJXt3lw6Ubyo6c2yXEEASnQpzQ2IPJBpQ + zAX+rncd76xNNgtAUmtPFdsWojwIOYvHLnCusmjB5zmpr08alKKUqKfjKI0ALfq8 + xrv2F7AFeaV2FWaCrH8ZrNBxLUnm/1MZbrknvnh4J+1Bpzi4JQvYJ1hb2BUYCPBj + kXTpShj58yzlPvr5oDzmy++evPjVf8Lh5f0LxWtDlYK8NED0dBzHZlL1eeuEmNJP + Iw/UNVlhVgPv3j329sdmGja+uck5JEAlL0uRU4D83f/YndwUUX+I+Um5baGuyJ42 + FXFtw9JHF3DJiERpYd/ZCPP8jQwAxKee2zukxUh/L1MCWBFoZCIuuy30ACq20gWZ + PAnDpqF9H/fzg3FQiwAaeF7ZCZPNvSCnV7myqdZ7C/adgayuRhT6vpMP48WACqV6 + ndmYEJL2WC+eT7eDD6hEZpVnBNeuRA/RnU6aRgybZ2+rB+hhXTfX3xzLxqJeLIZ7 + SWpXGNRZAmOy9Eqt/dKrzUUyrOXfgqHd75mWFlbHrQZ8tt0+1PE76XG4ZgT3pqOk + bHHqywJfJXpy5U62YBy0TruMM7WyKN8IrkvUdYkMGbyfVKudQha0lTIAvX8zeW1z + AHovXBFkdR9NgdggZV1XWdbBlscLOKLcg9t+HT2EKSvgx1sPJEhzBFdahwARAQAB + tFpST1MgQm9vdHN0cmFwIFJlcG9zaXRvcnkgKFNpZ25pbmcgS2V5IGZvciBST1Mg + Qm9vdHN0cmFwIFJlcG9zaXRvcnkpIDxyb3NAb3BlbnJvYm90aWNzLm9yZz6JAk4E + EwEIADgWIQRHMs5wbNexnbD/506O2y72YfyIDgUCX9u2fgIbAwULCQgHAgYVCgkI + CwIEFgIDAQIeAQIXgAAKCRCO2y72YfyIDksLD/9awISK9MlJJZ2W769Fj8D2JOEM + splwtVNBuADyH2rT2TjL5aY+V8/awq/DApl3ty/QpfM8qcybUyi94faAhdvYygMr + AvU3/VusaxexlJHKO9GkdFfFQTtcksWhV7+z21h1omq5RimInJA6eyrhsNjFnOiI + we4SG3Jwi+Scr0xPLIyuboacD+3AXxPaA3mwQjLnMyYMyBCZs7tTtET5FR6hAGIg + eptpm+Fiaosjub35/VB9r/JOjJCuiwKObMye+8jcDdR8umFxzqcgEe1TNQVBj5+V + I4ssbrzKvwAkte3mBEdndEBPbSlTAo0kd4ByMRZ5AWhqRdu4iabw8cz2IpGErUcb + K0ws76+D8PqnqjPqd5GkGxB54zLMMrrBya5+hnzyDifKzvv1M+L2xvFuICBLBTR7 + FnRownLKmDXLXp/EloRpTvchsO9W+Y3cDTkzkKpaUgs8Gl4dI/zPkHEp8iZBZNsk + mEibjJ5g2qBAYr9GbyaUiifdmpUiDoJpCyDq22rKfFkZl7t1+1MVbjz92A8Vjesb + QHt0icnkrvwg7mYfmMcdVF4TVNaR2XzLTkAz62r1kOoXnPbzUTA1uiLakagsUG5G + YXyUVOJlJDTWr784FVSsEQIslvbO8dk3gmiOpurxBrLGn70SdhCnQRqSrjOnvzX7 + 3ih4hgyGHQOJ/7p5Rg== + =v6u9 + -----END PGP PUBLIC KEY BLOCK----- + urls: + - https://packages.osrfoundation.org/gazebo/ubuntu-stable + - http://repos.ros.org/repos/ros_bootstrap # Needed for getting the ROS building tools packages like python3-rosdep +skip_rosdep_keys: +- python3-distutils +targets: + ubuntu: + noble: + amd64: + jammy: + amd64: + _config: + custom_rosdep_urls: + - https://raw.githubusercontent.com/osrf/osrf-rosdep/master/gz/00-gazebo.list +tests_require_gpu: true +type: ci-build +version: 1 diff --git a/jenkins-scripts/ros_buildfarm_config/index.yaml b/jenkins-scripts/ros_buildfarm_config/index.yaml new file mode 100644 index 000000000..3f2cb8997 --- /dev/null +++ b/jenkins-scripts/ros_buildfarm_config/index.yaml @@ -0,0 +1,13 @@ +%YAML 1.1 +# ROS buildfarm index file +--- +ci_builds: + colcon_any-manual: global/colcon_any-manual.yaml + colcon_gpu_any-manual: global/colcon_gpu_any-manual.yaml +jenkins_url: https://build.osrfoundation.org +notification_emails: +- jrivero@osrfoundation.org +prerequisites: +rosdistro_index_url: https://raw.githubusercontent.com/ros/rosdistro/master/index-v4.yaml +type: buildfarm +version: 1 From 4537d2bac536484cea050f116fa0f90330dea6b7 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Fri, 2 Aug 2024 19:14:36 +0200 Subject: [PATCH 05/37] Fix URLs in ros_buildfarm_config --- jenkins-scripts/ros_buildfarm_config/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jenkins-scripts/ros_buildfarm_config/README.md b/jenkins-scripts/ros_buildfarm_config/README.md index 973be5d6f..16ccf331d 100644 --- a/jenkins-scripts/ros_buildfarm_config/README.md +++ b/jenkins-scripts/ros_buildfarm_config/README.md @@ -41,7 +41,7 @@ file using the following (empty quotes are mandatory): ``` # remove the --dry-run for real execution ./generate_ci_jobs.py --dry-run \ - https://raw.githubusercontent.com/gazebo-tooling/release-tools/jrivero/ros_buildfarm/jenkins-scripts/ros_buildfarm_config/index.yaml \ + https://raw.githubusercontent.com/gazebo-tooling/release-tools/master/jenkins-scripts/ros_buildfarm_config/index.yaml \ "" ``` @@ -51,7 +51,7 @@ The different `` are defined in the index file just before the key ``` # remove the --dry-run for real execution ./generate_ci_jobs.py --dry-run \ - https://raw.githubusercontent.com/gazebo-tooling/release-tools/jrivero/ros_buildfarm/jenkins-scripts/ros_buildfarm_config/index.yaml \ + https://raw.githubusercontent.com/gazebo-tooling/release-tools/master/jenkins-scripts/ros_buildfarm_config/index.yaml \ "" colcon_any-manual ``` @@ -61,7 +61,7 @@ To automate the process using the `yq` tool: wget https://raw.githubusercontent.com/gazebo-tooling/release-tools/master/jenkins-scripts/ros_buildfarm_config/index.yaml for ci_build in $(yq '.ci_builds | keys' < index.yaml | sed 's:^- ::'); do ./generate_ci_jobs.py --dry-run \ - https://raw.githubusercontent.com/gazebo-tooling/release-tools/jrivero/ros_buildfarm/jenkins-scripts/ros_buildfarm_config/index.yaml \ + https://raw.githubusercontent.com/gazebo-tooling/release-tools/master/jenkins-scripts/ros_buildfarm_config/index.yaml \ "" $ci_build done ``` From 2b788c2da32aa2f972eb45d57511a16f0bc333ae Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Mon, 5 Aug 2024 19:07:04 +0200 Subject: [PATCH 06/37] Reduce max number of builds to keep to 125 (#1157) Signed-off-by: Jose Luis Rivero --- jenkins-scripts/dsl/_configs_/OSRFLinuxABIGitHub.groovy | 2 +- jenkins-scripts/dsl/_configs_/OSRFLinuxBuildPkgBase.groovy | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jenkins-scripts/dsl/_configs_/OSRFLinuxABIGitHub.groovy b/jenkins-scripts/dsl/_configs_/OSRFLinuxABIGitHub.groovy index b0bba9ed6..94876beb7 100644 --- a/jenkins-scripts/dsl/_configs_/OSRFLinuxABIGitHub.groovy +++ b/jenkins-scripts/dsl/_configs_/OSRFLinuxABIGitHub.groovy @@ -40,7 +40,7 @@ class OSRFLinuxABIGitHub logRotator { artifactNumToKeep(10) - numToKeep(200) + numToKeep(125) } concurrentBuild(true) diff --git a/jenkins-scripts/dsl/_configs_/OSRFLinuxBuildPkgBase.groovy b/jenkins-scripts/dsl/_configs_/OSRFLinuxBuildPkgBase.groovy index 111f57240..0f110d45b 100644 --- a/jenkins-scripts/dsl/_configs_/OSRFLinuxBuildPkgBase.groovy +++ b/jenkins-scripts/dsl/_configs_/OSRFLinuxBuildPkgBase.groovy @@ -18,7 +18,7 @@ class OSRFLinuxBuildPkgBase { logRotator { artifactNumToKeep(25) - numToKeep(200) + numToKeep(125) } wrappers { From 350e8ef1371ee1fcf3472994a3540661b1712ad4 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Mon, 5 Aug 2024 21:59:03 +0200 Subject: [PATCH 07/37] Add Noble packaging for Harmonic in gz-collections (#1159) * Add Noble packaging for Harmonic in gz-collections Signed-off-by: Jose Luis Rivero * Automated change: update logs [skip ci] * Fix pkg_config for Noble Signed-off-by: Jose Luis Rivero * Automated change: update logs [skip ci] --------- Signed-off-by: Jose Luis Rivero Co-authored-by: j-rivero --- jenkins-scripts/dsl/gz-collections.yaml | 3 +- jenkins-scripts/dsl/logs/generated_jobs.txt | 53 ++++++++++++++------- 2 files changed, 37 insertions(+), 19 deletions(-) diff --git a/jenkins-scripts/dsl/gz-collections.yaml b/jenkins-scripts/dsl/gz-collections.yaml index fb1d3a832..995800d22 100644 --- a/jenkins-scripts/dsl/gz-collections.yaml +++ b/jenkins-scripts/dsl/gz-collections.yaml @@ -349,6 +349,7 @@ collections: packaging: configs: - jammy + - noble - brew linux: ignore_major_version: @@ -734,7 +735,7 @@ packaging_configs: system: so: linux distribution: ubuntu - version: jammy + version: noble arch: - amd64 pre_setup_script_hook: diff --git a/jenkins-scripts/dsl/logs/generated_jobs.txt b/jenkins-scripts/dsl/logs/generated_jobs.txt index 0db7b0497..3f96bdec0 100644 --- a/jenkins-scripts/dsl/logs/generated_jobs.txt +++ b/jenkins-scripts/dsl/logs/generated_jobs.txt @@ -332,7 +332,7 @@ branch_ci ionic gz_utils-main-win branch_ci ionic sdformat-ci-main-homebrew-amd64 branch_ci ionic sdformat-ci-main-noble-amd64 branch_ci ionic sdformat-main-win -install_ci __upcoming__ gz_tools3-install-pkg-jammy-amd64 +install_ci __upcoming__ gz_tools3-install-pkg-noble-amd64 install_ci __upcoming__ gz_tools3-install_bottle-homebrew-amd64 install_ci citadel gz_citadel-install-pkg-focal-amd64 install_ci citadel gz_citadel-install_bottle-homebrew-amd64 @@ -469,72 +469,89 @@ install_ci garden sdformat13-install-pkg-focal-amd64 install_ci garden sdformat13-install-pkg-jammy-amd64 install_ci garden sdformat13-install_bottle-homebrew-amd64 install_ci harmonic gz_cmake3-install-pkg-jammy-amd64 +install_ci harmonic gz_cmake3-install-pkg-noble-amd64 install_ci harmonic gz_cmake3-install_bottle-homebrew-amd64 install_ci harmonic gz_common5-install-pkg-jammy-amd64 +install_ci harmonic gz_common5-install-pkg-noble-amd64 install_ci harmonic gz_common5-install_bottle-homebrew-amd64 install_ci harmonic gz_fuel_tools9-install-pkg-jammy-amd64 +install_ci harmonic gz_fuel_tools9-install-pkg-noble-amd64 install_ci harmonic gz_fuel_tools9-install_bottle-homebrew-amd64 install_ci harmonic gz_gui8-install-pkg-jammy-amd64 +install_ci harmonic gz_gui8-install-pkg-noble-amd64 install_ci harmonic gz_gui8-install_bottle-homebrew-amd64 install_ci harmonic gz_harmonic-install-pkg-jammy-amd64 +install_ci harmonic gz_harmonic-install-pkg-noble-amd64 install_ci harmonic gz_harmonic-install_bottle-homebrew-amd64 install_ci harmonic gz_launch7-install-pkg-jammy-amd64 +install_ci harmonic gz_launch7-install-pkg-noble-amd64 install_ci harmonic gz_launch7-install_bottle-homebrew-amd64 install_ci harmonic gz_math7-install-pkg-jammy-amd64 +install_ci harmonic gz_math7-install-pkg-noble-amd64 install_ci harmonic gz_math7-install_bottle-homebrew-amd64 install_ci harmonic gz_msgs10-install-pkg-jammy-amd64 +install_ci harmonic gz_msgs10-install-pkg-noble-amd64 install_ci harmonic gz_msgs10-install_bottle-homebrew-amd64 install_ci harmonic gz_physics7-install-pkg-jammy-amd64 +install_ci harmonic gz_physics7-install-pkg-noble-amd64 install_ci harmonic gz_physics7-install_bottle-homebrew-amd64 install_ci harmonic gz_plugin2-install-pkg-jammy-amd64 +install_ci harmonic gz_plugin2-install-pkg-noble-amd64 install_ci harmonic gz_plugin2-install_bottle-homebrew-amd64 install_ci harmonic gz_rendering8-install-pkg-jammy-amd64 +install_ci harmonic gz_rendering8-install-pkg-noble-amd64 install_ci harmonic gz_rendering8-install_bottle-homebrew-amd64 install_ci harmonic gz_sensors8-install-pkg-jammy-amd64 +install_ci harmonic gz_sensors8-install-pkg-noble-amd64 install_ci harmonic gz_sensors8-install_bottle-homebrew-amd64 install_ci harmonic gz_sim8-install-pkg-jammy-amd64 +install_ci harmonic gz_sim8-install-pkg-noble-amd64 install_ci harmonic gz_sim8-install_bottle-homebrew-amd64 install_ci harmonic gz_tools2-install-pkg-jammy-amd64 +install_ci harmonic gz_tools2-install-pkg-noble-amd64 install_ci harmonic gz_tools2-install_bottle-homebrew-amd64 install_ci harmonic gz_transport13-install-pkg-jammy-amd64 +install_ci harmonic gz_transport13-install-pkg-noble-amd64 install_ci harmonic gz_transport13-install_bottle-homebrew-amd64 install_ci harmonic gz_utils2-install-pkg-jammy-amd64 +install_ci harmonic gz_utils2-install-pkg-noble-amd64 install_ci harmonic gz_utils2-install_bottle-homebrew-amd64 install_ci harmonic sdformat14-install-pkg-jammy-amd64 +install_ci harmonic sdformat14-install-pkg-noble-amd64 install_ci harmonic sdformat14-install_bottle-homebrew-amd64 -install_ci ionic gz_cmake4-install-pkg-jammy-amd64 +install_ci ionic gz_cmake4-install-pkg-noble-amd64 install_ci ionic gz_cmake4-install_bottle-homebrew-amd64 -install_ci ionic gz_common6-install-pkg-jammy-amd64 +install_ci ionic gz_common6-install-pkg-noble-amd64 install_ci ionic gz_common6-install_bottle-homebrew-amd64 -install_ci ionic gz_fuel_tools10-install-pkg-jammy-amd64 +install_ci ionic gz_fuel_tools10-install-pkg-noble-amd64 install_ci ionic gz_fuel_tools10-install_bottle-homebrew-amd64 -install_ci ionic gz_gui9-install-pkg-jammy-amd64 +install_ci ionic gz_gui9-install-pkg-noble-amd64 install_ci ionic gz_gui9-install_bottle-homebrew-amd64 -install_ci ionic gz_ionic-install-pkg-jammy-amd64 +install_ci ionic gz_ionic-install-pkg-noble-amd64 install_ci ionic gz_ionic-install_bottle-homebrew-amd64 -install_ci ionic gz_launch8-install-pkg-jammy-amd64 +install_ci ionic gz_launch8-install-pkg-noble-amd64 install_ci ionic gz_launch8-install_bottle-homebrew-amd64 -install_ci ionic gz_math8-install-pkg-jammy-amd64 +install_ci ionic gz_math8-install-pkg-noble-amd64 install_ci ionic gz_math8-install_bottle-homebrew-amd64 -install_ci ionic gz_msgs11-install-pkg-jammy-amd64 +install_ci ionic gz_msgs11-install-pkg-noble-amd64 install_ci ionic gz_msgs11-install_bottle-homebrew-amd64 -install_ci ionic gz_physics8-install-pkg-jammy-amd64 +install_ci ionic gz_physics8-install-pkg-noble-amd64 install_ci ionic gz_physics8-install_bottle-homebrew-amd64 -install_ci ionic gz_plugin3-install-pkg-jammy-amd64 +install_ci ionic gz_plugin3-install-pkg-noble-amd64 install_ci ionic gz_plugin3-install_bottle-homebrew-amd64 -install_ci ionic gz_rendering9-install-pkg-jammy-amd64 +install_ci ionic gz_rendering9-install-pkg-noble-amd64 install_ci ionic gz_rendering9-install_bottle-homebrew-amd64 -install_ci ionic gz_sensors9-install-pkg-jammy-amd64 +install_ci ionic gz_sensors9-install-pkg-noble-amd64 install_ci ionic gz_sensors9-install_bottle-homebrew-amd64 -install_ci ionic gz_sim9-install-pkg-jammy-amd64 +install_ci ionic gz_sim9-install-pkg-noble-amd64 install_ci ionic gz_sim9-install_bottle-homebrew-amd64 -install_ci ionic gz_tools2-install-pkg-jammy-amd64 +install_ci ionic gz_tools2-install-pkg-noble-amd64 install_ci ionic gz_tools2-install_bottle-homebrew-amd64 -install_ci ionic gz_transport14-install-pkg-jammy-amd64 +install_ci ionic gz_transport14-install-pkg-noble-amd64 install_ci ionic gz_transport14-install_bottle-homebrew-amd64 -install_ci ionic gz_utils3-install-pkg-jammy-amd64 +install_ci ionic gz_utils3-install-pkg-noble-amd64 install_ci ionic gz_utils3-install_bottle-homebrew-amd64 -install_ci ionic sdformat15-install-pkg-jammy-amd64 +install_ci ionic sdformat15-install-pkg-noble-amd64 install_ci ionic sdformat15-install_bottle-homebrew-amd64 unofficial_wrappers_install_pkg_ci garden ros_gzgarden_bridge-install-pkg_humble-ci-jammy-amd64 unofficial_wrappers_install_pkg_ci garden ros_gzgarden_bridge-install-pkg_iron-ci-jammy-amd64 From 409e5c3094480d9aad3e0cacd57047a9f40fc279 Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Tue, 13 Aug 2024 16:31:40 -0700 Subject: [PATCH 08/37] homebrew_cleanup: don't fail on git fsck (#1160) The git fsck call is trying to improve reliability, but it can fail if git from brew is broken. Since this script is removing all installed formulae, just continue if git fsck fails. Signed-off-by: Steve Peters --- jenkins-scripts/lib/_homebrew_cleanup.bash | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/jenkins-scripts/lib/_homebrew_cleanup.bash b/jenkins-scripts/lib/_homebrew_cleanup.bash index 9222a53f1..30c3ccf5c 100644 --- a/jenkins-scripts/lib/_homebrew_cleanup.bash +++ b/jenkins-scripts/lib/_homebrew_cleanup.bash @@ -10,7 +10,9 @@ restore_brew() BREW_BINARY_DIR=/usr/local/bin BREW_BINARY=${BREW_BINARY_DIR}/brew -git -C $(${BREW_BINARY} --repo) fsck +# Try running `git fsck` before `brew update` in case `git gc` broke something +# but don't fail +git -C $(${BREW_BINARY} --repo) fsck || true export HOMEBREW_UPDATE_TO_TAG=1 ${BREW_BINARY} up || { restore_brew && ${BREW_BINARY} up ; } From 19594d6069957bc307ef47c353d7233e7c2ecfd7 Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Wed, 14 Aug 2024 13:13:45 -0700 Subject: [PATCH 09/37] gz-rendering9+: build without -DSKIP_optix (#1161) Signed-off-by: Steve Peters --- jenkins-scripts/docker/gz_rendering-compilation.bash | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/jenkins-scripts/docker/gz_rendering-compilation.bash b/jenkins-scripts/docker/gz_rendering-compilation.bash index caf362f03..60ea1c04a 100644 --- a/jenkins-scripts/docker/gz_rendering-compilation.bash +++ b/jenkins-scripts/docker/gz_rendering-compilation.bash @@ -35,6 +35,10 @@ fi export GPU_SUPPORT_NEEDED=true export GZDEV_PROJECT_NAME="gz-rendering${GZ_RENDERING_MAJOR_VERSION}" -export BUILDING_EXTRA_CMAKE_PARAMS+=" -DSKIP_optix=true" +# set SKIP_optix=true for Harmonic and earlier +# not needed for ionic since https://github.com/gazebosim/gz-rendering/pull/1032 +if [[ ${GZ_RENDERING_MAJOR_VERSION} -le 8 ]]; then + export BUILDING_EXTRA_CMAKE_PARAMS+=" -DSKIP_optix=true" +fi . ${SCRIPT_DIR}/lib/generic-building-base.bash From d80e20f162e382d5c0063b4602e5effcd7e87a1e Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Mon, 19 Aug 2024 17:18:50 -0700 Subject: [PATCH 10/37] Add spdlog to VCPKG_DEPENDENCIES_LEGACY (#1163) Needed by gazebosim/gz-utils#134. Signed-off-by: Steve Peters --- jenkins-scripts/lib/windows_env_vars.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins-scripts/lib/windows_env_vars.bat b/jenkins-scripts/lib/windows_env_vars.bat index c3d54a152..23c0d82cc 100644 --- a/jenkins-scripts/lib/windows_env_vars.bat +++ b/jenkins-scripts/lib/windows_env_vars.bat @@ -19,6 +19,6 @@ if NOT DEFINED VCPKG_SNAPSHOT ( set VCPKG_SNAPSHOT=2022.02.23 ) :: Set of common gz dependencies expected up to Garden -set VCPKG_DEPENDENCIES_LEGACY=assimp boost-core bullet3 ccd console-bridge cppzmq cuda curl dlfcn-win32 eigen3 fcl ffmpeg freeimage gdal gflags glib gts jsoncpp libyaml libzip ogre ogre2 ogre22 openssl protobuf pybind11 qt5 qt5-winextras qwt sqlite3 tinyxml2 zeromq +set VCPKG_DEPENDENCIES_LEGACY=assimp boost-core bullet3 ccd console-bridge cppzmq cuda curl dlfcn-win32 eigen3 fcl ffmpeg freeimage gdal gflags glib gts jsoncpp libyaml libzip ogre ogre2 ogre22 openssl protobuf pybind11 qt5 qt5-winextras qwt spdlog sqlite3 tinyxml2 zeromq goto :EOF From 7947017b7ce5ea73dff78f6a8701f7197d6344a4 Mon Sep 17 00:00:00 2001 From: "Addisu Z. Taddese" Date: Wed, 21 Aug 2024 13:41:31 -0500 Subject: [PATCH 11/37] Use stable branch for gz-cmake4 (#1164) * Use stable branch for gz-cmake4 Signed-off-by: Addisu Z. Taddese * Automated change: update logs [skip ci] --------- Signed-off-by: Addisu Z. Taddese Co-authored-by: azeey --- jenkins-scripts/dsl/gz-collections.yaml | 6 +++++- jenkins-scripts/dsl/logs/generated_jobs.txt | 14 ++++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/jenkins-scripts/dsl/gz-collections.yaml b/jenkins-scripts/dsl/gz-collections.yaml index 995800d22..db2d79e88 100644 --- a/jenkins-scripts/dsl/gz-collections.yaml +++ b/jenkins-scripts/dsl/gz-collections.yaml @@ -359,7 +359,7 @@ collections: - name: gz-cmake major_version: 4 repo: - current_branch: main + current_branch: gz-cmake4 - name: gz-tools major_version: 2 repo: @@ -445,6 +445,10 @@ collections: major_version: 3 repo: current_branch: main + - name: gz-cmake + major_version: 4 + repo: + current_branch: main ci: configs: - noble diff --git a/jenkins-scripts/dsl/logs/generated_jobs.txt b/jenkins-scripts/dsl/logs/generated_jobs.txt index 3f96bdec0..e952e1ec6 100644 --- a/jenkins-scripts/dsl/logs/generated_jobs.txt +++ b/jenkins-scripts/dsl/logs/generated_jobs.txt @@ -1,3 +1,4 @@ +asan_ci __upcoming__ gz_cmake-ci_asan-main-noble-amd64 asan_ci __upcoming__ gz_tools-ci_asan-main-noble-amd64 asan_ci citadel gz_cmake-ci_asan-ign-cmake2-focal-amd64 asan_ci citadel gz_common-ci_asan-ign-common3-focal-amd64 @@ -62,7 +63,7 @@ asan_ci harmonic gz_tools-ci_asan-gz-tools2-jammy-amd64 asan_ci harmonic gz_transport-ci_asan-gz-transport13-jammy-amd64 asan_ci harmonic gz_utils-ci_asan-gz-utils2-jammy-amd64 asan_ci harmonic sdformat-ci_asan-sdf14-jammy-amd64 -asan_ci ionic gz_cmake-ci_asan-main-noble-amd64 +asan_ci ionic gz_cmake-ci_asan-gz-cmake4-noble-amd64 asan_ci ionic gz_common-ci_asan-main-noble-amd64 asan_ci ionic gz_fuel_tools-ci_asan-main-noble-amd64 asan_ci ionic gz_gui-ci_asan-main-noble-amd64 @@ -78,6 +79,9 @@ asan_ci ionic gz_tools-ci_asan-gz-tools2-noble-amd64 asan_ci ionic gz_transport-ci_asan-main-noble-amd64 asan_ci ionic gz_utils-ci_asan-main-noble-amd64 asan_ci ionic sdformat-ci_asan-main-noble-amd64 +branch_ci __upcoming__ gz_cmake-ci-main-homebrew-amd64 +branch_ci __upcoming__ gz_cmake-ci-main-noble-amd64 +branch_ci __upcoming__ gz_cmake-main-win branch_ci __upcoming__ gz_tools-ci-main-homebrew-amd64 branch_ci __upcoming__ gz_tools-ci-main-noble-amd64 branch_ci __upcoming__ gz_tools-main-win @@ -284,9 +288,9 @@ branch_ci harmonic sdformat-ci-sdf14-homebrew-amd64 branch_ci harmonic sdformat-ci-sdf14-jammy-amd64 branch_ci harmonic sdformat-ci-sdf14-noble-amd64 branch_ci harmonic sdformat-sdf14-win -branch_ci ionic gz_cmake-ci-main-homebrew-amd64 -branch_ci ionic gz_cmake-ci-main-noble-amd64 -branch_ci ionic gz_cmake-main-win +branch_ci ionic gz_cmake-4-win +branch_ci ionic gz_cmake-ci-gz-cmake4-homebrew-amd64 +branch_ci ionic gz_cmake-ci-gz-cmake4-noble-amd64 branch_ci ionic gz_common-ci-main-homebrew-amd64 branch_ci ionic gz_common-ci-main-noble-amd64 branch_ci ionic gz_common-main-win @@ -332,6 +336,8 @@ branch_ci ionic gz_utils-main-win branch_ci ionic sdformat-ci-main-homebrew-amd64 branch_ci ionic sdformat-ci-main-noble-amd64 branch_ci ionic sdformat-main-win +install_ci __upcoming__ gz_cmake4-install-pkg-noble-amd64 +install_ci __upcoming__ gz_cmake4-install_bottle-homebrew-amd64 install_ci __upcoming__ gz_tools3-install-pkg-noble-amd64 install_ci __upcoming__ gz_tools3-install_bottle-homebrew-amd64 install_ci citadel gz_citadel-install-pkg-focal-amd64 From 689062fd649256f419ca233e5d4445755479b694 Mon Sep 17 00:00:00 2001 From: "Addisu Z. Taddese" Date: Thu, 22 Aug 2024 13:32:56 -0500 Subject: [PATCH 12/37] Use stable branch for gz-utils3 (#1166) * Use stable branch for gz-utils3 Signed-off-by: Addisu Z. Taddese * Automated change: update logs [skip ci] --------- Signed-off-by: Addisu Z. Taddese Co-authored-by: azeey --- jenkins-scripts/dsl/gz-collections.yaml | 6 +++++- jenkins-scripts/dsl/logs/generated_jobs.txt | 14 ++++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/jenkins-scripts/dsl/gz-collections.yaml b/jenkins-scripts/dsl/gz-collections.yaml index db2d79e88..48ff9d92d 100644 --- a/jenkins-scripts/dsl/gz-collections.yaml +++ b/jenkins-scripts/dsl/gz-collections.yaml @@ -367,7 +367,7 @@ collections: - name: gz-utils major_version: 3 repo: - current_branch: main + current_branch: gz-utils3 - name: gz-math major_version: 8 repo: @@ -449,6 +449,10 @@ collections: major_version: 4 repo: current_branch: main + - name: gz-utils + major_version: 3 + repo: + current_branch: main ci: configs: - noble diff --git a/jenkins-scripts/dsl/logs/generated_jobs.txt b/jenkins-scripts/dsl/logs/generated_jobs.txt index e952e1ec6..609eaf255 100644 --- a/jenkins-scripts/dsl/logs/generated_jobs.txt +++ b/jenkins-scripts/dsl/logs/generated_jobs.txt @@ -1,5 +1,6 @@ asan_ci __upcoming__ gz_cmake-ci_asan-main-noble-amd64 asan_ci __upcoming__ gz_tools-ci_asan-main-noble-amd64 +asan_ci __upcoming__ gz_utils-ci_asan-main-noble-amd64 asan_ci citadel gz_cmake-ci_asan-ign-cmake2-focal-amd64 asan_ci citadel gz_common-ci_asan-ign-common3-focal-amd64 asan_ci citadel gz_fuel_tools-ci_asan-ign-fuel-tools4-focal-amd64 @@ -77,7 +78,7 @@ asan_ci ionic gz_sensors-ci_asan-main-noble-amd64 asan_ci ionic gz_sim-ci_asan-main-noble-amd64 asan_ci ionic gz_tools-ci_asan-gz-tools2-noble-amd64 asan_ci ionic gz_transport-ci_asan-main-noble-amd64 -asan_ci ionic gz_utils-ci_asan-main-noble-amd64 +asan_ci ionic gz_utils-ci_asan-gz-utils3-noble-amd64 asan_ci ionic sdformat-ci_asan-main-noble-amd64 branch_ci __upcoming__ gz_cmake-ci-main-homebrew-amd64 branch_ci __upcoming__ gz_cmake-ci-main-noble-amd64 @@ -85,6 +86,9 @@ branch_ci __upcoming__ gz_cmake-main-win branch_ci __upcoming__ gz_tools-ci-main-homebrew-amd64 branch_ci __upcoming__ gz_tools-ci-main-noble-amd64 branch_ci __upcoming__ gz_tools-main-win +branch_ci __upcoming__ gz_utils-ci-main-homebrew-amd64 +branch_ci __upcoming__ gz_utils-ci-main-noble-amd64 +branch_ci __upcoming__ gz_utils-main-win branch_ci citadel gz_cmake-ci-ign-cmake2-focal-amd64 branch_ci citadel gz_cmake-ci-ign-cmake2-homebrew-amd64 branch_ci citadel gz_cmake-ign-cmake2-win @@ -330,9 +334,9 @@ branch_ci ionic gz_tools-ci-gz-tools2-noble-amd64 branch_ci ionic gz_transport-ci-main-homebrew-amd64 branch_ci ionic gz_transport-ci-main-noble-amd64 branch_ci ionic gz_transport-main-win -branch_ci ionic gz_utils-ci-main-homebrew-amd64 -branch_ci ionic gz_utils-ci-main-noble-amd64 -branch_ci ionic gz_utils-main-win +branch_ci ionic gz_utils-3-win +branch_ci ionic gz_utils-ci-gz-utils3-homebrew-amd64 +branch_ci ionic gz_utils-ci-gz-utils3-noble-amd64 branch_ci ionic sdformat-ci-main-homebrew-amd64 branch_ci ionic sdformat-ci-main-noble-amd64 branch_ci ionic sdformat-main-win @@ -340,6 +344,8 @@ install_ci __upcoming__ gz_cmake4-install-pkg-noble-amd64 install_ci __upcoming__ gz_cmake4-install_bottle-homebrew-amd64 install_ci __upcoming__ gz_tools3-install-pkg-noble-amd64 install_ci __upcoming__ gz_tools3-install_bottle-homebrew-amd64 +install_ci __upcoming__ gz_utils3-install-pkg-noble-amd64 +install_ci __upcoming__ gz_utils3-install_bottle-homebrew-amd64 install_ci citadel gz_citadel-install-pkg-focal-amd64 install_ci citadel gz_citadel-install_bottle-homebrew-amd64 install_ci citadel gz_cmake2-install-pkg-focal-amd64 From 1cc2fd7c6e640e18abff9967dacc695fb56a737f Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Fri, 23 Aug 2024 10:44:52 -0700 Subject: [PATCH 13/37] Use stable branch for gz-math8 (#1167) * Automated change: update logs [skip ci] Signed-off-by: Steve Peters Co-authored-by: scpeters Co-authored-by: Addisu Z. Taddese --- jenkins-scripts/dsl/gz-collections.yaml | 6 +++++- jenkins-scripts/dsl/logs/generated_jobs.txt | 14 ++++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/jenkins-scripts/dsl/gz-collections.yaml b/jenkins-scripts/dsl/gz-collections.yaml index 48ff9d92d..312964578 100644 --- a/jenkins-scripts/dsl/gz-collections.yaml +++ b/jenkins-scripts/dsl/gz-collections.yaml @@ -371,7 +371,7 @@ collections: - name: gz-math major_version: 8 repo: - current_branch: main + current_branch: gz-math8 - name: gz-plugin major_version: 3 repo: @@ -453,6 +453,10 @@ collections: major_version: 3 repo: current_branch: main + - name: gz-math + major_version: 8 + repo: + current_branch: main ci: configs: - noble diff --git a/jenkins-scripts/dsl/logs/generated_jobs.txt b/jenkins-scripts/dsl/logs/generated_jobs.txt index 609eaf255..2d95b1895 100644 --- a/jenkins-scripts/dsl/logs/generated_jobs.txt +++ b/jenkins-scripts/dsl/logs/generated_jobs.txt @@ -1,4 +1,5 @@ asan_ci __upcoming__ gz_cmake-ci_asan-main-noble-amd64 +asan_ci __upcoming__ gz_math-ci_asan-main-noble-amd64 asan_ci __upcoming__ gz_tools-ci_asan-main-noble-amd64 asan_ci __upcoming__ gz_utils-ci_asan-main-noble-amd64 asan_ci citadel gz_cmake-ci_asan-ign-cmake2-focal-amd64 @@ -69,7 +70,7 @@ asan_ci ionic gz_common-ci_asan-main-noble-amd64 asan_ci ionic gz_fuel_tools-ci_asan-main-noble-amd64 asan_ci ionic gz_gui-ci_asan-main-noble-amd64 asan_ci ionic gz_launch-ci_asan-main-noble-amd64 -asan_ci ionic gz_math-ci_asan-main-noble-amd64 +asan_ci ionic gz_math-ci_asan-gz-math8-noble-amd64 asan_ci ionic gz_msgs-ci_asan-main-noble-amd64 asan_ci ionic gz_physics-ci_asan-main-noble-amd64 asan_ci ionic gz_plugin-ci_asan-main-noble-amd64 @@ -83,6 +84,9 @@ asan_ci ionic sdformat-ci_asan-main-noble-amd64 branch_ci __upcoming__ gz_cmake-ci-main-homebrew-amd64 branch_ci __upcoming__ gz_cmake-ci-main-noble-amd64 branch_ci __upcoming__ gz_cmake-main-win +branch_ci __upcoming__ gz_math-ci-main-homebrew-amd64 +branch_ci __upcoming__ gz_math-ci-main-noble-amd64 +branch_ci __upcoming__ gz_math-main-win branch_ci __upcoming__ gz_tools-ci-main-homebrew-amd64 branch_ci __upcoming__ gz_tools-ci-main-noble-amd64 branch_ci __upcoming__ gz_tools-main-win @@ -307,9 +311,9 @@ branch_ci ionic gz_gui-main-win branch_ci ionic gz_launch-ci-main-homebrew-amd64 branch_ci ionic gz_launch-ci-main-noble-amd64 branch_ci ionic gz_launch-main-win -branch_ci ionic gz_math-ci-main-homebrew-amd64 -branch_ci ionic gz_math-ci-main-noble-amd64 -branch_ci ionic gz_math-main-win +branch_ci ionic gz_math-8-win +branch_ci ionic gz_math-ci-gz-math8-homebrew-amd64 +branch_ci ionic gz_math-ci-gz-math8-noble-amd64 branch_ci ionic gz_msgs-ci-main-homebrew-amd64 branch_ci ionic gz_msgs-ci-main-noble-amd64 branch_ci ionic gz_msgs-main-win @@ -342,6 +346,8 @@ branch_ci ionic sdformat-ci-main-noble-amd64 branch_ci ionic sdformat-main-win install_ci __upcoming__ gz_cmake4-install-pkg-noble-amd64 install_ci __upcoming__ gz_cmake4-install_bottle-homebrew-amd64 +install_ci __upcoming__ gz_math8-install-pkg-noble-amd64 +install_ci __upcoming__ gz_math8-install_bottle-homebrew-amd64 install_ci __upcoming__ gz_tools3-install-pkg-noble-amd64 install_ci __upcoming__ gz_tools3-install_bottle-homebrew-amd64 install_ci __upcoming__ gz_utils3-install-pkg-noble-amd64 From badcfa4825b962762b09b753178d88d396059884 Mon Sep 17 00:00:00 2001 From: Ian Chen Date: Fri, 23 Aug 2024 12:07:32 -0700 Subject: [PATCH 14/37] Use stable branch for gz-rendering9 (#1168) Signed-off-by: Ian Chen --- jenkins-scripts/dsl/gz-collections.yaml | 6 +++++- jenkins-scripts/dsl/logs/generated_jobs.txt | 14 ++++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/jenkins-scripts/dsl/gz-collections.yaml b/jenkins-scripts/dsl/gz-collections.yaml index 312964578..e68c3c448 100644 --- a/jenkins-scripts/dsl/gz-collections.yaml +++ b/jenkins-scripts/dsl/gz-collections.yaml @@ -387,7 +387,7 @@ collections: - name: gz-rendering major_version: 9 repo: - current_branch: main + current_branch: gz-rendering9 - name: sdformat major_version: 15 repo: @@ -457,6 +457,10 @@ collections: major_version: 8 repo: current_branch: main + - name: gz-rendering + major_version: 9 + repo: + current_branch: main ci: configs: - noble diff --git a/jenkins-scripts/dsl/logs/generated_jobs.txt b/jenkins-scripts/dsl/logs/generated_jobs.txt index 2d95b1895..4dbaf055a 100644 --- a/jenkins-scripts/dsl/logs/generated_jobs.txt +++ b/jenkins-scripts/dsl/logs/generated_jobs.txt @@ -1,5 +1,6 @@ asan_ci __upcoming__ gz_cmake-ci_asan-main-noble-amd64 asan_ci __upcoming__ gz_math-ci_asan-main-noble-amd64 +asan_ci __upcoming__ gz_rendering-ci_asan-main-noble-amd64 asan_ci __upcoming__ gz_tools-ci_asan-main-noble-amd64 asan_ci __upcoming__ gz_utils-ci_asan-main-noble-amd64 asan_ci citadel gz_cmake-ci_asan-ign-cmake2-focal-amd64 @@ -74,7 +75,7 @@ asan_ci ionic gz_math-ci_asan-gz-math8-noble-amd64 asan_ci ionic gz_msgs-ci_asan-main-noble-amd64 asan_ci ionic gz_physics-ci_asan-main-noble-amd64 asan_ci ionic gz_plugin-ci_asan-main-noble-amd64 -asan_ci ionic gz_rendering-ci_asan-main-noble-amd64 +asan_ci ionic gz_rendering-ci_asan-gz-rendering9-noble-amd64 asan_ci ionic gz_sensors-ci_asan-main-noble-amd64 asan_ci ionic gz_sim-ci_asan-main-noble-amd64 asan_ci ionic gz_tools-ci_asan-gz-tools2-noble-amd64 @@ -87,6 +88,9 @@ branch_ci __upcoming__ gz_cmake-main-win branch_ci __upcoming__ gz_math-ci-main-homebrew-amd64 branch_ci __upcoming__ gz_math-ci-main-noble-amd64 branch_ci __upcoming__ gz_math-main-win +branch_ci __upcoming__ gz_rendering-ci-main-homebrew-amd64 +branch_ci __upcoming__ gz_rendering-ci-main-noble-amd64 +branch_ci __upcoming__ gz_rendering-main-win branch_ci __upcoming__ gz_tools-ci-main-homebrew-amd64 branch_ci __upcoming__ gz_tools-ci-main-noble-amd64 branch_ci __upcoming__ gz_tools-main-win @@ -323,9 +327,9 @@ branch_ci ionic gz_physics-main-win branch_ci ionic gz_plugin-ci-main-homebrew-amd64 branch_ci ionic gz_plugin-ci-main-noble-amd64 branch_ci ionic gz_plugin-main-win -branch_ci ionic gz_rendering-ci-main-homebrew-amd64 -branch_ci ionic gz_rendering-ci-main-noble-amd64 -branch_ci ionic gz_rendering-main-win +branch_ci ionic gz_rendering-9-win +branch_ci ionic gz_rendering-ci-gz-rendering9-homebrew-amd64 +branch_ci ionic gz_rendering-ci-gz-rendering9-noble-amd64 branch_ci ionic gz_sensors-ci-main-homebrew-amd64 branch_ci ionic gz_sensors-ci-main-noble-amd64 branch_ci ionic gz_sensors-main-win @@ -348,6 +352,8 @@ install_ci __upcoming__ gz_cmake4-install-pkg-noble-amd64 install_ci __upcoming__ gz_cmake4-install_bottle-homebrew-amd64 install_ci __upcoming__ gz_math8-install-pkg-noble-amd64 install_ci __upcoming__ gz_math8-install_bottle-homebrew-amd64 +install_ci __upcoming__ gz_rendering9-install-pkg-noble-amd64 +install_ci __upcoming__ gz_rendering9-install_bottle-homebrew-amd64 install_ci __upcoming__ gz_tools3-install-pkg-noble-amd64 install_ci __upcoming__ gz_tools3-install_bottle-homebrew-amd64 install_ci __upcoming__ gz_utils3-install-pkg-noble-amd64 From a583f86205a7b2691361b8004263b719f8fdad9f Mon Sep 17 00:00:00 2001 From: Jenn Nguyen Date: Fri, 23 Aug 2024 15:56:51 -0700 Subject: [PATCH 15/37] use stable branch for gz-gui9 (#1169) Signed-off-by: Jenn Nguyen --- jenkins-scripts/dsl/gz-collections.yaml | 10 +++++++--- jenkins-scripts/dsl/logs/generated_jobs.txt | 14 ++++++++++---- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/jenkins-scripts/dsl/gz-collections.yaml b/jenkins-scripts/dsl/gz-collections.yaml index e68c3c448..91182a93b 100644 --- a/jenkins-scripts/dsl/gz-collections.yaml +++ b/jenkins-scripts/dsl/gz-collections.yaml @@ -403,7 +403,7 @@ collections: - name: gz-gui major_version: 9 repo: - current_branch: main + current_branch: gz-gui9 - name: gz-sensors major_version: 9 repo: @@ -449,8 +449,8 @@ collections: major_version: 4 repo: current_branch: main - - name: gz-utils - major_version: 3 + - name: gz-gui + major_version: 9 repo: current_branch: main - name: gz-math @@ -461,6 +461,10 @@ collections: major_version: 9 repo: current_branch: main + - name: gz-utils + major_version: 3 + repo: + current_branch: main ci: configs: - noble diff --git a/jenkins-scripts/dsl/logs/generated_jobs.txt b/jenkins-scripts/dsl/logs/generated_jobs.txt index 4dbaf055a..bf65d86b3 100644 --- a/jenkins-scripts/dsl/logs/generated_jobs.txt +++ b/jenkins-scripts/dsl/logs/generated_jobs.txt @@ -1,4 +1,5 @@ asan_ci __upcoming__ gz_cmake-ci_asan-main-noble-amd64 +asan_ci __upcoming__ gz_gui-ci_asan-main-noble-amd64 asan_ci __upcoming__ gz_math-ci_asan-main-noble-amd64 asan_ci __upcoming__ gz_rendering-ci_asan-main-noble-amd64 asan_ci __upcoming__ gz_tools-ci_asan-main-noble-amd64 @@ -69,7 +70,7 @@ asan_ci harmonic sdformat-ci_asan-sdf14-jammy-amd64 asan_ci ionic gz_cmake-ci_asan-gz-cmake4-noble-amd64 asan_ci ionic gz_common-ci_asan-main-noble-amd64 asan_ci ionic gz_fuel_tools-ci_asan-main-noble-amd64 -asan_ci ionic gz_gui-ci_asan-main-noble-amd64 +asan_ci ionic gz_gui-ci_asan-gz-gui9-noble-amd64 asan_ci ionic gz_launch-ci_asan-main-noble-amd64 asan_ci ionic gz_math-ci_asan-gz-math8-noble-amd64 asan_ci ionic gz_msgs-ci_asan-main-noble-amd64 @@ -85,6 +86,9 @@ asan_ci ionic sdformat-ci_asan-main-noble-amd64 branch_ci __upcoming__ gz_cmake-ci-main-homebrew-amd64 branch_ci __upcoming__ gz_cmake-ci-main-noble-amd64 branch_ci __upcoming__ gz_cmake-main-win +branch_ci __upcoming__ gz_gui-ci-main-homebrew-amd64 +branch_ci __upcoming__ gz_gui-ci-main-noble-amd64 +branch_ci __upcoming__ gz_gui-main-win branch_ci __upcoming__ gz_math-ci-main-homebrew-amd64 branch_ci __upcoming__ gz_math-ci-main-noble-amd64 branch_ci __upcoming__ gz_math-main-win @@ -309,9 +313,9 @@ branch_ci ionic gz_common-main-win branch_ci ionic gz_fuel_tools-ci-main-homebrew-amd64 branch_ci ionic gz_fuel_tools-ci-main-noble-amd64 branch_ci ionic gz_fuel_tools-main-win -branch_ci ionic gz_gui-ci-main-homebrew-amd64 -branch_ci ionic gz_gui-ci-main-noble-amd64 -branch_ci ionic gz_gui-main-win +branch_ci ionic gz_gui-9-win +branch_ci ionic gz_gui-ci-gz-gui9-homebrew-amd64 +branch_ci ionic gz_gui-ci-gz-gui9-noble-amd64 branch_ci ionic gz_launch-ci-main-homebrew-amd64 branch_ci ionic gz_launch-ci-main-noble-amd64 branch_ci ionic gz_launch-main-win @@ -350,6 +354,8 @@ branch_ci ionic sdformat-ci-main-noble-amd64 branch_ci ionic sdformat-main-win install_ci __upcoming__ gz_cmake4-install-pkg-noble-amd64 install_ci __upcoming__ gz_cmake4-install_bottle-homebrew-amd64 +install_ci __upcoming__ gz_gui9-install-pkg-noble-amd64 +install_ci __upcoming__ gz_gui9-install_bottle-homebrew-amd64 install_ci __upcoming__ gz_math8-install-pkg-noble-amd64 install_ci __upcoming__ gz_math8-install_bottle-homebrew-amd64 install_ci __upcoming__ gz_rendering9-install-pkg-noble-amd64 From d6948eeea017a4db9f96d9beeb46a17200da3057 Mon Sep 17 00:00:00 2001 From: Ian Chen Date: Fri, 23 Aug 2024 16:38:08 -0700 Subject: [PATCH 16/37] Use stable branch for gz-sensors9 (#1170) Signed-off-by: Ian Chen Co-authored-by: iche033 --- jenkins-scripts/dsl/gz-collections.yaml | 6 +++++- jenkins-scripts/dsl/logs/generated_jobs.txt | 14 ++++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/jenkins-scripts/dsl/gz-collections.yaml b/jenkins-scripts/dsl/gz-collections.yaml index 91182a93b..ad4d7302c 100644 --- a/jenkins-scripts/dsl/gz-collections.yaml +++ b/jenkins-scripts/dsl/gz-collections.yaml @@ -407,7 +407,7 @@ collections: - name: gz-sensors major_version: 9 repo: - current_branch: main + current_branch: gz-sensors9 - name: gz-physics major_version: 8 repo: @@ -461,6 +461,10 @@ collections: major_version: 9 repo: current_branch: main + - name: gz-sensors + major_version: 9 + repo: + current_branch: main - name: gz-utils major_version: 3 repo: diff --git a/jenkins-scripts/dsl/logs/generated_jobs.txt b/jenkins-scripts/dsl/logs/generated_jobs.txt index bf65d86b3..5d819b2c2 100644 --- a/jenkins-scripts/dsl/logs/generated_jobs.txt +++ b/jenkins-scripts/dsl/logs/generated_jobs.txt @@ -2,6 +2,7 @@ asan_ci __upcoming__ gz_cmake-ci_asan-main-noble-amd64 asan_ci __upcoming__ gz_gui-ci_asan-main-noble-amd64 asan_ci __upcoming__ gz_math-ci_asan-main-noble-amd64 asan_ci __upcoming__ gz_rendering-ci_asan-main-noble-amd64 +asan_ci __upcoming__ gz_sensors-ci_asan-main-noble-amd64 asan_ci __upcoming__ gz_tools-ci_asan-main-noble-amd64 asan_ci __upcoming__ gz_utils-ci_asan-main-noble-amd64 asan_ci citadel gz_cmake-ci_asan-ign-cmake2-focal-amd64 @@ -77,7 +78,7 @@ asan_ci ionic gz_msgs-ci_asan-main-noble-amd64 asan_ci ionic gz_physics-ci_asan-main-noble-amd64 asan_ci ionic gz_plugin-ci_asan-main-noble-amd64 asan_ci ionic gz_rendering-ci_asan-gz-rendering9-noble-amd64 -asan_ci ionic gz_sensors-ci_asan-main-noble-amd64 +asan_ci ionic gz_sensors-ci_asan-gz-sensors9-noble-amd64 asan_ci ionic gz_sim-ci_asan-main-noble-amd64 asan_ci ionic gz_tools-ci_asan-gz-tools2-noble-amd64 asan_ci ionic gz_transport-ci_asan-main-noble-amd64 @@ -95,6 +96,9 @@ branch_ci __upcoming__ gz_math-main-win branch_ci __upcoming__ gz_rendering-ci-main-homebrew-amd64 branch_ci __upcoming__ gz_rendering-ci-main-noble-amd64 branch_ci __upcoming__ gz_rendering-main-win +branch_ci __upcoming__ gz_sensors-ci-main-homebrew-amd64 +branch_ci __upcoming__ gz_sensors-ci-main-noble-amd64 +branch_ci __upcoming__ gz_sensors-main-win branch_ci __upcoming__ gz_tools-ci-main-homebrew-amd64 branch_ci __upcoming__ gz_tools-ci-main-noble-amd64 branch_ci __upcoming__ gz_tools-main-win @@ -334,9 +338,9 @@ branch_ci ionic gz_plugin-main-win branch_ci ionic gz_rendering-9-win branch_ci ionic gz_rendering-ci-gz-rendering9-homebrew-amd64 branch_ci ionic gz_rendering-ci-gz-rendering9-noble-amd64 -branch_ci ionic gz_sensors-ci-main-homebrew-amd64 -branch_ci ionic gz_sensors-ci-main-noble-amd64 -branch_ci ionic gz_sensors-main-win +branch_ci ionic gz_sensors-9-win +branch_ci ionic gz_sensors-ci-gz-sensors9-homebrew-amd64 +branch_ci ionic gz_sensors-ci-gz-sensors9-noble-amd64 branch_ci ionic gz_sim-ci-main-homebrew-amd64 branch_ci ionic gz_sim-ci-main-noble-amd64 branch_ci ionic gz_sim-main-win @@ -360,6 +364,8 @@ install_ci __upcoming__ gz_math8-install-pkg-noble-amd64 install_ci __upcoming__ gz_math8-install_bottle-homebrew-amd64 install_ci __upcoming__ gz_rendering9-install-pkg-noble-amd64 install_ci __upcoming__ gz_rendering9-install_bottle-homebrew-amd64 +install_ci __upcoming__ gz_sensors9-install-pkg-noble-amd64 +install_ci __upcoming__ gz_sensors9-install_bottle-homebrew-amd64 install_ci __upcoming__ gz_tools3-install-pkg-noble-amd64 install_ci __upcoming__ gz_tools3-install_bottle-homebrew-amd64 install_ci __upcoming__ gz_utils3-install-pkg-noble-amd64 From f89ac8cafc646260598eb8eb6d94be8093bdc9f7 Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Mon, 26 Aug 2024 09:59:38 -0700 Subject: [PATCH 17/37] Ionic CI: use stable branch for sdformat15 (#1171) * Automated change: update logs [skip ci] Signed-off-by: Steve Peters Co-authored-by: scpeters --- jenkins-scripts/dsl/gz-collections.yaml | 6 +++++- jenkins-scripts/dsl/logs/generated_jobs.txt | 14 ++++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/jenkins-scripts/dsl/gz-collections.yaml b/jenkins-scripts/dsl/gz-collections.yaml index ad4d7302c..5193bc602 100644 --- a/jenkins-scripts/dsl/gz-collections.yaml +++ b/jenkins-scripts/dsl/gz-collections.yaml @@ -391,7 +391,7 @@ collections: - name: sdformat major_version: 15 repo: - current_branch: main + current_branch: sdf15 - name: gz-fuel-tools major_version: 10 repo: @@ -469,6 +469,10 @@ collections: major_version: 3 repo: current_branch: main + - name: sdformat + major_version: 15 + repo: + current_branch: main ci: configs: - noble diff --git a/jenkins-scripts/dsl/logs/generated_jobs.txt b/jenkins-scripts/dsl/logs/generated_jobs.txt index 5d819b2c2..1e4d0ce36 100644 --- a/jenkins-scripts/dsl/logs/generated_jobs.txt +++ b/jenkins-scripts/dsl/logs/generated_jobs.txt @@ -5,6 +5,7 @@ asan_ci __upcoming__ gz_rendering-ci_asan-main-noble-amd64 asan_ci __upcoming__ gz_sensors-ci_asan-main-noble-amd64 asan_ci __upcoming__ gz_tools-ci_asan-main-noble-amd64 asan_ci __upcoming__ gz_utils-ci_asan-main-noble-amd64 +asan_ci __upcoming__ sdformat-ci_asan-main-noble-amd64 asan_ci citadel gz_cmake-ci_asan-ign-cmake2-focal-amd64 asan_ci citadel gz_common-ci_asan-ign-common3-focal-amd64 asan_ci citadel gz_fuel_tools-ci_asan-ign-fuel-tools4-focal-amd64 @@ -83,7 +84,7 @@ asan_ci ionic gz_sim-ci_asan-main-noble-amd64 asan_ci ionic gz_tools-ci_asan-gz-tools2-noble-amd64 asan_ci ionic gz_transport-ci_asan-main-noble-amd64 asan_ci ionic gz_utils-ci_asan-gz-utils3-noble-amd64 -asan_ci ionic sdformat-ci_asan-main-noble-amd64 +asan_ci ionic sdformat-ci_asan-sdf15-noble-amd64 branch_ci __upcoming__ gz_cmake-ci-main-homebrew-amd64 branch_ci __upcoming__ gz_cmake-ci-main-noble-amd64 branch_ci __upcoming__ gz_cmake-main-win @@ -105,6 +106,9 @@ branch_ci __upcoming__ gz_tools-main-win branch_ci __upcoming__ gz_utils-ci-main-homebrew-amd64 branch_ci __upcoming__ gz_utils-ci-main-noble-amd64 branch_ci __upcoming__ gz_utils-main-win +branch_ci __upcoming__ sdformat-ci-main-homebrew-amd64 +branch_ci __upcoming__ sdformat-ci-main-noble-amd64 +branch_ci __upcoming__ sdformat-main-win branch_ci citadel gz_cmake-ci-ign-cmake2-focal-amd64 branch_ci citadel gz_cmake-ci-ign-cmake2-homebrew-amd64 branch_ci citadel gz_cmake-ign-cmake2-win @@ -353,9 +357,9 @@ branch_ci ionic gz_transport-main-win branch_ci ionic gz_utils-3-win branch_ci ionic gz_utils-ci-gz-utils3-homebrew-amd64 branch_ci ionic gz_utils-ci-gz-utils3-noble-amd64 -branch_ci ionic sdformat-ci-main-homebrew-amd64 -branch_ci ionic sdformat-ci-main-noble-amd64 -branch_ci ionic sdformat-main-win +branch_ci ionic sdformat-ci-sdf15-homebrew-amd64 +branch_ci ionic sdformat-ci-sdf15-noble-amd64 +branch_ci ionic sdformat-sdf15-win install_ci __upcoming__ gz_cmake4-install-pkg-noble-amd64 install_ci __upcoming__ gz_cmake4-install_bottle-homebrew-amd64 install_ci __upcoming__ gz_gui9-install-pkg-noble-amd64 @@ -370,6 +374,8 @@ install_ci __upcoming__ gz_tools3-install-pkg-noble-amd64 install_ci __upcoming__ gz_tools3-install_bottle-homebrew-amd64 install_ci __upcoming__ gz_utils3-install-pkg-noble-amd64 install_ci __upcoming__ gz_utils3-install_bottle-homebrew-amd64 +install_ci __upcoming__ sdformat15-install-pkg-noble-amd64 +install_ci __upcoming__ sdformat15-install_bottle-homebrew-amd64 install_ci citadel gz_citadel-install-pkg-focal-amd64 install_ci citadel gz_citadel-install_bottle-homebrew-amd64 install_ci citadel gz_cmake2-install-pkg-focal-amd64 From d652f8eab687d5d1ac767a283d740cd1fedd8571 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Ag=C3=BCero?= Date: Mon, 26 Aug 2024 22:18:07 +0200 Subject: [PATCH 18/37] Use stable branch for gz-msgs11 (#1172) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * use gz-msgs11 stable branch Signed-off-by: Carlos Agüero --- jenkins-scripts/dsl/gz-collections.yaml | 6 +++++- jenkins-scripts/dsl/logs/generated_jobs.txt | 14 ++++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/jenkins-scripts/dsl/gz-collections.yaml b/jenkins-scripts/dsl/gz-collections.yaml index 5193bc602..ef838faee 100644 --- a/jenkins-scripts/dsl/gz-collections.yaml +++ b/jenkins-scripts/dsl/gz-collections.yaml @@ -383,7 +383,7 @@ collections: - name: gz-msgs major_version: 11 repo: - current_branch: main + current_branch: gz-msgs11 - name: gz-rendering major_version: 9 repo: @@ -457,6 +457,10 @@ collections: major_version: 8 repo: current_branch: main + - name: gz-msgs + major_version: 11 + repo: + current_branch: main - name: gz-rendering major_version: 9 repo: diff --git a/jenkins-scripts/dsl/logs/generated_jobs.txt b/jenkins-scripts/dsl/logs/generated_jobs.txt index 1e4d0ce36..1a68d6bfe 100644 --- a/jenkins-scripts/dsl/logs/generated_jobs.txt +++ b/jenkins-scripts/dsl/logs/generated_jobs.txt @@ -1,6 +1,7 @@ asan_ci __upcoming__ gz_cmake-ci_asan-main-noble-amd64 asan_ci __upcoming__ gz_gui-ci_asan-main-noble-amd64 asan_ci __upcoming__ gz_math-ci_asan-main-noble-amd64 +asan_ci __upcoming__ gz_msgs-ci_asan-main-noble-amd64 asan_ci __upcoming__ gz_rendering-ci_asan-main-noble-amd64 asan_ci __upcoming__ gz_sensors-ci_asan-main-noble-amd64 asan_ci __upcoming__ gz_tools-ci_asan-main-noble-amd64 @@ -75,7 +76,7 @@ asan_ci ionic gz_fuel_tools-ci_asan-main-noble-amd64 asan_ci ionic gz_gui-ci_asan-gz-gui9-noble-amd64 asan_ci ionic gz_launch-ci_asan-main-noble-amd64 asan_ci ionic gz_math-ci_asan-gz-math8-noble-amd64 -asan_ci ionic gz_msgs-ci_asan-main-noble-amd64 +asan_ci ionic gz_msgs-ci_asan-gz-msgs11-noble-amd64 asan_ci ionic gz_physics-ci_asan-main-noble-amd64 asan_ci ionic gz_plugin-ci_asan-main-noble-amd64 asan_ci ionic gz_rendering-ci_asan-gz-rendering9-noble-amd64 @@ -94,6 +95,9 @@ branch_ci __upcoming__ gz_gui-main-win branch_ci __upcoming__ gz_math-ci-main-homebrew-amd64 branch_ci __upcoming__ gz_math-ci-main-noble-amd64 branch_ci __upcoming__ gz_math-main-win +branch_ci __upcoming__ gz_msgs-ci-main-homebrew-amd64 +branch_ci __upcoming__ gz_msgs-ci-main-noble-amd64 +branch_ci __upcoming__ gz_msgs-main-win branch_ci __upcoming__ gz_rendering-ci-main-homebrew-amd64 branch_ci __upcoming__ gz_rendering-ci-main-noble-amd64 branch_ci __upcoming__ gz_rendering-main-win @@ -330,9 +334,9 @@ branch_ci ionic gz_launch-main-win branch_ci ionic gz_math-8-win branch_ci ionic gz_math-ci-gz-math8-homebrew-amd64 branch_ci ionic gz_math-ci-gz-math8-noble-amd64 -branch_ci ionic gz_msgs-ci-main-homebrew-amd64 -branch_ci ionic gz_msgs-ci-main-noble-amd64 -branch_ci ionic gz_msgs-main-win +branch_ci ionic gz_msgs-11-win +branch_ci ionic gz_msgs-ci-gz-msgs11-homebrew-amd64 +branch_ci ionic gz_msgs-ci-gz-msgs11-noble-amd64 branch_ci ionic gz_physics-ci-main-homebrew-amd64 branch_ci ionic gz_physics-ci-main-noble-amd64 branch_ci ionic gz_physics-main-win @@ -366,6 +370,8 @@ install_ci __upcoming__ gz_gui9-install-pkg-noble-amd64 install_ci __upcoming__ gz_gui9-install_bottle-homebrew-amd64 install_ci __upcoming__ gz_math8-install-pkg-noble-amd64 install_ci __upcoming__ gz_math8-install_bottle-homebrew-amd64 +install_ci __upcoming__ gz_msgs11-install-pkg-noble-amd64 +install_ci __upcoming__ gz_msgs11-install_bottle-homebrew-amd64 install_ci __upcoming__ gz_rendering9-install-pkg-noble-amd64 install_ci __upcoming__ gz_rendering9-install_bottle-homebrew-amd64 install_ci __upcoming__ gz_sensors9-install-pkg-noble-amd64 From 9682ebf0eed835008f7f881f88142926f25603fe Mon Sep 17 00:00:00 2001 From: Ian Chen Date: Mon, 26 Aug 2024 18:30:39 -0700 Subject: [PATCH 19/37] Use stable branch gz-fuel-tools10 (#1174) Signed-off-by: Ian Chen Co-authored-by: iche033 --- jenkins-scripts/dsl/gz-collections.yaml | 6 +++++- jenkins-scripts/dsl/logs/generated_jobs.txt | 14 ++++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/jenkins-scripts/dsl/gz-collections.yaml b/jenkins-scripts/dsl/gz-collections.yaml index ef838faee..5fa0d73b9 100644 --- a/jenkins-scripts/dsl/gz-collections.yaml +++ b/jenkins-scripts/dsl/gz-collections.yaml @@ -395,7 +395,7 @@ collections: - name: gz-fuel-tools major_version: 10 repo: - current_branch: main + current_branch: gz-fuel-tools10 - name: gz-transport major_version: 14 repo: @@ -449,6 +449,10 @@ collections: major_version: 4 repo: current_branch: main + - name: gz-fuel-tools + major_version: 10 + repo: + current_branch: main - name: gz-gui major_version: 9 repo: diff --git a/jenkins-scripts/dsl/logs/generated_jobs.txt b/jenkins-scripts/dsl/logs/generated_jobs.txt index 1a68d6bfe..e767abaab 100644 --- a/jenkins-scripts/dsl/logs/generated_jobs.txt +++ b/jenkins-scripts/dsl/logs/generated_jobs.txt @@ -1,4 +1,5 @@ asan_ci __upcoming__ gz_cmake-ci_asan-main-noble-amd64 +asan_ci __upcoming__ gz_fuel_tools-ci_asan-main-noble-amd64 asan_ci __upcoming__ gz_gui-ci_asan-main-noble-amd64 asan_ci __upcoming__ gz_math-ci_asan-main-noble-amd64 asan_ci __upcoming__ gz_msgs-ci_asan-main-noble-amd64 @@ -72,7 +73,7 @@ asan_ci harmonic gz_utils-ci_asan-gz-utils2-jammy-amd64 asan_ci harmonic sdformat-ci_asan-sdf14-jammy-amd64 asan_ci ionic gz_cmake-ci_asan-gz-cmake4-noble-amd64 asan_ci ionic gz_common-ci_asan-main-noble-amd64 -asan_ci ionic gz_fuel_tools-ci_asan-main-noble-amd64 +asan_ci ionic gz_fuel_tools-ci_asan-gz-fuel-tools10-noble-amd64 asan_ci ionic gz_gui-ci_asan-gz-gui9-noble-amd64 asan_ci ionic gz_launch-ci_asan-main-noble-amd64 asan_ci ionic gz_math-ci_asan-gz-math8-noble-amd64 @@ -89,6 +90,9 @@ asan_ci ionic sdformat-ci_asan-sdf15-noble-amd64 branch_ci __upcoming__ gz_cmake-ci-main-homebrew-amd64 branch_ci __upcoming__ gz_cmake-ci-main-noble-amd64 branch_ci __upcoming__ gz_cmake-main-win +branch_ci __upcoming__ gz_fuel_tools-ci-main-homebrew-amd64 +branch_ci __upcoming__ gz_fuel_tools-ci-main-noble-amd64 +branch_ci __upcoming__ gz_fuel_tools-main-win branch_ci __upcoming__ gz_gui-ci-main-homebrew-amd64 branch_ci __upcoming__ gz_gui-ci-main-noble-amd64 branch_ci __upcoming__ gz_gui-main-win @@ -322,9 +326,9 @@ branch_ci ionic gz_cmake-ci-gz-cmake4-noble-amd64 branch_ci ionic gz_common-ci-main-homebrew-amd64 branch_ci ionic gz_common-ci-main-noble-amd64 branch_ci ionic gz_common-main-win -branch_ci ionic gz_fuel_tools-ci-main-homebrew-amd64 -branch_ci ionic gz_fuel_tools-ci-main-noble-amd64 -branch_ci ionic gz_fuel_tools-main-win +branch_ci ionic gz_fuel_tools-10-win +branch_ci ionic gz_fuel_tools-ci-gz-fuel-tools10-homebrew-amd64 +branch_ci ionic gz_fuel_tools-ci-gz-fuel-tools10-noble-amd64 branch_ci ionic gz_gui-9-win branch_ci ionic gz_gui-ci-gz-gui9-homebrew-amd64 branch_ci ionic gz_gui-ci-gz-gui9-noble-amd64 @@ -366,6 +370,8 @@ branch_ci ionic sdformat-ci-sdf15-noble-amd64 branch_ci ionic sdformat-sdf15-win install_ci __upcoming__ gz_cmake4-install-pkg-noble-amd64 install_ci __upcoming__ gz_cmake4-install_bottle-homebrew-amd64 +install_ci __upcoming__ gz_fuel_tools10-install-pkg-noble-amd64 +install_ci __upcoming__ gz_fuel_tools10-install_bottle-homebrew-amd64 install_ci __upcoming__ gz_gui9-install-pkg-noble-amd64 install_ci __upcoming__ gz_gui9-install_bottle-homebrew-amd64 install_ci __upcoming__ gz_math8-install-pkg-noble-amd64 From 762cc0f35bdc7b54e823d108c13d2394c08c5c7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Ag=C3=BCero?= Date: Tue, 27 Aug 2024 15:20:09 +0200 Subject: [PATCH 20/37] Use stable branch gz-transport14 (#1173) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Use stable branch gz-transport14 Signed-off-by: Carlos Agüero Co-authored-by: Ian Chen --- jenkins-scripts/dsl/gz-collections.yaml | 6 +++++- jenkins-scripts/dsl/logs/generated_jobs.txt | 14 ++++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/jenkins-scripts/dsl/gz-collections.yaml b/jenkins-scripts/dsl/gz-collections.yaml index 5fa0d73b9..629492146 100644 --- a/jenkins-scripts/dsl/gz-collections.yaml +++ b/jenkins-scripts/dsl/gz-collections.yaml @@ -399,7 +399,7 @@ collections: - name: gz-transport major_version: 14 repo: - current_branch: main + current_branch: gz-transport14 - name: gz-gui major_version: 9 repo: @@ -473,6 +473,10 @@ collections: major_version: 9 repo: current_branch: main + - name: gz-transport + major_version: 14 + repo: + current_branch: main - name: gz-utils major_version: 3 repo: diff --git a/jenkins-scripts/dsl/logs/generated_jobs.txt b/jenkins-scripts/dsl/logs/generated_jobs.txt index e767abaab..f46f39e70 100644 --- a/jenkins-scripts/dsl/logs/generated_jobs.txt +++ b/jenkins-scripts/dsl/logs/generated_jobs.txt @@ -6,6 +6,7 @@ asan_ci __upcoming__ gz_msgs-ci_asan-main-noble-amd64 asan_ci __upcoming__ gz_rendering-ci_asan-main-noble-amd64 asan_ci __upcoming__ gz_sensors-ci_asan-main-noble-amd64 asan_ci __upcoming__ gz_tools-ci_asan-main-noble-amd64 +asan_ci __upcoming__ gz_transport-ci_asan-main-noble-amd64 asan_ci __upcoming__ gz_utils-ci_asan-main-noble-amd64 asan_ci __upcoming__ sdformat-ci_asan-main-noble-amd64 asan_ci citadel gz_cmake-ci_asan-ign-cmake2-focal-amd64 @@ -84,7 +85,7 @@ asan_ci ionic gz_rendering-ci_asan-gz-rendering9-noble-amd64 asan_ci ionic gz_sensors-ci_asan-gz-sensors9-noble-amd64 asan_ci ionic gz_sim-ci_asan-main-noble-amd64 asan_ci ionic gz_tools-ci_asan-gz-tools2-noble-amd64 -asan_ci ionic gz_transport-ci_asan-main-noble-amd64 +asan_ci ionic gz_transport-ci_asan-gz-transport14-noble-amd64 asan_ci ionic gz_utils-ci_asan-gz-utils3-noble-amd64 asan_ci ionic sdformat-ci_asan-sdf15-noble-amd64 branch_ci __upcoming__ gz_cmake-ci-main-homebrew-amd64 @@ -111,6 +112,9 @@ branch_ci __upcoming__ gz_sensors-main-win branch_ci __upcoming__ gz_tools-ci-main-homebrew-amd64 branch_ci __upcoming__ gz_tools-ci-main-noble-amd64 branch_ci __upcoming__ gz_tools-main-win +branch_ci __upcoming__ gz_transport-ci-main-homebrew-amd64 +branch_ci __upcoming__ gz_transport-ci-main-noble-amd64 +branch_ci __upcoming__ gz_transport-main-win branch_ci __upcoming__ gz_utils-ci-main-homebrew-amd64 branch_ci __upcoming__ gz_utils-ci-main-noble-amd64 branch_ci __upcoming__ gz_utils-main-win @@ -359,9 +363,9 @@ branch_ci ionic gz_sim-main-win branch_ci ionic gz_tools-2-win branch_ci ionic gz_tools-ci-gz-tools2-homebrew-amd64 branch_ci ionic gz_tools-ci-gz-tools2-noble-amd64 -branch_ci ionic gz_transport-ci-main-homebrew-amd64 -branch_ci ionic gz_transport-ci-main-noble-amd64 -branch_ci ionic gz_transport-main-win +branch_ci ionic gz_transport-14-win +branch_ci ionic gz_transport-ci-gz-transport14-homebrew-amd64 +branch_ci ionic gz_transport-ci-gz-transport14-noble-amd64 branch_ci ionic gz_utils-3-win branch_ci ionic gz_utils-ci-gz-utils3-homebrew-amd64 branch_ci ionic gz_utils-ci-gz-utils3-noble-amd64 @@ -384,6 +388,8 @@ install_ci __upcoming__ gz_sensors9-install-pkg-noble-amd64 install_ci __upcoming__ gz_sensors9-install_bottle-homebrew-amd64 install_ci __upcoming__ gz_tools3-install-pkg-noble-amd64 install_ci __upcoming__ gz_tools3-install_bottle-homebrew-amd64 +install_ci __upcoming__ gz_transport14-install-pkg-noble-amd64 +install_ci __upcoming__ gz_transport14-install_bottle-homebrew-amd64 install_ci __upcoming__ gz_utils3-install-pkg-noble-amd64 install_ci __upcoming__ gz_utils3-install_bottle-homebrew-amd64 install_ci __upcoming__ sdformat15-install-pkg-noble-amd64 From 70252c2bd492299b22138e9088aaf0bdb28bea59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Ag=C3=BCero?= Date: Tue, 27 Aug 2024 16:10:20 +0200 Subject: [PATCH 21/37] Use stable branch gz-plugin3 (#1176) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Use stable branch gz-plugin3 Signed-off-by: Carlos Agüero --- jenkins-scripts/dsl/gz-collections.yaml | 6 +++++- jenkins-scripts/dsl/logs/generated_jobs.txt | 14 ++++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/jenkins-scripts/dsl/gz-collections.yaml b/jenkins-scripts/dsl/gz-collections.yaml index 629492146..470ad0754 100644 --- a/jenkins-scripts/dsl/gz-collections.yaml +++ b/jenkins-scripts/dsl/gz-collections.yaml @@ -375,7 +375,7 @@ collections: - name: gz-plugin major_version: 3 repo: - current_branch: main + current_branch: gz-plugin3 - name: gz-common major_version: 6 repo: @@ -465,6 +465,10 @@ collections: major_version: 11 repo: current_branch: main + - name: gz-plugin + major_version: 3 + repo: + current_branch: main - name: gz-rendering major_version: 9 repo: diff --git a/jenkins-scripts/dsl/logs/generated_jobs.txt b/jenkins-scripts/dsl/logs/generated_jobs.txt index f46f39e70..555f754fd 100644 --- a/jenkins-scripts/dsl/logs/generated_jobs.txt +++ b/jenkins-scripts/dsl/logs/generated_jobs.txt @@ -3,6 +3,7 @@ asan_ci __upcoming__ gz_fuel_tools-ci_asan-main-noble-amd64 asan_ci __upcoming__ gz_gui-ci_asan-main-noble-amd64 asan_ci __upcoming__ gz_math-ci_asan-main-noble-amd64 asan_ci __upcoming__ gz_msgs-ci_asan-main-noble-amd64 +asan_ci __upcoming__ gz_plugin-ci_asan-main-noble-amd64 asan_ci __upcoming__ gz_rendering-ci_asan-main-noble-amd64 asan_ci __upcoming__ gz_sensors-ci_asan-main-noble-amd64 asan_ci __upcoming__ gz_tools-ci_asan-main-noble-amd64 @@ -80,7 +81,7 @@ asan_ci ionic gz_launch-ci_asan-main-noble-amd64 asan_ci ionic gz_math-ci_asan-gz-math8-noble-amd64 asan_ci ionic gz_msgs-ci_asan-gz-msgs11-noble-amd64 asan_ci ionic gz_physics-ci_asan-main-noble-amd64 -asan_ci ionic gz_plugin-ci_asan-main-noble-amd64 +asan_ci ionic gz_plugin-ci_asan-gz-plugin3-noble-amd64 asan_ci ionic gz_rendering-ci_asan-gz-rendering9-noble-amd64 asan_ci ionic gz_sensors-ci_asan-gz-sensors9-noble-amd64 asan_ci ionic gz_sim-ci_asan-main-noble-amd64 @@ -103,6 +104,9 @@ branch_ci __upcoming__ gz_math-main-win branch_ci __upcoming__ gz_msgs-ci-main-homebrew-amd64 branch_ci __upcoming__ gz_msgs-ci-main-noble-amd64 branch_ci __upcoming__ gz_msgs-main-win +branch_ci __upcoming__ gz_plugin-ci-main-homebrew-amd64 +branch_ci __upcoming__ gz_plugin-ci-main-noble-amd64 +branch_ci __upcoming__ gz_plugin-main-win branch_ci __upcoming__ gz_rendering-ci-main-homebrew-amd64 branch_ci __upcoming__ gz_rendering-ci-main-noble-amd64 branch_ci __upcoming__ gz_rendering-main-win @@ -348,9 +352,9 @@ branch_ci ionic gz_msgs-ci-gz-msgs11-noble-amd64 branch_ci ionic gz_physics-ci-main-homebrew-amd64 branch_ci ionic gz_physics-ci-main-noble-amd64 branch_ci ionic gz_physics-main-win -branch_ci ionic gz_plugin-ci-main-homebrew-amd64 -branch_ci ionic gz_plugin-ci-main-noble-amd64 -branch_ci ionic gz_plugin-main-win +branch_ci ionic gz_plugin-3-win +branch_ci ionic gz_plugin-ci-gz-plugin3-homebrew-amd64 +branch_ci ionic gz_plugin-ci-gz-plugin3-noble-amd64 branch_ci ionic gz_rendering-9-win branch_ci ionic gz_rendering-ci-gz-rendering9-homebrew-amd64 branch_ci ionic gz_rendering-ci-gz-rendering9-noble-amd64 @@ -382,6 +386,8 @@ install_ci __upcoming__ gz_math8-install-pkg-noble-amd64 install_ci __upcoming__ gz_math8-install_bottle-homebrew-amd64 install_ci __upcoming__ gz_msgs11-install-pkg-noble-amd64 install_ci __upcoming__ gz_msgs11-install_bottle-homebrew-amd64 +install_ci __upcoming__ gz_plugin3-install-pkg-noble-amd64 +install_ci __upcoming__ gz_plugin3-install_bottle-homebrew-amd64 install_ci __upcoming__ gz_rendering9-install-pkg-noble-amd64 install_ci __upcoming__ gz_rendering9-install_bottle-homebrew-amd64 install_ci __upcoming__ gz_sensors9-install-pkg-noble-amd64 From 293d9436a059d26a0fad6291164655d9fb9f6a54 Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Tue, 27 Aug 2024 10:21:45 -0700 Subject: [PATCH 22/37] source_changelog.bash: print baseline version (#1175) Signed-off-by: Steve Peters --- source-repo-scripts/source_changelog.bash | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source-repo-scripts/source_changelog.bash b/source-repo-scripts/source_changelog.bash index 71a8aea23..6b93dfd05 100755 --- a/source-repo-scripts/source_changelog.bash +++ b/source-repo-scripts/source_changelog.bash @@ -11,7 +11,8 @@ git fetch --tags PREV_VER=${1:-$(git describe --tags --abbrev=0 | sed 's/.*_//')} -echo "Changes since $PREV_VER" +echo "1. **Baseline:** this includes all changes from $PREV_VER and earlier." +echo "" ORIGIN_URL=$(git remote get-url origin) REPO=$(basename ${ORIGIN_URL%.git}) From c1ea08714c9db01997d1aa5d164b1f3a9e38c5e5 Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Tue, 27 Aug 2024 16:09:06 -0700 Subject: [PATCH 23/37] Ionic CI: use stable branch for gz-physics8 (#1178) * Automated change: update logs [skip ci] Signed-off-by: Steve Peters Co-authored-by: scpeters --- jenkins-scripts/dsl/gz-collections.yaml | 6 +++++- jenkins-scripts/dsl/logs/generated_jobs.txt | 14 ++++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/jenkins-scripts/dsl/gz-collections.yaml b/jenkins-scripts/dsl/gz-collections.yaml index 470ad0754..f8d82aef6 100644 --- a/jenkins-scripts/dsl/gz-collections.yaml +++ b/jenkins-scripts/dsl/gz-collections.yaml @@ -411,7 +411,7 @@ collections: - name: gz-physics major_version: 8 repo: - current_branch: main + current_branch: gz-physics8 - name: gz-sim major_version: 9 repo: @@ -465,6 +465,10 @@ collections: major_version: 11 repo: current_branch: main + - name: gz-physics + major_version: 8 + repo: + current_branch: main - name: gz-plugin major_version: 3 repo: diff --git a/jenkins-scripts/dsl/logs/generated_jobs.txt b/jenkins-scripts/dsl/logs/generated_jobs.txt index 555f754fd..0ca14789c 100644 --- a/jenkins-scripts/dsl/logs/generated_jobs.txt +++ b/jenkins-scripts/dsl/logs/generated_jobs.txt @@ -3,6 +3,7 @@ asan_ci __upcoming__ gz_fuel_tools-ci_asan-main-noble-amd64 asan_ci __upcoming__ gz_gui-ci_asan-main-noble-amd64 asan_ci __upcoming__ gz_math-ci_asan-main-noble-amd64 asan_ci __upcoming__ gz_msgs-ci_asan-main-noble-amd64 +asan_ci __upcoming__ gz_physics-ci_asan-main-noble-amd64 asan_ci __upcoming__ gz_plugin-ci_asan-main-noble-amd64 asan_ci __upcoming__ gz_rendering-ci_asan-main-noble-amd64 asan_ci __upcoming__ gz_sensors-ci_asan-main-noble-amd64 @@ -80,7 +81,7 @@ asan_ci ionic gz_gui-ci_asan-gz-gui9-noble-amd64 asan_ci ionic gz_launch-ci_asan-main-noble-amd64 asan_ci ionic gz_math-ci_asan-gz-math8-noble-amd64 asan_ci ionic gz_msgs-ci_asan-gz-msgs11-noble-amd64 -asan_ci ionic gz_physics-ci_asan-main-noble-amd64 +asan_ci ionic gz_physics-ci_asan-gz-physics8-noble-amd64 asan_ci ionic gz_plugin-ci_asan-gz-plugin3-noble-amd64 asan_ci ionic gz_rendering-ci_asan-gz-rendering9-noble-amd64 asan_ci ionic gz_sensors-ci_asan-gz-sensors9-noble-amd64 @@ -104,6 +105,9 @@ branch_ci __upcoming__ gz_math-main-win branch_ci __upcoming__ gz_msgs-ci-main-homebrew-amd64 branch_ci __upcoming__ gz_msgs-ci-main-noble-amd64 branch_ci __upcoming__ gz_msgs-main-win +branch_ci __upcoming__ gz_physics-ci-main-homebrew-amd64 +branch_ci __upcoming__ gz_physics-ci-main-noble-amd64 +branch_ci __upcoming__ gz_physics-main-win branch_ci __upcoming__ gz_plugin-ci-main-homebrew-amd64 branch_ci __upcoming__ gz_plugin-ci-main-noble-amd64 branch_ci __upcoming__ gz_plugin-main-win @@ -349,9 +353,9 @@ branch_ci ionic gz_math-ci-gz-math8-noble-amd64 branch_ci ionic gz_msgs-11-win branch_ci ionic gz_msgs-ci-gz-msgs11-homebrew-amd64 branch_ci ionic gz_msgs-ci-gz-msgs11-noble-amd64 -branch_ci ionic gz_physics-ci-main-homebrew-amd64 -branch_ci ionic gz_physics-ci-main-noble-amd64 -branch_ci ionic gz_physics-main-win +branch_ci ionic gz_physics-8-win +branch_ci ionic gz_physics-ci-gz-physics8-homebrew-amd64 +branch_ci ionic gz_physics-ci-gz-physics8-noble-amd64 branch_ci ionic gz_plugin-3-win branch_ci ionic gz_plugin-ci-gz-plugin3-homebrew-amd64 branch_ci ionic gz_plugin-ci-gz-plugin3-noble-amd64 @@ -386,6 +390,8 @@ install_ci __upcoming__ gz_math8-install-pkg-noble-amd64 install_ci __upcoming__ gz_math8-install_bottle-homebrew-amd64 install_ci __upcoming__ gz_msgs11-install-pkg-noble-amd64 install_ci __upcoming__ gz_msgs11-install_bottle-homebrew-amd64 +install_ci __upcoming__ gz_physics8-install-pkg-noble-amd64 +install_ci __upcoming__ gz_physics8-install_bottle-homebrew-amd64 install_ci __upcoming__ gz_plugin3-install-pkg-noble-amd64 install_ci __upcoming__ gz_plugin3-install_bottle-homebrew-amd64 install_ci __upcoming__ gz_rendering9-install-pkg-noble-amd64 From 27a0f8aff91159927fca86ecfb9106174890ba24 Mon Sep 17 00:00:00 2001 From: Ian Chen Date: Tue, 27 Aug 2024 17:22:21 -0700 Subject: [PATCH 24/37] Ionic CI: use stable branch for gz-common6 (#1179) Signed-off-by: Ian Chen Co-authored-by: iche033 --- jenkins-scripts/dsl/gz-collections.yaml | 6 +++++- jenkins-scripts/dsl/logs/generated_jobs.txt | 14 ++++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/jenkins-scripts/dsl/gz-collections.yaml b/jenkins-scripts/dsl/gz-collections.yaml index f8d82aef6..81e77d08a 100644 --- a/jenkins-scripts/dsl/gz-collections.yaml +++ b/jenkins-scripts/dsl/gz-collections.yaml @@ -379,7 +379,7 @@ collections: - name: gz-common major_version: 6 repo: - current_branch: main + current_branch: gz-common6 - name: gz-msgs major_version: 11 repo: @@ -449,6 +449,10 @@ collections: major_version: 4 repo: current_branch: main + - name: gz-common + major_version: 6 + repo: + current_branch: main - name: gz-fuel-tools major_version: 10 repo: diff --git a/jenkins-scripts/dsl/logs/generated_jobs.txt b/jenkins-scripts/dsl/logs/generated_jobs.txt index 0ca14789c..f3c64a6ac 100644 --- a/jenkins-scripts/dsl/logs/generated_jobs.txt +++ b/jenkins-scripts/dsl/logs/generated_jobs.txt @@ -1,4 +1,5 @@ asan_ci __upcoming__ gz_cmake-ci_asan-main-noble-amd64 +asan_ci __upcoming__ gz_common-ci_asan-main-noble-amd64 asan_ci __upcoming__ gz_fuel_tools-ci_asan-main-noble-amd64 asan_ci __upcoming__ gz_gui-ci_asan-main-noble-amd64 asan_ci __upcoming__ gz_math-ci_asan-main-noble-amd64 @@ -75,7 +76,7 @@ asan_ci harmonic gz_transport-ci_asan-gz-transport13-jammy-amd64 asan_ci harmonic gz_utils-ci_asan-gz-utils2-jammy-amd64 asan_ci harmonic sdformat-ci_asan-sdf14-jammy-amd64 asan_ci ionic gz_cmake-ci_asan-gz-cmake4-noble-amd64 -asan_ci ionic gz_common-ci_asan-main-noble-amd64 +asan_ci ionic gz_common-ci_asan-gz-common6-noble-amd64 asan_ci ionic gz_fuel_tools-ci_asan-gz-fuel-tools10-noble-amd64 asan_ci ionic gz_gui-ci_asan-gz-gui9-noble-amd64 asan_ci ionic gz_launch-ci_asan-main-noble-amd64 @@ -93,6 +94,9 @@ asan_ci ionic sdformat-ci_asan-sdf15-noble-amd64 branch_ci __upcoming__ gz_cmake-ci-main-homebrew-amd64 branch_ci __upcoming__ gz_cmake-ci-main-noble-amd64 branch_ci __upcoming__ gz_cmake-main-win +branch_ci __upcoming__ gz_common-ci-main-homebrew-amd64 +branch_ci __upcoming__ gz_common-ci-main-noble-amd64 +branch_ci __upcoming__ gz_common-main-win branch_ci __upcoming__ gz_fuel_tools-ci-main-homebrew-amd64 branch_ci __upcoming__ gz_fuel_tools-ci-main-noble-amd64 branch_ci __upcoming__ gz_fuel_tools-main-win @@ -335,9 +339,9 @@ branch_ci harmonic sdformat-sdf14-win branch_ci ionic gz_cmake-4-win branch_ci ionic gz_cmake-ci-gz-cmake4-homebrew-amd64 branch_ci ionic gz_cmake-ci-gz-cmake4-noble-amd64 -branch_ci ionic gz_common-ci-main-homebrew-amd64 -branch_ci ionic gz_common-ci-main-noble-amd64 -branch_ci ionic gz_common-main-win +branch_ci ionic gz_common-6-win +branch_ci ionic gz_common-ci-gz-common6-homebrew-amd64 +branch_ci ionic gz_common-ci-gz-common6-noble-amd64 branch_ci ionic gz_fuel_tools-10-win branch_ci ionic gz_fuel_tools-ci-gz-fuel-tools10-homebrew-amd64 branch_ci ionic gz_fuel_tools-ci-gz-fuel-tools10-noble-amd64 @@ -382,6 +386,8 @@ branch_ci ionic sdformat-ci-sdf15-noble-amd64 branch_ci ionic sdformat-sdf15-win install_ci __upcoming__ gz_cmake4-install-pkg-noble-amd64 install_ci __upcoming__ gz_cmake4-install_bottle-homebrew-amd64 +install_ci __upcoming__ gz_common6-install-pkg-noble-amd64 +install_ci __upcoming__ gz_common6-install_bottle-homebrew-amd64 install_ci __upcoming__ gz_fuel_tools10-install-pkg-noble-amd64 install_ci __upcoming__ gz_fuel_tools10-install_bottle-homebrew-amd64 install_ci __upcoming__ gz_gui9-install-pkg-noble-amd64 From 331932f6d52b84a10fce9714012edd6f106d20d1 Mon Sep 17 00:00:00 2001 From: Ian Chen Date: Wed, 28 Aug 2024 13:17:45 -0700 Subject: [PATCH 25/37] Ionic CI: use stable branch for gz-launch8 (#1180) Signed-off-by: Ian Chen Co-authored-by: iche033 --- jenkins-scripts/dsl/gz-collections.yaml | 6 +++++- jenkins-scripts/dsl/logs/generated_jobs.txt | 14 ++++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/jenkins-scripts/dsl/gz-collections.yaml b/jenkins-scripts/dsl/gz-collections.yaml index 81e77d08a..f1857aed3 100644 --- a/jenkins-scripts/dsl/gz-collections.yaml +++ b/jenkins-scripts/dsl/gz-collections.yaml @@ -419,7 +419,7 @@ collections: - name: gz-launch major_version: 8 repo: - current_branch: main + current_branch: gz-launch8 - name: gz-ionic major_version: 1 repo: @@ -461,6 +461,10 @@ collections: major_version: 9 repo: current_branch: main + - name: gz-launch + major_version: 8 + repo: + current_branch: main - name: gz-math major_version: 8 repo: diff --git a/jenkins-scripts/dsl/logs/generated_jobs.txt b/jenkins-scripts/dsl/logs/generated_jobs.txt index f3c64a6ac..281a5b607 100644 --- a/jenkins-scripts/dsl/logs/generated_jobs.txt +++ b/jenkins-scripts/dsl/logs/generated_jobs.txt @@ -2,6 +2,7 @@ asan_ci __upcoming__ gz_cmake-ci_asan-main-noble-amd64 asan_ci __upcoming__ gz_common-ci_asan-main-noble-amd64 asan_ci __upcoming__ gz_fuel_tools-ci_asan-main-noble-amd64 asan_ci __upcoming__ gz_gui-ci_asan-main-noble-amd64 +asan_ci __upcoming__ gz_launch-ci_asan-main-noble-amd64 asan_ci __upcoming__ gz_math-ci_asan-main-noble-amd64 asan_ci __upcoming__ gz_msgs-ci_asan-main-noble-amd64 asan_ci __upcoming__ gz_physics-ci_asan-main-noble-amd64 @@ -79,7 +80,7 @@ asan_ci ionic gz_cmake-ci_asan-gz-cmake4-noble-amd64 asan_ci ionic gz_common-ci_asan-gz-common6-noble-amd64 asan_ci ionic gz_fuel_tools-ci_asan-gz-fuel-tools10-noble-amd64 asan_ci ionic gz_gui-ci_asan-gz-gui9-noble-amd64 -asan_ci ionic gz_launch-ci_asan-main-noble-amd64 +asan_ci ionic gz_launch-ci_asan-gz-launch8-noble-amd64 asan_ci ionic gz_math-ci_asan-gz-math8-noble-amd64 asan_ci ionic gz_msgs-ci_asan-gz-msgs11-noble-amd64 asan_ci ionic gz_physics-ci_asan-gz-physics8-noble-amd64 @@ -103,6 +104,9 @@ branch_ci __upcoming__ gz_fuel_tools-main-win branch_ci __upcoming__ gz_gui-ci-main-homebrew-amd64 branch_ci __upcoming__ gz_gui-ci-main-noble-amd64 branch_ci __upcoming__ gz_gui-main-win +branch_ci __upcoming__ gz_launch-ci-main-homebrew-amd64 +branch_ci __upcoming__ gz_launch-ci-main-noble-amd64 +branch_ci __upcoming__ gz_launch-main-win branch_ci __upcoming__ gz_math-ci-main-homebrew-amd64 branch_ci __upcoming__ gz_math-ci-main-noble-amd64 branch_ci __upcoming__ gz_math-main-win @@ -348,9 +352,9 @@ branch_ci ionic gz_fuel_tools-ci-gz-fuel-tools10-noble-amd64 branch_ci ionic gz_gui-9-win branch_ci ionic gz_gui-ci-gz-gui9-homebrew-amd64 branch_ci ionic gz_gui-ci-gz-gui9-noble-amd64 -branch_ci ionic gz_launch-ci-main-homebrew-amd64 -branch_ci ionic gz_launch-ci-main-noble-amd64 -branch_ci ionic gz_launch-main-win +branch_ci ionic gz_launch-8-win +branch_ci ionic gz_launch-ci-gz-launch8-homebrew-amd64 +branch_ci ionic gz_launch-ci-gz-launch8-noble-amd64 branch_ci ionic gz_math-8-win branch_ci ionic gz_math-ci-gz-math8-homebrew-amd64 branch_ci ionic gz_math-ci-gz-math8-noble-amd64 @@ -392,6 +396,8 @@ install_ci __upcoming__ gz_fuel_tools10-install-pkg-noble-amd64 install_ci __upcoming__ gz_fuel_tools10-install_bottle-homebrew-amd64 install_ci __upcoming__ gz_gui9-install-pkg-noble-amd64 install_ci __upcoming__ gz_gui9-install_bottle-homebrew-amd64 +install_ci __upcoming__ gz_launch8-install-pkg-noble-amd64 +install_ci __upcoming__ gz_launch8-install_bottle-homebrew-amd64 install_ci __upcoming__ gz_math8-install-pkg-noble-amd64 install_ci __upcoming__ gz_math8-install_bottle-homebrew-amd64 install_ci __upcoming__ gz_msgs11-install-pkg-noble-amd64 From e1af3ea6d9a71d54c611c3e922a8ad98de6821c6 Mon Sep 17 00:00:00 2001 From: Ian Chen Date: Wed, 28 Aug 2024 22:59:36 -0700 Subject: [PATCH 26/37] Ionic CI: use stable branch for gz-sim9 (#1181) Signed-off-by: Ian Chen Co-authored-by: iche033 --- jenkins-scripts/dsl/gz-collections.yaml | 6 +++++- jenkins-scripts/dsl/logs/generated_jobs.txt | 14 ++++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/jenkins-scripts/dsl/gz-collections.yaml b/jenkins-scripts/dsl/gz-collections.yaml index f1857aed3..e1448e379 100644 --- a/jenkins-scripts/dsl/gz-collections.yaml +++ b/jenkins-scripts/dsl/gz-collections.yaml @@ -415,7 +415,7 @@ collections: - name: gz-sim major_version: 9 repo: - current_branch: main + current_branch: gz-sim9 - name: gz-launch major_version: 8 repo: @@ -489,6 +489,10 @@ collections: major_version: 9 repo: current_branch: main + - name: gz-sim + major_version: 9 + repo: + current_branch: main - name: gz-transport major_version: 14 repo: diff --git a/jenkins-scripts/dsl/logs/generated_jobs.txt b/jenkins-scripts/dsl/logs/generated_jobs.txt index 281a5b607..c15a66b28 100644 --- a/jenkins-scripts/dsl/logs/generated_jobs.txt +++ b/jenkins-scripts/dsl/logs/generated_jobs.txt @@ -9,6 +9,7 @@ asan_ci __upcoming__ gz_physics-ci_asan-main-noble-amd64 asan_ci __upcoming__ gz_plugin-ci_asan-main-noble-amd64 asan_ci __upcoming__ gz_rendering-ci_asan-main-noble-amd64 asan_ci __upcoming__ gz_sensors-ci_asan-main-noble-amd64 +asan_ci __upcoming__ gz_sim-ci_asan-main-noble-amd64 asan_ci __upcoming__ gz_tools-ci_asan-main-noble-amd64 asan_ci __upcoming__ gz_transport-ci_asan-main-noble-amd64 asan_ci __upcoming__ gz_utils-ci_asan-main-noble-amd64 @@ -87,7 +88,7 @@ asan_ci ionic gz_physics-ci_asan-gz-physics8-noble-amd64 asan_ci ionic gz_plugin-ci_asan-gz-plugin3-noble-amd64 asan_ci ionic gz_rendering-ci_asan-gz-rendering9-noble-amd64 asan_ci ionic gz_sensors-ci_asan-gz-sensors9-noble-amd64 -asan_ci ionic gz_sim-ci_asan-main-noble-amd64 +asan_ci ionic gz_sim-ci_asan-gz-sim9-noble-amd64 asan_ci ionic gz_tools-ci_asan-gz-tools2-noble-amd64 asan_ci ionic gz_transport-ci_asan-gz-transport14-noble-amd64 asan_ci ionic gz_utils-ci_asan-gz-utils3-noble-amd64 @@ -125,6 +126,9 @@ branch_ci __upcoming__ gz_rendering-main-win branch_ci __upcoming__ gz_sensors-ci-main-homebrew-amd64 branch_ci __upcoming__ gz_sensors-ci-main-noble-amd64 branch_ci __upcoming__ gz_sensors-main-win +branch_ci __upcoming__ gz_sim-ci-main-homebrew-amd64 +branch_ci __upcoming__ gz_sim-ci-main-noble-amd64 +branch_ci __upcoming__ gz_sim-main-win branch_ci __upcoming__ gz_tools-ci-main-homebrew-amd64 branch_ci __upcoming__ gz_tools-ci-main-noble-amd64 branch_ci __upcoming__ gz_tools-main-win @@ -373,9 +377,9 @@ branch_ci ionic gz_rendering-ci-gz-rendering9-noble-amd64 branch_ci ionic gz_sensors-9-win branch_ci ionic gz_sensors-ci-gz-sensors9-homebrew-amd64 branch_ci ionic gz_sensors-ci-gz-sensors9-noble-amd64 -branch_ci ionic gz_sim-ci-main-homebrew-amd64 -branch_ci ionic gz_sim-ci-main-noble-amd64 -branch_ci ionic gz_sim-main-win +branch_ci ionic gz_sim-9-win +branch_ci ionic gz_sim-ci-gz-sim9-homebrew-amd64 +branch_ci ionic gz_sim-ci-gz-sim9-noble-amd64 branch_ci ionic gz_tools-2-win branch_ci ionic gz_tools-ci-gz-tools2-homebrew-amd64 branch_ci ionic gz_tools-ci-gz-tools2-noble-amd64 @@ -410,6 +414,8 @@ install_ci __upcoming__ gz_rendering9-install-pkg-noble-amd64 install_ci __upcoming__ gz_rendering9-install_bottle-homebrew-amd64 install_ci __upcoming__ gz_sensors9-install-pkg-noble-amd64 install_ci __upcoming__ gz_sensors9-install_bottle-homebrew-amd64 +install_ci __upcoming__ gz_sim9-install-pkg-noble-amd64 +install_ci __upcoming__ gz_sim9-install_bottle-homebrew-amd64 install_ci __upcoming__ gz_tools3-install-pkg-noble-amd64 install_ci __upcoming__ gz_tools3-install_bottle-homebrew-amd64 install_ci __upcoming__ gz_transport14-install-pkg-noble-amd64 From c7fb68119d785bfb4d3e8f88c778cfb406390acf Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Fri, 30 Aug 2024 23:32:51 +0200 Subject: [PATCH 27/37] Workaround to exclude false positives in GCC warning plugin (#1182) Signed-off-by: Jose Luis Rivero --- jenkins-scripts/dsl/_configs_/OSRFLinuxCompilation.groovy | 1 + 1 file changed, 1 insertion(+) diff --git a/jenkins-scripts/dsl/_configs_/OSRFLinuxCompilation.groovy b/jenkins-scripts/dsl/_configs_/OSRFLinuxCompilation.groovy index 07fc5c23f..9461b4f68 100644 --- a/jenkins-scripts/dsl/_configs_/OSRFLinuxCompilation.groovy +++ b/jenkins-scripts/dsl/_configs_/OSRFLinuxCompilation.groovy @@ -80,6 +80,7 @@ class OSRFLinuxCompilation extends OSRFLinuxBase filters { 'io.jenkins.plugins.analysis.core.filter.ExcludeFile' { pattern('.*ALSA lib.*') + pattern('\\d+: \\(') } } isEnabledForFailure(false) From 2771a0ef234cefbb0f40a2430386a54e60969341 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Fri, 6 Sep 2024 19:35:56 +0200 Subject: [PATCH 28/37] Add the /bin/bash shebang to build.sh (#1177) Signed-off-by: Jose Luis Rivero --- jenkins-scripts/docker/lib/docker_generate_dockerfile.bash | 1 + 1 file changed, 1 insertion(+) diff --git a/jenkins-scripts/docker/lib/docker_generate_dockerfile.bash b/jenkins-scripts/docker/lib/docker_generate_dockerfile.bash index fc3e7c9eb..873f15369 100644 --- a/jenkins-scripts/docker/lib/docker_generate_dockerfile.bash +++ b/jenkins-scripts/docker/lib/docker_generate_dockerfile.bash @@ -145,6 +145,7 @@ fi echo '# BEGIN SECTION: create the Dockerfile' cat > Dockerfile << DELIM_DOCKER +#!/bin/bash ####################################################### # Docker file to run build.sh From 742720225e3fed2b53dbe0ffd701adf5157c108e Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Mon, 23 Sep 2024 02:44:31 -0700 Subject: [PATCH 29/37] brew supported distros: replace monterey with sonoma (#1183) * brew supported distro list: remove monterey Signed-off-by: Steve Peters * brew_release.dsl: add sonoma Signed-off-by: Steve Peters --------- Signed-off-by: Steve Peters --- jenkins-scripts/dsl/brew_release.dsl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins-scripts/dsl/brew_release.dsl b/jenkins-scripts/dsl/brew_release.dsl index ef69682b5..938959645 100644 --- a/jenkins-scripts/dsl/brew_release.dsl +++ b/jenkins-scripts/dsl/brew_release.dsl @@ -4,7 +4,7 @@ import javaposse.jobdsl.dsl.Job Globals.default_emails = "jrivero@osrfoundation.org, scpeters@osrfoundation.org" // first distro in list is used as touchstone -brew_supported_distros = [ "monterey", "ventura" ] +brew_supported_distros = [ "ventura", "sonoma" ] bottle_hash_updater_job_name = 'generic-release-homebrew_pr_bottle_hash_updater' bottle_builder_job_name = 'generic-release-homebrew_triggered_bottle_builder' directory_for_bottles = 'pkgs' From 606af288c19c3adc29bc187a3cfd3f7723626770 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Tue, 1 Oct 2024 11:14:38 +0200 Subject: [PATCH 30/37] Add support to create PR against ROS gz_*_vendor repositories in release.py (#1151) Details in https://github.com/gazebo-tooling/release-tools/pull/1151 --------- Signed-off-by: Jose Luis Rivero Signed-off-by: Addisu Z. Taddese Co-authored-by: Addisu Z. Taddese --- check_releasepy.bash | 68 ++++++++++++++-- release.py | 180 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 239 insertions(+), 9 deletions(-) diff --git a/check_releasepy.bash b/check_releasepy.bash index 921153017..9d5c100c4 100755 --- a/check_releasepy.bash +++ b/check_releasepy.bash @@ -1,9 +1,22 @@ #!/bin/bash -e -test_dir=$(mktemp -d) -mkdir -p ${test_dir}/{focal,jammy,ubuntu}/debian -export _RELEASEPY_TEST_RELEASE_REPO=${test_dir} export _RELEASEPY_DEBUG=1 +test_dir=$(mktemp -d) +export _RELEASEPY_TEST_RELEASE_REPO="${test_dir}/test-release" +mkdir -p ${_RELEASEPY_TEST_RELEASE_REPO}/{focal,jammy,ubuntu}/debian +export _RELEASEPY_TEST_SOURCE_REPO="${test_dir}/src" +mkdir -p ${_RELEASEPY_TEST_SOURCE_REPO} +# Fake packages.xml to make the vendor package script happy +cat > "${_RELEASEPY_TEST_SOURCE_REPO}/package.xml" <<-EOF + + + gz-foo + 0.0.0 + test + Testing maintainer + Foo License + +EOF exec_releasepy_test() { @@ -12,7 +25,7 @@ exec_releasepy_test() ./release.py \ --dry-run \ --no-sanity-checks \ - gz-foo 1.2.3 token ${test_params}"" + gz-foo 1.2.3 token ${test_params} } exec_ignition_releasepy_test() @@ -22,7 +35,7 @@ exec_ignition_releasepy_test() ./release.py \ --dry-run \ --no-sanity-checks \ - ign-foo 1.2.3 token ${test_params}"" + ign-foo 1.2.3 token ${test_params} } exec_ignition_gazebo_releasepy_test() @@ -32,7 +45,18 @@ exec_ignition_gazebo_releasepy_test() ./release.py \ --dry-run \ --no-sanity-checks \ - ign-gazebo 1.2.3 token ${test_params}"" + ign-gazebo 1.2.3 token ${test_params} +} + +exec_releasepy_with_real_gz() +{ + gz_pkg=${1} major_version=${2} + ./release.py \ + --dry-run \ + --no-sanity-checks \ + --source-repo-uri http://github.com/gazebosim/gz-common \ + --source-repo-existing-ref http://github.com/gazebosim/gz-common/foo-tag \ + "${gz_pkg}" "${major_version}.x.y" token } expect_job_run() @@ -73,7 +97,26 @@ expect_param() echo "${param} not found in test output" exit 1 fi +} + +expect_vendor_repo() +{ + output="${1}" repo="${2}" + + if ! grep -q "Github ${repo}" <<< "${output}"; then + echo "${repo} not found in test output" + exit 1 + fi +} + +expect_no_vendor() +{ + output="${1}" + if grep -q 'in ROS 2' <<< "${output}"; then + echo "ROS 2 string found in output" + exit 1 + fi } source_repo_uri_test=$(exec_releasepy_test "--source-repo-uri https://github.com/gazebosim/gz-foo.git") @@ -81,6 +124,7 @@ expect_job_run "${source_repo_uri_test}" "gz-foo-source" expect_job_not_run "${source_repo_uri_test}" "gz-foo-debbuilder" expect_number_of_jobs "${source_repo_uri_test}" "1" expect_param "${source_repo_uri_test}" "SOURCE_REPO_URI=https%3A%2F%2Fgithub.com%2Fgazebosim%2Fgz-foo.git" +expect_no_vendor "${source_repo_uri_test}" # non existing package source_tarball_uri_test=$(exec_releasepy_test "--source-tarball-uri https://gazebosim/gz-foo-1.2.3.tar.gz") expect_job_run "${source_tarball_uri_test}" "gz-foo-debbuilder" @@ -88,6 +132,7 @@ expect_job_run "${source_tarball_uri_test}" "generic-release-homebrew_pull_reque expect_job_not_run "${source_tarball_uri_test}" "gz-foo-source" expect_number_of_jobs "${source_tarball_uri_test}" "7" expect_param "${source_tarball_uri_test}" "SOURCE_TARBALL_URI=https%3A%2F%2Fgazebosim%2Fgz-foo-1.2.3.tar.gz" +expect_no_vendor "${source_tarball_uri_test}" nightly_test=$(exec_releasepy_test "--nightly-src-branch my-nightly-branch3 --upload-to-repo nightly") expect_job_run "${nightly_test}" "gz-foo-debbuilder" @@ -95,6 +140,7 @@ expect_job_not_run "${nightly_test}" "generic-release-homebrew_pull_request_upda expect_job_not_run "${nightly_test}" "gz-foo-source" expect_number_of_jobs "${nightly_test}" "2" expect_param "${nightly_test}" "SOURCE_TARBALL_URI=my-nightly-branch3" +expect_no_vendor "${nightly_test}" bump_linux_test=$(exec_releasepy_test "--source-tarball-uri https://gazebosim/gz-foo-1.2.3.tar.gz --only-bump-revision-linux -r 2") expect_job_run "${bump_linux_test}" "gz-foo-debbuilder" @@ -102,6 +148,7 @@ expect_job_not_run "${bump_linux_test}" "generic-release-homebrew_pull_request_u expect_job_not_run "${bump_linux_test}" "gz-foo-source" expect_number_of_jobs "${bump_linux_test}" "6" expect_param "${bump_linux_test}" "RELEASE_VERSION=2" +expect_no_vendor "${bump_linux_test}" ignition_test=$(exec_ignition_releasepy_test "--source-repo-uri https://github.com/gazebosim/gz-foo.git") expect_job_run "${ignition_test}" "gz-foo-source" @@ -128,3 +175,12 @@ expect_number_of_jobs "${ign_gazebo_source_tarball_uri_test}" "7" expect_param "${ign_gazebo_source_tarball_uri_test}" "SOURCE_TARBALL_URI=https%3A%2F%2Fgazebosim%2Fign-gazebo-1.2.3.tar.gz" expect_param "${ign_gazebo_source_tarball_uri_test}" "PACKAGE=ign-gazebo" expect_param "${ign_gazebo_source_tarball_uri_test}" "PACKAGE_ALIAS=ignition-gazebo" + +ros_vendor_test=$(exec_releasepy_with_real_gz gz-fuel-tools 9) +expect_vendor_repo "${ros_vendor_test}" gazebo-release/gz_fuel_tools_vendor + +ros_vendor_test=$(exec_releasepy_with_real_gz gz-cmake 2) +expect_no_vendor "${ros_vendor_test}" + +ros_vendor_test=$(exec_releasepy_with_real_gz gz-ionic 3) +expect_no_vendor "${ros_vendor_test}" diff --git a/release.py b/release.py index 265796308..262851709 100755 --- a/release.py +++ b/release.py @@ -2,6 +2,7 @@ from __future__ import print_function from argparse import RawTextHelpFormatter +from typing import Tuple import subprocess import sys import tempfile @@ -10,6 +11,7 @@ import urllib.request import argparse import shutil +import venv USAGE = 'release.py ' try: @@ -22,6 +24,7 @@ LINUX_DISTROS = ['ubuntu', 'debian'] SUPPORTED_ARCHS = ['amd64', 'armhf', 'arm64'] RELEASEPY_NO_ARCH_PREFIX = '.releasepy_NO_ARCH_' +ROS_VENDOR = {'harmonic': 'jazzy', 'ionic': 'rolling'} OSRF_REPOS_SUPPORTED = "stable prerelease nightly testing none" @@ -48,6 +51,10 @@ class ErrorNoOutput(Exception): pass +class ErrorAlreadyExists(Exception): + pass + + def error(msg): print("\n !! " + msg + "\n") sys.exit(1) @@ -151,6 +158,9 @@ def parse_args(argv): parser.add_argument('--only-bump-revision-linux', dest='bump_rev_linux_only', action='store_true', default=False, help='Bump only revision number. Do not upload new tarball.') + parser.add_argument('--only-bump-ros-vendor-package', dest='bump_ros_vendor_only', + action='store_true', default=False, + help='Only process the ROS vendor package (if any).') args = parser.parse_args() @@ -375,13 +385,13 @@ def discover_distros(repo_dir): return distro_arch_list -def check_call(cmd, ignore_dry_run=False): +def check_call(cmd, ignore_dry_run=False, cwd=None): if DRY_RUN and not ignore_dry_run: print_only_dbg('Dry-run running:\n %s\n' % (' '.join(cmd))) return b'', b'' else: print_only_dbg('Running:\n %s' % (' '.join(cmd))) - po = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + po = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, cwd=cwd) out, err = po.communicate() if po.returncode != 0: # bitbucket for the first one, github for the second @@ -391,6 +401,8 @@ def check_call(cmd, ignore_dry_run=False): raise ErrorNoPermsRepo() if b"abort: no username supplied" in err: raise ErrorNoUsernameSupplied() + if b"already exists:" in err: + raise ErrorAlreadyExists() if not out and not err: # assume that call is only for getting return code raise ErrorNoOutput() @@ -515,9 +527,170 @@ def display_help_job_chain_for_source_calls(args): f'{releasepy_check_url}') +def get_collections_for_package(package_name, version) -> list: + script_directory = os.path.dirname(os.path.abspath(sys.argv[0])) + helper_script = f'{script_directory}/jenkins-scripts/dsl/tools/get_collections_from_package_and_version.py' + collection_yaml = f'{script_directory}/jenkins-scripts/dsl/gz-collections.yaml' + cmd = [helper_script, + get_canonical_package_name(package_name), + version, + collection_yaml] + try: + _out, _err = check_call(cmd, IGNORE_DRY_RUN) + except ErrorNoOutput: + # no output is a valid result + _out = b"" + _err = "" + else: + if _err: + print(f"An error happened running get_collections_from_package_and_version: {_err}") + sys.exit(1) + + collection_list = _out.decode().strip().split(' ') + return collection_list + + +def get_vendor_github_repo(package_name) -> str: + canonical_name = get_canonical_package_name(package_name) + return f"gazebo-release/{canonical_name.replace('-', '_')}_vendor" + + +def get_vendor_repo_url(package_name) -> str: + # Clone needs ssh for real pushing operations. In simulation prefer https to avoid + # unexpected pushes and facilitate testing + protocol = 'https://github.com/' if DRY_RUN else 'ssh://git@github.com:' + return f"{protocol}{get_vendor_github_repo(package_name)}" + + +def prepare_vendor_pr_temp_workspace(package_name, ws_dir) -> Tuple[str, str, str]: + gz_vendor_tool = os.path.join(ws_dir, "gz_vendor") + # Create virtualenv for vendor dependencies + venv_dir = os.path.join(ws_dir, "venv") + venv.create(venv_dir, system_site_packages=True, with_pip=True) + subprocess.run([os.path.join(venv_dir, 'bin', 'pip3'), 'install', '-q', + 'jinja2==3.1.2', + 'catkin_pkg==1.0.0']) + cmd = ['git', 'clone', '-q', + 'https://github.com/gazebo-tooling/gz_vendor/', + gz_vendor_tool] + _, _err_tool = check_call(cmd, IGNORE_DRY_RUN) + gz_vendor_repo = os.path.join(ws_dir, 'gz_vendor_repo') + cmd = ['git', 'clone', '-q', + get_vendor_repo_url(package_name), + gz_vendor_repo] + _, _err_repo = check_call(cmd, IGNORE_DRY_RUN) + if _err_tool or _err_repo: + print("Problems with cloning vendor and tool repos:") + print(f"{_err_tool} {_err_repo}") + sys.exit(1) + + return gz_vendor_tool, gz_vendor_repo, venv_dir + + +def execute_update_vendor_package_tool(vendor_tool_path, + vendor_repo_path, + vendor_venv) -> None: + # The source repository when releasing matches the + src_repo = os.getcwd() + try: + src_repo = os.environ['_RELEASEPY_TEST_SOURCE_REPO'] + except KeyError: + pass + + run_cmd = [os.path.join(vendor_venv, 'bin', 'python3'), + f"{vendor_tool_path}/create_gz_vendor_pkg/create_vendor_package.py", + f"{os.path.join(src_repo, 'package.xml')}", + '--output_dir', vendor_repo_path] + _, _err_run = check_call(run_cmd, IGNORE_DRY_RUN) + if _err_run: + print("Problems running the create_vendor_package.py script:") + print(_err_run.decode()) + sys.exit(1) + + +def create_pr_for_vendor_package(args, repo_path, base_branch) -> str: + cmd_diff = ['git', "-C", repo_path, 'diff'] + _out, _ = check_call(cmd_diff, IGNORE_DRY_RUN) + if not _out.decode(): + return 'vendor tool did not produce any change, avoid the PR' + + branch_name = f'releasepy/{args.version}' + vendor_repo = get_vendor_repo_url(args.package) + branch_cmd = ['git', "-C", repo_path, + 'checkout', '-b', branch_name] + _, _ = check_call(branch_cmd, IGNORE_DRY_RUN) + commit_cmd = ['git', "-C", repo_path, + 'commit', + '-m', f'Bump version to {args.version}', + '--all'] + _, _ = check_call(commit_cmd) + push_cmd = ['git', "-C", repo_path, + 'push', '--force', + vendor_repo, branch_name] + _, _ = check_call(push_cmd) + pr_cmd = ['gh', 'pr', 'create', + '--base', base_branch, + '--head', branch_name, + '--title', f'Bump version to {args.version}', + '--body', 'PR automatically created by release.py'] + try: + _out, _err = check_call(pr_cmd, cwd=repo_path) + except ErrorAlreadyExists: + return f'there is already a PR for the branch: {branch_name} .'\ + 'Please check it out manuallly.' + + if _err: + print("Problems creating the PR for the vendor package:") + print(_err.decode()) + sys.exit(1) + + if DRY_RUN: + return ' (skipped the creation on --dry-run)' + + return _out.decode() + + +def create_pr_in_gz_vendor_repo(args, ros_distro) -> str: + pr_msg = '' + with tempfile.TemporaryDirectory() as ws_dir: + ws_dir = tempfile.mkdtemp() + # Prepare the temporary workspace + vendor_tool_path, vendor_repo_path, venv_dir = \ + prepare_vendor_pr_temp_workspace(args.package, ws_dir) + # Run updating script on the temporary workspace + execute_update_vendor_package_tool( + vendor_tool_path, vendor_repo_path, venv_dir) + # Commits and PR creation + pr_msg = create_pr_for_vendor_package( + args, vendor_repo_path, ros_distro) + + return pr_msg + + +def process_ros_vendor_package(args): + print("ROS vendor packages that can be updated:") + if args.package.replace('gz-','') in ROS_VENDOR: + print(" - There are no gz metapackages in ROS") + return + for collection in get_collections_for_package(args.package, + args.version): + if collection in ROS_VENDOR: + ros_distro = ROS_VENDOR[collection] + print(f" * Github {get_vendor_github_repo(args.package)} " + f"part of {collection} in ROS 2 {ros_distro}") + print(" + Preparing a PR: ", end='', flush=True) + pr_url = create_pr_in_gz_vendor_repo(args, ros_distro) + print(pr_url) + + def go(argv): args = parse_args(argv) + # If only the process of ROS vendor package is set, just do it + if args.bump_ros_vendor_only: + process_ros_vendor_package(args) + sys.exit(0) + # Default to release 1 if not present if not args.release_version: args.release_version = 1 @@ -640,7 +813,8 @@ def go(argv): 'Source', args.version) display_help_job_chain_for_source_calls(args) - + # Process the possible update of an associated ROS vendor package + process_ros_vendor_package(args) if __name__ == '__main__': go(sys.argv) From 6826bdd305b1a9b9a15368e213405fa34b6de2ab Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Wed, 9 Oct 2024 15:22:39 +0200 Subject: [PATCH 31/37] Add a check to avoid infinite number of builds archived by a job (#1187) * Add a check to avoid infinite number of builds archived by a job * Restrict the builds to keep to 75 in infinite configurations --------- Signed-off-by: Jose Luis Rivero --- .../dsl/_configs_/OSRFLinuxBackportPkg.groovy | 1 + jenkins-scripts/dsl/brew_release.dsl | 1 + jenkins-scripts/dsl/debian.dsl | 1 + jenkins-scripts/dsl/dsl_checks.bash | 9 +++++++-- jenkins-scripts/dsl/extra.dsl | 1 + 5 files changed, 11 insertions(+), 2 deletions(-) diff --git a/jenkins-scripts/dsl/_configs_/OSRFLinuxBackportPkg.groovy b/jenkins-scripts/dsl/_configs_/OSRFLinuxBackportPkg.groovy index a49e44f67..077e57e56 100644 --- a/jenkins-scripts/dsl/_configs_/OSRFLinuxBackportPkg.groovy +++ b/jenkins-scripts/dsl/_configs_/OSRFLinuxBackportPkg.groovy @@ -40,6 +40,7 @@ class OSRFLinuxBackportPkg logRotator { artifactNumToKeep(20) + numToKeep(75) } parameters { diff --git a/jenkins-scripts/dsl/brew_release.dsl b/jenkins-scripts/dsl/brew_release.dsl index 938959645..704c28e08 100644 --- a/jenkins-scripts/dsl/brew_release.dsl +++ b/jenkins-scripts/dsl/brew_release.dsl @@ -145,6 +145,7 @@ bottle_job_builder.with logRotator { artifactNumToKeep(10) + numToKeep(75) } axes { diff --git a/jenkins-scripts/dsl/debian.dsl b/jenkins-scripts/dsl/debian.dsl index bd87834ab..55160bf25 100644 --- a/jenkins-scripts/dsl/debian.dsl +++ b/jenkins-scripts/dsl/debian.dsl @@ -105,6 +105,7 @@ ratt_pkg_job.with logRotator { artifactNumToKeep(10) + numToKeep(75) } concurrentBuild(true) diff --git a/jenkins-scripts/dsl/dsl_checks.bash b/jenkins-scripts/dsl/dsl_checks.bash index 876750389..6f6932610 100755 --- a/jenkins-scripts/dsl/dsl_checks.bash +++ b/jenkins-scripts/dsl/dsl_checks.bash @@ -63,8 +63,6 @@ if [[ -n ${empty_branches_on_github_triggered} ]]; then exit 1 fi -# re-enable after https://github.com/gazebo-tooling/release-tools/issues/1095 - # Filter out the previous auto jobs filtered_dir=$(mktemp -d) cp -- *-abichecker-*.xml "${filtered_dir}" @@ -76,3 +74,10 @@ if [[ -n ${repeated} ]]; then echo "please exclude one of the versions in the yaml file to reduce the server workload" exit 1 fi + +avoid_infinite_build_archive=$(grep '-1' -- *.xml || true) +if [[ -n ${avoid_infinite_build_archive} ]]; then + echo "Found a job setup to keep infinite number of builds. This is BAD" + echo "${avoid_infinite_build_archive}" + exit 1 +fi diff --git a/jenkins-scripts/dsl/extra.dsl b/jenkins-scripts/dsl/extra.dsl index 59d6feeeb..3731dea48 100644 --- a/jenkins-scripts/dsl/extra.dsl +++ b/jenkins-scripts/dsl/extra.dsl @@ -79,6 +79,7 @@ gbp_repo_debbuilds.each { software -> logRotator { artifactNumToKeep(10) + numToKeep(75) } concurrentBuild(true) From 8483b5c73e47aa1e098f7dbbee29a7b3fc0ae3b8 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Mon, 14 Oct 2024 16:14:52 +0200 Subject: [PATCH 32/37] Fix release.py ssh clone URL for vendor packages (#1189) --- release.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release.py b/release.py index 262851709..111d147f0 100755 --- a/release.py +++ b/release.py @@ -558,8 +558,8 @@ def get_vendor_github_repo(package_name) -> str: def get_vendor_repo_url(package_name) -> str: # Clone needs ssh for real pushing operations. In simulation prefer https to avoid # unexpected pushes and facilitate testing - protocol = 'https://github.com/' if DRY_RUN else 'ssh://git@github.com:' - return f"{protocol}{get_vendor_github_repo(package_name)}" + protocol = 'https://github.com' if DRY_RUN else 'ssh://git@github.com' + return f"{protocol}/{get_vendor_github_repo(package_name)}" def prepare_vendor_pr_temp_workspace(package_name, ws_dir) -> Tuple[str, str, str]: From 389a7d6924b42e2ac09e744b389ce3325c7ea5d2 Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Tue, 29 Oct 2024 12:47:18 -0700 Subject: [PATCH 33/37] Replace /usr/local with HOMEBREW_PREFIX (#1190) One of our brew build scripts has a HOMEBREW_PREFIX variable, but it also has many paths hard-coded to /usr/local. In preparation for supporting arm-based CI machines that use brew from /opt/homebrew, use the HOMEBREW_PREFIX variable more widely. Signed-off-by: Steve Peters --- .../project-default-devel-homebrew-amd64.bash | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/jenkins-scripts/lib/project-default-devel-homebrew-amd64.bash b/jenkins-scripts/lib/project-default-devel-homebrew-amd64.bash index 91817a4d2..0b86233bd 100644 --- a/jenkins-scripts/lib/project-default-devel-homebrew-amd64.bash +++ b/jenkins-scripts/lib/project-default-devel-homebrew-amd64.bash @@ -24,7 +24,7 @@ export HOMEBREW_PREFIX=/usr/local export HOMEBREW_CELLAR=${HOMEBREW_PREFIX}/Cellar export PATH=${HOMEBREW_PREFIX}/bin:${HOMEBREW_PREFIX}/sbin:$PATH -export PYTHONPATH=$PYTHONPATH:/usr/local/lib/python +export PYTHONPATH=$PYTHONPATH:${HOMEBREW_PREFIX}/lib/python # make verbose mode? MAKE_VERBOSE_STR="" @@ -90,7 +90,7 @@ if [[ -n "${PIP_PACKAGES_NEEDED}" ]]; then brew install python3 PIP=pip3 if ! which ${PIP}; then - PIP=/usr/local/opt/python/bin/pip3 + PIP=${HOMEBREW_PREFIX}/opt/python/bin/pip3 fi # TODO use a python3 venv instead. ${PIP} install --break-system-packages ${PIP_PACKAGES_NEEDED} @@ -98,7 +98,7 @@ fi if [[ -z "${DISABLE_CCACHE}" ]]; then brew install ccache - export PATH=/usr/local/opt/ccache/libexec:$PATH + export PATH=${HOMEBREW_PREFIX}/opt/ccache/libexec:$PATH fi echo '# END SECTION' @@ -123,33 +123,33 @@ export DISPLAY=$(ps ax \ CMAKE_ARGS="" # set CMAKE_PREFIX_PATH if we are using qt@5 if brew ruby -e "exit ! '${PROJECT_FORMULA}'.f.recursive_dependencies.map(&:name).keep_if { |d| d == 'qt@5' }.empty?"; then - export CMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}:/usr/local/opt/qt@5 + export CMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}:${HOMEBREW_PREFIX}/opt/qt@5 fi # set cmake args if we are using qwt-qt5 if brew ruby -e "exit ! '${PROJECT_FORMULA}'.f.recursive_dependencies.map(&:name).keep_if { |d| d == 'qwt-qt5' }.empty?"; then - CMAKE_ARGS="${CMAKE_ARGS} -DQWT_WIN_INCLUDE_DIR=/usr/local/opt/qwt-qt5/lib/qwt.framework/Headers -DQWT_WIN_LIBRARY_DIR=/usr/local/opt/qwt-qt5/lib" + CMAKE_ARGS="${CMAKE_ARGS} -DQWT_WIN_INCLUDE_DIR=${HOMEBREW_PREFIX}/opt/qwt-qt5/lib/qwt.framework/Headers -DQWT_WIN_LIBRARY_DIR=${HOMEBREW_PREFIX}/opt/qwt-qt5/lib" fi # Workaround for cmake@3.21.4: set PATH if brew ruby -e "exit ! '${PROJECT_FORMULA}'.f.recursive_dependencies.map(&:name).keep_if { |d| d == 'osrf/simulation/cmake@3.21.4' }.empty?"; then - export PATH=/usr/local/opt/cmake@3.21.4/bin:${PATH} + export PATH=${HOMEBREW_PREFIX}/opt/cmake@3.21.4/bin:${PATH} fi # Workaround for ffmpeg 4: set PKG_CONFIG_PATH if we are using ffmpeg@4 if brew ruby -e "exit ! '${PROJECT_FORMULA}'.f.recursive_dependencies.map(&:name).keep_if { |d| d == 'osrf/simulation/ffmpeg@4' }.empty?"; then - export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:/usr/local/opt/ffmpeg@4/lib/pkgconfig + export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${HOMEBREW_PREFIX}/opt/ffmpeg@4/lib/pkgconfig fi # Workaround for tbb@2020_u3: set CPATH, LIBRARY_PATH, and CMAKE_PREFIX_PATH if brew ruby -e "exit ! '${PROJECT_FORMULA}'.f.recursive_dependencies.map(&:name).keep_if { |d| d == 'osrf/simulation/tbb@2020_u3' }.empty?"; then - export CMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}:/usr/local/opt/tbb@2020_u3 - export CPATH=${CPATH}:/usr/local/opt/tbb@2020_u3/include - export LIBRARY_PATH=${LIBRARY_PATH}:/usr/local/opt/tbb@2020_u3/lib + export CMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}:${HOMEBREW_PREFIX}/opt/tbb@2020_u3 + export CPATH=${CPATH}:${HOMEBREW_PREFIX}/opt/tbb@2020_u3/include + export LIBRARY_PATH=${LIBRARY_PATH}:${HOMEBREW_PREFIX}/opt/tbb@2020_u3/lib fi # if we are using gts, need to add gettext library path since it is keg-only if brew ruby -e "exit ! '${PROJECT_FORMULA}'.f.recursive_dependencies.map(&:name).keep_if { |d| d == 'gettext' }.empty?"; then - export LIBRARY_PATH=${LIBRARY_PATH}:/usr/local/opt/gettext/lib + export LIBRARY_PATH=${LIBRARY_PATH}:${HOMEBREW_PREFIX}/opt/gettext/lib fi # if we are using boost, need to add icu4c library path since it is keg-only if brew ruby -e "exit ! '${PROJECT_FORMULA}'.f.recursive_dependencies.map(&:name).keep_if { |d| d == 'icu4c' }.empty?"; then - export LIBRARY_PATH=${LIBRARY_PATH}:/usr/local/opt/icu4c/lib + export LIBRARY_PATH=${LIBRARY_PATH}:${HOMEBREW_PREFIX}/opt/icu4c/lib fi # set Python3_EXECUTABLE if this homebrew formula defines the python_cmake_arg method if brew ruby -e "exit '${PROJECT_FORMULA}'.f.respond_to?(:python_cmake_arg)"; then @@ -158,13 +158,13 @@ fi # if we are using dart@6.10.0 (custom OR port), need to add dartsim library path since it is keg-only if brew ruby -e "exit ! '${PROJECT_FORMULA}'.f.recursive_dependencies.map(&:name).keep_if { |d| d == 'osrf/simulation/dartsim@6.10.0' }.empty?"; then - export CMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}:/usr/local/opt/dartsim@6.10.0 - export DYLD_FALLBACK_LIBRARY_PATH=${DYLD_FALLBACK_LIBRARY_PATH}:/usr/local/opt/dartsim@6.10.0/lib:/usr/local/opt/octomap/local - export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:/usr/local/opt/dartsim@6.10.0/lib/pkgconfig + export CMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}:${HOMEBREW_PREFIX}/opt/dartsim@6.10.0 + export DYLD_FALLBACK_LIBRARY_PATH=${DYLD_FALLBACK_LIBRARY_PATH}:${HOMEBREW_PREFIX}/opt/dartsim@6.10.0/lib:${HOMEBREW_PREFIX}/opt/octomap/local + export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${HOMEBREW_PREFIX}/opt/dartsim@6.10.0/lib/pkgconfig fi cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DCMAKE_INSTALL_PREFIX=/usr/local/Cellar/${PROJECT_FORMULA}/HEAD \ + -DCMAKE_INSTALL_PREFIX=${HOMEBREW_PREFIX}/Cellar/${PROJECT_FORMULA}/HEAD \ ${CMAKE_ARGS} \ ${WORKSPACE}/${PROJECT_PATH} echo '# END SECTION' From 3cce6a8fa7fbaa7df18aeb2dc2260a9882b76e10 Mon Sep 17 00:00:00 2001 From: "Addisu Z. Taddese" Date: Thu, 31 Oct 2024 07:09:39 -0500 Subject: [PATCH 34/37] Rename new_ignition_release_repos script and update README (#1185) Signed-off-by: Addisu Z. Taddese --- release-repo-scripts/README.md | 28 ++++++++++--------- ...pos.bash => new_gazebo_release_repos.bash} | 4 +-- 2 files changed, 17 insertions(+), 15 deletions(-) rename release-repo-scripts/{new_ignition_release_repos.bash => new_gazebo_release_repos.bash} (96%) diff --git a/release-repo-scripts/README.md b/release-repo-scripts/README.md index f88766910..e68a3b83b 100644 --- a/release-repo-scripts/README.md +++ b/release-repo-scripts/README.md @@ -13,8 +13,9 @@ The script will bump the major version of a library for the packaging files inside a -release repository. Mostly designed to be run when a new -release repository is forked for a new major release. -*Note: this script is being used from new_ignition_release_repos script in this -repository which also creates new repositories.* +*Note: this script is being used from new_gazebo_release_repos script in +this repository which also creates new repositories. You'll probably want +to use that instead since it automates the forking and cloning process.* #### Usage @@ -34,12 +35,12 @@ than any other expected in the repository. #### Example -To bump `ign-rendering6` and create a new `ign-rendering7` release repositories, -first fork the `ign-rendering6` in GitHub. +To bump `gz-rendering6` and create a new `gz-rendering7` release repositories, +first fork the `gz-rendering6-release` in GitHub and call the fork `gz-rendering7-release`. ```bash -git clone https://github.com/gz-release/gz-rendering6-release -cd gz-rendering6-release +git clone https://github.com/gz-release/gz-rendering7-release +cd gz-rendering7-release ./path/to/release-tools/release-repo-scripts/bump_major_version 6 7 ``` @@ -127,7 +128,7 @@ cd gz-cmake3-release ./path/to/release-tools/release-repo-scripts/new_ubuntu_distribution.bash kinetic ``` -### new_ignition_release_repos.bash +### new_gazebo_release_repos.bash The script will create new -release repositories as forks from the previous version and run the `bump_major_version` script in the repository to update all files and @@ -140,16 +141,17 @@ script in this repository. ```bash cd /tmp/ -./path/to/release-tools/release-repo-scripts/new_ignition_release_repos.bash +./path/to/release-tools/release-repo-scripts/new_gazebo_release_repos.bash ``` -`list_of_new_ignition_names_space_separated` is composed from one or more +`list_of_new_gazebo_names_space_separated` is composed from one or more repository names to be created. Sequence of actions expected: - * Create ign-fooY-release if it does not exits + * Create gz-fooY-release if it does not exits * Clone to the current directory - * Pull from main/master branch from previous version, ign-fooX-release repository to have the whole history + * Pull from main/master branch from previous version, gz repository to + have the whole history * Run the bump_major_version from X to Y * Show the results * Commit/push all the changes @@ -158,11 +160,11 @@ The -release repositories used by this tool will be created on current directory #### Example -To create `ign-rendering7-release` repository copying files in `ign-rendering6-release`: +To create `gz-rendering7-release` repository copying files in `gz-rendering6-release`: ```bash cd /tmp/ -./path/to/release-tools/release-repo-scripts/new_ignition_release_repos.bash ign-rendering7 +./path/to/release-tools/release-repo-scripts/new_gazebo_release_repos.bash gz-rendering7 ``` ### rename_ignition_to_gazebo.bash diff --git a/release-repo-scripts/new_ignition_release_repos.bash b/release-repo-scripts/new_gazebo_release_repos.bash similarity index 96% rename from release-repo-scripts/new_ignition_release_repos.bash rename to release-repo-scripts/new_gazebo_release_repos.bash index 4bb5b6639..1ec311922 100755 --- a/release-repo-scripts/new_ignition_release_repos.bash +++ b/release-repo-scripts/new_gazebo_release_repos.bash @@ -10,8 +10,8 @@ set -e SCRIPT_DIR="$( cd "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )" if [[ $# -lt 1 ]]; then - echo "$0 " - echo " example: $0 ign-cmake3 ign-common22" + echo "$0 " + echo " example: $0 gz-cmake3 gz-common6" exit 1 fi From 46cdd91aadde3eac836c0b66087109133d134ea6 Mon Sep 17 00:00:00 2001 From: Ian Chen Date: Mon, 4 Nov 2024 02:06:45 -0800 Subject: [PATCH 35/37] Bump versions for main and setup nightlies (#1188) * bump versions for main, setup nightlies Signed-off-by: Ian Chen * Automated change: update logs [skip ci] * Use __upcoming__ as nightly reference Signed-off-by: Jose Luis Rivero --------- Signed-off-by: Ian Chen Signed-off-by: Jose Luis Rivero Co-authored-by: iche033 Co-authored-by: Jose Luis Rivero --- jenkins-scripts/dsl/gz-collections.yaml | 37 ++++++------- jenkins-scripts/dsl/ignition_collection.dsl | 2 +- jenkins-scripts/dsl/logs/generated_jobs.txt | 60 ++++++++++----------- 3 files changed, 50 insertions(+), 49 deletions(-) diff --git a/jenkins-scripts/dsl/gz-collections.yaml b/jenkins-scripts/dsl/gz-collections.yaml index e1448e379..11a6cb6cf 100644 --- a/jenkins-scripts/dsl/gz-collections.yaml +++ b/jenkins-scripts/dsl/gz-collections.yaml @@ -436,9 +436,6 @@ collections: linux: ignore_major_version: - gz-ionic - nightly: - distros: - - noble - name: '__upcoming__' libs: - name: gz-tools @@ -446,63 +443,63 @@ collections: repo: current_branch: main - name: gz-cmake - major_version: 4 + major_version: 5 repo: current_branch: main - name: gz-common - major_version: 6 + major_version: 7 repo: current_branch: main - name: gz-fuel-tools - major_version: 10 + major_version: 11 repo: current_branch: main - name: gz-gui - major_version: 9 + major_version: 10 repo: current_branch: main - name: gz-launch - major_version: 8 + major_version: 9 repo: current_branch: main - name: gz-math - major_version: 8 + major_version: 9 repo: current_branch: main - name: gz-msgs - major_version: 11 + major_version: 12 repo: current_branch: main - name: gz-physics - major_version: 8 + major_version: 9 repo: current_branch: main - name: gz-plugin - major_version: 3 + major_version: 4 repo: current_branch: main - name: gz-rendering - major_version: 9 + major_version: 10 repo: current_branch: main - name: gz-sensors - major_version: 9 + major_version: 10 repo: current_branch: main - name: gz-sim - major_version: 9 + major_version: 10 repo: current_branch: main - name: gz-transport - major_version: 14 + major_version: 15 repo: current_branch: main - name: gz-utils - major_version: 3 + major_version: 4 repo: current_branch: main - name: sdformat - major_version: 15 + major_version: 16 repo: current_branch: main ci: @@ -514,6 +511,10 @@ collections: configs: - noble - brew + linux: + nightly: + distros: + - noble ci_configs: - name: focal system: diff --git a/jenkins-scripts/dsl/ignition_collection.dsl b/jenkins-scripts/dsl/ignition_collection.dsl index e00232093..f214e5a9b 100644 --- a/jenkins-scripts/dsl/ignition_collection.dsl +++ b/jenkins-scripts/dsl/ignition_collection.dsl @@ -11,7 +11,7 @@ arch = 'amd64' file = readFileFromWorkspace("scripts/jenkins-scripts/dsl/gz-collections.yaml") gz_collections_yaml = new Yaml().load(file) -gz_nightly = 'ionic' +gz_nightly = '__upcoming__' String get_debbuilder_name(parsed_yaml_lib, parsed_yaml_packaging) { diff --git a/jenkins-scripts/dsl/logs/generated_jobs.txt b/jenkins-scripts/dsl/logs/generated_jobs.txt index c15a66b28..3d9a4f562 100644 --- a/jenkins-scripts/dsl/logs/generated_jobs.txt +++ b/jenkins-scripts/dsl/logs/generated_jobs.txt @@ -392,38 +392,38 @@ branch_ci ionic gz_utils-ci-gz-utils3-noble-amd64 branch_ci ionic sdformat-ci-sdf15-homebrew-amd64 branch_ci ionic sdformat-ci-sdf15-noble-amd64 branch_ci ionic sdformat-sdf15-win -install_ci __upcoming__ gz_cmake4-install-pkg-noble-amd64 -install_ci __upcoming__ gz_cmake4-install_bottle-homebrew-amd64 -install_ci __upcoming__ gz_common6-install-pkg-noble-amd64 -install_ci __upcoming__ gz_common6-install_bottle-homebrew-amd64 -install_ci __upcoming__ gz_fuel_tools10-install-pkg-noble-amd64 -install_ci __upcoming__ gz_fuel_tools10-install_bottle-homebrew-amd64 -install_ci __upcoming__ gz_gui9-install-pkg-noble-amd64 -install_ci __upcoming__ gz_gui9-install_bottle-homebrew-amd64 -install_ci __upcoming__ gz_launch8-install-pkg-noble-amd64 -install_ci __upcoming__ gz_launch8-install_bottle-homebrew-amd64 -install_ci __upcoming__ gz_math8-install-pkg-noble-amd64 -install_ci __upcoming__ gz_math8-install_bottle-homebrew-amd64 -install_ci __upcoming__ gz_msgs11-install-pkg-noble-amd64 -install_ci __upcoming__ gz_msgs11-install_bottle-homebrew-amd64 -install_ci __upcoming__ gz_physics8-install-pkg-noble-amd64 -install_ci __upcoming__ gz_physics8-install_bottle-homebrew-amd64 -install_ci __upcoming__ gz_plugin3-install-pkg-noble-amd64 -install_ci __upcoming__ gz_plugin3-install_bottle-homebrew-amd64 -install_ci __upcoming__ gz_rendering9-install-pkg-noble-amd64 -install_ci __upcoming__ gz_rendering9-install_bottle-homebrew-amd64 -install_ci __upcoming__ gz_sensors9-install-pkg-noble-amd64 -install_ci __upcoming__ gz_sensors9-install_bottle-homebrew-amd64 -install_ci __upcoming__ gz_sim9-install-pkg-noble-amd64 -install_ci __upcoming__ gz_sim9-install_bottle-homebrew-amd64 +install_ci __upcoming__ gz_cmake5-install-pkg-noble-amd64 +install_ci __upcoming__ gz_cmake5-install_bottle-homebrew-amd64 +install_ci __upcoming__ gz_common7-install-pkg-noble-amd64 +install_ci __upcoming__ gz_common7-install_bottle-homebrew-amd64 +install_ci __upcoming__ gz_fuel_tools11-install-pkg-noble-amd64 +install_ci __upcoming__ gz_fuel_tools11-install_bottle-homebrew-amd64 +install_ci __upcoming__ gz_gui10-install-pkg-noble-amd64 +install_ci __upcoming__ gz_gui10-install_bottle-homebrew-amd64 +install_ci __upcoming__ gz_launch9-install-pkg-noble-amd64 +install_ci __upcoming__ gz_launch9-install_bottle-homebrew-amd64 +install_ci __upcoming__ gz_math9-install-pkg-noble-amd64 +install_ci __upcoming__ gz_math9-install_bottle-homebrew-amd64 +install_ci __upcoming__ gz_msgs12-install-pkg-noble-amd64 +install_ci __upcoming__ gz_msgs12-install_bottle-homebrew-amd64 +install_ci __upcoming__ gz_physics9-install-pkg-noble-amd64 +install_ci __upcoming__ gz_physics9-install_bottle-homebrew-amd64 +install_ci __upcoming__ gz_plugin4-install-pkg-noble-amd64 +install_ci __upcoming__ gz_plugin4-install_bottle-homebrew-amd64 +install_ci __upcoming__ gz_rendering10-install-pkg-noble-amd64 +install_ci __upcoming__ gz_rendering10-install_bottle-homebrew-amd64 +install_ci __upcoming__ gz_sensors10-install-pkg-noble-amd64 +install_ci __upcoming__ gz_sensors10-install_bottle-homebrew-amd64 +install_ci __upcoming__ gz_sim10-install-pkg-noble-amd64 +install_ci __upcoming__ gz_sim10-install_bottle-homebrew-amd64 install_ci __upcoming__ gz_tools3-install-pkg-noble-amd64 install_ci __upcoming__ gz_tools3-install_bottle-homebrew-amd64 -install_ci __upcoming__ gz_transport14-install-pkg-noble-amd64 -install_ci __upcoming__ gz_transport14-install_bottle-homebrew-amd64 -install_ci __upcoming__ gz_utils3-install-pkg-noble-amd64 -install_ci __upcoming__ gz_utils3-install_bottle-homebrew-amd64 -install_ci __upcoming__ sdformat15-install-pkg-noble-amd64 -install_ci __upcoming__ sdformat15-install_bottle-homebrew-amd64 +install_ci __upcoming__ gz_transport15-install-pkg-noble-amd64 +install_ci __upcoming__ gz_transport15-install_bottle-homebrew-amd64 +install_ci __upcoming__ gz_utils4-install-pkg-noble-amd64 +install_ci __upcoming__ gz_utils4-install_bottle-homebrew-amd64 +install_ci __upcoming__ sdformat16-install-pkg-noble-amd64 +install_ci __upcoming__ sdformat16-install_bottle-homebrew-amd64 install_ci citadel gz_citadel-install-pkg-focal-amd64 install_ci citadel gz_citadel-install_bottle-homebrew-amd64 install_ci citadel gz_cmake2-install-pkg-focal-amd64 From c41059a4ba215f99923004b0ff38138d47717f0e Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Mon, 4 Nov 2024 17:45:59 +0100 Subject: [PATCH 36/37] Refactor build.sh init and include SHELL_ON_ERRORS (#1191) Signed-off-by: Jose Luis Rivero --- jenkins-scripts/docker/debian-ratt-builder.bash | 6 ++---- jenkins-scripts/docker/gz-source-generation.bash | 4 ++-- jenkins-scripts/docker/lib/_common_scripts.bash | 13 +++++++++++++ .../lib/_generic_linux_compilation_build.sh.bash | 9 +++------ jenkins-scripts/docker/lib/boilerplate_prepare.sh | 4 ++++ jenkins-scripts/docker/lib/debbuild-backport.bash | 7 ++----- jenkins-scripts/docker/lib/debbuild-base.bash | 7 ++----- jenkins-scripts/docker/lib/debbuild-bloom-base.bash | 7 ++----- .../docker/lib/debian-git-repo-base.bash | 7 ++----- .../docker/lib/docker_generate_dockerfile.bash | 5 ++++- .../docker/lib/gazebo_ros_pkgs-check-release.bash | 9 ++++----- jenkins-scripts/docker/lib/generic-abi-base.bash | 8 ++------ .../docker/lib/generic-install-base.bash | 7 +------ jenkins-scripts/docker/lib/gzdev-base-linux.bash | 8 +++----- 14 files changed, 46 insertions(+), 55 deletions(-) diff --git a/jenkins-scripts/docker/debian-ratt-builder.bash b/jenkins-scripts/docker/debian-ratt-builder.bash index 2b643b126..8019ac6bc 100644 --- a/jenkins-scripts/docker/debian-ratt-builder.bash +++ b/jenkins-scripts/docker/debian-ratt-builder.bash @@ -8,13 +8,11 @@ echo '# BEGIN SECTION: setup the testing enviroment' # Define the name to be used in docker export DOCKER_JOB_NAME="debian_ratt_builder" . "${SCRIPT_DIR}/lib/boilerplate_prepare.sh" +. "${SCRIPT_DIR}/lib/_common_scripts.bash" echo '# END SECTION' cat > build.sh << DELIM -################################################### -# Make project-specific changes here -# -set -ex +$(generate_buildsh_header) if ${USE_UNSTABLE}; then TARGET_DISTRO='unstable' diff --git a/jenkins-scripts/docker/gz-source-generation.bash b/jenkins-scripts/docker/gz-source-generation.bash index 85f7600b6..b7401268f 100644 --- a/jenkins-scripts/docker/gz-source-generation.bash +++ b/jenkins-scripts/docker/gz-source-generation.bash @@ -6,11 +6,11 @@ echo '# BEGIN SECTION: setup the testing enviroment' # Define the name to be used in docker export DOCKER_JOB_NAME="source_generation_job" . ${SCRIPT_DIR}/lib/boilerplate_prepare.sh +. ${SCRIPT_DIR}/lib/_common_scripts.bash echo '# END SECTION' cat > build.sh << DELIM -#!/bin/bash -set -ex +$(generate_buildsh_header) PKG_DIR=\$WORKSPACE/pkgs SOURCES_DIR=\$WORKSPACE/sources diff --git a/jenkins-scripts/docker/lib/_common_scripts.bash b/jenkins-scripts/docker/lib/_common_scripts.bash index 30e006bc4..e2fd99823 100644 --- a/jenkins-scripts/docker/lib/_common_scripts.bash +++ b/jenkins-scripts/docker/lib/_common_scripts.bash @@ -1 +1,14 @@ export APT_INSTALL="sudo DEBIAN_FRONTEND=noninteractive apt-get install -y" + +generate_buildsh_header() +{ + SHELL_ON_ERRORS=${SHELL_ON_ERRORS:-false} + echo "#!/bin/bash" + echo "set -ex" + if ${SHELL_ON_ERRORS}; then + echo 'trap "/bin/bash" 0 INT QUIT ABRT PIPE TERM' + fi + if $GENERIC_ENABLE_TIMING; then + echo "source ${TIMING_DIR}/_time_lib.sh ${WORKSPACE}" + fi +} diff --git a/jenkins-scripts/docker/lib/_generic_linux_compilation_build.sh.bash b/jenkins-scripts/docker/lib/_generic_linux_compilation_build.sh.bash index 344431001..ee737e521 100644 --- a/jenkins-scripts/docker/lib/_generic_linux_compilation_build.sh.bash +++ b/jenkins-scripts/docker/lib/_generic_linux_compilation_build.sh.bash @@ -19,13 +19,10 @@ fi [[ -z $GENERIC_ENABLE_CPPCHECK ]] && GENERIC_ENABLE_CPPCHECK=true [[ -z $GENERIC_ENABLE_TESTS ]] && GENERIC_ENABLE_TESTS=true -cat > build.sh << DELIM_HEADER -#!/bin/bash -set -ex +. ${SCRIPT_DIR}/lib/_common_scripts.bash -if $GENERIC_ENABLE_TIMING; then - source ${TIMING_DIR}/_time_lib.sh ${WORKSPACE} -fi +cat > build.sh << DELIM_HEADER +$(generate_buildsh_header) DELIM_HEADER # Process the source build of dependencies if needed diff --git a/jenkins-scripts/docker/lib/boilerplate_prepare.sh b/jenkins-scripts/docker/lib/boilerplate_prepare.sh index 4566d5366..d3ecea0b3 100755 --- a/jenkins-scripts/docker/lib/boilerplate_prepare.sh +++ b/jenkins-scripts/docker/lib/boilerplate_prepare.sh @@ -49,6 +49,10 @@ source ${SCRIPT_DIR}/../lib/boilerplate_timing_prepare.sh init_stopwatch TOTAL_TIME init_stopwatch CREATE_TESTING_ENVIROMENT +# Enable shell on errors is designed to help debuging but never +# to be run on Jenkins. +SHELL_ON_ERRORS=${SHELL_ON_ERRORS:-false} + # Default values - Provide them is prefered if [ -z ${DISTRO} ]; then DISTRO=bionic diff --git a/jenkins-scripts/docker/lib/debbuild-backport.bash b/jenkins-scripts/docker/lib/debbuild-backport.bash index 2c794ed33..65cac6382 100644 --- a/jenkins-scripts/docker/lib/debbuild-backport.bash +++ b/jenkins-scripts/docker/lib/debbuild-backport.bash @@ -12,13 +12,10 @@ fi export ENABLE_REAPER=false . ${SCRIPT_DIR}/lib/boilerplate_prepare.sh +. ${SCRIPT_DIR}/lib/_common_scripts.bash cat > build.sh << DELIM -################################################### -# Make project-specific changes here -# -#!/usr/bin/env bash -set -ex +$(generate_buildsh_header) cd $WORKSPACE/build diff --git a/jenkins-scripts/docker/lib/debbuild-base.bash b/jenkins-scripts/docker/lib/debbuild-base.bash index 70b3e4591..03a77e0c8 100644 --- a/jenkins-scripts/docker/lib/debbuild-base.bash +++ b/jenkins-scripts/docker/lib/debbuild-base.bash @@ -20,14 +20,11 @@ fi export ENABLE_REAPER=false . ${SCRIPT_DIR}/lib/boilerplate_prepare.sh +. ${SCRIPT_DIR}/lib/_common_scripts.bash . ${SCRIPT_DIR}/lib/_gazebo_utils.sh cat > build.sh << DELIM -################################################### -# Make project-specific changes here -# -#!/usr/bin/env bash -set -ex +$(generate_buildsh_header) cd $WORKSPACE/build diff --git a/jenkins-scripts/docker/lib/debbuild-bloom-base.bash b/jenkins-scripts/docker/lib/debbuild-bloom-base.bash index dee903dd0..3bd74ca0c 100644 --- a/jenkins-scripts/docker/lib/debbuild-bloom-base.bash +++ b/jenkins-scripts/docker/lib/debbuild-bloom-base.bash @@ -23,14 +23,11 @@ export ENABLE_REAPER=false PACKAGE_UNDERSCORE_NAME=${PACKAGE//-/_} . ${SCRIPT_DIR}/lib/boilerplate_prepare.sh +. ${SCRIPT_DIR}/lib/_common_scripts.bash . ${SCRIPT_DIR}/lib/_gazebo_utils.sh cat > build.sh << DELIM -################################################### -# Make project-specific changes here -# -#!/usr/bin/env bash -set -ex +$(generate_buildsh_header) cd $WORKSPACE/build diff --git a/jenkins-scripts/docker/lib/debian-git-repo-base.bash b/jenkins-scripts/docker/lib/debian-git-repo-base.bash index ebede7a4a..4298af32e 100644 --- a/jenkins-scripts/docker/lib/debian-git-repo-base.bash +++ b/jenkins-scripts/docker/lib/debian-git-repo-base.bash @@ -5,6 +5,7 @@ export ENABLE_REAPER=false . ${SCRIPT_DIR}/lib/boilerplate_prepare.sh +. ${SCRIPT_DIR}/lib/_common_scripts.bash . ${SCRIPT_DIR}/lib/_gazebo_utils.sh # The git plugin leaves a repository copy with a detached HEAD @@ -26,11 +27,7 @@ if [[ -z ${BRANCH} ]]; then fi cat > build.sh << DELIM -################################################### -# Make project-specific changes here -# -#!/usr/bin/env bash -set -ex +$(generate_buildsh_header) if ${CLONE_NEEDED}; then echo '# BEGIN SECTION: clone the git repo' diff --git a/jenkins-scripts/docker/lib/docker_generate_dockerfile.bash b/jenkins-scripts/docker/lib/docker_generate_dockerfile.bash index 873f15369..3778abb29 100644 --- a/jenkins-scripts/docker/lib/docker_generate_dockerfile.bash +++ b/jenkins-scripts/docker/lib/docker_generate_dockerfile.bash @@ -143,9 +143,12 @@ if [[ -z ${OSRF_REPOS_TO_USE} ]]; then fi fi +# Enable shell on errors is designed to help debuging but never +# to be run on Jenkins. +SHELL_ON_ERRORS=${SHELL_ON_ERRORS:-false} + echo '# BEGIN SECTION: create the Dockerfile' cat > Dockerfile << DELIM_DOCKER -#!/bin/bash ####################################################### # Docker file to run build.sh diff --git a/jenkins-scripts/docker/lib/gazebo_ros_pkgs-check-release.bash b/jenkins-scripts/docker/lib/gazebo_ros_pkgs-check-release.bash index f731d76ba..6b7641c0e 100644 --- a/jenkins-scripts/docker/lib/gazebo_ros_pkgs-check-release.bash +++ b/jenkins-scripts/docker/lib/gazebo_ros_pkgs-check-release.bash @@ -9,6 +9,7 @@ export ENABLE_REAPER=false DOCKER_JOB_NAME="gazebo_ros_pkgs_ci" . ${SCRIPT_DIR}/lib/boilerplate_prepare.sh +. ${SCRIPT_DIR}/lib/_common_scripts.bash . ${SCRIPT_DIR}/lib/_gazebo_utils.sh ROS_SETUP_PREINSTALL_HOOK=""" @@ -20,7 +21,8 @@ ${GAZEBO_MODEL_INSTALLATION} if ${ROS2}; then cat > build.sh << DELIM_CHECKOUT -set -ex +$(generate_buildsh_header) + source /opt/ros/${ROS_DISTRO}/setup.bash TEST_TIMEOUT=90 @@ -36,10 +38,7 @@ fi DELIM_CHECKOUT else cat > build.sh << DELIM_CHECKOUT -################################################### -# Make project-specific changes here -# -set -ex +$(generate_buildsh_header) [[ -d ${WORKSPACE}/gazebo_ros_demos ]] && rm -fr ${WORKSPACE}/gazebo_ros_demos git clone https://github.com/ros-simulation/gazebo_ros_demos ${WORKSPACE}/gazebo_ros_demos diff --git a/jenkins-scripts/docker/lib/generic-abi-base.bash b/jenkins-scripts/docker/lib/generic-abi-base.bash index 7c4c551fd..c24ae0fea 100644 --- a/jenkins-scripts/docker/lib/generic-abi-base.bash +++ b/jenkins-scripts/docker/lib/generic-abi-base.bash @@ -25,6 +25,7 @@ echo '# BEGIN SECTION: setup the testing enviroment' # Define the name to be used in docker DOCKER_JOB_NAME="abi_job" . ${SCRIPT_DIR}/lib/boilerplate_prepare.sh +. ${SCRIPT_DIR}/lib/_common_scripts.bash echo '# END SECTION' # Could be empty, just fine @@ -44,12 +45,7 @@ if [[ "${NEED_C17_COMPILER}" == "true" ]]; then fi cat > build.sh << DELIM -#!/bin/bash - -################################################### -# Make project-specific changes here -# -set -ex +$(generate_buildsh_header) if [ `expr length "${ABI_JOB_PRECHECKER_HOOK} "` -gt 1 ]; then echo '# BEGIN SECTION: running pre ABI hook' diff --git a/jenkins-scripts/docker/lib/generic-install-base.bash b/jenkins-scripts/docker/lib/generic-install-base.bash index 8a944ca00..b679e7b86 100644 --- a/jenkins-scripts/docker/lib/generic-install-base.bash +++ b/jenkins-scripts/docker/lib/generic-install-base.bash @@ -9,12 +9,7 @@ DOCKER_JOB_NAME="install_job" echo '# END SECTION' cat > build.sh << DELIM -#!/bin/bash - -################################################### -# Make project-specific changes here -# -set -ex +$(generate_buildsh_header) if [ `expr length "${INSTALL_JOB_PREINSTALL_HOOK} "` -gt 1 ]; then echo '# BEGIN SECTION: running pre install hook' diff --git a/jenkins-scripts/docker/lib/gzdev-base-linux.bash b/jenkins-scripts/docker/lib/gzdev-base-linux.bash index 7deb198a9..18824025c 100644 --- a/jenkins-scripts/docker/lib/gzdev-base-linux.bash +++ b/jenkins-scripts/docker/lib/gzdev-base-linux.bash @@ -1,14 +1,12 @@ echo '# BEGIN SECTION: setup the testing enviroment' export DOCKER_JOB_NAME="gzdev" . "${SCRIPT_DIR}/lib/boilerplate_prepare.sh" +. "${SCRIPT_DIR}/lib/_common_scripts.bash" +. "${SCRIPT_DIR}/lib/_install_nvidia_docker.sh" echo '# END SECTION' -. ${SCRIPT_DIR}/lib/_install_nvidia_docker.sh - cat > build.sh << DELIM -################################################### -# -set -ex +$(generate_buildsh_header) export MAKE_JOBS=${MAKE_JOBS} export DISPLAY=${DISPLAY} From 502bfff11390e3cb250a6d6c5aabd2c3a61d3230 Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Mon, 4 Nov 2024 14:55:00 -0800 Subject: [PATCH 37/37] brew CI: use python venv for pip installs (#1194) Signed-off-by: Steve Peters --- .../lib/project-default-devel-homebrew-amd64.bash | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/jenkins-scripts/lib/project-default-devel-homebrew-amd64.bash b/jenkins-scripts/lib/project-default-devel-homebrew-amd64.bash index 0b86233bd..1d8b33865 100644 --- a/jenkins-scripts/lib/project-default-devel-homebrew-amd64.bash +++ b/jenkins-scripts/lib/project-default-devel-homebrew-amd64.bash @@ -88,12 +88,10 @@ fi if [[ -n "${PIP_PACKAGES_NEEDED}" ]]; then brew install python3 - PIP=pip3 - if ! which ${PIP}; then - PIP=${HOMEBREW_PREFIX}/opt/python/bin/pip3 - fi - # TODO use a python3 venv instead. - ${PIP} install --break-system-packages ${PIP_PACKAGES_NEEDED} + rm -rf ${WORKSPACE}/venv + python3 -m venv ${WORKSPACE}/venv + . ${WORKSPACE}/venv/bin/activate + pip3 install ${PIP_PACKAGES_NEEDED} fi if [[ -z "${DISABLE_CCACHE}" ]]; then