Skip to content
This repository has been archived by the owner on Aug 2, 2022. It is now read-only.

Commit

Permalink
Changes for the Performance Analyzer IT to run with newer versions of…
Browse files Browse the repository at this point in the history
… ES (#256)
  • Loading branch information
Sid Narayan committed Dec 14, 2020
1 parent c9190f9 commit 4d6e1c9
Showing 1 changed file with 14 additions and 12 deletions.
26 changes: 14 additions & 12 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,7 @@ gradle.startParameter.excludedTaskNames += [ "forbiddenApisMain",
"testingConventions"]
import java.nio.file.Paths
import org.ajoberstar.gradle.git.tasks.GitClone
import org.elasticsearch.gradle.test.RestIntegTestTask

String rcaDir
String rcaArtifactsDir
Expand Down Expand Up @@ -366,7 +367,7 @@ task setupEsCluster() {
}

/**
* integTestRunner is a task provided by the ES test framework, which allows us to spin up clients
* integTest is a task provided by the ES test framework, which allows us to spin up clients
* and test API calls against a local or remote Elasticsearch cluster.
*
* The simplest way to run this task in a way that "just works" is to invoke
Expand All @@ -389,17 +390,18 @@ task setupEsCluster() {
* -Dtests.password to authenticate requests in the opendistro-security context
* -Dtests.password the password of the admin user specified by -Dtests.user
*/
// TODO : 'integTestRunner' task has been removed with 7.10, needs to be migrated
/* integTestRunner {
* onlyIf = {
* propEnabled("tests.enableIT")
* }
* // add "-Dtests.security.manager=false" to VM options if you want to run integ tests in IntelliJ
* systemProperty 'tests.security.manager', 'false'
* if (propEnabled("tests.useDockerCluster")) {
* dependsOn(setupEsCluster)
* }
}*/
task integTest(type: RestIntegTestTask) {
onlyIf = {
propEnabled("tests.enableIT")
}
if (propEnabled("tests.useDockerCluster")) {
dependsOn(setupEsCluster)
}
systemProperty 'tests.security.manager', 'false'
description = "Run integration tests against integTest cluster"
testClassesDirs = sourceSets.test.output.classesDirs
classpath = sourceSets.test.runtimeClasspath
}

// This is afterEvaluate because the bundlePlugin ZIP task is updated afterEvaluate and changes the ZIP name to match the plugin name
afterEvaluate {
Expand Down

0 comments on commit 4d6e1c9

Please sign in to comment.