Rankeval: Fold template test project into main module (#31203)

This change moves tests in `smoke-test-rank-eval-with-mustache` into the main ranking evaluation module by declaring that the integration testing cluster requires the `lang-mustache` plugin. This avoids having to maintain the qa project for only one basic test suite.
elastic · Jun 15, 2018 · 69bcd40 · 69bcd40
1 parent f4467ce
commit 69bcd40
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 72 deletions.
diff --git a/modules/rank-eval/build.gradle b/modules/rank-eval/build.gradle
@@ -23,3 +23,12 @@ esplugin {
  hasClientJar = true
 }
 
+integTestCluster {
+ // Modules who's integration is explicitly tested in integration tests
+ module project(':modules:lang-mustache')
+}
+
+run {
+ // Modules who's integration is explicitly tested in integration tests
+ module project(':modules:lang-mustache')
+}
diff --git a/...test/rank-eval/10_rank_eval_templated.yml → ...test/rank_eval/40_rank_eval_templated.yml b/...test/rank-eval/10_rank_eval_templated.yml → ...test/rank_eval/40_rank_eval_templated.yml
diff --git a/qa/smoke-test-rank-eval-with-mustache/build.gradle b/qa/smoke-test-rank-eval-with-mustache/build.gradle
diff --git a/...t/java/org/elasticsearch/index/rankeval/SmokeTestRankEvalWithMustacheYAMLTestSuiteIT.java b/...t/java/org/elasticsearch/index/rankeval/SmokeTestRankEvalWithMustacheYAMLTestSuiteIT.java