@@ -260,18 +260,9 @@ integTest {
260
260
if (System . getProperty(" test.debug" ) != null ) {
261
261
jvmArgs ' -agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=*:5005'
262
262
}
263
- // NOTE: this IT config discovers only junit5 (jupiter) tests.
264
- // https://github.com/opensearch-project/sql/issues/1974
265
- filter {
266
- includeTestsMatching ' org.opensearch.plugin.insights.rules.resthandler.top_queries.TopQueriesRestIT'
267
- }
268
-
269
- if (System . getProperty(" security.enabled" ) == " true" ) {
270
- getClusters(). forEach { cluster ->
271
- configureSecurityPlugin(cluster)
272
- }
273
- systemProperty " user" , " admin"
274
- systemProperty " password" , " admin"
263
+ if (System . getProperty(" security.enabled" ) == " true" || System . getProperty(" https" ) == " true" ) {
264
+ // Exclude this IT, because they executed in another task (:integTestWithSecurity)
265
+ exclude ' org/opensearch/plugin/insights/rules/resthandler/top_queries/TopQueriesRestIT.class'
275
266
}
276
267
}
277
268
@@ -342,8 +333,6 @@ task integTestWithSecurity(type: RestIntegTestTask) {
342
333
jvmArgs ' -agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=*:5005'
343
334
}
344
335
345
- // NOTE: this IT config discovers only junit5 (jupiter) tests.
346
- // https://github.com/opensearch-project/sql/issues/1974
347
336
filter {
348
337
includeTestsMatching ' org.opensearch.plugin.insights.rules.resthandler.top_queries.TopQueriesRestIT'
349
338
}
0 commit comments