search

gazebo-tooling / release-tools

8 stars 9 forks source link

Avoid to create duplicate ABI checkers on Garden libs that already have one #1142

Closed j-rivero closed 4 months ago

j-rivero commented 4 months ago

Should fix #1095

Add a new CI configuration for Focal that excludes from generating the ABI checkers the libs that already have them running on Harmonic. The trick is done in:

    exclude:
      all:
        - gz-citadel
        - gz-fortress
        - gz-garden
      abichecker:
        - gz-cmake
        - gz-tools
        # Exclude the abichecker that are duplicate with Harmonic
        # The ones on Harmonic run on jammy
        - gz-common
        - gz-math
        - gz-plugin
        - gz-utils

The PR also reenable a check to detect duplicate abi checkers.

j-rivero commented 4 months ago

No job is removed or added but the diff shows the expected behaviour of removing branches from the abichecker jobs:

diff -ur -I '.*<id>dashboard_portlet_.*</id>.*' /tmp/current_xml_configuration/gz_common-abichecker-any_to_any-ubuntu-focal-amd64.xml /tmp/pr_xml_configuration/gz_common-abichecker-any_to_any-ubuntu-focal-amd64.xml
--- /tmp/current_xml_configuration/gz_common-abichecker-any_to_any-ubuntu-focal-amd64.xml   2024-05-19 16:51:29.931118370 +0000
+++ /tmp/pr_xml_configuration/gz_common-abichecker-any_to_any-ubuntu-focal-amd64.xml    2024-05-19 16:50:07.107320279 +0000
@@ -78,9 +78,6 @@
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
                     <branch>ign-common4</branch>
                 </org.jenkinsci.plugins.ghprb.GhprbBranch>
-                <org.jenkinsci.plugins.ghprb.GhprbBranch>
-                    <branch>gz-common5</branch>
-                </org.jenkinsci.plugins.ghprb.GhprbBranch>
             </whiteListTargetBranches>
             <triggerPhrase>.*(re)?run test(s).*</triggerPhrase>
             <extensions>
diff -ur -I '.*<id>dashboard_portlet_.*</id>.*' /tmp/current_xml_configuration/gz_math-abichecker-any_to_any-ubuntu-focal-amd64.xml /tmp/pr_xml_configuration/gz_math-abichecker-any_to_any-ubuntu-focal-amd64.xml
--- /tmp/current_xml_configuration/gz_math-abichecker-any_to_any-ubuntu-focal-amd64.xml 2024-05-19 16:51:28.655124508 +0000
+++ /tmp/pr_xml_configuration/gz_math-abichecker-any_to_any-ubuntu-focal-amd64.xml  2024-05-19 16:50:05.835322773 +0000
@@ -75,9 +75,6 @@
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
                     <branch>ign-math6</branch>
                 </org.jenkinsci.plugins.ghprb.GhprbBranch>
-                <org.jenkinsci.plugins.ghprb.GhprbBranch>
-                    <branch>gz-math7</branch>
-                </org.jenkinsci.plugins.ghprb.GhprbBranch>
             </whiteListTargetBranches>
             <triggerPhrase>.*(re)?run test(s).*</triggerPhrase>
             <extensions>
diff -ur -I '.*<id>dashboard_portlet_.*</id>.*' /tmp/current_xml_configuration/gz_plugin-abichecker-any_to_any-ubuntu-focal-amd64.xml /tmp/pr_xml_configuration/gz_plugin-abichecker-any_to_any-ubuntu-focal-amd64.xml
--- /tmp/current_xml_configuration/gz_plugin-abichecker-any_to_any-ubuntu-focal-amd64.xml   2024-05-19 16:51:29.295121188 +0000
+++ /tmp/pr_xml_configuration/gz_plugin-abichecker-any_to_any-ubuntu-focal-amd64.xml    2024-05-19 16:50:06.475321524 +0000
@@ -75,9 +75,6 @@
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
                     <branch>ign-plugin1</branch>
                 </org.jenkinsci.plugins.ghprb.GhprbBranch>
-                <org.jenkinsci.plugins.ghprb.GhprbBranch>
-                    <branch>gz-plugin2</branch>
-                </org.jenkinsci.plugins.ghprb.GhprbBranch>
             </whiteListTargetBranches>
             <triggerPhrase>.*(re)?run test(s).*</triggerPhrase>
             <extensions>
diff -ur -I '.*<id>dashboard_portlet_.*</id>.*' /tmp/current_xml_configuration/gz_utils-abichecker-any_to_any-ubuntu-focal-amd64.xml /tmp/pr_xml_configuration/gz_utils-abichecker-any_to_any-ubuntu-focal-amd64.xml
--- /tmp/current_xml_configuration/gz_utils-abichecker-any_to_any-ubuntu-focal-amd64.xml    2024-05-19 16:51:36.995104708 +0000
+++ /tmp/pr_xml_configuration/gz_utils-abichecker-any_to_any-ubuntu-focal-amd64.xml 2024-05-19 16:50:14.191305201 +0000
@@ -75,9 +75,6 @@
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
                     <branch>ign-utils1</branch>
                 </org.jenkinsci.plugins.ghprb.GhprbBranch>
-                <org.jenkinsci.plugins.ghprb.GhprbBranch>
-                    <branch>gz-utils2</branch>
-                </org.jenkinsci.plugins.ghprb.GhprbBranch>
             </whiteListTargetBranches>
             <triggerPhrase>.*(re)?run test(s).*</triggerPhrase>
             <extensions>