From 7c47325dc70e471dd70c59efd358784bb66024cf Mon Sep 17 00:00:00 2001
From: Jason Tedor <jason@tedor.me>
Date: Wed, 31 Aug 2016 21:28:40 -0400
Subject: [PATCH] Correct path.conf for integ-test-zip distribution

The integ-test-zip distribution did not specify a value for
path.conf. As such, it picked up the default value of
/etc/elasticsearch. This means that on machines that have this
directory, integration tests could fail because they would try to pick
up configuration from that directory rather than from the home directory
of the exploded distribution. This commit fixes this issue by specifying
a value of path.conf for the integ-test-zip distribution.

Relates #20271
---
 distribution/build.gradle | 1 +
 1 file changed, 1 insertion(+)

diff --git a/distribution/build.gradle b/distribution/build.gradle
index 5409cfd3bc6..1a4c2249bb4 100644
--- a/distribution/build.gradle
+++ b/distribution/build.gradle
@@ -490,6 +490,7 @@ Map<String, String> expansionsForDistribution(distributionType) {
     'path.conf': [
       'tar': '$ES_HOME/config',
       'zip': '$ES_HOME/config',
+      'integ-test-zip': '$ES_HOME/config',
       'def': '/etc/elasticsearch',
     ],
     'path.env': [