Skip to content

Commit 6aa8830

Browse files
heemin32heemin32
committed
Revert "Use different package name between restart/rolling bwc tests (opensearch-project#1096) (opensearch-project#1107)"
This reverts commit 1739834. Signed-off-by: Heemin Kim <heemin@amazon.com>
1 parent 1739834 commit 6aa8830

24 files changed

+85
-85
lines changed

‎qa/restart-upgrade/build.gradle

+20-20
Original file line numberDiff line numberDiff line change
@@ -76,40 +76,40 @@ task testAgainstOldCluster(type: StandaloneRestIntegTestTask) {
7676
// because these features were released in 2.11 version.
7777
if (versionsBelow2_11.any { ext.neural_search_bwc_version.startsWith(it) }){
7878
filter {
79-
excludeTestsMatching "org.opensearch.neuralsearch.bwc.restart.MultiModalSearchIT.*"
80-
excludeTestsMatching "org.opensearch.neuralsearch.bwc.restart.HybridSearchIT.*"
81-
excludeTestsMatching "org.opensearch.neuralsearch.bwc.restart.NeuralSparseSearchIT.*"
82-
excludeTestsMatching "org.opensearch.neuralsearch.bwc.restart.NeuralQueryEnricherProcessorIT.*"
79+
excludeTestsMatching "org.opensearch.neuralsearch.bwc.MultiModalSearchIT.*"
80+
excludeTestsMatching "org.opensearch.neuralsearch.bwc.HybridSearchIT.*"
81+
excludeTestsMatching "org.opensearch.neuralsearch.bwc.NeuralSparseSearchIT.*"
82+
excludeTestsMatching "org.opensearch.neuralsearch.bwc.NeuralQueryEnricherProcessorIT.*"
8383
}
8484
}
8585

8686
// Excluding the these tests because we introduce them in 2.13
8787
if (versionsBelow2_13.any { ext.neural_search_bwc_version.startsWith(it) }){
8888
filter {
89-
excludeTestsMatching "org.opensearch.neuralsearch.bwc.restart.NeuralQueryEnricherProcessorIT.testNeuralQueryEnricherProcessor_NeuralSparseSearch_E2EFlow"
90-
excludeTestsMatching "org.opensearch.neuralsearch.bwc.restart.TextChunkingProcessorIT.*"
89+
excludeTestsMatching "org.opensearch.neuralsearch.bwc.NeuralQueryEnricherProcessorIT.testNeuralQueryEnricherProcessor_NeuralSparseSearch_E2EFlow"
90+
excludeTestsMatching "org.opensearch.neuralsearch.bwc.TextChunkingProcessorIT.*"
9191
}
9292
}
9393

9494
// Excluding the k-NN radial search tests because we introduce this feature in 2.14
9595
if (versionsBelow2_14.any { ext.neural_search_bwc_version.startsWith(it) }){
9696
filter {
97-
excludeTestsMatching "org.opensearch.neuralsearch.bwc.restart.KnnRadialSearchIT.*"
97+
excludeTestsMatching "org.opensearch.neuralsearch.bwc.KnnRadialSearchIT.*"
9898
}
9999
}
100100

101101
// Excluding the NeuralSparseQuery two-phase search pipeline tests because we introduce this feature in 2.15
102102
if (versionsBelow2_15.any { ext.neural_search_bwc_version.startsWith(it) }){
103103
filter {
104-
excludeTestsMatching "org.opensearch.neuralsearch.bwc.restart.NeuralSparseTwoPhaseProcessorIT.*"
105-
excludeTestsMatching "org.opensearch.neuralsearch.bwc.restart.HybridSearchWithRescoreIT.*"
104+
excludeTestsMatching "org.opensearch.neuralsearch.bwc.NeuralSparseTwoPhaseProcessorIT.*"
105+
excludeTestsMatching "org.opensearch.neuralsearch.bwc.HybridSearchWithRescoreIT.*"
106106
}
107107
}
108108

109109
// Excluding the batching processor tests because we introduce this feature in 2.16
110110
if (versionsBelow2_16.any { ext.neural_search_bwc_version.startsWith(it) }){
111111
filter {
112-
excludeTestsMatching "org.opensearch.neuralsearch.bwc.restart.BatchIngestionIT.*"
112+
excludeTestsMatching "org.opensearch.neuralsearch.bwc.BatchIngestionIT.*"
113113
}
114114
}
115115

@@ -141,40 +141,40 @@ task testAgainstNewCluster(type: StandaloneRestIntegTestTask) {
141141
// because these features were released in 2.11 version.
142142
if (versionsBelow2_11.any { ext.neural_search_bwc_version.startsWith(it) }){
143143
filter {
144-
excludeTestsMatching "org.opensearch.neuralsearch.bwc.restart.MultiModalSearchIT.*"
145-
excludeTestsMatching "org.opensearch.neuralsearch.bwc.restart.HybridSearchIT.*"
146-
excludeTestsMatching "org.opensearch.neuralsearch.bwc.restart.NeuralSparseSearchIT.*"
147-
excludeTestsMatching "org.opensearch.neuralsearch.bwc.restart.NeuralQueryEnricherProcessorIT.*"
144+
excludeTestsMatching "org.opensearch.neuralsearch.bwc.MultiModalSearchIT.*"
145+
excludeTestsMatching "org.opensearch.neuralsearch.bwc.HybridSearchIT.*"
146+
excludeTestsMatching "org.opensearch.neuralsearch.bwc.NeuralSparseSearchIT.*"
147+
excludeTestsMatching "org.opensearch.neuralsearch.bwc.NeuralQueryEnricherProcessorIT.*"
148148
}
149149
}
150150

151151
// Excluding these tests because we introduce them in 2.13
152152
if (versionsBelow2_13.any { ext.neural_search_bwc_version.startsWith(it) }){
153153
filter {
154-
excludeTestsMatching "org.opensearch.neuralsearch.bwc.restart.NeuralQueryEnricherProcessorIT.testNeuralQueryEnricherProcessor_NeuralSparseSearch_E2EFlow"
155-
excludeTestsMatching "org.opensearch.neuralsearch.bwc.restart.TextChunkingProcessorIT.*"
154+
excludeTestsMatching "org.opensearch.neuralsearch.bwc.NeuralQueryEnricherProcessorIT.testNeuralQueryEnricherProcessor_NeuralSparseSearch_E2EFlow"
155+
excludeTestsMatching "org.opensearch.neuralsearch.bwc.TextChunkingProcessorIT.*"
156156
}
157157
}
158158

159159
// Excluding the k-NN radial search tests because we introduce this feature in 2.14
160160
if (versionsBelow2_14.any { ext.neural_search_bwc_version.startsWith(it) }){
161161
filter {
162-
excludeTestsMatching "org.opensearch.neuralsearch.bwc.restart.KnnRadialSearchIT.*"
162+
excludeTestsMatching "org.opensearch.neuralsearch.bwc.KnnRadialSearchIT.*"
163163
}
164164
}
165165

166166
// Excluding the NeuralSparseQuery two-phase search pipeline tests because we introduce this feature in 2.15
167167
if (versionsBelow2_15.any { ext.neural_search_bwc_version.startsWith(it) }){
168168
filter {
169-
excludeTestsMatching "org.opensearch.neuralsearch.bwc.restart.NeuralSparseTwoPhaseProcessorIT.*"
170-
excludeTestsMatching "org.opensearch.neuralsearch.bwc.restart.HybridSearchWithRescoreIT.*"
169+
excludeTestsMatching "org.opensearch.neuralsearch.bwc.NeuralSparseTwoPhaseProcessorIT.*"
170+
excludeTestsMatching "org.opensearch.neuralsearch.bwc.HybridSearchWithRescoreIT.*"
171171
}
172172
}
173173

174174
// Excluding the batch processor tests because we introduce this feature in 2.16
175175
if (versionsBelow2_16.any { ext.neural_search_bwc_version.startsWith(it) }){
176176
filter {
177-
excludeTestsMatching "org.opensearch.neuralsearch.bwc.restart.BatchIngestionIT.*"
177+
excludeTestsMatching "org.opensearch.neuralsearch.bwc.BatchIngestionIT.*"
178178
}
179179
}
180180

‎qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/restart/AbstractRestartUpgradeRestTestCase.java ‎qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/AbstractRestartUpgradeRestTestCase.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Copyright OpenSearch Contributors
33
* SPDX-License-Identifier: Apache-2.0
44
*/
5-
package org.opensearch.neuralsearch.bwc.restart;
5+
package org.opensearch.neuralsearch.bwc;
66

77
import java.nio.file.Files;
88
import java.nio.file.Path;

‎qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/restart/BatchIngestionIT.java ‎qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/BatchIngestionIT.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Copyright OpenSearch Contributors
33
* SPDX-License-Identifier: Apache-2.0
44
*/
5-
package org.opensearch.neuralsearch.bwc.restart;
5+
package org.opensearch.neuralsearch.bwc;
66

77
import org.opensearch.neuralsearch.util.TestUtils;
88

‎qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/restart/HybridSearchIT.java ‎qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/HybridSearchIT.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Copyright OpenSearch Contributors
33
* SPDX-License-Identifier: Apache-2.0
44
*/
5-
package org.opensearch.neuralsearch.bwc.restart;
5+
package org.opensearch.neuralsearch.bwc;
66

77
import java.io.IOException;
88
import java.nio.file.Files;

‎qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/restart/HybridSearchWithRescoreIT.java ‎qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/HybridSearchWithRescoreIT.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Copyright OpenSearch Contributors
33
* SPDX-License-Identifier: Apache-2.0
44
*/
5-
package org.opensearch.neuralsearch.bwc.restart;
5+
package org.opensearch.neuralsearch.bwc;
66

77
import java.nio.file.Files;
88
import java.nio.file.Path;

‎qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/restart/KnnRadialSearchIT.java ‎qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/KnnRadialSearchIT.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Copyright OpenSearch Contributors
33
* SPDX-License-Identifier: Apache-2.0
44
*/
5-
package org.opensearch.neuralsearch.bwc.restart;
5+
package org.opensearch.neuralsearch.bwc;
66

77
import java.nio.file.Files;
88
import java.nio.file.Path;

‎qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/restart/MultiModalSearchIT.java ‎qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/MultiModalSearchIT.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Copyright OpenSearch Contributors
33
* SPDX-License-Identifier: Apache-2.0
44
*/
5-
package org.opensearch.neuralsearch.bwc.restart;
5+
package org.opensearch.neuralsearch.bwc;
66

77
import java.nio.file.Files;
88
import java.nio.file.Path;

‎qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/restart/NeuralQueryEnricherProcessorIT.java ‎qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/NeuralQueryEnricherProcessorIT.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Copyright OpenSearch Contributors
33
* SPDX-License-Identifier: Apache-2.0
44
*/
5-
package org.opensearch.neuralsearch.bwc.restart;
5+
package org.opensearch.neuralsearch.bwc;
66

77
import static org.opensearch.neuralsearch.util.TestUtils.NODES_BWC_CLUSTER;
88
import static org.opensearch.neuralsearch.util.TestUtils.SPARSE_ENCODING_PROCESSOR;

‎qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/restart/NeuralSparseSearchIT.java ‎qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/NeuralSparseSearchIT.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Copyright OpenSearch Contributors
33
* SPDX-License-Identifier: Apache-2.0
44
*/
5-
package org.opensearch.neuralsearch.bwc.restart;
5+
package org.opensearch.neuralsearch.bwc;
66

77
import java.nio.file.Files;
88
import java.nio.file.Path;

‎qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/restart/NeuralSparseTwoPhaseProcessorIT.java ‎qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/NeuralSparseTwoPhaseProcessorIT.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Copyright OpenSearch Contributors
33
* SPDX-License-Identifier: Apache-2.0
44
*/
5-
package org.opensearch.neuralsearch.bwc.restart;
5+
package org.opensearch.neuralsearch.bwc;
66

77
import org.opensearch.common.settings.Settings;
88
import org.opensearch.neuralsearch.query.NeuralSparseQueryBuilder;

‎qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/restart/SemanticSearchIT.java ‎qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/SemanticSearchIT.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Copyright OpenSearch Contributors
33
* SPDX-License-Identifier: Apache-2.0
44
*/
5-
package org.opensearch.neuralsearch.bwc.restart;
5+
package org.opensearch.neuralsearch.bwc;
66

77
import java.nio.file.Files;
88
import java.nio.file.Path;

‎qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/restart/TextChunkingProcessorIT.java ‎qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/TextChunkingProcessorIT.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Copyright OpenSearch Contributors
33
* SPDX-License-Identifier: Apache-2.0
44
*/
5-
package org.opensearch.neuralsearch.bwc.restart;
5+
package org.opensearch.neuralsearch.bwc;
66

77
import java.net.URL;
88
import java.nio.file.Files;

0 commit comments

Comments
 (0)