fix(alerting): restructure pluggable dataformat gradle task (opensearch-project#2167)

yashgupte21 · web-flow · commit b5a7a51ae4b7 · 2026-06-02T17:19:47.000-07:00
Move integTestPluggableDataformat task and cluster config outside the
integTest closure to avoid interfering with individual test targeting.
Add failOnNoMatchingTests false so the task does not fail when triggered
via finalizedBy with specific test filters.

Signed-off-by: YashPradeep Gupte &lt;yashprg@amazon.com&gt;
diff --git a/alerting/build.gradle b/alerting/build.gradle
@@ -393,48 +393,43 @@ integTest {
         }
     }
 
-    task integTestPluggableDataformat(type: RestIntegTestTask) {
-        description = "Runs integration tests with pluggable dataformat feature flag enabled"
-        dependsOn bundlePlugin
-        testClassesDirs = sourceSets.test.output.classesDirs
-        classpath = sourceSets.test.runtimeClasspath
-
-        systemProperty 'tests.security.manager', 'false'
-        systemProperty 'java.io.tmpdir', opensearch_tmp_dir.absolutePath
-        systemProperty 'tests.pluggable_dataformat_enabled', 'true'
-
-        filter {
-            includeTestsMatching "org.opensearch.alerting.transport.PluggableDataFormatMonitorBlockIT"
-        }
+    filter {
+        excludeTestsMatching "org.opensearch.alerting.transport.PluggableDataFormatMonitorBlockIT"
     }
+}
 
-    testClusters.integTestPluggableDataformat {
-        testDistribution = "ARCHIVE"
-        systemProperty 'opensearch.experimental.feature.pluggable.dataformat.enabled', 'true'
+task integTestPluggableDataformat(type: RestIntegTestTask) {
+    description = "Runs integration tests with pluggable dataformat feature flag enabled"
+    dependsOn bundlePlugin
+    testClassesDirs = sourceSets.test.output.classesDirs
+    classpath = sourceSets.test.runtimeClasspath
 
-        // Include same plugins as main integTest cluster
-        plugin(provider({ new RegularFile() { @Override File getAsFile() { return configurations.zipArchive.asFileTree.matching { include '**/opensearch-notifications-core*' }.singleFile } } }))
-        plugin(provider({ new RegularFile() { @Override File getAsFile() { return configurations.zipArchive.asFileTree.matching { include '**/notifications*' }.singleFile } } }))
-        plugin(provider({ new RegularFile() { @Override File getAsFile() { return configurations.zipArchive.asFileTree.matching { include '**/opensearch-job-scheduler*' }.singleFile } } }))
-        plugin(provider({ new RegularFile() { @Override File getAsFile() { return configurations.zipArchive.asFileTree.matching { include '**/opensearch-sql-plugin*' }.singleFile } } }))
+    systemProperty 'tests.security.manager', 'false'
+    systemProperty 'java.io.tmpdir', opensearch_tmp_dir.absolutePath
+    systemProperty 'tests.pluggable_dataformat_enabled', 'true'
 
+    filter {
+        includeTestsMatching "org.opensearch.alerting.transport.PluggableDataFormatMonitorBlockIT"
+        failOnNoMatchingTests false
     }
+}
 
-    // Install alerting plugin on the pluggable dataformat test cluster
-    integTestPluggableDataformat.dependsOn(bundle)
-    integTestPluggableDataformat.getClusters().forEach{c -> c.plugin(project.getObjects().fileProperty().value(bundle.getArchiveFile()))}
+testClusters.integTestPluggableDataformat {
+    testDistribution = "ARCHIVE"
+    systemProperty 'opensearch.experimental.feature.pluggable.dataformat.enabled', 'true'
 
-    // Exclude pluggable dataformat tests from the main integTest task
-    integTest {
-        filter {
-            excludeTestsMatching "org.opensearch.alerting.transport.PluggableDataFormatMonitorBlockIT"
-        }
-    }
+    plugin(provider({ new RegularFile() { @Override File getAsFile() { return configurations.zipArchive.asFileTree.matching { include '**/opensearch-notifications-core*' }.singleFile } } }))
+    plugin(provider({ new RegularFile() { @Override File getAsFile() { return configurations.zipArchive.asFileTree.matching { include '**/notifications*' }.singleFile } } }))
+    plugin(provider({ new RegularFile() { @Override File getAsFile() { return configurations.zipArchive.asFileTree.matching { include '**/opensearch-job-scheduler*' }.singleFile } } }))
+    plugin(provider({ new RegularFile() { @Override File getAsFile() { return configurations.zipArchive.asFileTree.matching { include '**/opensearch-sql-plugin*' }.singleFile } } }))
+}
 
-    check.dependsOn integTestPluggableDataformat
-    if (!usingRemoteCluster) {
-        integTest.finalizedBy integTestPluggableDataformat
-    }
+integTestPluggableDataformat.dependsOn(bundle)
+integTestPluggableDataformat.getClusters().forEach{c -> c.plugin(project.getObjects().fileProperty().value(bundle.getArchiveFile()))}
+
+check.dependsOn integTestPluggableDataformat
+if (!usingRemoteCluster) {
+    integTest.finalizedBy integTestPluggableDataformat
 }
 
 task integTestRemote(type: RestIntegTestTask) {
