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

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

Merged
merged 6 commits into from
May 23, 2024

Conversation

j-rivero
Copy link
Contributor

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
Copy link
Contributor Author

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>

@j-rivero j-rivero merged commit 2d167cf into master May 23, 2024
1 check passed
@j-rivero j-rivero deleted the jrivero/remove_indexes_dup_abichecker branch May 23, 2024 11:57
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.

gz-collections.yaml can generate two abichecker jobs
2 participants