Avoid to create duplicate ABI checkers on Garden libs that already ha…

…ve one (#1142) * Remove duplicate abichecker --------- Signed-off-by: Jose Luis Rivero <[email protected]>
gazebo-tooling · May 23, 2024 · 2d167cf · 2d167cf
1 parent 9876e30
commit 2d167cf
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 12 deletions.
diff --git a/jenkins-scripts/dsl/dsl_checks.bash b/jenkins-scripts/dsl/dsl_checks.bash
@@ -53,13 +53,13 @@ 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}"
-# rm -f "${filtered_dir}"/*-ubuntu_auto*.xml
-# repeated=$(grep '\<branch>' "${filtered_dir}"/*-abichecker-*.xml | awk '{ print $2 }' | sort | uniq -d)
-# if [[ -n ${repeated} ]]; then
-#   echo "Found a duplicate in an abichecker branch:"
-#   echo "${repeated}"
-#   echo "please exclude one of the versions in the yaml file to reduce the server workload"
-#   exit 1
-# fi
+filtered_dir=$(mktemp -d)
+cp -- *-abichecker-*.xml "${filtered_dir}"
+rm -f "${filtered_dir}"/*-ubuntu_auto*.xml
+repeated=$(grep '\<branch>' "${filtered_dir}"/*-abichecker-*.xml | awk '{ print $2 }' | sort | uniq -d)
+if [[ -n ${repeated} ]]; then
+   echo "Found a duplicate in an abichecker branch:"
+   echo "${repeated}"
+   echo "please exclude one of the versions in the yaml file to reduce the server workload"
+   exit 1
+fi
diff --git a/jenkins-scripts/dsl/gz-collections.yaml b/jenkins-scripts/dsl/gz-collections.yaml
@@ -1,4 +1,4 @@
-#
+
 # SPEC: not yet approved, used as draft
 #
 #---
@@ -256,7 +256,7 @@ collections:
           current_branch: main
     ci:
       configs:
-        - focal
+        - focal_exclude_harmonic_abi_dups
         - brew
         - win
     packaging:
@@ -507,6 +507,43 @@ ci_configs:
       - pr_abichecker
       - stable_branches
       - stable_branches_asan
+  - name: focal_exclude_harmonic_abi_dups
+    system:
+      so: linux
+      distribution: ubuntu
+      version: focal
+      arch: amd64
+    requirements:
+      large_memory:
+        - gz-physics
+      nvidia_gpu:
+        - gz-sim
+        - gz-gui
+        - gz-rendering
+        - gz-sensors
+    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
+    pre_setup_script_hook:
+      gz-physics:
+        - "export MAKE_JOBS=1"
+    tests_disabled:
+    ci_categories_enabled:
+      - pr
+      - pr_abichecker
+      - stable_branches
+      - stable_branches_asan
   - name: noble
     system:
       so: linux