diff --git a/jenkins-scripts/dsl/dsl_checks.bash b/jenkins-scripts/dsl/dsl_checks.bash index a8ae04cd7..b09bb62bb 100755 --- a/jenkins-scripts/dsl/dsl_checks.bash +++ b/jenkins-scripts/dsl/dsl_checks.bash @@ -50,6 +50,17 @@ 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 '' \ + -- {gz_,sdformat}*{-abichecker-,-pr_any-}*.xml || true) +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 diff --git a/jenkins-scripts/dsl/gazebo_libs.dsl b/jenkins-scripts/dsl/gazebo_libs.dsl index 3b3b18a0b..b56f6b99c 100644 --- a/jenkins-scripts/dsl/gazebo_libs.dsl +++ b/jenkins-scripts/dsl/gazebo_libs.dsl @@ -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) ?: @@ -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 {