From f2c70b70c86421c34216ae40dcb43e8ecf65cbfb Mon Sep 17 00:00:00 2001 From: Jason Tedor Date: Fri, 24 Aug 2018 09:48:54 -0400 Subject: [PATCH] Make CCR QA tests build again (#33113) Welp, I broke this. I merged a change to auto-discover the CCR QA tests by making :x-pack:plugin:ccr:check auto-discover the check tasks in the qa sub-project. Yet, the check tasks for these sub-projects did not depend on the necessary test tasks (as we were previously doing this directly from the ccr build file. This commit fixes this! --- .../ccr/qa/multi-cluster-with-incompatible-license/build.gradle | 1 + x-pack/plugin/ccr/qa/multi-cluster-with-security/build.gradle | 1 + x-pack/plugin/ccr/qa/multi-cluster/build.gradle | 1 + 3 files changed, 3 insertions(+) diff --git a/x-pack/plugin/ccr/qa/multi-cluster-with-incompatible-license/build.gradle b/x-pack/plugin/ccr/qa/multi-cluster-with-incompatible-license/build.gradle index 18f1eba3b6d46..97d4008eb8c1f 100644 --- a/x-pack/plugin/ccr/qa/multi-cluster-with-incompatible-license/build.gradle +++ b/x-pack/plugin/ccr/qa/multi-cluster-with-incompatible-license/build.gradle @@ -36,4 +36,5 @@ followClusterTestRunner { finalizedBy 'leaderClusterTestCluster#stop' } +check.dependsOn followClusterTest test.enabled = false diff --git a/x-pack/plugin/ccr/qa/multi-cluster-with-security/build.gradle b/x-pack/plugin/ccr/qa/multi-cluster-with-security/build.gradle index 970c400e7327e..897aed0110e17 100644 --- a/x-pack/plugin/ccr/qa/multi-cluster-with-security/build.gradle +++ b/x-pack/plugin/ccr/qa/multi-cluster-with-security/build.gradle @@ -71,4 +71,5 @@ followClusterTestRunner { finalizedBy 'leaderClusterTestCluster#stop' } +check.dependsOn followClusterTest test.enabled = false // no unit tests for multi-cluster-search, only the rest integration test diff --git a/x-pack/plugin/ccr/qa/multi-cluster/build.gradle b/x-pack/plugin/ccr/qa/multi-cluster/build.gradle index 9d59a18ab5203..cc726e1a65257 100644 --- a/x-pack/plugin/ccr/qa/multi-cluster/build.gradle +++ b/x-pack/plugin/ccr/qa/multi-cluster/build.gradle @@ -37,4 +37,5 @@ followClusterTestRunner { finalizedBy 'leaderClusterTestCluster#stop' } +check.dependsOn followClusterTest test.enabled = false // no unit tests for multi-cluster-search, only the rest integration test