Skip to content

Commit 4685e96

Browse files
authored
Disable the FlakyTest plugin for ASAN jobs (#1506)
Signed-off-by: Jose Luis Rivero <jrivero@honurobotics.com>
1 parent 01566f7 commit 4685e96

3 files changed

Lines changed: 15 additions & 8 deletions

File tree

jenkins-scripts/dsl/_configs_/GenericCompilation.groovy

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ class GenericCompilation
3333
'''.stripIndent()
3434
}
3535

36-
static void create(Job job, boolean enable_testing = true)
36+
static void create(Job job, boolean enable_testing = true,
37+
boolean enable_flaky_test_report = true)
3738
{
3839

3940
GenericMail.update_field(job, 'defaultContent',
@@ -55,8 +56,10 @@ class GenericCompilation
5556
publishers
5657
{
5758
archiveJunit('build/test_results/*.xml') {
58-
testDataPublishers {
59-
publishFlakyTestsReport()
59+
if (enable_flaky_test_report) {
60+
testDataPublishers {
61+
publishFlakyTestsReport()
62+
}
6063
}
6164
}
6265
} // end of publishers

jenkins-scripts/dsl/_configs_/OSRFLinuxCompilation.groovy

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ import javaposse.jobdsl.dsl.Job
1212
class OSRFLinuxCompilation extends OSRFLinuxBase
1313
{
1414
static void create(Job job, enable_testing = true,
15-
enable_cppcheck = true)
15+
enable_cppcheck = true,
16+
enable_flaky_test_report = true)
1617
{
1718
OSRFLinuxBase.create(job)
1819

@@ -43,7 +44,7 @@ class OSRFLinuxCompilation extends OSRFLinuxBase
4344
}
4445

4546
/* Properties from generic compilations */
46-
GenericCompilation.create(job, enable_testing)
47+
GenericCompilation.create(job, enable_testing, enable_flaky_test_report)
4748

4849
job.with
4950
{

jenkins-scripts/dsl/gazebo_libs.dsl

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,8 @@ void generate_ciconfigs_by_lib(config, pkgconf_per_src_index)
104104
}
105105

106106
void generate_ci_job(gz_ci_job, lib_name, branch, ci_config,
107-
extra_cmake = '', extra_test = '', extra_cmd = '')
107+
extra_cmake = '', extra_test = '', extra_cmd = '',
108+
enable_flaky_test_report = true)
108109
{
109110
def script_name_prefix = cleanup_library_name(lib_name)
110111
def distro = ci_config.system.version
@@ -113,7 +114,8 @@ void generate_ci_job(gz_ci_job, lib_name, branch, ci_config,
113114
def ws_checkout_dir = lib_name
114115
extra_cmd = [extra_cmd, pre_setup_script].findAll({ it != null }).join('\n')
115116

116-
OSRFLinuxCompilation.create(gz_ci_job, is_testing_enabled(lib_name, ci_config))
117+
OSRFLinuxCompilation.create(gz_ci_job, is_testing_enabled(lib_name, ci_config),
118+
true, enable_flaky_test_report)
117119
OSRFGitHub.create(gz_ci_job,
118120
"gazebosim/${lib_name}",
119121
branch,
@@ -145,7 +147,8 @@ void generate_asan_ci_job(gz_ci_job, lib_name, branch, ci_config, extra_cmd = ''
145147
generate_ci_job(gz_ci_job, lib_name, branch, ci_config,
146148
'-DGZ_SANITIZER=Address',
147149
Globals.MAKETEST_SKIP_GZ,
148-
asan_extra)
150+
asan_extra,
151+
false) // disable the flaky test plugin for -asan- jobs
149152
gz_ci_job.with {
150153
// -asan- builds can produce really long logs. Reduce the number of builds in the server
151154
logRotator {

0 commit comments

Comments
 (0)