Skip to content

Remove completely the FlakyTest plugin from DSL #1507

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

Merged
j-rivero merged 1 commit into from
Jun 3, 2026
Merged

Remove completely the FlakyTest plugin from DSL #1507

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 2 additions & 9 deletions jenkins-scripts/dsl/_configs_/GenericCompilation.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,7 @@ class GenericCompilation
'''.stripIndent()
}

static void create(Job job, boolean enable_testing = true,
boolean enable_flaky_test_report = true)
static void create(Job job, boolean enable_testing = true)
{

GenericMail.update_field(job, 'defaultContent',
Expand All @@ -55,13 +54,7 @@ class GenericCompilation
{
publishers
{
archiveJunit('build/test_results/*.xml') {
if (enable_flaky_test_report) {
testDataPublishers {
publishFlakyTestsReport()
}
}
}
archiveJunit('build/test_results/*.xml')
} // end of publishers
} // end of enable_testing
} // end of job
Expand Down
5 changes: 2 additions & 3 deletions jenkins-scripts/dsl/_configs_/OSRFLinuxCompilation.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ import javaposse.jobdsl.dsl.Job
class OSRFLinuxCompilation extends OSRFLinuxBase
{
static void create(Job job, enable_testing = true,
enable_cppcheck = true,
enable_flaky_test_report = true)
enable_cppcheck = true)
{
OSRFLinuxBase.create(job)

Expand Down Expand Up @@ -44,7 +43,7 @@ class OSRFLinuxCompilation extends OSRFLinuxBase
}

/* Properties from generic compilations */
GenericCompilation.create(job, enable_testing, enable_flaky_test_report)
GenericCompilation.create(job, enable_testing)

job.with
{
Expand Down
9 changes: 3 additions & 6 deletions jenkins-scripts/dsl/gazebo_libs.dsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,7 @@ void generate_ciconfigs_by_lib(config, pkgconf_per_src_index)
}

void generate_ci_job(gz_ci_job, lib_name, branch, ci_config,
extra_cmake = '', extra_test = '', extra_cmd = '',
enable_flaky_test_report = true)
extra_cmake = '', extra_test = '', extra_cmd = '')
{
def script_name_prefix = cleanup_library_name(lib_name)
def distro = ci_config.system.version
Expand All @@ -114,8 +113,7 @@ void generate_ci_job(gz_ci_job, lib_name, branch, ci_config,
def ws_checkout_dir = lib_name
extra_cmd = [extra_cmd, pre_setup_script].findAll({ it != null }).join('\n')

OSRFLinuxCompilation.create(gz_ci_job, is_testing_enabled(lib_name, ci_config),
true, enable_flaky_test_report)
OSRFLinuxCompilation.create(gz_ci_job, is_testing_enabled(lib_name, ci_config))
OSRFGitHub.create(gz_ci_job,
"gazebosim/${lib_name}",
branch,
Expand Down Expand Up @@ -147,8 +145,7 @@ void generate_asan_ci_job(gz_ci_job, lib_name, branch, ci_config, extra_cmd = ''
generate_ci_job(gz_ci_job, lib_name, branch, ci_config,
'-DGZ_SANITIZER=Address',
Globals.MAKETEST_SKIP_GZ,
asan_extra,
false) // disable the flaky test plugin for -asan- jobs
asan_extra)
gz_ci_job.with {
// -asan- builds can produce really long logs. Reduce the number of builds in the server
logRotator {
Expand Down
Loading