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

Change Citadel CI: from Bionic to Focal and change name from ign_ to use gz_ #1083

Merged
merged 3 commits into from
Nov 30, 2023

Conversation

j-rivero
Copy link
Contributor

@j-rivero j-rivero commented Nov 28, 2023

Two main changes in our Citadel CI jobs:

  • Instead of using Bionic which is EOL for keeping the CI running on Citadel, use Focal which is still supported.
  • Since we are going to change CI job names and I'm going to use the opportunity to also include the rename of ign_ ot gz_. Keeping ign_ is confusing the developer team with old jobs and is going to be hard to configure in repositories for accepting CI jobs in each branch. This way the naming schema should use all gz_ for all the collections.

This PR also fixes existing problems with Windows CI on Citadel that it is relying on having a gz- prefix name to overwrite the colcon workspace checkout.

@j-rivero
Copy link
Contributor Author

jobs generated:

diff -ur /tmp/current_log_generated/jobs.txt /tmp/pr_log_generated/jobs.txt
--- /tmp/current_log_generated/jobs.txt	2023-11-28 18:28:57.829940876 +0000
+++ /tmp/pr_log_generated/jobs.txt	2023-11-28 18:27:34.254754364 +0000
@@ -1,49 +1,49 @@
 branch_ci __upcoming__ gz_tools-ci-main-homebrew-amd64
 branch_ci __upcoming__ gz_tools-ci-main-jammy-amd64
 branch_ci __upcoming__ gz_tools-main-win
-branch_ci citadel ign_cmake-2-win
-branch_ci citadel ign_cmake-ci-ign-cmake2-bionic-amd64
-branch_ci citadel ign_cmake-ci-ign-cmake2-homebrew-amd64
-branch_ci citadel ign_common-3-win
-branch_ci citadel ign_common-ci-ign-common3-bionic-amd64
-branch_ci citadel ign_common-ci-ign-common3-homebrew-amd64
-branch_ci citadel ign_fuel_tools-4-win
-branch_ci citadel ign_fuel_tools-ci-ign-fuel-tools4-bionic-amd64
-branch_ci citadel ign_fuel_tools-ci-ign-fuel-tools4-homebrew-amd64
-branch_ci citadel ign_gazebo-3-win
-branch_ci citadel ign_gazebo-ci-ign-gazebo3-bionic-amd64
-branch_ci citadel ign_gazebo-ci-ign-gazebo3-homebrew-amd64
-branch_ci citadel ign_gui-3-win
-branch_ci citadel ign_gui-ci-ign-gui3-bionic-amd64
-branch_ci citadel ign_gui-ci-ign-gui3-homebrew-amd64
-branch_ci citadel ign_launch-2-win
-branch_ci citadel ign_launch-ci-ign-launch2-bionic-amd64
-branch_ci citadel ign_launch-ci-ign-launch2-homebrew-amd64
-branch_ci citadel ign_math-6-win
-branch_ci citadel ign_math-ci-ign-math6-bionic-amd64
-branch_ci citadel ign_math-ci-ign-math6-homebrew-amd64
-branch_ci citadel ign_msgs-5-win
-branch_ci citadel ign_msgs-ci-ign-msgs5-bionic-amd64
-branch_ci citadel ign_msgs-ci-ign-msgs5-homebrew-amd64
-branch_ci citadel ign_physics-2-win
-branch_ci citadel ign_physics-ci-ign-physics2-bionic-amd64
-branch_ci citadel ign_physics-ci-ign-physics2-homebrew-amd64
-branch_ci citadel ign_plugin-1-win
-branch_ci citadel ign_plugin-ci-ign-plugin1-bionic-amd64
-branch_ci citadel ign_plugin-ci-ign-plugin1-homebrew-amd64
-branch_ci citadel ign_rendering-3-win
-branch_ci citadel ign_rendering-ci-ign-rendering3-bionic-amd64
-branch_ci citadel ign_rendering-ci-ign-rendering3-homebrew-amd64
-branch_ci citadel ign_sensors-3-win
-branch_ci citadel ign_sensors-ci-ign-sensors3-bionic-amd64
-branch_ci citadel ign_sensors-ci-ign-sensors3-homebrew-amd64
-branch_ci citadel ign_tools-1-win
-branch_ci citadel ign_tools-ci-ign-tools1-bionic-amd64
-branch_ci citadel ign_tools-ci-ign-tools1-homebrew-amd64
-branch_ci citadel ign_transport-8-win
-branch_ci citadel ign_transport-ci-ign-transport8-bionic-amd64
-branch_ci citadel ign_transport-ci-ign-transport8-homebrew-amd64
-branch_ci citadel sdformat-ci-sdf9-bionic-amd64
+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
+branch_ci citadel gz_common-ci-ign-common3-focal-amd64
+branch_ci citadel gz_common-ci-ign-common3-homebrew-amd64
+branch_ci citadel gz_common-ign-common3-win
+branch_ci citadel gz_fuel_tools-ci-ign-fuel-tools4-focal-amd64
+branch_ci citadel gz_fuel_tools-ci-ign-fuel-tools4-homebrew-amd64
+branch_ci citadel gz_fuel_tools-ign-fuel-tools4-win
+branch_ci citadel gz_gui-ci-ign-gui3-focal-amd64
+branch_ci citadel gz_gui-ci-ign-gui3-homebrew-amd64
+branch_ci citadel gz_gui-ign-gui3-win
+branch_ci citadel gz_launch-ci-ign-launch2-focal-amd64
+branch_ci citadel gz_launch-ci-ign-launch2-homebrew-amd64
+branch_ci citadel gz_launch-ign-launch2-win
+branch_ci citadel gz_math-ci-ign-math6-focal-amd64
+branch_ci citadel gz_math-ci-ign-math6-homebrew-amd64
+branch_ci citadel gz_math-ign-math6-win
+branch_ci citadel gz_msgs-ci-ign-msgs5-focal-amd64
+branch_ci citadel gz_msgs-ci-ign-msgs5-homebrew-amd64
+branch_ci citadel gz_msgs-ign-msgs5-win
+branch_ci citadel gz_physics-ci-ign-physics2-focal-amd64
+branch_ci citadel gz_physics-ci-ign-physics2-homebrew-amd64
+branch_ci citadel gz_physics-ign-physics2-win
+branch_ci citadel gz_plugin-ci-ign-plugin1-focal-amd64
+branch_ci citadel gz_plugin-ci-ign-plugin1-homebrew-amd64
+branch_ci citadel gz_plugin-ign-plugin1-win
+branch_ci citadel gz_rendering-ci-ign-rendering3-focal-amd64
+branch_ci citadel gz_rendering-ci-ign-rendering3-homebrew-amd64
+branch_ci citadel gz_rendering-ign-rendering3-win
+branch_ci citadel gz_sensors-ci-ign-sensors3-focal-amd64
+branch_ci citadel gz_sensors-ci-ign-sensors3-homebrew-amd64
+branch_ci citadel gz_sensors-ign-sensors3-win
+branch_ci citadel gz_sim-ci-ign-gazebo3-focal-amd64
+branch_ci citadel gz_sim-ci-ign-gazebo3-homebrew-amd64
+branch_ci citadel gz_sim-ign-gazebo3-win
+branch_ci citadel gz_tools-ci-ign-tools1-focal-amd64
+branch_ci citadel gz_tools-ci-ign-tools1-homebrew-amd64
+branch_ci citadel gz_tools-ign-tools1-win
+branch_ci citadel gz_transport-ci-ign-transport8-focal-amd64
+branch_ci citadel gz_transport-ci-ign-transport8-homebrew-amd64
+branch_ci citadel gz_transport-ign-transport8-win
+branch_ci citadel sdformat-ci-sdf9-focal-amd64
 branch_ci citadel sdformat-ci-sdf9-homebrew-amd64
 branch_ci citadel sdformat-sdf9-win
 branch_ci fortress gz_cmake-ci-ign-cmake2-focal-amd64

@j-rivero
Copy link
Contributor Author

content changed. I expect Citadel branches to be added to PR jobs that previously run on Focal and existing brew/windows.

Only in /tmp/pr_xml_configuration: gz-citadel-source.xml
Only in /tmp/pr_xml_configuration: gz-common3-source.xml
Only in /tmp/pr_xml_configuration: gz-fuel-tools4-source.xml
Only in /tmp/pr_xml_configuration: gz-gui3-source.xml
Only in /tmp/pr_xml_configuration: gz-launch2-source.xml
Only in /tmp/pr_xml_configuration: gz-msgs5-source.xml
Only in /tmp/pr_xml_configuration: gz-physics2-source.xml
Only in /tmp/pr_xml_configuration: gz-rendering3-source.xml
Only in /tmp/pr_xml_configuration: gz-sensors3-source.xml
Only in /tmp/pr_xml_configuration: gz-sim3-source.xml
Only in /tmp/pr_xml_configuration: gz-transport8-source.xml
Only in /tmp/current_xml_configuration: gz_citadel-install-pkg-bionic-amd64.xml
Only in /tmp/pr_xml_configuration: gz_citadel-install-pkg-focal-amd64.xml
Only in /tmp/pr_xml_configuration: gz_common-ci-ign-common3-focal-amd64.xml
Only in /tmp/pr_xml_configuration: gz_common-ci-ign-common3-homebrew-amd64.xml
diff -ur -I '.*<id>dashboard_portlet_.*</id>.*' /tmp/current_xml_configuration/gz_common-ci-pr_any-focal-amd64.xml /tmp/pr_xml_configuration/gz_common-ci-pr_any-focal-amd64.xml
--- /tmp/current_xml_configuration/gz_common-ci-pr_any-focal-amd64.xml	2023-11-28 18:28:00.978659518 +0000
+++ /tmp/pr_xml_configuration/gz_common-ci-pr_any-focal-amd64.xml	2023-11-28 18:26:31.854966257 +0000
@@ -53,6 +53,9 @@
             <cron></cron>
             <whiteListTargetBranches>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
+                    <branch>ign-common3</branch>
+                </org.jenkinsci.plugins.ghprb.GhprbBranch>
+                <org.jenkinsci.plugins.ghprb.GhprbBranch>
                     <branch>ign-common4</branch>
                 </org.jenkinsci.plugins.ghprb.GhprbBranch>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
diff -ur -I '.*<id>dashboard_portlet_.*</id>.*' /tmp/current_xml_configuration/gz_common-ci-pr_any-homebrew-amd64.xml /tmp/pr_xml_configuration/gz_common-ci-pr_any-homebrew-amd64.xml
--- /tmp/current_xml_configuration/gz_common-ci-pr_any-homebrew-amd64.xml	2023-11-28 18:28:01.370658117 +0000
+++ /tmp/pr_xml_configuration/gz_common-ci-pr_any-homebrew-amd64.xml	2023-11-28 18:26:32.338964439 +0000
@@ -58,6 +58,9 @@
             <cron></cron>
             <whiteListTargetBranches>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
+                    <branch>ign-common3</branch>
+                </org.jenkinsci.plugins.ghprb.GhprbBranch>
+                <org.jenkinsci.plugins.ghprb.GhprbBranch>
                     <branch>ign-common4</branch>
                 </org.jenkinsci.plugins.ghprb.GhprbBranch>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
Only in /tmp/pr_xml_configuration: gz_common-ign-common3-win.xml
diff -ur -I '.*<id>dashboard_portlet_.*</id>.*' /tmp/current_xml_configuration/gz_common-pr-win.xml /tmp/pr_xml_configuration/gz_common-pr-win.xml
--- /tmp/current_xml_configuration/gz_common-pr-win.xml	2023-11-28 18:28:01.758656730 +0000
+++ /tmp/pr_xml_configuration/gz_common-pr-win.xml	2023-11-28 18:26:32.802962705 +0000
@@ -56,6 +56,9 @@
             <cron></cron>
             <whiteListTargetBranches>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
+                    <branch>ign-common3</branch>
+                </org.jenkinsci.plugins.ghprb.GhprbBranch>
+                <org.jenkinsci.plugins.ghprb.GhprbBranch>
                     <branch>ign-common4</branch>
                 </org.jenkinsci.plugins.ghprb.GhprbBranch>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
diff -ur -I '.*<id>dashboard_portlet_.*</id>.*' /tmp/current_xml_configuration/gz_fuel_tools-abichecker-any_to_any-ubuntu-focal-amd64.xml /tmp/pr_xml_configuration/gz_fuel_tools-abichecker-any_to_any-ubuntu-focal-amd64.xml
--- /tmp/current_xml_configuration/gz_fuel_tools-abichecker-any_to_any-ubuntu-focal-amd64.xml	2023-11-28 18:28:05.238644291 +0000
+++ /tmp/pr_xml_configuration/gz_fuel_tools-abichecker-any_to_any-ubuntu-focal-amd64.xml	2023-11-28 18:26:38.586941985 +0000
@@ -73,6 +73,9 @@
             <cron></cron>
             <whiteListTargetBranches>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
+                    <branch>ign-fuel-tools4</branch>
+                </org.jenkinsci.plugins.ghprb.GhprbBranch>
+                <org.jenkinsci.plugins.ghprb.GhprbBranch>
                     <branch>ign-fuel-tools7</branch>
                 </org.jenkinsci.plugins.ghprb.GhprbBranch>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
Only in /tmp/pr_xml_configuration: gz_fuel_tools-ci-ign-fuel-tools4-focal-amd64.xml
Only in /tmp/pr_xml_configuration: gz_fuel_tools-ci-ign-fuel-tools4-homebrew-amd64.xml
diff -ur -I '.*<id>dashboard_portlet_.*</id>.*' /tmp/current_xml_configuration/gz_fuel_tools-ci-pr_any-focal-amd64.xml /tmp/pr_xml_configuration/gz_fuel_tools-ci-pr_any-focal-amd64.xml
--- /tmp/current_xml_configuration/gz_fuel_tools-ci-pr_any-focal-amd64.xml	2023-11-28 18:28:05.158644576 +0000
+++ /tmp/pr_xml_configuration/gz_fuel_tools-ci-pr_any-focal-amd64.xml	2023-11-28 18:26:38.510942257 +0000
@@ -53,6 +53,9 @@
             <cron></cron>
             <whiteListTargetBranches>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
+                    <branch>ign-fuel-tools4</branch>
+                </org.jenkinsci.plugins.ghprb.GhprbBranch>
+                <org.jenkinsci.plugins.ghprb.GhprbBranch>
                     <branch>ign-fuel-tools7</branch>
                 </org.jenkinsci.plugins.ghprb.GhprbBranch>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
diff -ur -I '.*<id>dashboard_portlet_.*</id>.*' /tmp/current_xml_configuration/gz_fuel_tools-ci-pr_any-homebrew-amd64.xml /tmp/pr_xml_configuration/gz_fuel_tools-ci-pr_any-homebrew-amd64.xml
--- /tmp/current_xml_configuration/gz_fuel_tools-ci-pr_any-homebrew-amd64.xml	2023-11-28 18:28:05.638642861 +0000
+++ /tmp/pr_xml_configuration/gz_fuel_tools-ci-pr_any-homebrew-amd64.xml	2023-11-28 18:26:39.058940295 +0000
@@ -58,6 +58,9 @@
             <cron></cron>
             <whiteListTargetBranches>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
+                    <branch>ign-fuel-tools4</branch>
+                </org.jenkinsci.plugins.ghprb.GhprbBranch>
+                <org.jenkinsci.plugins.ghprb.GhprbBranch>
                     <branch>ign-fuel-tools7</branch>
                 </org.jenkinsci.plugins.ghprb.GhprbBranch>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
Only in /tmp/pr_xml_configuration: gz_fuel_tools-ign-fuel-tools4-win.xml
diff -ur -I '.*<id>dashboard_portlet_.*</id>.*' /tmp/current_xml_configuration/gz_fuel_tools-pr-win.xml /tmp/pr_xml_configuration/gz_fuel_tools-pr-win.xml
--- /tmp/current_xml_configuration/gz_fuel_tools-pr-win.xml	2023-11-28 18:28:06.034641446 +0000
+++ /tmp/pr_xml_configuration/gz_fuel_tools-pr-win.xml	2023-11-28 18:26:39.530938603 +0000
@@ -56,6 +56,9 @@
             <cron></cron>
             <whiteListTargetBranches>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
+                    <branch>ign-fuel-tools4</branch>
+                </org.jenkinsci.plugins.ghprb.GhprbBranch>
+                <org.jenkinsci.plugins.ghprb.GhprbBranch>
                     <branch>ign-fuel-tools7</branch>
                 </org.jenkinsci.plugins.ghprb.GhprbBranch>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
diff -ur -I '.*<id>dashboard_portlet_.*</id>.*' /tmp/current_xml_configuration/gz_gui-abichecker-any_to_any-ubuntu-focal-amd64.xml /tmp/pr_xml_configuration/gz_gui-abichecker-any_to_any-ubuntu-focal-amd64.xml
--- /tmp/current_xml_configuration/gz_gui-abichecker-any_to_any-ubuntu-focal-amd64.xml	2023-11-28 18:28:08.094634082 +0000
+++ /tmp/pr_xml_configuration/gz_gui-abichecker-any_to_any-ubuntu-focal-amd64.xml	2023-11-28 18:26:41.910930565 +0000
@@ -73,6 +73,9 @@
             <cron></cron>
             <whiteListTargetBranches>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
+                    <branch>ign-gui3</branch>
+                </org.jenkinsci.plugins.ghprb.GhprbBranch>
+                <org.jenkinsci.plugins.ghprb.GhprbBranch>
                     <branch>ign-gui6</branch>
                 </org.jenkinsci.plugins.ghprb.GhprbBranch>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
Only in /tmp/pr_xml_configuration: gz_gui-ci-ign-gui3-focal-amd64.xml
Only in /tmp/pr_xml_configuration: gz_gui-ci-ign-gui3-homebrew-amd64.xml
diff -ur -I '.*<id>dashboard_portlet_.*</id>.*' /tmp/current_xml_configuration/gz_gui-ci-pr_any-focal-amd64.xml /tmp/pr_xml_configuration/gz_gui-ci-pr_any-focal-amd64.xml
--- /tmp/current_xml_configuration/gz_gui-ci-pr_any-focal-amd64.xml	2023-11-28 18:28:08.014634368 +0000
+++ /tmp/pr_xml_configuration/gz_gui-ci-pr_any-focal-amd64.xml	2023-11-28 18:26:41.830930818 +0000
@@ -53,6 +53,9 @@
             <cron></cron>
             <whiteListTargetBranches>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
+                    <branch>ign-gui3</branch>
+                </org.jenkinsci.plugins.ghprb.GhprbBranch>
+                <org.jenkinsci.plugins.ghprb.GhprbBranch>
                     <branch>ign-gui6</branch>
                 </org.jenkinsci.plugins.ghprb.GhprbBranch>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
diff -ur -I '.*<id>dashboard_portlet_.*</id>.*' /tmp/current_xml_configuration/gz_gui-ci-pr_any-homebrew-amd64.xml /tmp/pr_xml_configuration/gz_gui-ci-pr_any-homebrew-amd64.xml
--- /tmp/current_xml_configuration/gz_gui-ci-pr_any-homebrew-amd64.xml	2023-11-28 18:28:08.482632695 +0000
+++ /tmp/pr_xml_configuration/gz_gui-ci-pr_any-homebrew-amd64.xml	2023-11-28 18:26:42.382929074 +0000
@@ -58,6 +58,9 @@
             <cron></cron>
             <whiteListTargetBranches>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
+                    <branch>ign-gui3</branch>
+                </org.jenkinsci.plugins.ghprb.GhprbBranch>
+                <org.jenkinsci.plugins.ghprb.GhprbBranch>
                     <branch>ign-gui6</branch>
                 </org.jenkinsci.plugins.ghprb.GhprbBranch>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
Only in /tmp/pr_xml_configuration: gz_gui-ign-gui3-win.xml
diff -ur -I '.*<id>dashboard_portlet_.*</id>.*' /tmp/current_xml_configuration/gz_gui-pr-win.xml /tmp/pr_xml_configuration/gz_gui-pr-win.xml
--- /tmp/current_xml_configuration/gz_gui-pr-win.xml	2023-11-28 18:28:08.886631109 +0000
+++ /tmp/pr_xml_configuration/gz_gui-pr-win.xml	2023-11-28 18:26:42.858927571 +0000
@@ -56,6 +56,9 @@
             <cron></cron>
             <whiteListTargetBranches>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
+                    <branch>ign-gui3</branch>
+                </org.jenkinsci.plugins.ghprb.GhprbBranch>
+                <org.jenkinsci.plugins.ghprb.GhprbBranch>
                     <branch>ign-gui6</branch>
                 </org.jenkinsci.plugins.ghprb.GhprbBranch>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
diff -ur -I '.*<id>dashboard_portlet_.*</id>.*' /tmp/current_xml_configuration/gz_launch-abichecker-any_to_any-ubuntu-focal-amd64.xml /tmp/pr_xml_configuration/gz_launch-abichecker-any_to_any-ubuntu-focal-amd64.xml
--- /tmp/current_xml_configuration/gz_launch-abichecker-any_to_any-ubuntu-focal-amd64.xml	2023-11-28 18:28:13.774553390 +0000
+++ /tmp/pr_xml_configuration/gz_launch-abichecker-any_to_any-ubuntu-focal-amd64.xml	2023-11-28 18:26:48.530909389 +0000
@@ -73,6 +73,9 @@
             <cron></cron>
             <whiteListTargetBranches>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
+                    <branch>ign-launch2</branch>
+                </org.jenkinsci.plugins.ghprb.GhprbBranch>
+                <org.jenkinsci.plugins.ghprb.GhprbBranch>
                     <branch>ign-launch5</branch>
                 </org.jenkinsci.plugins.ghprb.GhprbBranch>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
Only in /tmp/pr_xml_configuration: gz_launch-ci-ign-launch2-focal-amd64.xml
Only in /tmp/pr_xml_configuration: gz_launch-ci-ign-launch2-homebrew-amd64.xml
diff -ur -I '.*<id>dashboard_portlet_.*</id>.*' /tmp/current_xml_configuration/gz_launch-ci-pr_any-focal-amd64.xml /tmp/pr_xml_configuration/gz_launch-ci-pr_any-focal-amd64.xml
--- /tmp/current_xml_configuration/gz_launch-ci-pr_any-focal-amd64.xml	2023-11-28 18:28:13.694554662 +0000
+++ /tmp/pr_xml_configuration/gz_launch-ci-pr_any-focal-amd64.xml	2023-11-28 18:26:48.450909684 +0000
@@ -53,6 +53,9 @@
             <cron></cron>
             <whiteListTargetBranches>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
+                    <branch>ign-launch2</branch>
+                </org.jenkinsci.plugins.ghprb.GhprbBranch>
+                <org.jenkinsci.plugins.ghprb.GhprbBranch>
                     <branch>ign-launch5</branch>
                 </org.jenkinsci.plugins.ghprb.GhprbBranch>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
diff -ur -I '.*<id>dashboard_portlet_.*</id>.*' /tmp/current_xml_configuration/gz_launch-ci-pr_any-homebrew-amd64.xml /tmp/pr_xml_configuration/gz_launch-ci-pr_any-homebrew-amd64.xml
--- /tmp/current_xml_configuration/gz_launch-ci-pr_any-homebrew-amd64.xml	2023-11-28 18:28:14.162547220 +0000
+++ /tmp/pr_xml_configuration/gz_launch-ci-pr_any-homebrew-amd64.xml	2023-11-28 18:26:48.998908340 +0000
@@ -58,6 +58,9 @@
             <cron></cron>
             <whiteListTargetBranches>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
+                    <branch>ign-launch2</branch>
+                </org.jenkinsci.plugins.ghprb.GhprbBranch>
+                <org.jenkinsci.plugins.ghprb.GhprbBranch>
                     <branch>ign-launch5</branch>
                 </org.jenkinsci.plugins.ghprb.GhprbBranch>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
Only in /tmp/pr_xml_configuration: gz_launch-ign-launch2-win.xml
diff -ur -I '.*<id>dashboard_portlet_.*</id>.*' /tmp/current_xml_configuration/gz_launch-pr-win.xml /tmp/pr_xml_configuration/gz_launch-pr-win.xml
--- /tmp/current_xml_configuration/gz_launch-pr-win.xml	2023-11-28 18:28:14.554540988 +0000
+++ /tmp/pr_xml_configuration/gz_launch-pr-win.xml	2023-11-28 18:26:49.466908034 +0000
@@ -56,6 +56,9 @@
             <cron></cron>
             <whiteListTargetBranches>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
+                    <branch>ign-launch2</branch>
+                </org.jenkinsci.plugins.ghprb.GhprbBranch>
+                <org.jenkinsci.plugins.ghprb.GhprbBranch>
                     <branch>ign-launch5</branch>
                 </org.jenkinsci.plugins.ghprb.GhprbBranch>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
diff -ur -I '.*<id>dashboard_portlet_.*</id>.*' /tmp/current_xml_configuration/gz_msgs-abichecker-any_to_any-ubuntu-focal-amd64.xml /tmp/pr_xml_configuration/gz_msgs-abichecker-any_to_any-ubuntu-focal-amd64.xml
--- /tmp/current_xml_configuration/gz_msgs-abichecker-any_to_any-ubuntu-focal-amd64.xml	2023-11-28 18:28:02.402654428 +0000
+++ /tmp/pr_xml_configuration/gz_msgs-abichecker-any_to_any-ubuntu-focal-amd64.xml	2023-11-28 18:26:33.518960139 +0000
@@ -73,6 +73,9 @@
             <cron></cron>
             <whiteListTargetBranches>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
+                    <branch>ign-msgs5</branch>
+                </org.jenkinsci.plugins.ghprb.GhprbBranch>
+                <org.jenkinsci.plugins.ghprb.GhprbBranch>
                     <branch>ign-msgs8</branch>
                 </org.jenkinsci.plugins.ghprb.GhprbBranch>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
Only in /tmp/pr_xml_configuration: gz_msgs-ci-ign-msgs5-focal-amd64.xml
Only in /tmp/pr_xml_configuration: gz_msgs-ci-ign-msgs5-homebrew-amd64.xml
diff -ur -I '.*<id>dashboard_portlet_.*</id>.*' /tmp/current_xml_configuration/gz_msgs-ci-pr_any-focal-amd64.xml /tmp/pr_xml_configuration/gz_msgs-ci-pr_any-focal-amd64.xml
--- /tmp/current_xml_configuration/gz_msgs-ci-pr_any-focal-amd64.xml	2023-11-28 18:28:02.322654714 +0000
+++ /tmp/pr_xml_configuration/gz_msgs-ci-pr_any-focal-amd64.xml	2023-11-28 18:26:33.438960427 +0000
@@ -53,6 +53,9 @@
             <cron></cron>
             <whiteListTargetBranches>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
+                    <branch>ign-msgs5</branch>
+                </org.jenkinsci.plugins.ghprb.GhprbBranch>
+                <org.jenkinsci.plugins.ghprb.GhprbBranch>
                     <branch>ign-msgs8</branch>
                 </org.jenkinsci.plugins.ghprb.GhprbBranch>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
diff -ur -I '.*<id>dashboard_portlet_.*</id>.*' /tmp/current_xml_configuration/gz_msgs-ci-pr_any-homebrew-amd64.xml /tmp/pr_xml_configuration/gz_msgs-ci-pr_any-homebrew-amd64.xml
--- /tmp/current_xml_configuration/gz_msgs-ci-pr_any-homebrew-amd64.xml	2023-11-28 18:28:02.806652984 +0000
+++ /tmp/pr_xml_configuration/gz_msgs-ci-pr_any-homebrew-amd64.xml	2023-11-28 18:26:33.990958449 +0000
@@ -58,6 +58,9 @@
             <cron></cron>
             <whiteListTargetBranches>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
+                    <branch>ign-msgs5</branch>
+                </org.jenkinsci.plugins.ghprb.GhprbBranch>
+                <org.jenkinsci.plugins.ghprb.GhprbBranch>
                     <branch>ign-msgs8</branch>
                 </org.jenkinsci.plugins.ghprb.GhprbBranch>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
Only in /tmp/pr_xml_configuration: gz_msgs-ign-msgs5-win.xml
diff -ur -I '.*<id>dashboard_portlet_.*</id>.*' /tmp/current_xml_configuration/gz_msgs-pr-win.xml /tmp/pr_xml_configuration/gz_msgs-pr-win.xml
--- /tmp/current_xml_configuration/gz_msgs-pr-win.xml	2023-11-28 18:28:03.194651597 +0000
+++ /tmp/pr_xml_configuration/gz_msgs-pr-win.xml	2023-11-28 18:26:34.458956773 +0000
@@ -56,6 +56,9 @@
             <cron></cron>
             <whiteListTargetBranches>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
+                    <branch>ign-msgs5</branch>
+                </org.jenkinsci.plugins.ghprb.GhprbBranch>
+                <org.jenkinsci.plugins.ghprb.GhprbBranch>
                     <branch>ign-msgs8</branch>
                 </org.jenkinsci.plugins.ghprb.GhprbBranch>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
diff -ur -I '.*<id>dashboard_portlet_.*</id>.*' /tmp/current_xml_configuration/gz_physics-abichecker-any_to_any-ubuntu-focal-amd64.xml /tmp/pr_xml_configuration/gz_physics-abichecker-any_to_any-ubuntu-focal-amd64.xml
--- /tmp/current_xml_configuration/gz_physics-abichecker-any_to_any-ubuntu-focal-amd64.xml	2023-11-28 18:28:10.934598546 +0000
+++ /tmp/pr_xml_configuration/gz_physics-abichecker-any_to_any-ubuntu-focal-amd64.xml	2023-11-28 18:26:45.230920078 +0000
@@ -73,6 +73,9 @@
             <cron></cron>
             <whiteListTargetBranches>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
+                    <branch>ign-physics2</branch>
+                </org.jenkinsci.plugins.ghprb.GhprbBranch>
+                <org.jenkinsci.plugins.ghprb.GhprbBranch>
                     <branch>ign-physics5</branch>
                 </org.jenkinsci.plugins.ghprb.GhprbBranch>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
@@ -143,7 +146,7 @@
 export DISTRO=focal
 
 
-
+export MAKE_JOBS=1
 
 export ARCH=amd64
 export DEST_BRANCH=${DEST_BRANCH:-$ghprbTargetBranch}
diff -ur -I '.*<id>dashboard_portlet_.*</id>.*' /tmp/current_xml_configuration/gz_physics-ci-gz-physics6-focal-amd64.xml /tmp/pr_xml_configuration/gz_physics-ci-gz-physics6-focal-amd64.xml
--- /tmp/current_xml_configuration/gz_physics-ci-gz-physics6-focal-amd64.xml	2023-11-28 18:28:10.774601090 +0000
+++ /tmp/pr_xml_configuration/gz_physics-ci-gz-physics6-focal-amd64.xml	2023-11-28 18:26:45.074920571 +0000
@@ -75,7 +75,7 @@
             <command>#!/bin/bash -xe
 
 
-
+export MAKE_JOBS=1
 export BUILDING_EXTRA_CMAKE_PARAMS=""
 export BUILDING_EXTRA_MAKETEST_PARAMS=""
 export BUILDING_SOFTWARE_DIRECTORY="gz-physics"
Only in /tmp/pr_xml_configuration: gz_physics-ci-ign-physics2-focal-amd64.xml
Only in /tmp/pr_xml_configuration: gz_physics-ci-ign-physics2-homebrew-amd64.xml
diff -ur -I '.*<id>dashboard_portlet_.*</id>.*' /tmp/current_xml_configuration/gz_physics-ci-ign-physics5-focal-amd64.xml /tmp/pr_xml_configuration/gz_physics-ci-ign-physics5-focal-amd64.xml
--- /tmp/current_xml_configuration/gz_physics-ci-ign-physics5-focal-amd64.xml	2023-11-28 18:28:10.694602362 +0000
+++ /tmp/pr_xml_configuration/gz_physics-ci-ign-physics5-focal-amd64.xml	2023-11-28 18:26:44.994920824 +0000
@@ -75,7 +75,7 @@
             <command>#!/bin/bash -xe
 
 
-
+export MAKE_JOBS=1
 export BUILDING_EXTRA_CMAKE_PARAMS=""
 export BUILDING_EXTRA_MAKETEST_PARAMS=""
 export BUILDING_SOFTWARE_DIRECTORY="gz-physics"
diff -ur -I '.*<id>dashboard_portlet_.*</id>.*' /tmp/current_xml_configuration/gz_physics-ci-pr_any-focal-amd64.xml /tmp/pr_xml_configuration/gz_physics-ci-pr_any-focal-amd64.xml
--- /tmp/current_xml_configuration/gz_physics-ci-pr_any-focal-amd64.xml	2023-11-28 18:28:10.854599818 +0000
+++ /tmp/pr_xml_configuration/gz_physics-ci-pr_any-focal-amd64.xml	2023-11-28 18:26:45.154920318 +0000
@@ -53,6 +53,9 @@
             <cron></cron>
             <whiteListTargetBranches>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
+                    <branch>ign-physics2</branch>
+                </org.jenkinsci.plugins.ghprb.GhprbBranch>
+                <org.jenkinsci.plugins.ghprb.GhprbBranch>
                     <branch>ign-physics5</branch>
                 </org.jenkinsci.plugins.ghprb.GhprbBranch>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
@@ -98,7 +101,7 @@
 export DISTRO=focal
 
 
-
+export MAKE_JOBS=1
 
 export BUILDING_SOFTWARE_DIRECTORY=gz-physics
 export ARCH=amd64
diff -ur -I '.*<id>dashboard_portlet_.*</id>.*' /tmp/current_xml_configuration/gz_physics-ci-pr_any-homebrew-amd64.xml /tmp/pr_xml_configuration/gz_physics-ci-pr_any-homebrew-amd64.xml
--- /tmp/current_xml_configuration/gz_physics-ci-pr_any-homebrew-amd64.xml	2023-11-28 18:28:11.322592376 +0000
+++ /tmp/pr_xml_configuration/gz_physics-ci-pr_any-homebrew-amd64.xml	2023-11-28 18:26:45.702918587 +0000
@@ -58,6 +58,9 @@
             <cron></cron>
             <whiteListTargetBranches>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
+                    <branch>ign-physics2</branch>
+                </org.jenkinsci.plugins.ghprb.GhprbBranch>
+                <org.jenkinsci.plugins.ghprb.GhprbBranch>
                     <branch>ign-physics5</branch>
                 </org.jenkinsci.plugins.ghprb.GhprbBranch>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
Only in /tmp/pr_xml_configuration: gz_physics-ign-physics2-win.xml
diff -ur -I '.*<id>dashboard_portlet_.*</id>.*' /tmp/current_xml_configuration/gz_physics-pr-win.xml /tmp/pr_xml_configuration/gz_physics-pr-win.xml
--- /tmp/current_xml_configuration/gz_physics-pr-win.xml	2023-11-28 18:28:11.710586208 +0000
+++ /tmp/pr_xml_configuration/gz_physics-pr-win.xml	2023-11-28 18:26:46.170917109 +0000
@@ -56,6 +56,9 @@
             <cron></cron>
             <whiteListTargetBranches>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
+                    <branch>ign-physics2</branch>
+                </org.jenkinsci.plugins.ghprb.GhprbBranch>
+                <org.jenkinsci.plugins.ghprb.GhprbBranch>
                     <branch>ign-physics5</branch>
                 </org.jenkinsci.plugins.ghprb.GhprbBranch>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
diff -ur -I '.*<id>dashboard_portlet_.*</id>.*' /tmp/current_xml_configuration/gz_rendering-abichecker-any_to_any-ubuntu-focal-amd64.xml /tmp/pr_xml_configuration/gz_rendering-abichecker-any_to_any-ubuntu-focal-amd64.xml
--- /tmp/current_xml_configuration/gz_rendering-abichecker-any_to_any-ubuntu-focal-amd64.xml	2023-11-28 18:28:03.822649352 +0000
+++ /tmp/pr_xml_configuration/gz_rendering-abichecker-any_to_any-ubuntu-focal-amd64.xml	2023-11-28 18:26:35.174954207 +0000
@@ -73,6 +73,9 @@
             <cron></cron>
             <whiteListTargetBranches>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
+                    <branch>ign-rendering3</branch>
+                </org.jenkinsci.plugins.ghprb.GhprbBranch>
+                <org.jenkinsci.plugins.ghprb.GhprbBranch>
                     <branch>ign-rendering6</branch>
                 </org.jenkinsci.plugins.ghprb.GhprbBranch>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
Only in /tmp/pr_xml_configuration: gz_rendering-ci-ign-rendering3-focal-amd64.xml
Only in /tmp/pr_xml_configuration: gz_rendering-ci-ign-rendering3-homebrew-amd64.xml
diff -ur -I '.*<id>dashboard_portlet_.*</id>.*' /tmp/current_xml_configuration/gz_rendering-ci-pr_any-focal-amd64.xml /tmp/pr_xml_configuration/gz_rendering-ci-pr_any-focal-amd64.xml
--- /tmp/current_xml_configuration/gz_rendering-ci-pr_any-focal-amd64.xml	2023-11-28 18:28:03.746649624 +0000
+++ /tmp/pr_xml_configuration/gz_rendering-ci-pr_any-focal-amd64.xml	2023-11-28 18:26:35.094954495 +0000
@@ -53,6 +53,9 @@
             <cron></cron>
             <whiteListTargetBranches>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
+                    <branch>ign-rendering3</branch>
+                </org.jenkinsci.plugins.ghprb.GhprbBranch>
+                <org.jenkinsci.plugins.ghprb.GhprbBranch>
                     <branch>ign-rendering6</branch>
                 </org.jenkinsci.plugins.ghprb.GhprbBranch>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
diff -ur -I '.*<id>dashboard_portlet_.*</id>.*' /tmp/current_xml_configuration/gz_rendering-ci-pr_any-homebrew-amd64.xml /tmp/pr_xml_configuration/gz_rendering-ci-pr_any-homebrew-amd64.xml
--- /tmp/current_xml_configuration/gz_rendering-ci-pr_any-homebrew-amd64.xml	2023-11-28 18:28:04.214647951 +0000
+++ /tmp/pr_xml_configuration/gz_rendering-ci-pr_any-homebrew-amd64.xml	2023-11-28 18:26:35.698952331 +0000
@@ -58,6 +58,9 @@
             <cron></cron>
             <whiteListTargetBranches>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
+                    <branch>ign-rendering3</branch>
+                </org.jenkinsci.plugins.ghprb.GhprbBranch>
+                <org.jenkinsci.plugins.ghprb.GhprbBranch>
                     <branch>ign-rendering6</branch>
                 </org.jenkinsci.plugins.ghprb.GhprbBranch>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
Only in /tmp/pr_xml_configuration: gz_rendering-ign-rendering3-win.xml
diff -ur -I '.*<id>dashboard_portlet_.*</id>.*' /tmp/current_xml_configuration/gz_rendering-pr-win.xml /tmp/pr_xml_configuration/gz_rendering-pr-win.xml
--- /tmp/current_xml_configuration/gz_rendering-pr-win.xml	2023-11-28 18:28:04.602646564 +0000
+++ /tmp/pr_xml_configuration/gz_rendering-pr-win.xml	2023-11-28 18:26:36.166950654 +0000
@@ -56,6 +56,9 @@
             <cron></cron>
             <whiteListTargetBranches>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
+                    <branch>ign-rendering3</branch>
+                </org.jenkinsci.plugins.ghprb.GhprbBranch>
+                <org.jenkinsci.plugins.ghprb.GhprbBranch>
                     <branch>ign-rendering6</branch>
                 </org.jenkinsci.plugins.ghprb.GhprbBranch>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
diff -ur -I '.*<id>dashboard_portlet_.*</id>.*' /tmp/current_xml_configuration/gz_sensors-abichecker-any_to_any-ubuntu-focal-amd64.xml /tmp/pr_xml_configuration/gz_sensors-abichecker-any_to_any-ubuntu-focal-amd64.xml
--- /tmp/current_xml_configuration/gz_sensors-abichecker-any_to_any-ubuntu-focal-amd64.xml	2023-11-28 18:28:09.518621060 +0000
+++ /tmp/pr_xml_configuration/gz_sensors-abichecker-any_to_any-ubuntu-focal-amd64.xml	2023-11-28 18:26:43.570925321 +0000
@@ -73,6 +73,9 @@
             <cron></cron>
             <whiteListTargetBranches>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
+                    <branch>ign-sensors3</branch>
+                </org.jenkinsci.plugins.ghprb.GhprbBranch>
+                <org.jenkinsci.plugins.ghprb.GhprbBranch>
                     <branch>ign-sensors6</branch>
                 </org.jenkinsci.plugins.ghprb.GhprbBranch>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
Only in /tmp/pr_xml_configuration: gz_sensors-ci-ign-sensors3-focal-amd64.xml
Only in /tmp/pr_xml_configuration: gz_sensors-ci-ign-sensors3-homebrew-amd64.xml
diff -ur -I '.*<id>dashboard_portlet_.*</id>.*' /tmp/current_xml_configuration/gz_sensors-ci-pr_any-focal-amd64.xml /tmp/pr_xml_configuration/gz_sensors-ci-pr_any-focal-amd64.xml
--- /tmp/current_xml_configuration/gz_sensors-ci-pr_any-focal-amd64.xml	2023-11-28 18:28:09.438622332 +0000
+++ /tmp/pr_xml_configuration/gz_sensors-ci-pr_any-focal-amd64.xml	2023-11-28 18:26:43.494925562 +0000
@@ -53,6 +53,9 @@
             <cron></cron>
             <whiteListTargetBranches>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
+                    <branch>ign-sensors3</branch>
+                </org.jenkinsci.plugins.ghprb.GhprbBranch>
+                <org.jenkinsci.plugins.ghprb.GhprbBranch>
                     <branch>ign-sensors6</branch>
                 </org.jenkinsci.plugins.ghprb.GhprbBranch>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
diff -ur -I '.*<id>dashboard_portlet_.*</id>.*' /tmp/current_xml_configuration/gz_sensors-ci-pr_any-homebrew-amd64.xml /tmp/pr_xml_configuration/gz_sensors-ci-pr_any-homebrew-amd64.xml
--- /tmp/current_xml_configuration/gz_sensors-ci-pr_any-homebrew-amd64.xml	2023-11-28 18:28:09.910614828 +0000
+++ /tmp/pr_xml_configuration/gz_sensors-ci-pr_any-homebrew-amd64.xml	2023-11-28 18:26:44.054923793 +0000
@@ -58,6 +58,9 @@
             <cron></cron>
             <whiteListTargetBranches>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
+                    <branch>ign-sensors3</branch>
+                </org.jenkinsci.plugins.ghprb.GhprbBranch>
+                <org.jenkinsci.plugins.ghprb.GhprbBranch>
                     <branch>ign-sensors6</branch>
                 </org.jenkinsci.plugins.ghprb.GhprbBranch>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
Only in /tmp/pr_xml_configuration: gz_sensors-ign-sensors3-win.xml
diff -ur -I '.*<id>dashboard_portlet_.*</id>.*' /tmp/current_xml_configuration/gz_sensors-pr-win.xml /tmp/pr_xml_configuration/gz_sensors-pr-win.xml
--- /tmp/current_xml_configuration/gz_sensors-pr-win.xml	2023-11-28 18:28:10.298608658 +0000
+++ /tmp/pr_xml_configuration/gz_sensors-pr-win.xml	2023-11-28 18:26:44.522922314 +0000
@@ -56,6 +56,9 @@
             <cron></cron>
             <whiteListTargetBranches>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
+                    <branch>ign-sensors3</branch>
+                </org.jenkinsci.plugins.ghprb.GhprbBranch>
+                <org.jenkinsci.plugins.ghprb.GhprbBranch>
                     <branch>ign-sensors6</branch>
                 </org.jenkinsci.plugins.ghprb.GhprbBranch>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
diff -ur -I '.*<id>dashboard_portlet_.*</id>.*' /tmp/current_xml_configuration/gz_sim-abichecker-any_to_any-ubuntu-focal-amd64.xml /tmp/pr_xml_configuration/gz_sim-abichecker-any_to_any-ubuntu-focal-amd64.xml
--- /tmp/current_xml_configuration/gz_sim-abichecker-any_to_any-ubuntu-focal-amd64.xml	2023-11-28 18:28:12.346576095 +0000
+++ /tmp/pr_xml_configuration/gz_sim-abichecker-any_to_any-ubuntu-focal-amd64.xml	2023-11-28 18:26:46.882914860 +0000
@@ -73,6 +73,9 @@
             <cron></cron>
             <whiteListTargetBranches>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
+                    <branch>ign-gazebo3</branch>
+                </org.jenkinsci.plugins.ghprb.GhprbBranch>
+                <org.jenkinsci.plugins.ghprb.GhprbBranch>
                     <branch>ign-gazebo6</branch>
                 </org.jenkinsci.plugins.ghprb.GhprbBranch>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
Only in /tmp/pr_xml_configuration: gz_sim-ci-ign-gazebo3-focal-amd64.xml
Only in /tmp/pr_xml_configuration: gz_sim-ci-ign-gazebo3-homebrew-amd64.xml
diff -ur -I '.*<id>dashboard_portlet_.*</id>.*' /tmp/current_xml_configuration/gz_sim-ci-pr_any-focal-amd64.xml /tmp/pr_xml_configuration/gz_sim-ci-pr_any-focal-amd64.xml
--- /tmp/current_xml_configuration/gz_sim-ci-pr_any-focal-amd64.xml	2023-11-28 18:28:12.266577367 +0000
+++ /tmp/pr_xml_configuration/gz_sim-ci-pr_any-focal-amd64.xml	2023-11-28 18:26:46.802915113 +0000
@@ -53,6 +53,9 @@
             <cron></cron>
             <whiteListTargetBranches>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
+                    <branch>ign-gazebo3</branch>
+                </org.jenkinsci.plugins.ghprb.GhprbBranch>
+                <org.jenkinsci.plugins.ghprb.GhprbBranch>
                     <branch>ign-gazebo6</branch>
                 </org.jenkinsci.plugins.ghprb.GhprbBranch>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
diff -ur -I '.*<id>dashboard_portlet_.*</id>.*' /tmp/current_xml_configuration/gz_sim-ci-pr_any-homebrew-amd64.xml /tmp/pr_xml_configuration/gz_sim-ci-pr_any-homebrew-amd64.xml
--- /tmp/current_xml_configuration/gz_sim-ci-pr_any-homebrew-amd64.xml	2023-11-28 18:28:12.738569862 +0000
+++ /tmp/pr_xml_configuration/gz_sim-ci-pr_any-homebrew-amd64.xml	2023-11-28 18:26:47.350913382 +0000
@@ -58,6 +58,9 @@
             <cron></cron>
             <whiteListTargetBranches>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
+                    <branch>ign-gazebo3</branch>
+                </org.jenkinsci.plugins.ghprb.GhprbBranch>
+                <org.jenkinsci.plugins.ghprb.GhprbBranch>
                     <branch>ign-gazebo6</branch>
                 </org.jenkinsci.plugins.ghprb.GhprbBranch>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
Only in /tmp/pr_xml_configuration: gz_sim-ign-gazebo3-win.xml
diff -ur -I '.*<id>dashboard_portlet_.*</id>.*' /tmp/current_xml_configuration/gz_sim-pr-win.xml /tmp/pr_xml_configuration/gz_sim-pr-win.xml
--- /tmp/current_xml_configuration/gz_sim-pr-win.xml	2023-11-28 18:28:13.142563438 +0000
+++ /tmp/pr_xml_configuration/gz_sim-pr-win.xml	2023-11-28 18:26:47.818911904 +0000
@@ -56,6 +56,9 @@
             <cron></cron>
             <whiteListTargetBranches>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
+                    <branch>ign-gazebo3</branch>
+                </org.jenkinsci.plugins.ghprb.GhprbBranch>
+                <org.jenkinsci.plugins.ghprb.GhprbBranch>
                     <branch>ign-gazebo6</branch>
                 </org.jenkinsci.plugins.ghprb.GhprbBranch>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
diff -ur -I '.*<id>dashboard_portlet_.*</id>.*' /tmp/current_xml_configuration/gz_transport-abichecker-any_to_any-ubuntu-focal-amd64.xml /tmp/pr_xml_configuration/gz_transport-abichecker-any_to_any-ubuntu-focal-amd64.xml
--- /tmp/current_xml_configuration/gz_transport-abichecker-any_to_any-ubuntu-focal-amd64.xml	2023-11-28 18:28:06.666639186 +0000
+++ /tmp/pr_xml_configuration/gz_transport-abichecker-any_to_any-ubuntu-focal-amd64.xml	2023-11-28 18:26:40.250936025 +0000
@@ -73,6 +73,9 @@
             <cron></cron>
             <whiteListTargetBranches>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
+                    <branch>ign-transport8</branch>
+                </org.jenkinsci.plugins.ghprb.GhprbBranch>
+                <org.jenkinsci.plugins.ghprb.GhprbBranch>
                     <branch>ign-transport11</branch>
                 </org.jenkinsci.plugins.ghprb.GhprbBranch>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
Only in /tmp/pr_xml_configuration: gz_transport-ci-ign-transport8-focal-amd64.xml
Only in /tmp/pr_xml_configuration: gz_transport-ci-ign-transport8-homebrew-amd64.xml
diff -ur -I '.*<id>dashboard_portlet_.*</id>.*' /tmp/current_xml_configuration/gz_transport-ci-pr_any-focal-amd64.xml /tmp/pr_xml_configuration/gz_transport-ci-pr_any-focal-amd64.xml
--- /tmp/current_xml_configuration/gz_transport-ci-pr_any-focal-amd64.xml	2023-11-28 18:28:06.590639458 +0000
+++ /tmp/pr_xml_configuration/gz_transport-ci-pr_any-focal-amd64.xml	2023-11-28 18:26:40.166936325 +0000
@@ -53,6 +53,9 @@
             <cron></cron>
             <whiteListTargetBranches>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
+                    <branch>ign-transport8</branch>
+                </org.jenkinsci.plugins.ghprb.GhprbBranch>
+                <org.jenkinsci.plugins.ghprb.GhprbBranch>
                     <branch>ign-transport11</branch>
                 </org.jenkinsci.plugins.ghprb.GhprbBranch>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
diff -ur -I '.*<id>dashboard_portlet_.*</id>.*' /tmp/current_xml_configuration/gz_transport-ci-pr_any-homebrew-amd64.xml /tmp/pr_xml_configuration/gz_transport-ci-pr_any-homebrew-amd64.xml
--- /tmp/current_xml_configuration/gz_transport-ci-pr_any-homebrew-amd64.xml	2023-11-28 18:28:07.062637771 +0000
+++ /tmp/pr_xml_configuration/gz_transport-ci-pr_any-homebrew-amd64.xml	2023-11-28 18:26:40.722934335 +0000
@@ -58,6 +58,9 @@
             <cron></cron>
             <whiteListTargetBranches>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
+                    <branch>ign-transport8</branch>
+                </org.jenkinsci.plugins.ghprb.GhprbBranch>
+                <org.jenkinsci.plugins.ghprb.GhprbBranch>
                     <branch>ign-transport11</branch>
                 </org.jenkinsci.plugins.ghprb.GhprbBranch>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
Only in /tmp/pr_xml_configuration: gz_transport-ign-transport8-win.xml
diff -ur -I '.*<id>dashboard_portlet_.*</id>.*' /tmp/current_xml_configuration/gz_transport-pr-win.xml /tmp/pr_xml_configuration/gz_transport-pr-win.xml
--- /tmp/current_xml_configuration/gz_transport-pr-win.xml	2023-11-28 18:28:07.450636384 +0000
+++ /tmp/pr_xml_configuration/gz_transport-pr-win.xml	2023-11-28 18:26:41.198932814 +0000
@@ -56,6 +56,9 @@
             <cron></cron>
             <whiteListTargetBranches>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
+                    <branch>ign-transport8</branch>
+                </org.jenkinsci.plugins.ghprb.GhprbBranch>
+                <org.jenkinsci.plugins.ghprb.GhprbBranch>
                     <branch>ign-transport11</branch>
                 </org.jenkinsci.plugins.ghprb.GhprbBranch>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
Only in /tmp/current_xml_configuration: ign-citadel-source.xml
Only in /tmp/current_xml_configuration: ign-cmake2-source.xml
Only in /tmp/current_xml_configuration: ign-common3-source.xml
Only in /tmp/current_xml_configuration: ign-fuel-tools4-source.xml
Only in /tmp/current_xml_configuration: ign-gazebo7-source.xml
Only in /tmp/current_xml_configuration: ign-gui3-source.xml
Only in /tmp/current_xml_configuration: ign-launch2-source.xml
Only in /tmp/current_xml_configuration: ign-math6-source.xml
Only in /tmp/current_xml_configuration: ign-msgs5-source.xml
Only in /tmp/current_xml_configuration: ign-physics2-source.xml
Only in /tmp/current_xml_configuration: ign-plugin1-source.xml
Only in /tmp/current_xml_configuration: ign-rendering3-source.xml
Only in /tmp/current_xml_configuration: ign-sensors3-source.xml
Only in /tmp/current_xml_configuration: ign-tools1-source.xml
Only in /tmp/current_xml_configuration: ign-transport8-source.xml
Only in /tmp/current_xml_configuration: ign_cmake-2-win.xml
Only in /tmp/current_xml_configuration: ign_cmake-ci-ign-cmake2-bionic-amd64.xml
Only in /tmp/current_xml_configuration: ign_cmake-ci-ign-cmake2-homebrew-amd64.xml
Only in /tmp/current_xml_configuration: ign_cmake-ci-pr_any-bionic-amd64.xml
Only in /tmp/current_xml_configuration: ign_cmake-ci-pr_any-homebrew-amd64.xml
Only in /tmp/current_xml_configuration: ign_cmake-pr-win.xml
Only in /tmp/current_xml_configuration: ign_common-3-win.xml
Only in /tmp/current_xml_configuration: ign_common-abichecker-any_to_any-ubuntu-bionic-amd64.xml
Only in /tmp/current_xml_configuration: ign_common-ci-ign-common3-bionic-amd64.xml
Only in /tmp/current_xml_configuration: ign_common-ci-ign-common3-homebrew-amd64.xml
Only in /tmp/current_xml_configuration: ign_common-ci-pr_any-bionic-amd64.xml
Only in /tmp/current_xml_configuration: ign_common-ci-pr_any-homebrew-amd64.xml
Only in /tmp/current_xml_configuration: ign_common-pr-win.xml
Only in /tmp/current_xml_configuration: ign_fuel_tools-4-win.xml
Only in /tmp/current_xml_configuration: ign_fuel_tools-abichecker-any_to_any-ubuntu-bionic-amd64.xml
Only in /tmp/current_xml_configuration: ign_fuel_tools-ci-ign-fuel-tools4-bionic-amd64.xml
Only in /tmp/current_xml_configuration: ign_fuel_tools-ci-ign-fuel-tools4-homebrew-amd64.xml
Only in /tmp/current_xml_configuration: ign_fuel_tools-ci-pr_any-bionic-amd64.xml
Only in /tmp/current_xml_configuration: ign_fuel_tools-ci-pr_any-homebrew-amd64.xml
Only in /tmp/current_xml_configuration: ign_fuel_tools-pr-win.xml
Only in /tmp/current_xml_configuration: ign_gazebo-3-win.xml
Only in /tmp/current_xml_configuration: ign_gazebo-abichecker-any_to_any-ubuntu-bionic-amd64.xml
Only in /tmp/current_xml_configuration: ign_gazebo-ci-ign-gazebo3-bionic-amd64.xml
Only in /tmp/current_xml_configuration: ign_gazebo-ci-ign-gazebo3-homebrew-amd64.xml
Only in /tmp/current_xml_configuration: ign_gazebo-ci-pr_any-bionic-amd64.xml
Only in /tmp/current_xml_configuration: ign_gazebo-ci-pr_any-homebrew-amd64.xml
Only in /tmp/current_xml_configuration: ign_gazebo-pr-win.xml
Only in /tmp/current_xml_configuration: ign_gui-3-win.xml
Only in /tmp/current_xml_configuration: ign_gui-abichecker-any_to_any-ubuntu-bionic-amd64.xml
Only in /tmp/current_xml_configuration: ign_gui-ci-ign-gui3-bionic-amd64.xml
Only in /tmp/current_xml_configuration: ign_gui-ci-ign-gui3-homebrew-amd64.xml
Only in /tmp/current_xml_configuration: ign_gui-ci-pr_any-bionic-amd64.xml
Only in /tmp/current_xml_configuration: ign_gui-ci-pr_any-homebrew-amd64.xml
Only in /tmp/current_xml_configuration: ign_gui-pr-win.xml
Only in /tmp/current_xml_configuration: ign_launch-2-win.xml
Only in /tmp/current_xml_configuration: ign_launch-abichecker-any_to_any-ubuntu-bionic-amd64.xml
Only in /tmp/current_xml_configuration: ign_launch-ci-ign-launch2-bionic-amd64.xml
Only in /tmp/current_xml_configuration: ign_launch-ci-ign-launch2-homebrew-amd64.xml
Only in /tmp/current_xml_configuration: ign_launch-ci-pr_any-bionic-amd64.xml
Only in /tmp/current_xml_configuration: ign_launch-ci-pr_any-homebrew-amd64.xml
Only in /tmp/current_xml_configuration: ign_launch-pr-win.xml
Only in /tmp/current_xml_configuration: ign_math-6-win.xml
Only in /tmp/current_xml_configuration: ign_math-abichecker-any_to_any-ubuntu-bionic-amd64.xml
Only in /tmp/current_xml_configuration: ign_math-ci-ign-math6-bionic-amd64.xml
Only in /tmp/current_xml_configuration: ign_math-ci-ign-math6-homebrew-amd64.xml
Only in /tmp/current_xml_configuration: ign_math-ci-pr_any-bionic-amd64.xml
Only in /tmp/current_xml_configuration: ign_math-ci-pr_any-homebrew-amd64.xml
Only in /tmp/current_xml_configuration: ign_math-pr-win.xml
Only in /tmp/current_xml_configuration: ign_msgs-5-win.xml
Only in /tmp/current_xml_configuration: ign_msgs-abichecker-any_to_any-ubuntu-bionic-amd64.xml
Only in /tmp/current_xml_configuration: ign_msgs-ci-ign-msgs5-bionic-amd64.xml
Only in /tmp/current_xml_configuration: ign_msgs-ci-ign-msgs5-homebrew-amd64.xml
Only in /tmp/current_xml_configuration: ign_msgs-ci-pr_any-bionic-amd64.xml
Only in /tmp/current_xml_configuration: ign_msgs-ci-pr_any-homebrew-amd64.xml
Only in /tmp/current_xml_configuration: ign_msgs-pr-win.xml
Only in /tmp/current_xml_configuration: ign_physics-2-win.xml
Only in /tmp/current_xml_configuration: ign_physics-abichecker-any_to_any-ubuntu-bionic-amd64.xml
Only in /tmp/current_xml_configuration: ign_physics-ci-ign-physics2-bionic-amd64.xml
Only in /tmp/current_xml_configuration: ign_physics-ci-ign-physics2-homebrew-amd64.xml
Only in /tmp/current_xml_configuration: ign_physics-ci-pr_any-bionic-amd64.xml
Only in /tmp/current_xml_configuration: ign_physics-ci-pr_any-homebrew-amd64.xml
Only in /tmp/current_xml_configuration: ign_physics-pr-win.xml
Only in /tmp/current_xml_configuration: ign_plugin-1-win.xml
Only in /tmp/current_xml_configuration: ign_plugin-abichecker-any_to_any-ubuntu-bionic-amd64.xml
Only in /tmp/current_xml_configuration: ign_plugin-ci-ign-plugin1-bionic-amd64.xml
Only in /tmp/current_xml_configuration: ign_plugin-ci-ign-plugin1-homebrew-amd64.xml
Only in /tmp/current_xml_configuration: ign_plugin-ci-pr_any-bionic-amd64.xml
Only in /tmp/current_xml_configuration: ign_plugin-ci-pr_any-homebrew-amd64.xml
Only in /tmp/current_xml_configuration: ign_plugin-pr-win.xml
Only in /tmp/current_xml_configuration: ign_rendering-3-win.xml
Only in /tmp/current_xml_configuration: ign_rendering-abichecker-any_to_any-ubuntu-bionic-amd64.xml
Only in /tmp/current_xml_configuration: ign_rendering-ci-ign-rendering3-bionic-amd64.xml
Only in /tmp/current_xml_configuration: ign_rendering-ci-ign-rendering3-homebrew-amd64.xml
Only in /tmp/current_xml_configuration: ign_rendering-ci-pr_any-bionic-amd64.xml
Only in /tmp/current_xml_configuration: ign_rendering-ci-pr_any-homebrew-amd64.xml
Only in /tmp/current_xml_configuration: ign_rendering-pr-win.xml
Only in /tmp/current_xml_configuration: ign_sensors-3-win.xml
Only in /tmp/current_xml_configuration: ign_sensors-abichecker-any_to_any-ubuntu-bionic-amd64.xml
Only in /tmp/current_xml_configuration: ign_sensors-ci-ign-sensors3-bionic-amd64.xml
Only in /tmp/current_xml_configuration: ign_sensors-ci-ign-sensors3-homebrew-amd64.xml
Only in /tmp/current_xml_configuration: ign_sensors-ci-pr_any-bionic-amd64.xml
Only in /tmp/current_xml_configuration: ign_sensors-ci-pr_any-homebrew-amd64.xml
Only in /tmp/current_xml_configuration: ign_sensors-pr-win.xml
Only in /tmp/current_xml_configuration: ign_tools-1-win.xml
Only in /tmp/current_xml_configuration: ign_tools-ci-ign-tools1-bionic-amd64.xml
Only in /tmp/current_xml_configuration: ign_tools-ci-ign-tools1-homebrew-amd64.xml
Only in /tmp/current_xml_configuration: ign_tools-ci-pr_any-bionic-amd64.xml
Only in /tmp/current_xml_configuration: ign_tools-ci-pr_any-homebrew-amd64.xml
Only in /tmp/current_xml_configuration: ign_tools-pr-win.xml
Only in /tmp/current_xml_configuration: ign_transport-8-win.xml
Only in /tmp/current_xml_configuration: ign_transport-abichecker-any_to_any-ubuntu-bionic-amd64.xml
Only in /tmp/current_xml_configuration: ign_transport-ci-ign-transport8-bionic-amd64.xml
Only in /tmp/current_xml_configuration: ign_transport-ci-ign-transport8-homebrew-amd64.xml
Only in /tmp/current_xml_configuration: ign_transport-ci-pr_any-bionic-amd64.xml
Only in /tmp/current_xml_configuration: ign_transport-ci-pr_any-homebrew-amd64.xml
Only in /tmp/current_xml_configuration: ign_transport-pr-win.xml
Only in /tmp/current_xml_configuration: ignition_citadel-install-pkg-bionic-amd64.xml
Only in /tmp/pr_xml_configuration: ignition_citadel-install-pkg-focal-amd64.xml
diff -ur -I '.*<id>dashboard_portlet_.*</id>.*' /tmp/current_xml_configuration/ignition_citadel-install-pkg_ros_bootstrap-any-manual.xml /tmp/pr_xml_configuration/ignition_citadel-install-pkg_ros_bootstrap-any-manual.xml
--- /tmp/current_xml_configuration/ignition_citadel-install-pkg_ros_bootstrap-any-manual.xml	2023-11-28 18:28:51.178004060 +0000
+++ /tmp/pr_xml_configuration/ignition_citadel-install-pkg_ros_bootstrap-any-manual.xml	2023-11-28 18:27:27.574778173 +0000
@@ -22,7 +22,7 @@
                 </hudson.model.StringParameterDefinition>
                 <hudson.model.StringParameterDefinition>
                     <name>DISTRO</name>
-                    <defaultValue>bionic</defaultValue>
+                    <defaultValue>focal</defaultValue>
                     <description>Linux release inside LINUX_DISTRO to build packages for</description>
                 </hudson.model.StringParameterDefinition>
                 <hudson.model.StringParameterDefinition>
Only in /tmp/current_xml_configuration: sdformat-abichecker-any_to_any-ubuntu-bionic-amd64.xml
diff -ur -I '.*<id>dashboard_portlet_.*</id>.*' /tmp/current_xml_configuration/sdformat-abichecker-any_to_any-ubuntu-focal-amd64.xml /tmp/pr_xml_configuration/sdformat-abichecker-any_to_any-ubuntu-focal-amd64.xml
--- /tmp/current_xml_configuration/sdformat-abichecker-any_to_any-ubuntu-focal-amd64.xml	2023-11-28 18:27:49.694699250 +0000
+++ /tmp/pr_xml_configuration/sdformat-abichecker-any_to_any-ubuntu-focal-amd64.xml	2023-11-28 18:26:36.898948031 +0000
@@ -73,6 +73,9 @@
             <cron></cron>
             <whiteListTargetBranches>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
+                    <branch>sdf9</branch>
+                </org.jenkinsci.plugins.ghprb.GhprbBranch>
+                <org.jenkinsci.plugins.ghprb.GhprbBranch>
                     <branch>sdf12</branch>
                 </org.jenkinsci.plugins.ghprb.GhprbBranch>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
Only in /tmp/current_xml_configuration: sdformat-ci-pr_any-bionic-amd64.xml
diff -ur -I '.*<id>dashboard_portlet_.*</id>.*' /tmp/current_xml_configuration/sdformat-ci-pr_any-focal-amd64.xml /tmp/pr_xml_configuration/sdformat-ci-pr_any-focal-amd64.xml
--- /tmp/current_xml_configuration/sdformat-ci-pr_any-focal-amd64.xml	2023-11-28 18:27:49.614699531 +0000
+++ /tmp/pr_xml_configuration/sdformat-ci-pr_any-focal-amd64.xml	2023-11-28 18:26:36.818948319 +0000
@@ -53,6 +53,9 @@
             <cron></cron>
             <whiteListTargetBranches>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
+                    <branch>sdf9</branch>
+                </org.jenkinsci.plugins.ghprb.GhprbBranch>
+                <org.jenkinsci.plugins.ghprb.GhprbBranch>
                     <branch>sdf12</branch>
                 </org.jenkinsci.plugins.ghprb.GhprbBranch>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
Only in /tmp/current_xml_configuration: sdformat-ci-sdf9-bionic-amd64.xml
Only in /tmp/pr_xml_configuration: sdformat-ci-sdf9-focal-amd64.xml

Copy link
Contributor

@Crola1702 Crola1702 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. Just one minor comment.

Also, bumping to focal and changing to gz_ will collide with some fortress packages.

E.g.: citadel gz_cmake-ci-ign-cmake2-focal-amd64 and fortress gz_cmake-ci-ign-cmake2-focal-amd64 (in fact, this job already exists: link).

I'm ok with that, as specifically, for these jobs that's the way the Gazebo dashboard should show the jobs.

@j-rivero
Copy link
Contributor Author

Also, bumping to focal and changing to gz_ will collide with some fortress packages.

E.g.: citadel gz_cmake-ci-ign-cmake2-focal-amd64 and fortress gz_cmake-ci-ign-cmake2-focal-amd64 (in fact, this job already exists: link).

I'm ok with that, as specifically, for these jobs that's the way the Gazebo dashboard should show the jobs.

This is expected since the same library and version is included in both collections.

Signed-off-by: Jose Luis Rivero <[email protected]>
@j-rivero j-rivero merged commit 2b92f84 into master Nov 30, 2023
@j-rivero j-rivero deleted the jrivero/use_gz_and_focal_citadel branch November 30, 2023 11:22
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.

2 participants