fix distribution builds (#1640) (#1643)

* fix distribution builds update fix add a dummy test fix distribution builds * remove dummy tests * Removed tests per offline discussion. --------- (cherry picked from commit 07fb522) Signed-off-by: Subhobrata Dey <[email protected]> Signed-off-by: AWSHurneyt <[email protected]> Co-authored-by: Subhobrata Dey <[email protected]>
opensearch-project · Aug 6, 2024 · 715f271 · 715f271
1 parent cf50029
commit 715f271
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 442 deletions.
diff --git a/sample-remote-monitor-plugin/build.gradle b/sample-remote-monitor-plugin/build.gradle
@@ -64,103 +64,3 @@ javaRestTest {
 testClusters.javaRestTest {
     testDistribution = 'INTEG_TEST'
 }
-
-task integTest(type: RestIntegTestTask) {
-    description = "Run tests against a cluster"
-    testClassesDirs = sourceSets.test.output.classesDirs
-    classpath = sourceSets.test.runtimeClasspath
-
-    if (System.getProperty("https") == null || System.getProperty("https") == "false") {
-        filter {
-            includeTestsMatching "org.opensearch.alerting.SampleRemoteMonitorIT"
-        }
-    }
-}
-tasks.named("check").configure { dependsOn(integTest) }
-
-integTest {
-    if (project.hasProperty('excludeTests')) {
-        project.properties['excludeTests']?.replaceAll('\\s', '')?.split('[,;]')?.each {
-            exclude "${it}"
-        }
-    }
-    systemProperty 'tests.security.manager', 'false'
-    systemProperty 'java.io.tmpdir', es_tmp_dir.absolutePath
-
-    systemProperty "https", System.getProperty("https")
-    systemProperty "user", System.getProperty("user")
-    systemProperty "password", System.getProperty("password")
-    // Tell the test JVM if the cluster JVM is running under a debugger so that tests can use longer timeouts for
-    // requests. The 'doFirst' delays reading the debug setting on the cluster till execution time.
-    doFirst {
-        // Tell the test JVM if the cluster JVM is running under a debugger so that tests can
-        // use longer timeouts for requests.
-        def isDebuggingCluster = getDebug() || System.getProperty("test.debug") != null
-        systemProperty 'cluster.debug', isDebuggingCluster
-        // Set number of nodes system property to be used in tests
-        systemProperty 'cluster.number_of_nodes', "${_numNodes}"
-        // There seems to be an issue when running multi node run or integ tasks with unicast_hosts
-        // not being written, the waitForAllConditions ensures it's written
-        getClusters().forEach { cluster ->
-            cluster.waitForAllConditions()
-        }
-    }
-
-    // The -Dcluster.debug option makes the cluster debuggable; this makes the tests debuggable
-    if (System.getProperty("test.debug") != null) {
-        jvmArgs '-agentlib:jdwp=transport=dt_socket,server=n,suspend=y,address=8000'
-    }
-}
-project.getTasks().getByName('bundlePlugin').dependsOn(rootProject.project(":alerting").tasks.getByName('assemble'))
-Zip bundle = (Zip) project.getTasks().getByName("bundlePlugin");
-Zip rootBundle = (Zip) rootProject.project(":alerting").getTasks().getByName("bundlePlugin");
-integTest.dependsOn(bundle)
-integTest.getClusters().forEach{c -> {
-    c.plugin(rootProject.project(":alerting").getObjects().fileProperty().value(rootBundle.getArchiveFile()))
-    c.plugin(project.getObjects().fileProperty().value(bundle.getArchiveFile()))
-}}
-
-testClusters.integTest {
-    testDistribution = 'ARCHIVE'
-
-    // Cluster shrink exception thrown if we try to set numberOfNodes to 1, so only apply if > 1
-    if (_numNodes > 1) numberOfNodes = _numNodes
-    // When running integration tests it doesn't forward the --debug-jvm to the cluster anymore
-    // i.e. we have to use a custom property to flag when we want to debug OpenSearch JVM
-    // since we also support multi node integration tests we increase debugPort per node
-    if (System.getProperty("cluster.debug") != null) {
-        def debugPort = 5005
-        nodes.forEach { node ->
-            node.jvmArgs("-agentlib:jdwp=transport=dt_socket,server=n,suspend=y,address=*:${debugPort}")
-            debugPort += 1
-        }
-    }
-    setting 'path.repo', repo.absolutePath
-}
-
-run {
-    doFirst {
-        // There seems to be an issue when running multi node run or integ tasks with unicast_hosts
-        // not being written, the waitForAllConditions ensures it's written
-        getClusters().forEach { cluster ->
-            cluster.waitForAllConditions()
-        }
-    }
-    useCluster testClusters.integTest
-}
-
-// As of ES 7.7 the sample-extension-plugin is being added to the list of plugins for the testCluster during build before
-// the job-scheduler plugin is causing build failures.
-// The job-scheduler zip is added explicitly above but the sample-extension-plugin is added implicitly at some time during evaluation.
-// Will need to do a deep dive to find out exactly what task adds the sample-extension-plugin and add job-scheduler there but a temporary hack is to
-// reorder the plugins list after evaluation but prior to task execution when the plugins are installed.
-afterEvaluate {
-    testClusters.javaRestTest.nodes.each { node ->
-        def nodePlugins = node.plugins
-        def firstPlugin = nodePlugins.get(0)
-        if (firstPlugin.provider == project.bundlePlugin.archiveFile) {
-            nodePlugins.remove(0)
-            nodePlugins.add(firstPlugin)
-        }
-    }
-}