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.

Sign up for GitHub

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

Jump to bottom

Avoid abicheckers to be generated with no whiteListedBranches #1144

Merged
merged 8 commits into from
May 23, 2024
Merged

Avoid abicheckers to be generated with no whiteListedBranches #1144

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
69382dd
Avoid abicheckers to be generated with no whiteListedBranches
j-rivero May 21, 2024
9dfb41b
Add a check to avoid future problems
j-rivero May 21, 2024
a522c45
Restrict test to gazebo_libs
j-rivero May 21, 2024
4bd6a57
Merge branch 'master' into jrivero/abi_empty
j-rivero May 22, 2024
d4ca5ca
Debug
j-rivero May 22, 2024
4f8ab8d
Revert "Debug"
j-rivero May 23, 2024
c483343
Handle no results by grep not to exit
j-rivero May 23, 2024
134f12a
Merge branch 'master' into jrivero/abi_empty
j-rivero May 23, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/ci-dsl.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
- name: Checks for DSL Code
run: |
cd jenkins-scripts/dsl
./dsl_checks.bash
bash -x ./dsl_checks.bash
- name: Export XML generated configuration for diff
run: |
cd jenkins-scripts/dsl
Expand Down
10 changes: 10 additions & 0 deletions jenkins-scripts/dsl/dsl_checks.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,16 @@ if [[ -n ${non_github_orgs} ]]; then
exit 1
fi

# Check that whiteListedTargetBranches are non empty in all generated gazebo_libs
# see https://github.com/gazebo-tooling/release-tools/pull/1144
# For other jobs the use case is valid since pr can be enabled on all branches
empty_branches_on_github_triggered=$(grep '<whiteListTargetBranches></whiteListTargetBranches>' -- {gz_,sdformat}*{-abichecker-,-pr_any-}*.xml)
if [[ -n ${empty_branches_on_github_triggered} ]]; then
echo "Unexpected whiteListTargetBranches without values. It will trigger all branches:"
echo "${empty_branches_on_github_triggered}"
exit 1
fi

# re-enable after https://github.com/gazebo-tooling/release-tools/issues/1095

# Filter out the previous auto jobs
Expand Down
3 changes: 2 additions & 1 deletion jenkins-scripts/dsl/gazebo_libs.dsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,6 +345,7 @@ gz_collections_yaml.collections.each { collection ->
branch_index[lib_name][platform]['pr'] << [branch: branch_name, ci_name: config_name]
}
if (categories_enabled.contains('pr_abichecker') &&
(branch_name != 'main') &&
(! ci_config.exclude.abichecker?.contains(lib_name)))
{
branch_index[lib_name][platform]['pr_abichecker'].contains(branch_name) ?:
Expand Down Expand Up @@ -482,7 +483,7 @@ branch_index.each { lib_name, distro_configs ->
OSRFLinuxABIGitHub.create(abi_job)
GenericAnyJobGitHub.create(abi_job,
"gazebosim/${lib_name}",
branch_names - [ 'main'])
branch_names)
generate_label_by_requirements(abi_job, lib_name, ci_config.requirements)
abi_job.with
{
Expand Down
Loading