Skip to content

use shell with JAVA_HOME for starting archive #40118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 16, 2019
Merged

use shell with JAVA_HOME for starting archive #40118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions qa/vagrant/src/main/java/org/elasticsearch/packaging/test/ArchiveTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"));
}
Expand Down
4 changes: 0 additions & 4 deletions qa/vagrant/src/main/java/org/elasticsearch/packaging/util/Archives.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");

Expand Down