Skip to content

Commit 1cb3b0c

Browse files
author
Hendrik Muhs
authored
[7.6][Transform] separate old and mixed rolling upgrade tests (#48302)
separates rolling upgrade tests for transforms created on old and mixed clusters and disable testing transforms on mixed clusters for <7.4.
1 parent bbe50ec commit 1cb3b0c

File tree

3 files changed

+26
-33
lines changed

3 files changed

+26
-33
lines changed

x-pack/qa/rolling-upgrade/build.gradle

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,10 +196,16 @@ for (Version bwcVersion : bwcVersions.wireCompatible) {
196196
def toBlackList = []
197197
// Dataframe transforms were not added until 7.2.0
198198
if (bwcVersion.before('7.2.0')) {
199-
toBlackList << 'upgraded_cluster/80_data_frame_jobs_crud/Get start, stop, and delete old and mixed cluster batch data frame transforms'
200-
toBlackList << 'upgraded_cluster/80_data_frame_jobs_crud/Test GET, stop, delete, old and mixed continuous transforms'
199+
toBlackList << 'upgraded_cluster/80_data_frame_jobs_crud/Get start, stop, and delete old cluster batch data frame transforms'
200+
toBlackList << 'upgraded_cluster/80_data_frame_jobs_crud/Test GET, stop, delete, old continuous transforms'
201+
}
201202

203+
// transform in mixed cluster is effectively disabled till 7.4, see gh#48019
204+
if (bwcVersion.before('7.4.0')) {
205+
toBlackList << 'upgraded_cluster/80_data_frame_jobs_crud/Get start, stop mixed cluster batch data frame transforms'
206+
toBlackList << 'upgraded_cluster/80_data_frame_jobs_crud/Test GET, mixed continuous transforms'
202207
}
208+
203209
if (!toBlackList.empty) {
204210
systemProperty 'tests.rest.blacklist', toBlackList.join(',')
205211
}

x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/80_data_frame_jobs_crud.yml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
---
22
"Test put batch data frame transforms on mixed cluster":
3-
- skip:
4-
version: "all"
5-
reason: "https://github.com/elastic/elasticsearch/issues/47943"
63
- do:
74
cluster.health:
85
index: "transform-airline-data"
@@ -114,9 +111,6 @@
114111

115112
---
116113
"Test put continuous data frame transform on mixed cluster":
117-
- skip:
118-
version: "all"
119-
reason: "https://github.com/elastic/elasticsearch/issues/47943"
120114
- do:
121115
cluster.health:
122116
index: "transform-airline-data-cont"
@@ -183,9 +177,6 @@
183177

184178
---
185179
"Test GET, start, and stop old cluster batch transforms":
186-
- skip:
187-
version: "all"
188-
reason: "https://github.com/elastic/elasticsearch/issues/47943"
189180
- do:
190181
cluster.health:
191182
index: "transform-airline-data"
@@ -270,9 +261,6 @@
270261

271262
---
272263
"Test GET, stop, start, old continuous transforms":
273-
- skip:
274-
version: "all"
275-
reason: "https://github.com/elastic/elasticsearch/issues/47943"
276264
- do:
277265
cluster.health:
278266
index: "transform-airline-data-cont"

x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/80_data_frame_jobs_crud.yml

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,7 @@ setup:
66
# wait for long enough that we give delayed unassigned shards to stop being delayed
77
timeout: 70s
88
---
9-
"Get start, stop, and delete old and mixed cluster batch data frame transforms":
10-
- skip:
11-
version: "all"
12-
reason: "https://github.com/elastic/elasticsearch/issues/47943"
9+
"Get start, stop, and delete old cluster batch data frame transforms":
1310
# Simple and complex OLD transforms
1411
- do:
1512
transform.get_transform:
@@ -77,7 +74,17 @@ setup:
7774
- match: { count: 1 }
7875
- match: { transforms.0.id: "old-complex-transform" }
7976
- match: { transforms.0.state: "stopped" }
77+
# Delete old transform
78+
- do:
79+
transform.delete_transform:
80+
transform_id: "old-simple-transform"
81+
- do:
82+
transform.get_transform_stats:
83+
transform_id: "old-simple-transform"
84+
- match: { count: 0 }
8085

86+
---
87+
"Get start, stop mixed cluster batch data frame transforms":
8188
# Simple and complex Mixed cluster transforms
8289
- do:
8390
transform.get_transform:
@@ -146,26 +153,20 @@ setup:
146153
- match: { count: 1 }
147154
- match: { transforms.0.id: "mixed-complex-transform" }
148155
- match: { transforms.0.state: "stopped" }
149-
150-
# Delete all old and mixed transforms
156+
# Delete mixed transform
151157
- do:
152158
transform.delete_transform:
153-
transform_id: "old-simple-transform"
154-
159+
transform_id: "mixed-simple-transform"
155160
- do:
156161
transform.delete_transform:
157-
transform_id: "mixed-simple-transform"
158-
162+
transform_id: "mixed-complex-transform"
159163
- do:
160164
transform.get_transform_stats:
161-
transform_id: "old-simple-transform,mixed-simple-transform"
165+
transform_id: "mixed-simple-transform,mixed-complex-transform"
162166
- match: { count: 0 }
163167

164168
---
165-
"Test GET, stop, delete, old and mixed continuous transforms":
166-
- skip:
167-
version: "all"
168-
reason: "https://github.com/elastic/elasticsearch/issues/47943"
169+
"Test GET, stop, delete, old continuous transforms":
169170
- do:
170171
transform.get_transform:
171172
transform_id: "old-simple-continuous-transform"
@@ -210,7 +211,8 @@ setup:
210211
- do:
211212
transform.delete_transform:
212213
transform_id: "old-simple-continuous-transform"
213-
214+
---
215+
"Test GET, mixed continuous transforms":
214216
- do:
215217
transform.get_transform:
216218
transform_id: "mixed-simple-continuous-transform"
@@ -257,9 +259,6 @@ setup:
257259
transform_id: "mixed-simple-continuous-transform"
258260
---
259261
"Test index mappings for latest internal index":
260-
- skip:
261-
version: "all"
262-
reason: "https://github.com/elastic/elasticsearch/issues/47943"
263262
- do:
264263
transform.put_transform:
265264
transform_id: "upgraded-simple-transform"

0 commit comments

Comments
 (0)