Make packaging tests use jdk downloader (#42097)

This commit removes the jdk11 download in vagrant provisioning and
converts it to using the jdk downloader for the system jdk, and sets up
a separate jdk for use by the test (which will be converted to running
gradle in a followup).

Vagrantfile

@@ -72,7 +72,7 @@ Vagrant.configure(2) do |config|
       config.vm.box = 'elastic/debian-8-x86_64'
       deb_common config, box, extra: <<-SHELL
         # this sometimes gets a bad ip, and doesn't appear to be needed
-        rm /etc/apt/sources.list.d/http_debian_net_debian.list
+        rm -f /etc/apt/sources.list.d/http_debian_net_debian.list
       SHELL
     end
   end

buildSrc/src/main/groovy/org/elasticsearch/gradle/vagrant/BatsOverVagrantTask.groovy

@@ -27,15 +27,15 @@ import org.gradle.api.tasks.Input
 public class BatsOverVagrantTask extends VagrantCommandTask {
 
     @Input
-    String remoteCommand
+    Object remoteCommand
 
     BatsOverVagrantTask() {
         command = 'ssh'
     }
 
-    void setRemoteCommand(String remoteCommand) {
+    void setRemoteCommand(Object remoteCommand) {
         this.remoteCommand = Objects.requireNonNull(remoteCommand)
-        setArgs(['--command', remoteCommand])
+        setArgs((Iterable<?>) ['--command', remoteCommand])
     }
 
     @Override

buildSrc/src/main/groovy/org/elasticsearch/gradle/vagrant/VagrantTestPlugin.groovy

@@ -1,11 +1,18 @@
 package org.elasticsearch.gradle.vagrant
 
 import org.apache.tools.ant.taskdefs.condition.Os
+import org.elasticsearch.gradle.BwcVersions
 import org.elasticsearch.gradle.FileContentsTask
+import org.elasticsearch.gradle.Jdk
+import org.elasticsearch.gradle.JdkDownloadPlugin
 import org.elasticsearch.gradle.LoggedExec
 import org.elasticsearch.gradle.Version
-import org.elasticsearch.gradle.BwcVersions
-import org.gradle.api.*
+import org.gradle.api.GradleException
+import org.gradle.api.InvalidUserDataException
+import org.gradle.api.NamedDomainObjectContainer
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.api.Task
 import org.gradle.api.artifacts.dsl.RepositoryHandler
 import org.gradle.api.execution.TaskExecutionAdapter
 import org.gradle.api.internal.artifacts.dependencies.DefaultProjectDependency
@@ -15,6 +22,8 @@ import org.gradle.api.tasks.Exec
 import org.gradle.api.tasks.StopExecutionException
 import org.gradle.api.tasks.TaskState
 
+import java.nio.file.Paths
+
 import static java.util.Collections.unmodifiableList
 
 class VagrantTestPlugin implements Plugin<Project> {
@@ -85,8 +94,22 @@ class VagrantTestPlugin implements Plugin<Project> {
     /** extra env vars to pass to vagrant for box configuration **/
     Map<String, String> vagrantBoxEnvVars = [:]
 
+    private static final String GRADLE_JDK_VERSION = "12.0.1+12@69cfe15208a647278a19ef0990eea691"
+    private Jdk linuxGradleJdk;
+    private Jdk windowsGradleJdk;
+
     @Override
     void apply(Project project) {
+        project.pluginManager.apply(JdkDownloadPlugin.class)
+        NamedDomainObjectContainer<Jdk> jdksContainer = (NamedDomainObjectContainer<Jdk>) project.getExtensions().getByName("jdks");
+        linuxGradleJdk = jdksContainer.create("linux_gradle") {
+            version = GRADLE_JDK_VERSION
+            platform = "linux"
+        }
+        windowsGradleJdk = jdksContainer.create("windows_gradle") {
+            version = GRADLE_JDK_VERSION
+            platform = "windows"
+        }
 
         collectAvailableBoxes(project)
 
@@ -264,7 +287,7 @@ class VagrantTestPlugin implements Plugin<Project> {
         }
     }
 
-    private static void createPrepareVagrantTestEnvTask(Project project) {
+    private void createPrepareVagrantTestEnvTask(Project project) {
         File packagingDir = new File(project.buildDir, PACKAGING_CONFIGURATION)
 
         File archivesDir = new File(packagingDir, 'archives')
@@ -280,19 +303,20 @@ class VagrantTestPlugin implements Plugin<Project> {
         }
 
         Task createLinuxRunnerScript = project.tasks.create('createLinuxRunnerScript', FileContentsTask) {
-            dependsOn copyPackagingTests
+            dependsOn copyPackagingTests, linuxGradleJdk
             file "${testsDir}/run-tests.sh"
             contents """\
                      if [ "\$#" -eq 0 ]; then
                        test_args=( "${-> project.extensions.esvagrant.testClass}" )
                      else
                        test_args=( "\$@" )
                      fi
-                     java -cp "\$PACKAGING_TESTS/*" org.elasticsearch.packaging.VMTestRunner "\${test_args[@]}"
+                     
+                     "${-> convertPath(project, linuxGradleJdk.toString()) }"/bin/java -cp "\$PACKAGING_TESTS/*" org.elasticsearch.packaging.VMTestRunner "\${test_args[@]}"
                      """
         }
         Task createWindowsRunnerScript = project.tasks.create('createWindowsRunnerScript', FileContentsTask) {
-            dependsOn copyPackagingTests
+            dependsOn copyPackagingTests, windowsGradleJdk
             file "${testsDir}/run-tests.ps1"
             // the use of $args rather than param() here is deliberate because the syntax for array (multivalued) parameters is likely
             // a little trappy for those unfamiliar with powershell
@@ -302,7 +326,7 @@ class VagrantTestPlugin implements Plugin<Project> {
                      } else {
                        \$testArgs = \$args
                      }
-                     java -cp "\$Env:PACKAGING_TESTS/*" org.elasticsearch.packaging.VMTestRunner @testArgs
+                     & "${-> convertPath(project, windowsGradleJdk.toString()) }"/bin/java -cp "\$Env:PACKAGING_TESTS/*" org.elasticsearch.packaging.VMTestRunner @testArgs
                      exit \$LASTEXITCODE
                      """
         }
@@ -617,4 +641,9 @@ class VagrantTestPlugin implements Plugin<Project> {
             }
         }
     }
+
+    // convert the given path from an elasticsearch repo path to a VM path
+    private String convertPath(Project project, String path) {
+        return "/elasticsearch/" + project.rootDir.toPath().relativize(Paths.get(path));
+    }
 }