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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions jenkins-scripts/dsl/dsl_checks.bash
Original file line number Diff line number Diff line change
Expand Up @@ -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
41 changes: 39 additions & 2 deletions jenkins-scripts/dsl/gz-collections.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#

# SPEC: not yet approved, used as draft
#
#---
Expand Down Expand Up @@ -256,7 +256,7 @@ collections:
current_branch: main
ci:
configs:
- focal
- focal_exclude_harmonic_abi_dups
- brew
- win
packaging:
Expand Down Expand Up @@ -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
Expand Down
Loading