From 9cb49eacae8e02628c63b0d7edec75bcb2a75800 Mon Sep 17 00:00:00 2001 From: will-hwang Date: Tue, 7 Jan 2025 15:38:48 -0800 Subject: [PATCH] removing version checks only in rolling upgrade tests Signed-off-by: will-hwang --- qa/restart-upgrade/build.gradle | 41 +++++++++++ qa/rolling-upgrade/build.gradle | 125 -------------------------------- 2 files changed, 41 insertions(+), 125 deletions(-) diff --git a/qa/restart-upgrade/build.gradle b/qa/restart-upgrade/build.gradle index 4e4652426..d0069d1a3 100644 --- a/qa/restart-upgrade/build.gradle +++ b/qa/restart-upgrade/build.gradle @@ -137,6 +137,47 @@ task testAgainstNewCluster(type: StandaloneRestIntegTestTask) { systemProperty 'tests.is_old_cluster', 'false' systemProperty 'tests.plugin_bwc_version', ext.neural_search_bwc_version + // Excluding MultiModalSearchIT, HybridSearchIT, NeuralSparseSearchIT, NeuralQueryEnricherProcessorIT tests from neural search version 2.9 and 2.10 + // because these features were released in 2.11 version. + if (versionsBelow2_11.any { ext.neural_search_bwc_version.startsWith(it) }){ + filter { + excludeTestsMatching "org.opensearch.neuralsearch.bwc.MultiModalSearchIT.*" + excludeTestsMatching "org.opensearch.neuralsearch.bwc.HybridSearchIT.*" + excludeTestsMatching "org.opensearch.neuralsearch.bwc.NeuralSparseSearchIT.*" + excludeTestsMatching "org.opensearch.neuralsearch.bwc.NeuralQueryEnricherProcessorIT.*" + } + } + + // Excluding these tests because we introduce them in 2.13 + if (versionsBelow2_13.any { ext.neural_search_bwc_version.startsWith(it) }){ + filter { + excludeTestsMatching "org.opensearch.neuralsearch.bwc.NeuralQueryEnricherProcessorIT.testNeuralQueryEnricherProcessor_NeuralSparseSearch_E2EFlow" + excludeTestsMatching "org.opensearch.neuralsearch.bwc.TextChunkingProcessorIT.*" + } + } + + // Excluding the k-NN radial search tests because we introduce this feature in 2.14 + if (versionsBelow2_14.any { ext.neural_search_bwc_version.startsWith(it) }){ + filter { + excludeTestsMatching "org.opensearch.neuralsearch.bwc.KnnRadialSearchIT.*" + } + } + + // Excluding the NeuralSparseQuery two-phase search pipeline tests because we introduce this feature in 2.15 + if (versionsBelow2_15.any { ext.neural_search_bwc_version.startsWith(it) }){ + filter { + excludeTestsMatching "org.opensearch.neuralsearch.bwc.NeuralSparseTwoPhaseProcessorIT.*" + excludeTestsMatching "org.opensearch.neuralsearch.bwc.HybridSearchWithRescoreIT.*" + } + } + + // Excluding the batch processor tests because we introduce this feature in 2.16 + if (versionsBelow2_16.any { ext.neural_search_bwc_version.startsWith(it) }){ + filter { + excludeTestsMatching "org.opensearch.neuralsearch.bwc.BatchIngestionIT.*" + } + } + nonInputProperties.systemProperty('tests.rest.cluster', "${-> testClusters."${baseName}".allHttpSocketURI.join(",")}") nonInputProperties.systemProperty('tests.clustername', "${-> testClusters."${baseName}".getName()}") systemProperty 'tests.security.manager', 'false' diff --git a/qa/rolling-upgrade/build.gradle b/qa/rolling-upgrade/build.gradle index fa78a08f1..0e7b80db2 100644 --- a/qa/rolling-upgrade/build.gradle +++ b/qa/rolling-upgrade/build.gradle @@ -71,47 +71,6 @@ task testAgainstOldCluster(type: StandaloneRestIntegTestTask) { systemProperty 'tests.plugin_bwc_version', ext.neural_search_bwc_version systemProperty 'tests.skip_delete_model_index', 'true' - //Excluding MultiModalSearchIT, HybridSearchIT, NeuralSparseSearchIT, NeuralQueryEnricherProcessorIT tests from neural search version 2.9 and 2.10 - // because these features were released in 2.11 version. - if (versionsBelow2_11.any { ext.neural_search_bwc_version.startsWith(it) }){ - filter { - excludeTestsMatching "org.opensearch.neuralsearch.bwc.MultiModalSearchIT.*" - excludeTestsMatching "org.opensearch.neuralsearch.bwc.HybridSearchIT.*" - excludeTestsMatching "org.opensearch.neuralsearch.bwc.NeuralSparseSearchIT.*" - excludeTestsMatching "org.opensearch.neuralsearch.bwc.NeuralQueryEnricherProcessorIT.*" - } - } - - // Excluding the tests because we introduce these features in 2.13 - if (versionsBelow2_13.any { ext.neural_search_bwc_version.startsWith(it) }){ - filter { - excludeTestsMatching "org.opensearch.neuralsearch.bwc.NeuralQueryEnricherProcessorIT.testNeuralQueryEnricherProcessor_NeuralSparseSearch_E2EFlow" - excludeTestsMatching "org.opensearch.neuralsearch.bwc.TextChunkingProcessorIT.*" - } - } - - // Excluding the k-NN radial search and batch ingestion tests because we introduce these features in 2.14 - if (versionsBelow2_14.any { ext.neural_search_bwc_version.startsWith(it) }){ - filter { - excludeTestsMatching "org.opensearch.neuralsearch.bwc.KnnRadialSearchIT.*" - } - } - - // Excluding the neural sparse two phase processor test because we introduce this feature in 2.15 - if (versionsBelow2_15.any { ext.neural_search_bwc_version.startsWith(it) }){ - filter { - excludeTestsMatching "org.opensearch.neuralsearch.bwc.NeuralSparseTwoPhaseProcessorIT.*" - excludeTestsMatching "org.opensearch.neuralsearch.bwc.HybridSearchWithRescoreIT.*" - } - } - - // Excluding the batching processor tests because we introduce this feature in 2.16 - if (versionsBelow2_16.any { ext.neural_search_bwc_version.startsWith(it) }){ - filter { - excludeTestsMatching "org.opensearch.neuralsearch.bwc.BatchIngestionIT.*" - } - } - nonInputProperties.systemProperty('tests.rest.cluster', "${-> testClusters."${baseName}".allHttpSocketURI.join(",")}") nonInputProperties.systemProperty('tests.clustername', "${-> testClusters."${baseName}".getName()}") systemProperty 'tests.security.manager', 'false' @@ -137,48 +96,6 @@ task testAgainstOneThirdUpgradedCluster(type: StandaloneRestIntegTestTask) { systemProperty 'tests.skip_delete_model_index', 'true' systemProperty 'tests.plugin_bwc_version', ext.neural_search_bwc_version - //Excluding MultiModalSearchIT, HybridSearchIT, NeuralSparseSearchIT, NeuralQueryEnricherProcessorIT tests from neural search version 2.9 and 2.10 - // because these features were released in 2.11 version. - if (versionsBelow2_11.any { ext.neural_search_bwc_version.startsWith(it) }){ - filter { - excludeTestsMatching "org.opensearch.neuralsearch.bwc.MultiModalSearchIT.*" - excludeTestsMatching "org.opensearch.neuralsearch.bwc.HybridSearchIT.*" - excludeTestsMatching "org.opensearch.neuralsearch.bwc.NeuralSparseSearchIT.*" - excludeTestsMatching "org.opensearch.neuralsearch.bwc.NeuralQueryEnricherProcessorIT.*" - } - } - - // Excluding the tests because we introduce these features in 2.13 - if (versionsBelow2_13.any { ext.neural_search_bwc_version.startsWith(it) }){ - filter { - excludeTestsMatching "org.opensearch.neuralsearch.bwc.NeuralQueryEnricherProcessorIT.testNeuralQueryEnricherProcessor_NeuralSparseSearch_E2EFlow" - excludeTestsMatching "org.opensearch.neuralsearch.bwc.TextChunkingProcessorIT.*" - } - } - - // Excluding the k-NN radial search and batch ingestion tests because we introduce these features in 2.14 - if (versionsBelow2_14.any { ext.neural_search_bwc_version.startsWith(it) }){ - filter { - excludeTestsMatching "org.opensearch.neuralsearch.bwc.KnnRadialSearchIT.*" - excludeTestsMatching "org.opensearch.neuralsearch.bwc.BatchIngestionIT.*" - } - } - - // Excluding the neural sparse two phase processor test because we introduce this feature in 2.15 - if (versionsBelow2_15.any { ext.neural_search_bwc_version.startsWith(it) }){ - filter { - excludeTestsMatching "org.opensearch.neuralsearch.bwc.NeuralSparseTwoPhaseProcessorIT.*" - excludeTestsMatching "org.opensearch.neuralsearch.bwc.HybridSearchWithRescoreIT.*" - } - } - - // Excluding the batching processor tests because we introduce this feature in 2.16 - if (versionsBelow2_16.any { ext.neural_search_bwc_version.startsWith(it) }){ - filter { - excludeTestsMatching "org.opensearch.neuralsearch.bwc.BatchIngestionIT.*" - } - } - nonInputProperties.systemProperty('tests.rest.cluster', "${-> testClusters."${baseName}".allHttpSocketURI.join(",")}") nonInputProperties.systemProperty('tests.clustername', "${-> testClusters."${baseName}".getName()}") systemProperty 'tests.security.manager', 'false' @@ -203,48 +120,6 @@ task testAgainstTwoThirdsUpgradedCluster(type: StandaloneRestIntegTestTask) { systemProperty 'tests.skip_delete_model_index', 'true' systemProperty 'tests.plugin_bwc_version', ext.neural_search_bwc_version - // Excluding MultiModalSearchIT, HybridSearchIT, NeuralSparseSearchIT, NeuralQueryEnricherProcessorIT tests from neural search version 2.9 and 2.10 - // because these features were released in 2.11 version. - if (versionsBelow2_11.any { ext.neural_search_bwc_version.startsWith(it) }){ - filter { - excludeTestsMatching "org.opensearch.neuralsearch.bwc.MultiModalSearchIT.*" - excludeTestsMatching "org.opensearch.neuralsearch.bwc.HybridSearchIT.*" - excludeTestsMatching "org.opensearch.neuralsearch.bwc.NeuralSparseSearchIT.*" - excludeTestsMatching "org.opensearch.neuralsearch.bwc.NeuralQueryEnricherProcessorIT.*" - } - } - - // Excluding the tests because we introduce these features in 2.13 - if (versionsBelow2_13.any { ext.neural_search_bwc_version.startsWith(it) }){ - filter { - excludeTestsMatching "org.opensearch.neuralsearch.bwc.NeuralQueryEnricherProcessorIT.testNeuralQueryEnricherProcessor_NeuralSparseSearch_E2EFlow" - excludeTestsMatching "org.opensearch.neuralsearch.bwc.TextChunkingProcessorIT.*" - } - } - - // Excluding the k-NN radial search and batch ingestion tests because we introduce these features in 2.14 - if (versionsBelow2_14.any { ext.neural_search_bwc_version.startsWith(it) }){ - filter { - excludeTestsMatching "org.opensearch.neuralsearch.bwc.KnnRadialSearchIT.*" - excludeTestsMatching "org.opensearch.neuralsearch.bwc.BatchIngestionIT.*" - } - } - - // Excluding the neural sparse two phase processor test because we introduce this feature in 2.15 - if (versionsBelow2_15.any { ext.neural_search_bwc_version.startsWith(it) }){ - filter { - excludeTestsMatching "org.opensearch.neuralsearch.bwc.NeuralSparseTwoPhaseProcessorIT.*" - excludeTestsMatching "org.opensearch.neuralsearch.bwc.HybridSearchWithRescoreIT.*" - } - } - - // Excluding the batching processor tests because we introduce this feature in 2.16 - if (versionsBelow2_16.any { ext.neural_search_bwc_version.startsWith(it) }){ - filter { - excludeTestsMatching "org.opensearch.neuralsearch.bwc.BatchIngestionIT.*" - } - } - nonInputProperties.systemProperty('tests.rest.cluster', "${-> testClusters."${baseName}".allHttpSocketURI.join(",")}") nonInputProperties.systemProperty('tests.clustername', "${-> testClusters."${baseName}".getName()}") systemProperty 'tests.security.manager', 'false'