use shell with JAVA_HOME for starting archive (elastic#40118)

Closes elastic#40099
jasontedor · Mar 16, 2019 · 2722d3f · 2722d3f
1 parent df11ba8
commit 2722d3f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/qa/vagrant/src/main/java/org/elasticsearch/packaging/test/ArchiveTestCase.java b/qa/vagrant/src/main/java/org/elasticsearch/packaging/test/ArchiveTestCase.java
@@ -369,12 +369,12 @@ public void test93ElasticsearchNodeCustomDataPathAndNotEsHomeWorkDir() throws IO
         Path relativeDataPath = installation.data.relativize(installation.home);
         append(installation.config("elasticsearch.yml"), "path.data: " + relativeDataPath);
 
-        Archives.runElasticsearch(installation);
-        Archives.stopElasticsearch(installation);
-
-        final Shell sh = new Shell();
+        final Shell sh = newShell();
         sh.setWorkingDirectory(getTempDir());
 
+        Archives.runElasticsearch(installation, sh);
+        Archives.stopElasticsearch(installation);
+
         Result result = sh.run("echo y | " + installation.executables().elasticsearchNode + " unsafe-bootstrap");
         assertThat(result.stdout, containsString("Master node was successfully bootstrapped"));
     }

diff --git a/qa/vagrant/src/main/java/org/elasticsearch/packaging/util/Archives.java b/qa/vagrant/src/main/java/org/elasticsearch/packaging/util/Archives.java
@@ -255,10 +255,6 @@ private static void verifyDefaultInstallation(Installation es, Distribution dist
         ).forEach(configFile -> assertThat(es.config(configFile), file(File, owner, owner, p660)));
     }
 
-    public static void runElasticsearch(Installation installation) throws IOException {
-        runElasticsearch(installation, new Shell());
-    }
-
     public static void runElasticsearch(Installation installation, Shell sh) throws IOException {
         final Path pidFile = installation.home.resolve("elasticsearch.pid");