From ae88fe69319437180ae6fb907da660d009f069b5 Mon Sep 17 00:00:00 2001 From: Heemin Kim Date: Wed, 15 Jan 2025 08:22:07 -0800 Subject: [PATCH] Use different package name between restart/rolling bwc tests (#1096) Signed-off-by: Heemin Kim (cherry picked from commit c98b9c28126307af6e8e5e4a26f8b3ad470ccecf) --- qa/restart-upgrade/build.gradle | 40 +++++++++---------- .../AbstractRestartUpgradeRestTestCase.java | 2 +- .../bwc/{ => restart}/BatchIngestionIT.java | 2 +- .../bwc/{ => restart}/HybridSearchIT.java | 2 +- .../HybridSearchWithRescoreIT.java | 2 +- .../bwc/{ => restart}/KnnRadialSearchIT.java | 2 +- .../bwc/{ => restart}/MultiModalSearchIT.java | 2 +- .../NeuralQueryEnricherProcessorIT.java | 2 +- .../{ => restart}/NeuralSparseSearchIT.java | 2 +- .../NeuralSparseTwoPhaseProcessorIT.java | 2 +- .../bwc/{ => restart}/SemanticSearchIT.java | 2 +- .../TextChunkingProcessorIT.java | 2 +- .../AbstractRollingUpgradeTestCase.java | 2 +- .../bwc/{ => rolling}/BatchIngestionIT.java | 2 +- .../bwc/{ => rolling}/HybridSearchIT.java | 2 +- .../HybridSearchWithRescoreIT.java | 2 +- .../bwc/{ => rolling}/KnnRadialSearchIT.java | 2 +- .../bwc/{ => rolling}/MultiModalSearchIT.java | 2 +- .../NeuralQueryEnricherProcessorIT.java | 2 +- .../{ => rolling}/NeuralSparseSearchIT.java | 2 +- .../NeuralSparseTwoPhaseProcessorIT.java | 2 +- .../bwc/{ => rolling}/SemanticSearchIT.java | 2 +- .../TextChunkingProcessorIT.java | 2 +- 23 files changed, 42 insertions(+), 42 deletions(-) rename qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/{ => restart}/AbstractRestartUpgradeRestTestCase.java (99%) rename qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/{ => restart}/BatchIngestionIT.java (97%) rename qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/{ => restart}/HybridSearchIT.java (99%) rename qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/{ => restart}/HybridSearchWithRescoreIT.java (99%) rename qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/{ => restart}/KnnRadialSearchIT.java (98%) rename qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/{ => restart}/MultiModalSearchIT.java (98%) rename qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/{ => restart}/NeuralQueryEnricherProcessorIT.java (99%) rename qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/{ => restart}/NeuralSparseSearchIT.java (98%) rename qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/{ => restart}/NeuralSparseTwoPhaseProcessorIT.java (98%) rename qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/{ => restart}/SemanticSearchIT.java (98%) rename qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/{ => restart}/TextChunkingProcessorIT.java (98%) rename qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/{ => rolling}/AbstractRollingUpgradeTestCase.java (99%) rename qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/{ => rolling}/BatchIngestionIT.java (98%) rename qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/{ => rolling}/HybridSearchIT.java (99%) rename qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/{ => rolling}/HybridSearchWithRescoreIT.java (99%) rename qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/{ => rolling}/KnnRadialSearchIT.java (99%) rename qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/{ => rolling}/MultiModalSearchIT.java (98%) rename qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/{ => rolling}/NeuralQueryEnricherProcessorIT.java (99%) rename qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/{ => rolling}/NeuralSparseSearchIT.java (99%) rename qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/{ => rolling}/NeuralSparseTwoPhaseProcessorIT.java (98%) rename qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/{ => rolling}/SemanticSearchIT.java (98%) rename qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/{ => rolling}/TextChunkingProcessorIT.java (98%) diff --git a/qa/restart-upgrade/build.gradle b/qa/restart-upgrade/build.gradle index d0069d1a3..053866cf6 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.MultiModalSearchIT.*" - excludeTestsMatching "org.opensearch.neuralsearch.bwc.HybridSearchIT.*" - excludeTestsMatching "org.opensearch.neuralsearch.bwc.NeuralSparseSearchIT.*" - excludeTestsMatching "org.opensearch.neuralsearch.bwc.NeuralQueryEnricherProcessorIT.*" + 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.*" } } // 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.NeuralQueryEnricherProcessorIT.testNeuralQueryEnricherProcessor_NeuralSparseSearch_E2EFlow" - excludeTestsMatching "org.opensearch.neuralsearch.bwc.TextChunkingProcessorIT.*" + excludeTestsMatching "org.opensearch.neuralsearch.bwc.restart.NeuralQueryEnricherProcessorIT.testNeuralQueryEnricherProcessor_NeuralSparseSearch_E2EFlow" + excludeTestsMatching "org.opensearch.neuralsearch.bwc.restart.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.*" + excludeTestsMatching "org.opensearch.neuralsearch.bwc.restart.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.*" + excludeTestsMatching "org.opensearch.neuralsearch.bwc.restart.NeuralSparseTwoPhaseProcessorIT.*" + excludeTestsMatching "org.opensearch.neuralsearch.bwc.restart.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.*" + excludeTestsMatching "org.opensearch.neuralsearch.bwc.restart.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.MultiModalSearchIT.*" - excludeTestsMatching "org.opensearch.neuralsearch.bwc.HybridSearchIT.*" - excludeTestsMatching "org.opensearch.neuralsearch.bwc.NeuralSparseSearchIT.*" - excludeTestsMatching "org.opensearch.neuralsearch.bwc.NeuralQueryEnricherProcessorIT.*" + 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.*" } } // 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.*" + excludeTestsMatching "org.opensearch.neuralsearch.bwc.restart.NeuralQueryEnricherProcessorIT.testNeuralQueryEnricherProcessor_NeuralSparseSearch_E2EFlow" + excludeTestsMatching "org.opensearch.neuralsearch.bwc.restart.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.*" + excludeTestsMatching "org.opensearch.neuralsearch.bwc.restart.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.*" + excludeTestsMatching "org.opensearch.neuralsearch.bwc.restart.NeuralSparseTwoPhaseProcessorIT.*" + excludeTestsMatching "org.opensearch.neuralsearch.bwc.restart.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.*" + excludeTestsMatching "org.opensearch.neuralsearch.bwc.restart.BatchIngestionIT.*" } } diff --git a/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/AbstractRestartUpgradeRestTestCase.java b/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/restart/AbstractRestartUpgradeRestTestCase.java similarity index 99% rename from qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/AbstractRestartUpgradeRestTestCase.java rename to qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/restart/AbstractRestartUpgradeRestTestCase.java index 7028888ca..ca5a3e34e 100644 --- a/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/AbstractRestartUpgradeRestTestCase.java +++ b/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/restart/AbstractRestartUpgradeRestTestCase.java @@ -2,7 +2,7 @@ * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.neuralsearch.bwc; +package org.opensearch.neuralsearch.bwc.restart; import java.nio.file.Files; import java.nio.file.Path; diff --git a/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/BatchIngestionIT.java b/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/restart/BatchIngestionIT.java similarity index 97% rename from qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/BatchIngestionIT.java rename to qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/restart/BatchIngestionIT.java index f9cd11251..7fa0b1301 100644 --- a/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/BatchIngestionIT.java +++ b/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/restart/BatchIngestionIT.java @@ -2,7 +2,7 @@ * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.neuralsearch.bwc; +package org.opensearch.neuralsearch.bwc.restart; import org.opensearch.neuralsearch.util.TestUtils; diff --git a/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/HybridSearchIT.java b/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/restart/HybridSearchIT.java similarity index 99% rename from qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/HybridSearchIT.java rename to qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/restart/HybridSearchIT.java index 56ffec24a..d08d208da 100644 --- a/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/HybridSearchIT.java +++ b/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/restart/HybridSearchIT.java @@ -2,7 +2,7 @@ * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.neuralsearch.bwc; +package org.opensearch.neuralsearch.bwc.restart; import java.io.IOException; import java.nio.file.Files; diff --git a/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/HybridSearchWithRescoreIT.java b/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/restart/HybridSearchWithRescoreIT.java similarity index 99% rename from qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/HybridSearchWithRescoreIT.java rename to qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/restart/HybridSearchWithRescoreIT.java index fb8596905..9329a934b 100644 --- a/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/HybridSearchWithRescoreIT.java +++ b/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/restart/HybridSearchWithRescoreIT.java @@ -2,7 +2,7 @@ * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.neuralsearch.bwc; +package org.opensearch.neuralsearch.bwc.restart; import java.nio.file.Files; import java.nio.file.Path; diff --git a/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/KnnRadialSearchIT.java b/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/restart/KnnRadialSearchIT.java similarity index 98% rename from qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/KnnRadialSearchIT.java rename to qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/restart/KnnRadialSearchIT.java index c3f461871..b6bb42d73 100644 --- a/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/KnnRadialSearchIT.java +++ b/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/restart/KnnRadialSearchIT.java @@ -2,7 +2,7 @@ * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.neuralsearch.bwc; +package org.opensearch.neuralsearch.bwc.restart; import java.nio.file.Files; import java.nio.file.Path; diff --git a/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/MultiModalSearchIT.java b/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/restart/MultiModalSearchIT.java similarity index 98% rename from qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/MultiModalSearchIT.java rename to qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/restart/MultiModalSearchIT.java index 7c098ef42..df3f8e94e 100644 --- a/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/MultiModalSearchIT.java +++ b/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/restart/MultiModalSearchIT.java @@ -2,7 +2,7 @@ * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.neuralsearch.bwc; +package org.opensearch.neuralsearch.bwc.restart; import java.nio.file.Files; import java.nio.file.Path; diff --git a/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/NeuralQueryEnricherProcessorIT.java b/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/restart/NeuralQueryEnricherProcessorIT.java similarity index 99% rename from qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/NeuralQueryEnricherProcessorIT.java rename to qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/restart/NeuralQueryEnricherProcessorIT.java index e9005f0d6..97182bfa0 100644 --- a/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/NeuralQueryEnricherProcessorIT.java +++ b/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/restart/NeuralQueryEnricherProcessorIT.java @@ -2,7 +2,7 @@ * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.neuralsearch.bwc; +package org.opensearch.neuralsearch.bwc.restart; 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/NeuralSparseSearchIT.java b/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/restart/NeuralSparseSearchIT.java similarity index 98% rename from qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/NeuralSparseSearchIT.java rename to qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/restart/NeuralSparseSearchIT.java index 8ec54711a..5978f71ab 100644 --- a/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/NeuralSparseSearchIT.java +++ b/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/restart/NeuralSparseSearchIT.java @@ -2,7 +2,7 @@ * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.neuralsearch.bwc; +package org.opensearch.neuralsearch.bwc.restart; import java.nio.file.Files; import java.nio.file.Path; diff --git a/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/NeuralSparseTwoPhaseProcessorIT.java b/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/restart/NeuralSparseTwoPhaseProcessorIT.java similarity index 98% rename from qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/NeuralSparseTwoPhaseProcessorIT.java rename to qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/restart/NeuralSparseTwoPhaseProcessorIT.java index 4b00a7916..6a6994809 100644 --- a/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/NeuralSparseTwoPhaseProcessorIT.java +++ b/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/restart/NeuralSparseTwoPhaseProcessorIT.java @@ -2,7 +2,7 @@ * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.neuralsearch.bwc; +package org.opensearch.neuralsearch.bwc.restart; 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/SemanticSearchIT.java b/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/restart/SemanticSearchIT.java similarity index 98% rename from qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/SemanticSearchIT.java rename to qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/restart/SemanticSearchIT.java index dcbf58ed8..9dc35c02d 100644 --- a/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/SemanticSearchIT.java +++ b/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/restart/SemanticSearchIT.java @@ -2,7 +2,7 @@ * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.neuralsearch.bwc; +package org.opensearch.neuralsearch.bwc.restart; import java.nio.file.Files; import java.nio.file.Path; diff --git a/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/TextChunkingProcessorIT.java b/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/restart/TextChunkingProcessorIT.java similarity index 98% rename from qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/TextChunkingProcessorIT.java rename to qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/restart/TextChunkingProcessorIT.java index ba44eba9a..d68903478 100644 --- a/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/TextChunkingProcessorIT.java +++ b/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/restart/TextChunkingProcessorIT.java @@ -2,7 +2,7 @@ * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.neuralsearch.bwc; +package org.opensearch.neuralsearch.bwc.restart; import java.net.URL; import java.nio.file.Files; diff --git a/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/AbstractRollingUpgradeTestCase.java b/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/rolling/AbstractRollingUpgradeTestCase.java similarity index 99% rename from qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/AbstractRollingUpgradeTestCase.java rename to qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/rolling/AbstractRollingUpgradeTestCase.java index c3fd8228b..66d9d5d12 100644 --- a/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/AbstractRollingUpgradeTestCase.java +++ b/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/rolling/AbstractRollingUpgradeTestCase.java @@ -2,7 +2,7 @@ * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.neuralsearch.bwc; +package org.opensearch.neuralsearch.bwc.rolling; import java.nio.file.Files; import java.nio.file.Path; diff --git a/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/BatchIngestionIT.java b/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/rolling/BatchIngestionIT.java similarity index 98% rename from qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/BatchIngestionIT.java rename to qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/rolling/BatchIngestionIT.java index aef3e323a..01fce83f0 100644 --- a/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/BatchIngestionIT.java +++ b/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/rolling/BatchIngestionIT.java @@ -2,7 +2,7 @@ * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.neuralsearch.bwc; +package org.opensearch.neuralsearch.bwc.rolling; import org.opensearch.neuralsearch.util.TestUtils; diff --git a/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/HybridSearchIT.java b/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/rolling/HybridSearchIT.java similarity index 99% rename from qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/HybridSearchIT.java rename to qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/rolling/HybridSearchIT.java index 95924112c..461fe91ac 100644 --- a/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/HybridSearchIT.java +++ b/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/rolling/HybridSearchIT.java @@ -2,7 +2,7 @@ * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.neuralsearch.bwc; +package org.opensearch.neuralsearch.bwc.rolling; import java.nio.file.Files; import java.nio.file.Path; diff --git a/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/HybridSearchWithRescoreIT.java b/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/rolling/HybridSearchWithRescoreIT.java similarity index 99% rename from qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/HybridSearchWithRescoreIT.java rename to qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/rolling/HybridSearchWithRescoreIT.java index 4526f6be0..3cea2400d 100644 --- a/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/HybridSearchWithRescoreIT.java +++ b/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/rolling/HybridSearchWithRescoreIT.java @@ -2,7 +2,7 @@ * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.neuralsearch.bwc; +package org.opensearch.neuralsearch.bwc.rolling; 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/KnnRadialSearchIT.java b/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/rolling/KnnRadialSearchIT.java similarity index 99% rename from qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/KnnRadialSearchIT.java rename to qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/rolling/KnnRadialSearchIT.java index 88af8b757..e9fb1a4a7 100644 --- a/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/KnnRadialSearchIT.java +++ b/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/rolling/KnnRadialSearchIT.java @@ -2,7 +2,7 @@ * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.neuralsearch.bwc; +package org.opensearch.neuralsearch.bwc.rolling; import java.nio.file.Files; import java.nio.file.Path; diff --git a/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/MultiModalSearchIT.java b/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/rolling/MultiModalSearchIT.java similarity index 98% rename from qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/MultiModalSearchIT.java rename to qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/rolling/MultiModalSearchIT.java index e2df88d6d..6ced20d95 100644 --- a/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/MultiModalSearchIT.java +++ b/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/rolling/MultiModalSearchIT.java @@ -2,7 +2,7 @@ * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.neuralsearch.bwc; +package org.opensearch.neuralsearch.bwc.rolling; import java.nio.file.Files; import java.nio.file.Path; diff --git a/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/NeuralQueryEnricherProcessorIT.java b/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/rolling/NeuralQueryEnricherProcessorIT.java similarity index 99% rename from qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/NeuralQueryEnricherProcessorIT.java rename to qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/rolling/NeuralQueryEnricherProcessorIT.java index 58e362470..e22e65e4a 100644 --- a/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/NeuralQueryEnricherProcessorIT.java +++ b/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/rolling/NeuralQueryEnricherProcessorIT.java @@ -2,7 +2,7 @@ * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.neuralsearch.bwc; +package org.opensearch.neuralsearch.bwc.rolling; 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/NeuralSparseSearchIT.java b/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/rolling/NeuralSparseSearchIT.java similarity index 99% rename from qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/NeuralSparseSearchIT.java rename to qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/rolling/NeuralSparseSearchIT.java index 3a27d0271..8cebae4a2 100644 --- a/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/NeuralSparseSearchIT.java +++ b/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/rolling/NeuralSparseSearchIT.java @@ -2,7 +2,7 @@ * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.neuralsearch.bwc; +package org.opensearch.neuralsearch.bwc.rolling; import java.nio.file.Files; import java.nio.file.Path; diff --git a/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/NeuralSparseTwoPhaseProcessorIT.java b/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/rolling/NeuralSparseTwoPhaseProcessorIT.java similarity index 98% rename from qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/NeuralSparseTwoPhaseProcessorIT.java rename to qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/rolling/NeuralSparseTwoPhaseProcessorIT.java index c95ee93e0..5338b777f 100644 --- a/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/NeuralSparseTwoPhaseProcessorIT.java +++ b/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/rolling/NeuralSparseTwoPhaseProcessorIT.java @@ -2,7 +2,7 @@ * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.neuralsearch.bwc; +package org.opensearch.neuralsearch.bwc.rolling; 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/SemanticSearchIT.java b/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/rolling/SemanticSearchIT.java similarity index 98% rename from qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/SemanticSearchIT.java rename to qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/rolling/SemanticSearchIT.java index e30411709..989d53897 100644 --- a/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/SemanticSearchIT.java +++ b/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/rolling/SemanticSearchIT.java @@ -2,7 +2,7 @@ * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.neuralsearch.bwc; +package org.opensearch.neuralsearch.bwc.rolling; import java.nio.file.Files; import java.nio.file.Path; diff --git a/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/TextChunkingProcessorIT.java b/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/rolling/TextChunkingProcessorIT.java similarity index 98% rename from qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/TextChunkingProcessorIT.java rename to qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/rolling/TextChunkingProcessorIT.java index f2451c480..29ec1fed5 100644 --- a/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/TextChunkingProcessorIT.java +++ b/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/rolling/TextChunkingProcessorIT.java @@ -2,7 +2,7 @@ * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.neuralsearch.bwc; +package org.opensearch.neuralsearch.bwc.rolling; import java.net.URL; import java.nio.file.Files;