Link to SYSTEM_JAVA_HOME on windows#40806
Merged
rjernst merged 2 commits intoelastic:masterfrom Apr 4, 2019
Merged
Conversation
We don't always have java home defined in packaging tests, as we want to use the bundled jdk most of the time. This commit fixes the java home with special characters test to link to SYSTEM_JAVA_HOME on windows. closes elastic#40797
Collaborator
|
Pinging @elastic/es-core-infra |
Member
Author
|
Note I only put 8.0 on here as it looks like the backports of #39712 have not yet been merged (and should incorporate this fix once it is in). |
pgomulka
approved these changes
Apr 3, 2019
Contributor
pgomulka
left a comment
There was a problem hiding this comment.
Probably worthy to run windows tests from command line as they might not be include in package sample.
If the fix in cleanup works then this lgtm
| } finally { | ||
| //clean up sym link | ||
| sh.run("cmd /c del /F /Q 'C:\\Program Files (x86)\\java' "); | ||
| sh.run("cmd /c rmdir 'C:\\Program Files (x86)\\java' "); |
Contributor
There was a problem hiding this comment.
Hopefully it will pass, but I think the problem is the path with spaces (apostrophes didn't help) . Note that del command should pass when run on windows.
If it still fails I would use fileutils.rm
Member
Author
The packaging label triggers a full run of packaging tests, which include windows VMs. I will double check the CI output to ensure windows was run. |
pgomulka
pushed a commit
to pgomulka/elasticsearch
that referenced
this pull request
Apr 4, 2019
We don't always have java home defined in packaging tests, as we want to use the bundled jdk most of the time. This commit fixes the java home with special characters test to link to SYSTEM_JAVA_HOME on windows. closes elastic#40797
pgomulka
pushed a commit
to pgomulka/elasticsearch
that referenced
this pull request
Apr 4, 2019
We don't always have java home defined in packaging tests, as we want to use the bundled jdk most of the time. This commit fixes the java home with special characters test to link to SYSTEM_JAVA_HOME on windows. closes elastic#40797
pgomulka
pushed a commit
to pgomulka/elasticsearch
that referenced
this pull request
Apr 4, 2019
We don't always have java home defined in packaging tests, as we want to use the bundled jdk most of the time. This commit fixes the java home with special characters test to link to SYSTEM_JAVA_HOME on windows. closes elastic#40797
This was referenced Apr 4, 2019
pgomulka
added a commit
that referenced
this pull request
Apr 4, 2019
pgomulka
added a commit
that referenced
this pull request
Apr 4, 2019
pgomulka
added a commit
that referenced
this pull request
Apr 5, 2019
…40768) the elasticsearch.bat and elasticsearch-env.bat won't work if JAVA contains parentheses. This seems to be the limitation of FOR /F IN (command) DO syntax. The JAVA variable present in a command contains a path to a binary to start elasticsearch (with spaces & parens). We can workaround the problem of spaces and parentheses in this path by referring this variable with a CALL command. Note that executing binaries with CALL is an undocumented behaviour (but works) closes #38578 closes #38624 closes #33405 closes #30606 backports: * Bat scripts to work with JAVA_HOME with parentheses(#39712) * Link to SYSTEM_JAVA_HOME on windows (#40806)
gurkankaymak
pushed a commit
to gurkankaymak/elasticsearch
that referenced
this pull request
May 27, 2019
We don't always have java home defined in packaging tests, as we want to use the bundled jdk most of the time. This commit fixes the java home with special characters test to link to SYSTEM_JAVA_HOME on windows. closes elastic#40797
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
We don't always have java home defined in packaging tests, as we want to
use the bundled jdk most of the time. This commit fixes the java home
with special characters test to link to SYSTEM_JAVA_HOME on windows.
closes #40797