From aa0ef84f5a6dc1a4621e5b896f2177bb904b0dce Mon Sep 17 00:00:00 2001
From: Nik Everett <nik9000@gmail.com>
Date: Wed, 2 Mar 2016 08:29:32 -0500
Subject: [PATCH] Silence reindex's rest tests

They are failing sporadically in CI.
---
 modules/reindex/build.gradle                                 | 5 +++++
 .../java/org/elasticsearch/index/reindex/ReindexRestIT.java  | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/modules/reindex/build.gradle b/modules/reindex/build.gradle
index 5bd5aeb3dc0..6b9c7a620f0 100644
--- a/modules/reindex/build.gradle
+++ b/modules/reindex/build.gradle
@@ -21,3 +21,8 @@ esplugin {
   description 'The Reindex module adds APIs to reindex from one index to another or update documents in place.'
   classname 'org.elasticsearch.index.reindex.ReindexPlugin'
 }
+
+integTest {
+  // Since there is only a single integTest and we're disabling it we need to disable the whole phase
+  enabled = false
+}
diff --git a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/ReindexRestIT.java b/modules/reindex/src/test/java/org/elasticsearch/index/reindex/ReindexRestIT.java
index d8718c5b493..21194df77a4 100644
--- a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/ReindexRestIT.java
+++ b/modules/reindex/src/test/java/org/elasticsearch/index/reindex/ReindexRestIT.java
@@ -22,12 +22,14 @@ package org.elasticsearch.index.reindex;
 import com.carrotsearch.randomizedtesting.annotations.Name;
 import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
 
+import org.apache.lucene.util.LuceneTestCase.AwaitsFix;
 import org.elasticsearch.test.rest.ESRestTestCase;
 import org.elasticsearch.test.rest.RestTestCandidate;
 import org.elasticsearch.test.rest.parser.RestTestParseException;
 
 import java.io.IOException;
 
+@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/16906")
 public class ReindexRestIT extends ESRestTestCase {
     public ReindexRestIT(@Name("yaml") RestTestCandidate testCandidate) {
         super(testCandidate);