diff --git a/x-pack/qa/rolling-upgrade/build.gradle b/x-pack/qa/rolling-upgrade/build.gradle index d66522c5d3b..78b8f3e57dc 100644 --- a/x-pack/qa/rolling-upgrade/build.gradle +++ b/x-pack/qa/rolling-upgrade/build.gradle @@ -116,11 +116,11 @@ for (Version bwcVersion : bwcVersions.wireCompatible) { def toBlackList = [] // Dataframe transforms were not added until 7.2.0 if (bwcVersion.before('7.2.0')) { - toBlackList << 'old_cluster/80_data_frame_jobs_crud/Test put batch data frame transforms on old cluster' + toBlackList << 'old_cluster/80_transform_jobs_crud/Test put batch transform on old cluster' } // continuous Dataframe transforms were not added until 7.3.0 if (bwcVersion.before('7.3.0')) { - toBlackList << 'old_cluster/80_data_frame_jobs_crud/Test put continuous data frame transform on old cluster' + toBlackList << 'old_cluster/80_transform_jobs_crud/Test put continuous transform on old cluster' } if (!toBlackList.empty) { systemProperty 'tests.rest.blacklist', toBlackList.join(',') @@ -144,14 +144,14 @@ for (Version bwcVersion : bwcVersions.wireCompatible) { 'mixed_cluster/30_ml_jobs_crud/Create a job in the mixed cluster and write some data', 'mixed_cluster/40_ml_datafeed_crud/Put job and datafeed without aggs in mixed cluster', 'mixed_cluster/40_ml_datafeed_crud/Put job and datafeed with aggs in mixed cluster', - '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' + 'mixed_cluster/80_transform_jobs_crud/Test put batch transform on mixed cluster', + 'mixed_cluster/80_transform_jobs_crud/Test put continuous transform on mixed cluster', ] // 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' + 'mixed_cluster/80_transform_jobs_crud/Test GET, start, and stop old cluster batch transforms', + 'mixed_cluster/80_transform_jobs_crud/Test GET, stop, start, old continuous transforms' ]) } systemProperty 'tests.rest.blacklist', toBlackList.join(',') @@ -171,10 +171,10 @@ for (Version bwcVersion : bwcVersions.wireCompatible) { // 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 GET, stop, start, old continuous transforms' + 'mixed_cluster/80_transform_jobs_crud/Test put batch transform on mixed cluster', + 'mixed_cluster/80_transform_jobs_crud/Test GET, start, and stop old cluster batch transforms', + 'mixed_cluster/80_transform_jobs_crud/Test put continuous transform on mixed cluster', + 'mixed_cluster/80_transform_jobs_crud/Test GET, stop, start, old continuous transforms' ]) } if (!toBlackList.empty) { @@ -197,16 +197,16 @@ for (Version bwcVersion : bwcVersions.wireCompatible) { def toBlackList = [] // Dataframe transforms were not added until 7.2.0 if (bwcVersion.before('7.2.0')) { - toBlackList << 'upgraded_cluster/80_data_frame_jobs_crud/Get start, stop, and delete old cluster batch data frame transforms' + toBlackList << 'upgraded_cluster/80_transform_jobs_crud/Get start, stop, and delete old cluster batch transform' } // continuous Dataframe transforms were not added until 7.3.0 if (bwcVersion.before('7.3.0')) { - toBlackList << 'upgraded_cluster/80_data_frame_jobs_crud/Test GET, stop, delete, old continuous transforms' + toBlackList << 'upgraded_cluster/80_transform_jobs_crud/Test GET, stop, delete, old continuous transforms' } // transform in mixed cluster is effectively disabled till 7.4, see gh#48019 if (bwcVersion.before('7.4.0')) { - toBlackList << 'upgraded_cluster/80_data_frame_jobs_crud/Get start, stop mixed cluster batch data frame transforms' - toBlackList << 'upgraded_cluster/80_data_frame_jobs_crud/Test GET, mixed continuous transforms' + toBlackList << 'upgraded_cluster/80_transform_jobs_crud/Get start, stop mixed cluster batch transform' + toBlackList << 'upgraded_cluster/80_transform_jobs_crud/Test GET, mixed continuous transforms' } if (!toBlackList.empty) { diff --git a/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/80_data_frame_jobs_crud.yml b/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/80_transform_jobs_crud.yml similarity index 99% rename from x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/80_data_frame_jobs_crud.yml rename to x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/80_transform_jobs_crud.yml index 0d8645eac3f..a3f14c3e562 100644 --- a/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/80_data_frame_jobs_crud.yml +++ b/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/80_transform_jobs_crud.yml @@ -1,5 +1,5 @@ --- -"Test put batch data frame transforms on mixed cluster": +"Test put batch transform on mixed cluster": - do: cluster.health: index: "transform-airline-data" @@ -110,7 +110,7 @@ #- match: { transforms.0.state: "stopped" } --- -"Test put continuous data frame transform on mixed cluster": +"Test put continuous transform on mixed cluster": - do: cluster.health: index: "transform-airline-data-cont" diff --git a/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/80_data_frame_jobs_crud.yml b/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/80_transform_jobs_crud.yml similarity index 98% rename from x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/80_data_frame_jobs_crud.yml rename to x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/80_transform_jobs_crud.yml index c8799b2233a..876e1850ec9 100644 --- a/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/80_data_frame_jobs_crud.yml +++ b/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/80_transform_jobs_crud.yml @@ -1,5 +1,5 @@ --- -"Test put batch data frame transforms on old cluster": +"Test put batch transform on old cluster": - do: indices.create: index: transform-airline-data @@ -118,7 +118,7 @@ - match: { transforms.0.id: "old-complex-transform" } --- -"Test put continuous data frame transform on old cluster": +"Test put continuous transform on old cluster": - do: indices.create: index: transform-airline-data-cont diff --git a/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/80_data_frame_jobs_crud.yml b/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/80_transform_jobs_crud.yml similarity index 98% rename from x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/80_data_frame_jobs_crud.yml rename to x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/80_transform_jobs_crud.yml index 2f25d5ae6d6..1235414f9f6 100644 --- a/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/80_data_frame_jobs_crud.yml +++ b/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/80_transform_jobs_crud.yml @@ -6,7 +6,7 @@ setup: # wait for long enough that we give delayed unassigned shards to stop being delayed timeout: 70s --- -"Get start, stop, and delete old cluster batch data frame transforms": +"Get start, stop, and delete old cluster batch transform": # Simple and complex OLD transforms - do: transform.get_transform: @@ -84,7 +84,7 @@ setup: - match: { count: 0 } --- -"Get start, stop mixed cluster batch data frame transforms": +"Get start, stop mixed cluster batch transform": # Simple and complex Mixed cluster transforms - do: transform.get_transform: