Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Generate Harmonic CI jobs on Jammy for Harmonic branches #971

Merged
merged 4 commits into from
Jul 28, 2023

Conversation

j-rivero
Copy link
Contributor

@j-rivero j-rivero commented Jul 21, 2023

Use the YAML format to generate the -ci-${branches}- jobs for Harmonic branches.

Note: in draft until being sure that the XML configurations are not changed but only add new jobs.

Testing Build Status

Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>
@j-rivero
Copy link
Contributor Author

Only in /tmp/pr_xml_configuration: gz_cmake-ci-gz-cmake3-jammy-amd64.xml
Only in /tmp/pr_xml_configuration: gz_common-ci-gz-common5-jammy-amd64.xml
Only in /tmp/pr_xml_configuration: gz_fuel_tools-ci-main-jammy-amd64.xml
Only in /tmp/pr_xml_configuration: gz_gui-ci-main-jammy-amd64.xml
Only in /tmp/pr_xml_configuration: gz_launch-ci-main-jammy-amd64.xml
Only in /tmp/pr_xml_configuration: gz_math-ci-gz-math7-jammy-amd64.xml
Only in /tmp/pr_xml_configuration: gz_msgs-ci-main-jammy-amd64.xml
Only in /tmp/pr_xml_configuration: gz_physics-ci-gz-physics6-jammy-amd64.xml
Only in /tmp/pr_xml_configuration: gz_plugin-ci-gz-plugin2-jammy-amd64.xml
Only in /tmp/pr_xml_configuration: gz_rendering-ci-main-jammy-amd64.xml
Only in /tmp/pr_xml_configuration: gz_sensors-ci-main-jammy-amd64.xml
Only in /tmp/pr_xml_configuration: gz_sim-ci-main-jammy-amd64.xml
Only in /tmp/pr_xml_configuration: gz_tools-ci-gz-tools2-jammy-amd64.xml
Only in /tmp/pr_xml_configuration: gz_transport-ci-main-jammy-amd64.xml
Only in /tmp/pr_xml_configuration: gz_utils-ci-gz-utils2-jammy-amd64.xml
Only in /tmp/pr_xml_configuration: sdformat-ci-sdf13-jammy-amd64.xml

@j-rivero j-rivero marked this pull request as ready for review July 27, 2023 17:05
Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>
@j-rivero
Copy link
Contributor Author

Needed a fix for checkout directory in b480adf.

New builds tested in:

  • gz-common5 Build Status
  • gz-sensors main Build Status

@j-rivero
Copy link
Contributor Author

For buildfarmers and the dashboard: these new jobs based in the configuration done in the YAML file might change a little bit the naming schema although we should gain consistency and the dashboard script might consume the yaml file directly or we can reuse the Groovy code here to output Markdown for the dashboard if needed.

My plan is to merge this that affects only to Harmonic but move to the rest of Gazebo releases in a new PR. //cc @Blast545 @Crola1702 @claraberendsen

Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>
@j-rivero
Copy link
Contributor Author

Update Harmonic dashboard manually:

diff -ur -I '.*<id>dashboard_portlet_.*</id>.*' /tmp/current_xml_configuration/ign-harmonic.xml /tmp/pr_xml_configuration/ign-harmonic.xml
--- /tmp/current_xml_configuration/ign-harmonic.xml	2023-07-28 16:04:02.532286035 +0000
+++ /tmp/pr_xml_configuration/ign-harmonic.xml	2023-07-28 16:02:18.147755127 +0000
@@ -20,6 +20,21 @@
         <string>gz-tools2-debbuilder</string>
         <string>gz-transport13-debbuilder</string>
         <string>gz-utils2-debbuilder</string>
+        <string>gz_cmake-ci-gz-cmake3-jammy-amd64.xml</string>
+        <string>gz_common-ci-gz-common5-jammy-amd64.xml</string>
+        <string>gz_fuel_tools-ci-main-jammy-amd64.xml</string>
+        <string>gz_gui-ci-main-jammy-amd64.xml</string>
+        <string>gz_launch-ci-main-jammy-amd64.xml</string>
+        <string>gz_math-ci-gz-math7-jammy-amd64.xml</string>
+        <string>gz_msgs-ci-main-jammy-amd64.xml</string>
+        <string>gz_physics-ci-gz-physics6-jammy-amd64.xml</string>
+        <string>gz_plugin-ci-gz-plugin2-jammy-amd64.xml</string>
+        <string>gz_rendering-ci-main-jammy-amd64.xml</string>
+        <string>gz_sensors-ci-main-jammy-amd64.xml</string>
+        <string>gz_sim-ci-main-jammy-amd64.xml</string>
+        <string>gz_tools-ci-gz-tools2-jammy-amd64.xml</string>
+        <string>gz_transport-ci-main-jammy-amd64.xml</string>
+        <string>gz_utils-ci-gz-utils2-jammy-amd64.xml</string>
         <string>ign_cmake-gz-3-win</string>
         <string>ign_common-gz-5-win</string>
         <string>ign_fuel-tools-gz-9-win</string>
@@ -35,38 +50,23 @@
         <string>ign_tools-gz-2-win</string>
         <string>ign_transport-gz-13-win</string>
         <string>ign_utils-gz-2-win</string>
-        <string>ignition_cmake-ci-gz-cmake3-focal-amd64</string>
         <string>ignition_cmake-ci-gz-cmake3-homebrew-amd64</string>
-        <string>ignition_common-ci-gz-common5-focal-amd64</string>
         <string>ignition_common-ci-gz-common5-homebrew-amd64</string>
-        <string>ignition_fuel-tools-ci-gz-fuel-tools9-focal-amd64</string>
         <string>ignition_fuel-tools-ci-gz-fuel-tools9-homebrew-amd64</string>
-        <string>ignition_gazebo-ci-main-focal-amd64</string>
         <string>ignition_gazebo-ci-main-homebrew-amd64</string>
-        <string>ignition_gui-ci-main-focal-amd64</string>
         <string>ignition_gui-ci-main-homebrew-amd64</string>
         <string>ignition_harmonic-ci-main-homebrew-amd64</string>
-        <string>ignition_launch-ci-main-focal-amd64</string>
         <string>ignition_launch-ci-main-homebrew-amd64</string>
-        <string>ignition_math-ci-gz-math7-focal-amd64</string>
         <string>ignition_math-ci-gz-math7-homebrew-amd64</string>
-        <string>ignition_msgs-ci-gz-msgs10-focal-amd64</string>
         <string>ignition_msgs-ci-gz-msgs10-homebrew-amd64</string>
-        <string>ignition_physics-ci-gz-physics6-focal-amd64</string>
         <string>ignition_physics-ci-gz-physics6-homebrew-amd64</string>
-        <string>ignition_plugin-ci-gz-plugin2-focal-amd64</string>
         <string>ignition_plugin-ci-gz-plugin2-homebrew-amd64</string>
-        <string>ignition_rendering-ci-main-focal-amd64</string>
         <string>ignition_rendering-ci-main-homebrew-amd64</string>
-        <string>ignition_sensors-ci-main-focal-amd64</string>
         <string>ignition_sensors-ci-main-homebrew-amd64</string>
-        <string>ignition_tools-ci-gz-tools2-focal-amd64</string>
         <string>ignition_tools-ci-gz-tools2-homebrew-amd64</string>
-        <string>ignition_transport-ci-gz-transport13-focal-amd64</string>
         <string>ignition_transport-ci-gz-transport13-homebrew-amd64</string>
-        <string>ignition_utils-ci-gz-utils2-focal-amd64</string>
         <string>ignition_utils-ci-gz-utils2-homebrew-amd64</string>
-        <string>sdformat-ci-sdformat13-focal-amd64</string>
+        <string>sdformat-ci-sdf13-jammy-amd64.xml</string>
         <string>sdformat-ci-sdformat13-homebrew-amd64</string>
         <string>sdformat-sdf-13-win</string>
         <string>sdformat13-debbuilder</string>

Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>
@j-rivero
Copy link
Contributor Author

I think we are good to go.

@j-rivero j-rivero merged commit 22bfbb9 into master Jul 28, 2023
1 check passed
@j-rivero j-rivero deleted the jrivero/jrivero/harmonic_ci_yaml branch July 28, 2023 16:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant