Skip to content

Commit a0d3516

Browse files
authored
Remove completely the FlakyTest plugin from DSL (#1507)
Signed-off-by: Jose Luis Rivero <jrivero@honurobotics.com>
1 parent 4685e96 commit a0d3516

3 files changed

Lines changed: 7 additions & 18 deletions

File tree

jenkins-scripts/dsl/_configs_/GenericCompilation.groovy

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

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

4039
GenericMail.update_field(job, 'defaultContent',
@@ -55,13 +54,7 @@ class GenericCompilation
5554
{
5655
publishers
5756
{
58-
archiveJunit('build/test_results/*.xml') {
59-
if (enable_flaky_test_report) {
60-
testDataPublishers {
61-
publishFlakyTestsReport()
62-
}
63-
}
64-
}
57+
archiveJunit('build/test_results/*.xml')
6558
} // end of publishers
6659
} // end of enable_testing
6760
} // end of job

jenkins-scripts/dsl/_configs_/OSRFLinuxCompilation.groovy

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

@@ -44,7 +43,7 @@ class OSRFLinuxCompilation extends OSRFLinuxBase
4443
}
4544

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

4948
job.with
5049
{

jenkins-scripts/dsl/gazebo_libs.dsl

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,7 @@ 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 = '',
108-
enable_flaky_test_report = true)
107+
extra_cmake = '', extra_test = '', extra_cmd = '')
109108
{
110109
def script_name_prefix = cleanup_library_name(lib_name)
111110
def distro = ci_config.system.version
@@ -114,8 +113,7 @@ void generate_ci_job(gz_ci_job, lib_name, branch, ci_config,
114113
def ws_checkout_dir = lib_name
115114
extra_cmd = [extra_cmd, pre_setup_script].findAll({ it != null }).join('\n')
116115

117-
OSRFLinuxCompilation.create(gz_ci_job, is_testing_enabled(lib_name, ci_config),
118-
true, enable_flaky_test_report)
116+
OSRFLinuxCompilation.create(gz_ci_job, is_testing_enabled(lib_name, ci_config))
119117
OSRFGitHub.create(gz_ci_job,
120118
"gazebosim/${lib_name}",
121119
branch,
@@ -147,8 +145,7 @@ void generate_asan_ci_job(gz_ci_job, lib_name, branch, ci_config, extra_cmd = ''
147145
generate_ci_job(gz_ci_job, lib_name, branch, ci_config,
148146
'-DGZ_SANITIZER=Address',
149147
Globals.MAKETEST_SKIP_GZ,
150-
asan_extra,
151-
false) // disable the flaky test plugin for -asan- jobs
148+
asan_extra)
152149
gz_ci_job.with {
153150
// -asan- builds can produce really long logs. Reduce the number of builds in the server
154151
logRotator {

0 commit comments

Comments
 (0)