From f999d639be5eb2599f21900be0edff6dbc04d769 Mon Sep 17 00:00:00 2001
From: Jason Tedor <jason@tedor.me>
Date: Fri, 5 Jan 2018 17:25:10 -0500
Subject: [PATCH] Update platforms tests to use Gradle wrapper

Gradle will no longer be needed in the test VMs as the Gradle wrapper
can be used to run the platform tests. This commit updates the platform
tests to use the Gradle wrapper, and removes installing Gradle in the VM
which will speed up VM provisioning.

Relates #28105
---
 Vagrantfile                                       | 15 ---------------
 .../gradle/vagrant/VagrantTestPlugin.groovy       |  2 +-
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 6ace825e5c3..f123a572f97 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -206,9 +206,6 @@ def provision(config,
     v.memory = Integer(ENV['VAGRANT_MEMORY'] || 8192)
     v.cpus = Integer(ENV['VAGRANT_CPUS'] || 4)
   end
-  config.vm.synced_folder "#{Dir.home}/.gradle/caches", "/home/vagrant/.gradle/caches",
-    create: true,
-    owner: "vagrant"
   config.vm.provision "dependencies", type: "shell", inline: <<-SHELL
     set -e
     set -o pipefail
@@ -273,17 +270,6 @@ def provision(config,
       rm -rf /tmp/bats
     }
 
-    installed gradle || {
-      echo "==> Installing Gradle"
-      curl -sS -o /tmp/gradle.zip -L https://services.gradle.org/distributions/gradle-3.3-bin.zip
-      unzip -q /tmp/gradle.zip -d /opt
-      rm -rf /tmp/gradle.zip
-      ln -s /opt/gradle-3.3/bin/gradle /usr/bin/gradle
-      # make nfs mounted gradle home dir writeable
-      chown vagrant:vagrant /home/vagrant/.gradle
-    }
-
-
     cat \<\<VARS > /etc/profile.d/elasticsearch_vars.sh
 export ZIP=/elasticsearch/distribution/zip/build/distributions
 export TAR=/elasticsearch/distribution/tar/build/distributions
@@ -293,7 +279,6 @@ export BATS=/project/build/bats
 export BATS_UTILS=/project/build/bats/utils
 export BATS_TESTS=/project/build/bats/tests
 export BATS_ARCHIVES=/project/build/bats/archives
-export GRADLE_HOME=/opt/gradle-3.3
 VARS
     cat \<\<SUDOERS_VARS > /etc/sudoers.d/elasticsearch_vars
 Defaults   env_keep += "ZIP"
diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/vagrant/VagrantTestPlugin.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/vagrant/VagrantTestPlugin.groovy
index 2510620ac71..0f55123b5cb 100644
--- a/buildSrc/src/main/groovy/org/elasticsearch/gradle/vagrant/VagrantTestPlugin.groovy
+++ b/buildSrc/src/main/groovy/org/elasticsearch/gradle/vagrant/VagrantTestPlugin.groovy
@@ -43,7 +43,7 @@ class VagrantTestPlugin implements Plugin<Project> {
 
     private static final BATS = 'bats'
     private static final String BATS_TEST_COMMAND ="cd \$BATS_ARCHIVES && sudo bats --tap \$BATS_TESTS/*.$BATS"
-    private static final String PLATFORM_TEST_COMMAND ="rm -rf ~/elasticsearch && rsync -r /elasticsearch/ ~/elasticsearch && cd ~/elasticsearch && \$GRADLE_HOME/bin/gradle test integTest"
+    private static final String PLATFORM_TEST_COMMAND ="rm -rf ~/elasticsearch && rsync -r /elasticsearch/ ~/elasticsearch && cd ~/elasticsearch && ./gradlew test integTest"
 
     @Override
     void apply(Project project) {