From aba5a075492edbf6bf5fed2b793fa334ef84e698 Mon Sep 17 00:00:00 2001
From: jaymode <jay@elastic.co>
Date: Thu, 3 May 2018 11:18:46 -0600
Subject: [PATCH 1/3] Build: add generated-resources to gitignore

This commit adds a gitignore file for the openldap-tests and
saml-idp-tests projects. Both projects create a generated-resources
directory that should never be added to git, so the gitignore will
ignore these directories.
---
 x-pack/qa/openldap-tests/.gitignore | 1 +
 x-pack/qa/saml-idp-tests/.gitignore | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 x-pack/qa/openldap-tests/.gitignore
 create mode 100644 x-pack/qa/saml-idp-tests/.gitignore

diff --git a/x-pack/qa/openldap-tests/.gitignore b/x-pack/qa/openldap-tests/.gitignore
new file mode 100644
index 0000000000000..d4f7ff2d537f3
--- /dev/null
+++ b/x-pack/qa/openldap-tests/.gitignore
@@ -0,0 +1 @@
+generated-resources
diff --git a/x-pack/qa/saml-idp-tests/.gitignore b/x-pack/qa/saml-idp-tests/.gitignore
new file mode 100644
index 0000000000000..d4f7ff2d537f3
--- /dev/null
+++ b/x-pack/qa/saml-idp-tests/.gitignore
@@ -0,0 +1 @@
+generated-resources

From e73c3eff7df7d086c7e4da957104954035e656d1 Mon Sep 17 00:00:00 2001
From: jaymode <jay@elastic.co>
Date: Thu, 3 May 2018 12:25:45 -0600
Subject: [PATCH 2/3] add to top level gitignore

---
 .gitignore                          | 1 +
 x-pack/qa/openldap-tests/.gitignore | 1 -
 x-pack/qa/saml-idp-tests/.gitignore | 1 -
 3 files changed, 1 insertion(+), 2 deletions(-)
 delete mode 100644 x-pack/qa/openldap-tests/.gitignore
 delete mode 100644 x-pack/qa/saml-idp-tests/.gitignore

diff --git a/.gitignore b/.gitignore
index 8b2a7335ade9d..d48163a405d3a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,6 +19,7 @@ nbactions.xml
 # gradle stuff
 .gradle/
 build/
+generated-resources/
 
 # vscode stuff
 .vscode/
diff --git a/x-pack/qa/openldap-tests/.gitignore b/x-pack/qa/openldap-tests/.gitignore
deleted file mode 100644
index d4f7ff2d537f3..0000000000000
--- a/x-pack/qa/openldap-tests/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-generated-resources
diff --git a/x-pack/qa/saml-idp-tests/.gitignore b/x-pack/qa/saml-idp-tests/.gitignore
deleted file mode 100644
index d4f7ff2d537f3..0000000000000
--- a/x-pack/qa/saml-idp-tests/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-generated-resources

From 37dc2287806e2fc08d21583b9aac013cf9a135b9 Mon Sep 17 00:00:00 2001
From: jaymode <jay@elastic.co>
Date: Thu, 3 May 2018 12:41:39 -0600
Subject: [PATCH 3/3] don't use gitignore, move to build

---
 .gitignore                            | 1 -
 x-pack/qa/openldap-tests/build.gradle | 2 +-
 x-pack/qa/saml-idp-tests/build.gradle | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index d48163a405d3a..8b2a7335ade9d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,7 +19,6 @@ nbactions.xml
 # gradle stuff
 .gradle/
 build/
-generated-resources/
 
 # vscode stuff
 .vscode/
diff --git a/x-pack/qa/openldap-tests/build.gradle b/x-pack/qa/openldap-tests/build.gradle
index 6aef9fa28921f..24976ab6113ab 100644
--- a/x-pack/qa/openldap-tests/build.gradle
+++ b/x-pack/qa/openldap-tests/build.gradle
@@ -14,7 +14,7 @@ task openLdapFixture {
     dependsOn "vagrantCheckVersion", "virtualboxCheckVersion", idpFixtureProject.up
 }
 
-String outputDir = "generated-resources/${project.name}"
+String outputDir = "${project.buildDir}/generated-resources/${project.name}"
 task copyIdpTrust(type: Copy) {
     from idpFixtureProject.file('src/main/resources/certs/idptrust.jks');
     into outputDir
diff --git a/x-pack/qa/saml-idp-tests/build.gradle b/x-pack/qa/saml-idp-tests/build.gradle
index 251311fe8cd0a..ebb0d88991ff6 100644
--- a/x-pack/qa/saml-idp-tests/build.gradle
+++ b/x-pack/qa/saml-idp-tests/build.gradle
@@ -16,7 +16,7 @@ task idpFixture {
     dependsOn "vagrantCheckVersion", "virtualboxCheckVersion", idpFixtureProject.up
 }
 
-String outputDir = "generated-resources/${project.name}"
+String outputDir = "${project.buildDir}/generated-resources/${project.name}"
 task copyIdpCertificate(type: Copy) {
     from idpFixtureProject.file('src/main/resources/certs/ca.crt');
     into outputDir