Skip to content

Commit 94e1120

Browse files
will-hwangwill-hwang
committed
add version check for backport 2.x
Signed-off-by: will-hwang <[email protected]>
1 parent 238a657 commit 94e1120

File tree

1 file changed

+207
-0
lines changed

1 file changed

+207
-0
lines changed

Diff for: ‎qa/rolling-upgrade/build.gradle

+207
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,58 @@ task testAgainstOldCluster(type: StandaloneRestIntegTestTask) {
6565
systemProperty 'tests.plugin_bwc_version', ext.neural_search_bwc_version
6666
systemProperty 'tests.skip_delete_model_index', 'true'
6767

68+
//Excluding MultiModalSearchIT, HybridSearchIT, NeuralSparseSearchIT, NeuralQueryEnricherProcessorIT tests from neural search version 2.9 and 2.10
69+
// because these features were released in 2.11 version.
70+
if (ext.neural_search_bwc_version.startsWith("2.9") || ext.neural_search_bwc_version.startsWith("2.10")){
71+
filter {
72+
excludeTestsMatching "org.opensearch.neuralsearch.bwc.MultiModalSearchIT.*"
73+
excludeTestsMatching "org.opensearch.neuralsearch.bwc.HybridSearchIT.*"
74+
excludeTestsMatching "org.opensearch.neuralsearch.bwc.NeuralSparseSearchIT.*"
75+
excludeTestsMatching "org.opensearch.neuralsearch.bwc.NeuralQueryEnricherProcessorIT.*"
76+
}
77+
}
78+
79+
// Excluding the test because hybrid query with rescore is not compatible with 2.14 and lower
80+
if (ext.neural_search_bwc_version.startsWith("2.9") || ext.neural_search_bwc_version.startsWith("2.10")
81+
|| ext.neural_search_bwc_version.startsWith("2.11") || ext.neural_search_bwc_version.startsWith("2.12")
82+
|| ext.neural_search_bwc_version.startsWith("2.13") || ext.neural_search_bwc_version.startsWith("2.14")) {
83+
filter {
84+
excludeTestsMatching "org.opensearch.neuralsearch.bwc.HybridSearchWithRescoreIT.*"
85+
}
86+
}
87+
88+
// Excluding the test because we introduce this feature in 2.13
89+
if (ext.neural_search_bwc_version.startsWith("2.11") || ext.neural_search_bwc_version.startsWith("2.12")){
90+
filter {
91+
excludeTestsMatching "org.opensearch.neuralsearch.bwc.NeuralQueryEnricherProcessorIT.testNeuralQueryEnricherProcessor_NeuralSparseSearch_E2EFlow"
92+
}
93+
}
94+
95+
// Excluding the text chunking processor test because we introduce this feature in 2.13
96+
if (ext.neural_search_bwc_version.startsWith("2.9") || ext.neural_search_bwc_version.startsWith("2.10") || ext.neural_search_bwc_version.startsWith("2.11") || ext.neural_search_bwc_version.startsWith("2.12")){
97+
filter {
98+
excludeTestsMatching "org.opensearch.neuralsearch.bwc.TextChunkingProcessorIT.*"
99+
}
100+
}
101+
102+
// Excluding the k-NN radial search and batch ingestion tests because we introduce these features in 2.14
103+
if (ext.neural_search_bwc_version.startsWith("2.9") || ext.neural_search_bwc_version.startsWith("2.10") || ext.neural_search_bwc_version.startsWith("2.11") || ext.neural_search_bwc_version.startsWith("2.12") || ext.neural_search_bwc_version.startsWith("2.13")){
104+
filter {
105+
excludeTestsMatching "org.opensearch.neuralsearch.bwc.KnnRadialSearchIT.*"
106+
excludeTestsMatching "org.opensearch.neuralsearch.bwc.BatchIngestionIT.*"
107+
}
108+
}
109+
110+
// Excluding the neural sparse two phase processor test because we introduce this feature in 2.15
111+
if (ext.neural_search_bwc_version.startsWith("2.9") || ext.neural_search_bwc_version.startsWith("2.10")
112+
|| ext.neural_search_bwc_version.startsWith("2.11") || ext.neural_search_bwc_version.startsWith("2.12")
113+
|| ext.neural_search_bwc_version.startsWith("2.13") || ext.neural_search_bwc_version.startsWith("2.14")){
114+
filter {
115+
excludeTestsMatching "org.opensearch.neuralsearch.bwc.NeuralSparseTwoPhaseProcessorIT.*"
116+
}
117+
}
118+
119+
68120
nonInputProperties.systemProperty('tests.rest.cluster', "${-> testClusters."${baseName}".allHttpSocketURI.join(",")}")
69121
nonInputProperties.systemProperty('tests.clustername', "${-> testClusters."${baseName}".getName()}")
70122
systemProperty 'tests.security.manager', 'false'
@@ -90,6 +142,58 @@ task testAgainstOneThirdUpgradedCluster(type: StandaloneRestIntegTestTask) {
90142
systemProperty 'tests.skip_delete_model_index', 'true'
91143
systemProperty 'tests.plugin_bwc_version', ext.neural_search_bwc_version
92144

145+
//Excluding MultiModalSearchIT, HybridSearchIT, NeuralSparseSearchIT, NeuralQueryEnricherProcessorIT tests from neural search version 2.9 and 2.10
146+
// because these features were released in 2.11 version.
147+
if (ext.neural_search_bwc_version.startsWith("2.9") || ext.neural_search_bwc_version.startsWith("2.10")){
148+
filter {
149+
excludeTestsMatching "org.opensearch.neuralsearch.bwc.MultiModalSearchIT.*"
150+
excludeTestsMatching "org.opensearch.neuralsearch.bwc.HybridSearchIT.*"
151+
excludeTestsMatching "org.opensearch.neuralsearch.bwc.NeuralSparseSearchIT.*"
152+
excludeTestsMatching "org.opensearch.neuralsearch.bwc.NeuralQueryEnricherProcessorIT.*"
153+
}
154+
}
155+
156+
// Excluding the test because hybrid query with rescore is not compatible with 2.14 and lower
157+
if (ext.neural_search_bwc_version.startsWith("2.9") || ext.neural_search_bwc_version.startsWith("2.10")
158+
|| ext.neural_search_bwc_version.startsWith("2.11") || ext.neural_search_bwc_version.startsWith("2.12")
159+
|| ext.neural_search_bwc_version.startsWith("2.13") || ext.neural_search_bwc_version.startsWith("2.14")) {
160+
filter {
161+
excludeTestsMatching "org.opensearch.neuralsearch.bwc.HybridSearchWithRescoreIT.*"
162+
}
163+
}
164+
165+
// Excluding the test because we introduce this feature in 2.13
166+
if (ext.neural_search_bwc_version.startsWith("2.11") || ext.neural_search_bwc_version.startsWith("2.12")){
167+
filter {
168+
excludeTestsMatching "org.opensearch.neuralsearch.bwc.NeuralQueryEnricherProcessorIT.testNeuralQueryEnricherProcessor_NeuralSparseSearch_E2EFlow"
169+
}
170+
}
171+
172+
// Excluding the text chunking processor test because we introduce this feature in 2.13
173+
if (ext.neural_search_bwc_version.startsWith("2.9") || ext.neural_search_bwc_version.startsWith("2.10") || ext.neural_search_bwc_version.startsWith("2.11") || ext.neural_search_bwc_version.startsWith("2.12")){
174+
filter {
175+
excludeTestsMatching "org.opensearch.neuralsearch.bwc.TextChunkingProcessorIT.*"
176+
}
177+
}
178+
179+
// Excluding the k-NN radial search and batch ingestion tests because we introduce these features in 2.14
180+
if (ext.neural_search_bwc_version.startsWith("2.9") || ext.neural_search_bwc_version.startsWith("2.10") || ext.neural_search_bwc_version.startsWith("2.11") || ext.neural_search_bwc_version.startsWith("2.12") || ext.neural_search_bwc_version.startsWith("2.13")){
181+
filter {
182+
excludeTestsMatching "org.opensearch.neuralsearch.bwc.KnnRadialSearchIT.*"
183+
excludeTestsMatching "org.opensearch.neuralsearch.bwc.BatchIngestionIT.*"
184+
}
185+
}
186+
187+
// Excluding the neural sparse two phase processor test because we introduce this feature in 2.15
188+
if (ext.neural_search_bwc_version.startsWith("2.9") || ext.neural_search_bwc_version.startsWith("2.10")
189+
|| ext.neural_search_bwc_version.startsWith("2.11") || ext.neural_search_bwc_version.startsWith("2.12")
190+
|| ext.neural_search_bwc_version.startsWith("2.13") || ext.neural_search_bwc_version.startsWith("2.14")){
191+
filter {
192+
excludeTestsMatching "org.opensearch.neuralsearch.bwc.NeuralSparseTwoPhaseProcessorIT.*"
193+
}
194+
}
195+
196+
93197
nonInputProperties.systemProperty('tests.rest.cluster', "${-> testClusters."${baseName}".allHttpSocketURI.join(",")}")
94198
nonInputProperties.systemProperty('tests.clustername', "${-> testClusters."${baseName}".getName()}")
95199
systemProperty 'tests.security.manager', 'false'
@@ -114,6 +218,58 @@ task testAgainstTwoThirdsUpgradedCluster(type: StandaloneRestIntegTestTask) {
114218
systemProperty 'tests.skip_delete_model_index', 'true'
115219
systemProperty 'tests.plugin_bwc_version', ext.neural_search_bwc_version
116220

221+
// Excluding MultiModalSearchIT, HybridSearchIT, NeuralSparseSearchIT, NeuralQueryEnricherProcessorIT tests from neural search version 2.9 and 2.10
222+
// because these features were released in 2.11 version.
223+
if (ext.neural_search_bwc_version.startsWith("2.9") || ext.neural_search_bwc_version.startsWith("2.10")){
224+
filter {
225+
excludeTestsMatching "org.opensearch.neuralsearch.bwc.MultiModalSearchIT.*"
226+
excludeTestsMatching "org.opensearch.neuralsearch.bwc.HybridSearchIT.*"
227+
excludeTestsMatching "org.opensearch.neuralsearch.bwc.NeuralSparseSearchIT.*"
228+
excludeTestsMatching "org.opensearch.neuralsearch.bwc.NeuralQueryEnricherProcessorIT.*"
229+
}
230+
}
231+
232+
// Excluding the test because hybrid query with rescore is not compatible with 2.14 and lower
233+
if (ext.neural_search_bwc_version.startsWith("2.9") || ext.neural_search_bwc_version.startsWith("2.10")
234+
|| ext.neural_search_bwc_version.startsWith("2.11") || ext.neural_search_bwc_version.startsWith("2.12")
235+
|| ext.neural_search_bwc_version.startsWith("2.13") || ext.neural_search_bwc_version.startsWith("2.14")) {
236+
filter {
237+
excludeTestsMatching "org.opensearch.neuralsearch.bwc.HybridSearchWithRescoreIT.*"
238+
}
239+
}
240+
241+
// Excluding the test because we introduce this feature in 2.13
242+
if (ext.neural_search_bwc_version.startsWith("2.11") || ext.neural_search_bwc_version.startsWith("2.12")){
243+
filter {
244+
excludeTestsMatching "org.opensearch.neuralsearch.bwc.NeuralQueryEnricherProcessorIT.testNeuralQueryEnricherProcessor_NeuralSparseSearch_E2EFlow"
245+
}
246+
}
247+
248+
// Excluding the text chunking processor test because we introduce this feature in 2.13
249+
if (ext.neural_search_bwc_version.startsWith("2.9") || ext.neural_search_bwc_version.startsWith("2.10") || ext.neural_search_bwc_version.startsWith("2.11") || ext.neural_search_bwc_version.startsWith("2.12")){
250+
filter {
251+
excludeTestsMatching "org.opensearch.neuralsearch.bwc.TextChunkingProcessorIT.*"
252+
}
253+
}
254+
255+
// Excluding the k-NN radial search and batch ingestion tests because we introduce these features in 2.14
256+
if (ext.neural_search_bwc_version.startsWith("2.9") || ext.neural_search_bwc_version.startsWith("2.10") || ext.neural_search_bwc_version.startsWith("2.11") || ext.neural_search_bwc_version.startsWith("2.12") || ext.neural_search_bwc_version.startsWith("2.13")){
257+
filter {
258+
excludeTestsMatching "org.opensearch.neuralsearch.bwc.KnnRadialSearchIT.*"
259+
excludeTestsMatching "org.opensearch.neuralsearch.bwc.BatchIngestionIT.*"
260+
}
261+
}
262+
263+
// Excluding the neural sparse two phase processor test because we introduce this feature in 2.15
264+
if (ext.neural_search_bwc_version.startsWith("2.9") || ext.neural_search_bwc_version.startsWith("2.10")
265+
|| ext.neural_search_bwc_version.startsWith("2.11") || ext.neural_search_bwc_version.startsWith("2.12")
266+
|| ext.neural_search_bwc_version.startsWith("2.13") || ext.neural_search_bwc_version.startsWith("2.14")){
267+
filter {
268+
excludeTestsMatching "org.opensearch.neuralsearch.bwc.NeuralSparseTwoPhaseProcessorIT.*"
269+
}
270+
}
271+
272+
117273
nonInputProperties.systemProperty('tests.rest.cluster', "${-> testClusters."${baseName}".allHttpSocketURI.join(",")}")
118274
nonInputProperties.systemProperty('tests.clustername', "${-> testClusters."${baseName}".getName()}")
119275
systemProperty 'tests.security.manager', 'false'
@@ -138,6 +294,57 @@ task testRollingUpgrade(type: StandaloneRestIntegTestTask) {
138294
systemProperty 'tests.skip_delete_model_index', 'true'
139295
systemProperty 'tests.plugin_bwc_version', ext.neural_search_bwc_version
140296

297+
//Excluding MultiModalSearchIT, HybridSearchIT, NeuralSparseSearchIT, NeuralQueryEnricherProcessorIT tests from neural search version 2.9 and 2.10
298+
// because these features were released in 2.11 version.
299+
if (ext.neural_search_bwc_version.startsWith("2.9") || ext.neural_search_bwc_version.startsWith("2.10")){
300+
filter {
301+
excludeTestsMatching "org.opensearch.neuralsearch.bwc.MultiModalSearchIT.*"
302+
excludeTestsMatching "org.opensearch.neuralsearch.bwc.HybridSearchIT.*"
303+
excludeTestsMatching "org.opensearch.neuralsearch.bwc.NeuralSparseSearchIT.*"
304+
excludeTestsMatching "org.opensearch.neuralsearch.bwc.NeuralQueryEnricherProcessorIT.*"
305+
}
306+
}
307+
308+
// Excluding the test because hybrid query with rescore is not compatible with 2.14 and lower
309+
if (ext.neural_search_bwc_version.startsWith("2.9") || ext.neural_search_bwc_version.startsWith("2.10")
310+
|| ext.neural_search_bwc_version.startsWith("2.11") || ext.neural_search_bwc_version.startsWith("2.12")
311+
|| ext.neural_search_bwc_version.startsWith("2.13") || ext.neural_search_bwc_version.startsWith("2.14")) {
312+
filter {
313+
excludeTestsMatching "org.opensearch.neuralsearch.bwc.HybridSearchWithRescoreIT.*"
314+
}
315+
}
316+
317+
// Excluding the test because we introduce this feature in 2.13
318+
if (ext.neural_search_bwc_version.startsWith("2.11") || ext.neural_search_bwc_version.startsWith("2.12")){
319+
filter {
320+
excludeTestsMatching "org.opensearch.neuralsearch.bwc.NeuralQueryEnricherProcessorIT.testNeuralQueryEnricherProcessor_NeuralSparseSearch_E2EFlow"
321+
}
322+
}
323+
324+
// Excluding the text chunking processor test because we introduce this feature in 2.13
325+
if (ext.neural_search_bwc_version.startsWith("2.9") || ext.neural_search_bwc_version.startsWith("2.10") || ext.neural_search_bwc_version.startsWith("2.11") || ext.neural_search_bwc_version.startsWith("2.12")){
326+
filter {
327+
excludeTestsMatching "org.opensearch.neuralsearch.bwc.TextChunkingProcessorIT.*"
328+
}
329+
}
330+
331+
// Excluding the k-NN radial search and batch ingestion tests because we introduce these features in 2.14
332+
if (ext.neural_search_bwc_version.startsWith("2.9") || ext.neural_search_bwc_version.startsWith("2.10") || ext.neural_search_bwc_version.startsWith("2.11") || ext.neural_search_bwc_version.startsWith("2.12") || ext.neural_search_bwc_version.startsWith("2.13")){
333+
filter {
334+
excludeTestsMatching "org.opensearch.neuralsearch.bwc.KnnRadialSearchIT.*"
335+
excludeTestsMatching "org.opensearch.neuralsearch.bwc.BatchIngestionIT.*"
336+
}
337+
}
338+
339+
// Excluding the neural sparse two phase processor test because we introduce this feature in 2.15
340+
if (ext.neural_search_bwc_version.startsWith("2.9") || ext.neural_search_bwc_version.startsWith("2.10")
341+
|| ext.neural_search_bwc_version.startsWith("2.11") || ext.neural_search_bwc_version.startsWith("2.12")
342+
|| ext.neural_search_bwc_version.startsWith("2.13") || ext.neural_search_bwc_version.startsWith("2.14")){
343+
filter {
344+
excludeTestsMatching "org.opensearch.neuralsearch.bwc.NeuralSparseTwoPhaseProcessorIT.*"
345+
}
346+
}
347+
141348
nonInputProperties.systemProperty('tests.rest.cluster', "${-> testClusters."${baseName}".allHttpSocketURI.join(",")}")
142349
nonInputProperties.systemProperty('tests.clustername', "${-> testClusters."${baseName}".getName()}")
143350
systemProperty 'tests.security.manager', 'false'

0 commit comments

Comments
 (0)