diff --git a/qa/restart-upgrade/build.gradle b/qa/restart-upgrade/build.gradle index 053866cf6..d0069d1a3 100644 --- a/qa/restart-upgrade/build.gradle +++ b/qa/restart-upgrade/build.gradle @@ -76,40 +76,40 @@ task testAgainstOldCluster(type: StandaloneRestIntegTestTask) { // 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.restart.MultiModalSearchIT.*" - excludeTestsMatching "org.opensearch.neuralsearch.bwc.restart.HybridSearchIT.*" - excludeTestsMatching "org.opensearch.neuralsearch.bwc.restart.NeuralSparseSearchIT.*" - excludeTestsMatching "org.opensearch.neuralsearch.bwc.restart.NeuralQueryEnricherProcessorIT.*" + 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 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.restart.NeuralQueryEnricherProcessorIT.testNeuralQueryEnricherProcessor_NeuralSparseSearch_E2EFlow" - excludeTestsMatching "org.opensearch.neuralsearch.bwc.restart.TextChunkingProcessorIT.*" + 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.restart.KnnRadialSearchIT.*" + 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.restart.NeuralSparseTwoPhaseProcessorIT.*" - excludeTestsMatching "org.opensearch.neuralsearch.bwc.restart.HybridSearchWithRescoreIT.*" + 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.restart.BatchIngestionIT.*" + excludeTestsMatching "org.opensearch.neuralsearch.bwc.BatchIngestionIT.*" } } @@ -141,40 +141,40 @@ task testAgainstNewCluster(type: StandaloneRestIntegTestTask) { // 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.restart.MultiModalSearchIT.*" - excludeTestsMatching "org.opensearch.neuralsearch.bwc.restart.HybridSearchIT.*" - excludeTestsMatching "org.opensearch.neuralsearch.bwc.restart.NeuralSparseSearchIT.*" - excludeTestsMatching "org.opensearch.neuralsearch.bwc.restart.NeuralQueryEnricherProcessorIT.*" + 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.restart.NeuralQueryEnricherProcessorIT.testNeuralQueryEnricherProcessor_NeuralSparseSearch_E2EFlow" - excludeTestsMatching "org.opensearch.neuralsearch.bwc.restart.TextChunkingProcessorIT.*" + 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.restart.KnnRadialSearchIT.*" + 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.restart.NeuralSparseTwoPhaseProcessorIT.*" - excludeTestsMatching "org.opensearch.neuralsearch.bwc.restart.HybridSearchWithRescoreIT.*" + 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.restart.BatchIngestionIT.*" + excludeTestsMatching "org.opensearch.neuralsearch.bwc.BatchIngestionIT.*" } } diff --git a/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/restart/AbstractRestartUpgradeRestTestCase.java b/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/AbstractRestartUpgradeRestTestCase.java similarity index 99% rename from qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/restart/AbstractRestartUpgradeRestTestCase.java rename to qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/AbstractRestartUpgradeRestTestCase.java index ca5a3e34e..7028888ca 100644 --- a/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/restart/AbstractRestartUpgradeRestTestCase.java +++ b/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/AbstractRestartUpgradeRestTestCase.java @@ -2,7 +2,7 @@ * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.neuralsearch.bwc.restart; +package org.opensearch.neuralsearch.bwc; import java.nio.file.Files; import java.nio.file.Path; diff --git a/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/restart/BatchIngestionIT.java b/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/BatchIngestionIT.java similarity index 97% rename from qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/restart/BatchIngestionIT.java rename to qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/BatchIngestionIT.java index 7fa0b1301..f9cd11251 100644 --- a/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/restart/BatchIngestionIT.java +++ b/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/BatchIngestionIT.java @@ -2,7 +2,7 @@ * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.neuralsearch.bwc.restart; +package org.opensearch.neuralsearch.bwc; import org.opensearch.neuralsearch.util.TestUtils; diff --git a/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/restart/HybridSearchIT.java b/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/HybridSearchIT.java similarity index 99% rename from qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/restart/HybridSearchIT.java rename to qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/HybridSearchIT.java index d08d208da..56ffec24a 100644 --- a/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/restart/HybridSearchIT.java +++ b/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/HybridSearchIT.java @@ -2,7 +2,7 @@ * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.neuralsearch.bwc.restart; +package org.opensearch.neuralsearch.bwc; import java.io.IOException; import java.nio.file.Files; diff --git a/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/restart/HybridSearchWithRescoreIT.java b/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/HybridSearchWithRescoreIT.java similarity index 99% rename from qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/restart/HybridSearchWithRescoreIT.java rename to qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/HybridSearchWithRescoreIT.java index 9329a934b..fb8596905 100644 --- a/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/restart/HybridSearchWithRescoreIT.java +++ b/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/HybridSearchWithRescoreIT.java @@ -2,7 +2,7 @@ * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.neuralsearch.bwc.restart; +package org.opensearch.neuralsearch.bwc; import java.nio.file.Files; import java.nio.file.Path; diff --git a/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/restart/KnnRadialSearchIT.java b/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/KnnRadialSearchIT.java similarity index 98% rename from qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/restart/KnnRadialSearchIT.java rename to qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/KnnRadialSearchIT.java index b6bb42d73..c3f461871 100644 --- a/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/restart/KnnRadialSearchIT.java +++ b/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/KnnRadialSearchIT.java @@ -2,7 +2,7 @@ * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.neuralsearch.bwc.restart; +package org.opensearch.neuralsearch.bwc; import java.nio.file.Files; import java.nio.file.Path; diff --git a/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/restart/MultiModalSearchIT.java b/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/MultiModalSearchIT.java similarity index 98% rename from qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/restart/MultiModalSearchIT.java rename to qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/MultiModalSearchIT.java index df3f8e94e..7c098ef42 100644 --- a/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/restart/MultiModalSearchIT.java +++ b/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/MultiModalSearchIT.java @@ -2,7 +2,7 @@ * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.neuralsearch.bwc.restart; +package org.opensearch.neuralsearch.bwc; import java.nio.file.Files; import java.nio.file.Path; diff --git a/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/restart/NeuralQueryEnricherProcessorIT.java b/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/NeuralQueryEnricherProcessorIT.java similarity index 99% rename from qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/restart/NeuralQueryEnricherProcessorIT.java rename to qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/NeuralQueryEnricherProcessorIT.java index 97182bfa0..e9005f0d6 100644 --- a/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/restart/NeuralQueryEnricherProcessorIT.java +++ b/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/NeuralQueryEnricherProcessorIT.java @@ -2,7 +2,7 @@ * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.neuralsearch.bwc.restart; +package org.opensearch.neuralsearch.bwc; import static org.opensearch.neuralsearch.util.TestUtils.NODES_BWC_CLUSTER; import static org.opensearch.neuralsearch.util.TestUtils.SPARSE_ENCODING_PROCESSOR; diff --git a/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/restart/NeuralSparseSearchIT.java b/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/NeuralSparseSearchIT.java similarity index 98% rename from qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/restart/NeuralSparseSearchIT.java rename to qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/NeuralSparseSearchIT.java index 5978f71ab..8ec54711a 100644 --- a/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/restart/NeuralSparseSearchIT.java +++ b/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/NeuralSparseSearchIT.java @@ -2,7 +2,7 @@ * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.neuralsearch.bwc.restart; +package org.opensearch.neuralsearch.bwc; import java.nio.file.Files; import java.nio.file.Path; diff --git a/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/restart/NeuralSparseTwoPhaseProcessorIT.java b/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/NeuralSparseTwoPhaseProcessorIT.java similarity index 98% rename from qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/restart/NeuralSparseTwoPhaseProcessorIT.java rename to qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/NeuralSparseTwoPhaseProcessorIT.java index 6a6994809..4b00a7916 100644 --- a/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/restart/NeuralSparseTwoPhaseProcessorIT.java +++ b/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/NeuralSparseTwoPhaseProcessorIT.java @@ -2,7 +2,7 @@ * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.neuralsearch.bwc.restart; +package org.opensearch.neuralsearch.bwc; import org.opensearch.common.settings.Settings; import org.opensearch.neuralsearch.query.NeuralSparseQueryBuilder; diff --git a/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/restart/SemanticSearchIT.java b/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/SemanticSearchIT.java similarity index 98% rename from qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/restart/SemanticSearchIT.java rename to qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/SemanticSearchIT.java index 9dc35c02d..dcbf58ed8 100644 --- a/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/restart/SemanticSearchIT.java +++ b/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/SemanticSearchIT.java @@ -2,7 +2,7 @@ * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.neuralsearch.bwc.restart; +package org.opensearch.neuralsearch.bwc; import java.nio.file.Files; import java.nio.file.Path; diff --git a/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/restart/TextChunkingProcessorIT.java b/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/TextChunkingProcessorIT.java similarity index 98% rename from qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/restart/TextChunkingProcessorIT.java rename to qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/TextChunkingProcessorIT.java index d68903478..ba44eba9a 100644 --- a/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/restart/TextChunkingProcessorIT.java +++ b/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/TextChunkingProcessorIT.java @@ -2,7 +2,7 @@ * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.neuralsearch.bwc.restart; +package org.opensearch.neuralsearch.bwc; import java.net.URL; import java.nio.file.Files; diff --git a/qa/rolling-upgrade/build.gradle b/qa/rolling-upgrade/build.gradle index f91a93fc2..ab063ab49 100644 --- a/qa/rolling-upgrade/build.gradle +++ b/qa/rolling-upgrade/build.gradle @@ -75,10 +75,10 @@ task testAgainstOldCluster(type: StandaloneRestIntegTestTask) { // 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.rolling.MultiModalSearchIT.*" - excludeTestsMatching "org.opensearch.neuralsearch.bwc.rolling.HybridSearchIT.*" - excludeTestsMatching "org.opensearch.neuralsearch.bwc.rolling.NeuralSparseSearchIT.*" - excludeTestsMatching "org.opensearch.neuralsearch.bwc.rolling.NeuralQueryEnricherProcessorIT.*" + excludeTestsMatching "org.opensearch.neuralsearch.bwc.MultiModalSearchIT.*" + excludeTestsMatching "org.opensearch.neuralsearch.bwc.HybridSearchIT.*" + excludeTestsMatching "org.opensearch.neuralsearch.bwc.NeuralSparseSearchIT.*" + excludeTestsMatching "org.opensearch.neuralsearch.bwc.NeuralQueryEnricherProcessorIT.*" } } @@ -86,36 +86,36 @@ task testAgainstOldCluster(type: StandaloneRestIntegTestTask) { // Excluding the test because hybrid query with rescore is not compatible with 2.14 and lower if (versionsBelow2_14.any { ext.neural_search_bwc_version.startsWith(it) }){ filter { - excludeTestsMatching "org.opensearch.neuralsearch.bwc.rolling.HybridSearchWithRescoreIT.*" + excludeTestsMatching "org.opensearch.neuralsearch.bwc.HybridSearchWithRescoreIT.*" } } // 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.rolling.NeuralQueryEnricherProcessorIT.testNeuralQueryEnricherProcessor_NeuralSparseSearch_E2EFlow" - excludeTestsMatching "org.opensearch.neuralsearch.bwc.rolling.TextChunkingProcessorIT.*" + 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.rolling.KnnRadialSearchIT.*" + 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.rolling.NeuralSparseTwoPhaseProcessorIT.*" + excludeTestsMatching "org.opensearch.neuralsearch.bwc.NeuralSparseTwoPhaseProcessorIT.*" } } // 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.rolling.BatchIngestionIT.*" + excludeTestsMatching "org.opensearch.neuralsearch.bwc.BatchIngestionIT.*" } } @@ -148,10 +148,10 @@ task testAgainstOneThirdUpgradedCluster(type: StandaloneRestIntegTestTask) { // 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.rolling.MultiModalSearchIT.*" - excludeTestsMatching "org.opensearch.neuralsearch.bwc.rolling.HybridSearchIT.*" - excludeTestsMatching "org.opensearch.neuralsearch.bwc.rolling.NeuralSparseSearchIT.*" - excludeTestsMatching "org.opensearch.neuralsearch.bwc.rolling.NeuralQueryEnricherProcessorIT.*" + excludeTestsMatching "org.opensearch.neuralsearch.bwc.MultiModalSearchIT.*" + excludeTestsMatching "org.opensearch.neuralsearch.bwc.HybridSearchIT.*" + excludeTestsMatching "org.opensearch.neuralsearch.bwc.NeuralSparseSearchIT.*" + excludeTestsMatching "org.opensearch.neuralsearch.bwc.NeuralQueryEnricherProcessorIT.*" } } @@ -160,37 +160,37 @@ task testAgainstOneThirdUpgradedCluster(type: StandaloneRestIntegTestTask) { || ext.neural_search_bwc_version.startsWith("2.11") || ext.neural_search_bwc_version.startsWith("2.12") || ext.neural_search_bwc_version.startsWith("2.13") || ext.neural_search_bwc_version.startsWith("2.14")) { filter { - excludeTestsMatching "org.opensearch.neuralsearch.bwc.rolling.HybridSearchWithRescoreIT.*" + excludeTestsMatching "org.opensearch.neuralsearch.bwc.HybridSearchWithRescoreIT.*" } } // 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.rolling.NeuralQueryEnricherProcessorIT.testNeuralQueryEnricherProcessor_NeuralSparseSearch_E2EFlow" - excludeTestsMatching "org.opensearch.neuralsearch.bwc.rolling.TextChunkingProcessorIT.*" + 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.rolling.KnnRadialSearchIT.*" - excludeTestsMatching "org.opensearch.neuralsearch.bwc.rolling.BatchIngestionIT.*" + 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.rolling.NeuralSparseTwoPhaseProcessorIT.*" + excludeTestsMatching "org.opensearch.neuralsearch.bwc.NeuralSparseTwoPhaseProcessorIT.*" } } // 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.rolling.BatchIngestionIT.*" + excludeTestsMatching "org.opensearch.neuralsearch.bwc.BatchIngestionIT.*" } } @@ -222,10 +222,10 @@ task testAgainstTwoThirdsUpgradedCluster(type: StandaloneRestIntegTestTask) { // 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.rolling.MultiModalSearchIT.*" - excludeTestsMatching "org.opensearch.neuralsearch.bwc.rolling.HybridSearchIT.*" - excludeTestsMatching "org.opensearch.neuralsearch.bwc.rolling.NeuralSparseSearchIT.*" - excludeTestsMatching "org.opensearch.neuralsearch.bwc.rolling.NeuralQueryEnricherProcessorIT.*" + excludeTestsMatching "org.opensearch.neuralsearch.bwc.MultiModalSearchIT.*" + excludeTestsMatching "org.opensearch.neuralsearch.bwc.HybridSearchIT.*" + excludeTestsMatching "org.opensearch.neuralsearch.bwc.NeuralSparseSearchIT.*" + excludeTestsMatching "org.opensearch.neuralsearch.bwc.NeuralQueryEnricherProcessorIT.*" } } @@ -234,37 +234,37 @@ task testAgainstTwoThirdsUpgradedCluster(type: StandaloneRestIntegTestTask) { || ext.neural_search_bwc_version.startsWith("2.11") || ext.neural_search_bwc_version.startsWith("2.12") || ext.neural_search_bwc_version.startsWith("2.13") || ext.neural_search_bwc_version.startsWith("2.14")) { filter { - excludeTestsMatching "org.opensearch.neuralsearch.bwc.rolling.HybridSearchWithRescoreIT.*" + excludeTestsMatching "org.opensearch.neuralsearch.bwc.HybridSearchWithRescoreIT.*" } } // 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.rolling.NeuralQueryEnricherProcessorIT.testNeuralQueryEnricherProcessor_NeuralSparseSearch_E2EFlow" - excludeTestsMatching "org.opensearch.neuralsearch.bwc.rolling.TextChunkingProcessorIT.*" + 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.rolling.KnnRadialSearchIT.*" - excludeTestsMatching "org.opensearch.neuralsearch.bwc.rolling.BatchIngestionIT.*" + 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.rolling.NeuralSparseTwoPhaseProcessorIT.*" + excludeTestsMatching "org.opensearch.neuralsearch.bwc.NeuralSparseTwoPhaseProcessorIT.*" } } // 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.rolling.BatchIngestionIT.*" + excludeTestsMatching "org.opensearch.neuralsearch.bwc.BatchIngestionIT.*" } } @@ -296,10 +296,10 @@ task testRollingUpgrade(type: StandaloneRestIntegTestTask) { // 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.rolling.MultiModalSearchIT.*" - excludeTestsMatching "org.opensearch.neuralsearch.bwc.rolling.HybridSearchIT.*" - excludeTestsMatching "org.opensearch.neuralsearch.bwc.rolling.NeuralSparseSearchIT.*" - excludeTestsMatching "org.opensearch.neuralsearch.bwc.rolling.NeuralQueryEnricherProcessorIT.*" + excludeTestsMatching "org.opensearch.neuralsearch.bwc.MultiModalSearchIT.*" + excludeTestsMatching "org.opensearch.neuralsearch.bwc.HybridSearchIT.*" + excludeTestsMatching "org.opensearch.neuralsearch.bwc.NeuralSparseSearchIT.*" + excludeTestsMatching "org.opensearch.neuralsearch.bwc.NeuralQueryEnricherProcessorIT.*" } } @@ -308,37 +308,37 @@ task testRollingUpgrade(type: StandaloneRestIntegTestTask) { || ext.neural_search_bwc_version.startsWith("2.11") || ext.neural_search_bwc_version.startsWith("2.12") || ext.neural_search_bwc_version.startsWith("2.13") || ext.neural_search_bwc_version.startsWith("2.14")) { filter { - excludeTestsMatching "org.opensearch.neuralsearch.bwc.rolling.HybridSearchWithRescoreIT.*" + excludeTestsMatching "org.opensearch.neuralsearch.bwc.HybridSearchWithRescoreIT.*" } } // 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.rolling.NeuralQueryEnricherProcessorIT.testNeuralQueryEnricherProcessor_NeuralSparseSearch_E2EFlow" - excludeTestsMatching "org.opensearch.neuralsearch.bwc.rolling.TextChunkingProcessorIT.*" + 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.rolling.KnnRadialSearchIT.*" - excludeTestsMatching "org.opensearch.neuralsearch.bwc.rolling.BatchIngestionIT.*" + 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.rolling.NeuralSparseTwoPhaseProcessorIT.*" + excludeTestsMatching "org.opensearch.neuralsearch.bwc.NeuralSparseTwoPhaseProcessorIT.*" } } // 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.rolling.BatchIngestionIT.*" + excludeTestsMatching "org.opensearch.neuralsearch.bwc.BatchIngestionIT.*" } } diff --git a/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/rolling/AbstractRollingUpgradeTestCase.java b/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/AbstractRollingUpgradeTestCase.java similarity index 99% rename from qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/rolling/AbstractRollingUpgradeTestCase.java rename to qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/AbstractRollingUpgradeTestCase.java index 66d9d5d12..c3fd8228b 100644 --- a/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/rolling/AbstractRollingUpgradeTestCase.java +++ b/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/AbstractRollingUpgradeTestCase.java @@ -2,7 +2,7 @@ * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.neuralsearch.bwc.rolling; +package org.opensearch.neuralsearch.bwc; import java.nio.file.Files; import java.nio.file.Path; diff --git a/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/rolling/BatchIngestionIT.java b/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/BatchIngestionIT.java similarity index 98% rename from qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/rolling/BatchIngestionIT.java rename to qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/BatchIngestionIT.java index 01fce83f0..aef3e323a 100644 --- a/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/rolling/BatchIngestionIT.java +++ b/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/BatchIngestionIT.java @@ -2,7 +2,7 @@ * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.neuralsearch.bwc.rolling; +package org.opensearch.neuralsearch.bwc; import org.opensearch.neuralsearch.util.TestUtils; diff --git a/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/rolling/HybridSearchIT.java b/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/HybridSearchIT.java similarity index 99% rename from qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/rolling/HybridSearchIT.java rename to qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/HybridSearchIT.java index 461fe91ac..95924112c 100644 --- a/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/rolling/HybridSearchIT.java +++ b/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/HybridSearchIT.java @@ -2,7 +2,7 @@ * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.neuralsearch.bwc.rolling; +package org.opensearch.neuralsearch.bwc; import java.nio.file.Files; import java.nio.file.Path; diff --git a/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/rolling/HybridSearchWithRescoreIT.java b/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/HybridSearchWithRescoreIT.java similarity index 99% rename from qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/rolling/HybridSearchWithRescoreIT.java rename to qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/HybridSearchWithRescoreIT.java index 3cea2400d..4526f6be0 100644 --- a/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/rolling/HybridSearchWithRescoreIT.java +++ b/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/HybridSearchWithRescoreIT.java @@ -2,7 +2,7 @@ * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.neuralsearch.bwc.rolling; +package org.opensearch.neuralsearch.bwc; import org.opensearch.index.query.MatchQueryBuilder; import org.opensearch.index.query.QueryBuilder; diff --git a/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/rolling/KnnRadialSearchIT.java b/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/KnnRadialSearchIT.java similarity index 99% rename from qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/rolling/KnnRadialSearchIT.java rename to qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/KnnRadialSearchIT.java index e9fb1a4a7..88af8b757 100644 --- a/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/rolling/KnnRadialSearchIT.java +++ b/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/KnnRadialSearchIT.java @@ -2,7 +2,7 @@ * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.neuralsearch.bwc.rolling; +package org.opensearch.neuralsearch.bwc; import java.nio.file.Files; import java.nio.file.Path; diff --git a/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/rolling/MultiModalSearchIT.java b/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/MultiModalSearchIT.java similarity index 98% rename from qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/rolling/MultiModalSearchIT.java rename to qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/MultiModalSearchIT.java index 6ced20d95..e2df88d6d 100644 --- a/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/rolling/MultiModalSearchIT.java +++ b/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/MultiModalSearchIT.java @@ -2,7 +2,7 @@ * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.neuralsearch.bwc.rolling; +package org.opensearch.neuralsearch.bwc; import java.nio.file.Files; import java.nio.file.Path; diff --git a/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/rolling/NeuralQueryEnricherProcessorIT.java b/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/NeuralQueryEnricherProcessorIT.java similarity index 99% rename from qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/rolling/NeuralQueryEnricherProcessorIT.java rename to qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/NeuralQueryEnricherProcessorIT.java index e22e65e4a..58e362470 100644 --- a/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/rolling/NeuralQueryEnricherProcessorIT.java +++ b/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/NeuralQueryEnricherProcessorIT.java @@ -2,7 +2,7 @@ * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.neuralsearch.bwc.rolling; +package org.opensearch.neuralsearch.bwc; import org.opensearch.common.settings.Settings; import org.opensearch.neuralsearch.util.TestUtils; diff --git a/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/rolling/NeuralSparseSearchIT.java b/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/NeuralSparseSearchIT.java similarity index 99% rename from qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/rolling/NeuralSparseSearchIT.java rename to qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/NeuralSparseSearchIT.java index 8cebae4a2..3a27d0271 100644 --- a/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/rolling/NeuralSparseSearchIT.java +++ b/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/NeuralSparseSearchIT.java @@ -2,7 +2,7 @@ * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.neuralsearch.bwc.rolling; +package org.opensearch.neuralsearch.bwc; import java.nio.file.Files; import java.nio.file.Path; diff --git a/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/rolling/NeuralSparseTwoPhaseProcessorIT.java b/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/NeuralSparseTwoPhaseProcessorIT.java similarity index 98% rename from qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/rolling/NeuralSparseTwoPhaseProcessorIT.java rename to qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/NeuralSparseTwoPhaseProcessorIT.java index 5338b777f..c95ee93e0 100644 --- a/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/rolling/NeuralSparseTwoPhaseProcessorIT.java +++ b/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/NeuralSparseTwoPhaseProcessorIT.java @@ -2,7 +2,7 @@ * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.neuralsearch.bwc.rolling; +package org.opensearch.neuralsearch.bwc; import org.opensearch.common.settings.Settings; import org.opensearch.neuralsearch.query.NeuralSparseQueryBuilder; diff --git a/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/rolling/SemanticSearchIT.java b/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/SemanticSearchIT.java similarity index 98% rename from qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/rolling/SemanticSearchIT.java rename to qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/SemanticSearchIT.java index 989d53897..e30411709 100644 --- a/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/rolling/SemanticSearchIT.java +++ b/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/SemanticSearchIT.java @@ -2,7 +2,7 @@ * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.neuralsearch.bwc.rolling; +package org.opensearch.neuralsearch.bwc; import java.nio.file.Files; import java.nio.file.Path; diff --git a/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/rolling/TextChunkingProcessorIT.java b/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/TextChunkingProcessorIT.java similarity index 98% rename from qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/rolling/TextChunkingProcessorIT.java rename to qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/TextChunkingProcessorIT.java index 29ec1fed5..f2451c480 100644 --- a/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/rolling/TextChunkingProcessorIT.java +++ b/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/TextChunkingProcessorIT.java @@ -2,7 +2,7 @@ * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.neuralsearch.bwc.rolling; +package org.opensearch.neuralsearch.bwc; import java.net.URL; import java.nio.file.Files;