From 4b3a672a0bf252d5e095e76ca1d73535039de42c Mon Sep 17 00:00:00 2001 From: Hendrik Muhs Date: Mon, 21 Oct 2019 08:19:58 +0200 Subject: [PATCH] blacklist transform tests in mixed cluster prior 7.4 (#48247) blacklist transform tests in mixed cluster prior 7.4, see #48019 fixes #47943 --- x-pack/qa/rolling-upgrade/build.gradle | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/x-pack/qa/rolling-upgrade/build.gradle b/x-pack/qa/rolling-upgrade/build.gradle index 4a510ff0400..a305a51e450 100644 --- a/x-pack/qa/rolling-upgrade/build.gradle +++ b/x-pack/qa/rolling-upgrade/build.gradle @@ -146,13 +146,12 @@ for (Version bwcVersion : bwcVersions.wireCompatible) { 'mixed_cluster/80_data_frame_jobs_crud/Test put batch data frame transforms on mixed cluster', 'mixed_cluster/80_data_frame_jobs_crud/Test put continuous data frame transform on mixed cluster' ] - // Dataframe transforms were not added until 7.2.0 - if (bwcVersion.before('7.2.0')) { - toBlackList << 'mixed_cluster/80_data_frame_jobs_crud/Test GET, start, and stop old cluster batch transforms' - } - // continuous Dataframe transforms were not added until 7.3.0 - if (bwcVersion.before('7.3.0')) { - toBlackList << 'mixed_cluster/80_data_frame_jobs_crud/Test GET, stop, start, old continuous transforms' + // transform in mixed cluster is effectively disabled till 7.4, see gh#48019 + if (bwcVersion.before('7.4.0')) { + toBlackList.addAll([ + 'mixed_cluster/80_data_frame_jobs_crud/Test GET, start, and stop old cluster batch transforms', + 'mixed_cluster/80_data_frame_jobs_crud/Test GET, stop, start, old continuous transforms' + ]) } systemProperty 'tests.rest.blacklist', toBlackList.join(',') } @@ -168,16 +167,15 @@ for (Version bwcVersion : bwcVersions.wireCompatible) { systemProperty 'tests.rest.suite', 'mixed_cluster' systemProperty 'tests.first_round', 'false' def toBlackList = [] - if (bwcVersion.before('7.2.0')) { + // transform in mixed cluster is effectively disabled till 7.4, see gh#48019 + if (bwcVersion.before('7.4.0')) { toBlackList.addAll([ 'mixed_cluster/80_data_frame_jobs_crud/Test put batch data frame transforms on mixed cluster', 'mixed_cluster/80_data_frame_jobs_crud/Test GET, start, and stop old cluster batch transforms', - 'mixed_cluster/80_data_frame_jobs_crud/Test put continuous data frame transform on mixed cluster' + 'mixed_cluster/80_data_frame_jobs_crud/Test put continuous data frame transform on mixed cluster', + 'mixed_cluster/80_data_frame_jobs_crud/Test GET, stop, start, old continuous transforms' ]) } - if (bwcVersion.before('7.3.0')) { - toBlackList << 'mixed_cluster/80_data_frame_jobs_crud/Test GET, stop, start, old continuous transforms' - } if (!toBlackList.empty) { systemProperty 'tests.rest.blacklist', toBlackList.join(',') }