Allow running Java+Ruby tests on Windows separately #15861
Merged
Conversation
This file contains 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
This commit allows separate running of Java and Ruby tests on Windows i.e. the same way as we currently do on unix (`unit_tests.sh`) via a cli argument. If no argument has been supplied, both tests are run (as it does now). The wrapper script is also rewritten from old batch style script to powershell. Relates elastic#15566
to double check that a windows test failure results in a BK failure
This reverts commit 6b11a92.
|
This is now ready for review. FYI @robbavey I added you as a reviewer since you seem to have touched this codebase a while ago. |
roaksoax
approved these changes
Jan 30, 2024
| @@ -38,7 +38,7 @@ def compat_linux_step(imagesuffix: str) -> dict[str, typing.Any]: | |||
|
|
|||
|
|
|||
| def compat_windows_step(imagesuffix: str) -> dict[str, typing.Any]: | |||
| windows_command = LiteralScalarString(r'''$$env:WORKSPACE=$$PWD.Path ; .\\ci\\unit_tests.bat''') | |||
| windows_command = LiteralScalarString(r'''.\\ci\\unit_tests.ps1''') | |||
There was a problem hiding this comment.
Should we drop the env variables here? maybe just just $$PWD.Path?
There was a problem hiding this comment.
It's deliberate that we drop WORSPACE because this old env variable was needed by the old bat script.
Regarding using a full path, when BK checks out a repo it cds under the checked out repo, so it's safe to just invoke scripts relatively. We do the same elsewhere in Linux etc.
|
💚 Build Succeeded
History
cc @dliappis |
|
@logstashmachine backport 8.12 |
|
@logstashmachine backport 7.17 |
github-actions bot
pushed a commit
that referenced
this pull request
Feb 1, 2024
This commit allows separate running of Java and Ruby tests on Windows i.e. the same way as we currently do on unix (unit_tests.sh) via a cli argument. If no argument has been supplied, both tests are run (as it does now). The wrapper script is also rewritten from old batch style script to Powershell. This work allows us to split the existing Windows CI job in a subsequent PR to separate steps, as we currently do on Linux. Relates: #15566 (cherry picked from commit 8ac5518)
github-actions bot
pushed a commit
that referenced
this pull request
Feb 1, 2024
This commit allows separate running of Java and Ruby tests on Windows i.e. the same way as we currently do on unix (unit_tests.sh) via a cli argument. If no argument has been supplied, both tests are run (as it does now). The wrapper script is also rewritten from old batch style script to Powershell. This work allows us to split the existing Windows CI job in a subsequent PR to separate steps, as we currently do on Linux. Relates: #15566 (cherry picked from commit 8ac5518)
dliappis
added a commit
to dliappis/logstash
that referenced
this pull request
Feb 1, 2024
As a follow up to elastic#15861 this commit splits the current unit tests step for the Windows JDK matrix pipeline to two that run Java and Ruby unit tests separately. Closes elastic#15566
dliappis
added a commit
that referenced
this pull request
Feb 1, 2024
This commit allows separate running of Java and Ruby tests on Windows i.e. the same way as we currently do on unix (unit_tests.sh) via a cli argument. If no argument has been supplied, both tests are run (as it does now). The wrapper script is also rewritten from old batch style script to Powershell. This work allows us to split the existing Windows CI job in a subsequent PR to separate steps, as we currently do on Linux. Relates: #15566 (cherry picked from commit 8ac5518) Co-authored-by: Dimitrios Liappis <[email protected]>
dliappis
added a commit
that referenced
this pull request
Feb 1, 2024
This commit allows separate running of Java and Ruby tests on Windows i.e. the same way as we currently do on unix (unit_tests.sh) via a cli argument. If no argument has been supplied, both tests are run (as it does now). The wrapper script is also rewritten from old batch style script to Powershell. This work allows us to split the existing Windows CI job in a subsequent PR to separate steps, as we currently do on Linux. Relates: #15566 (cherry picked from commit 8ac5518) Co-authored-by: Dimitrios Liappis <[email protected]>
dliappis
added a commit
that referenced
this pull request
Mar 11, 2024
dliappis
added a commit
that referenced
this pull request
Mar 11, 2024
As a follow up to #15861 this commit splits the current unit tests step for the Windows JDK matrix pipeline to two that run Java and Ruby unit tests separately. Closes #15566 (cherry picked from commit c0c213d) Co-authored-by: Dimitrios Liappis <[email protected]>
dliappis
added a commit
that referenced
this pull request
Mar 11, 2024
As a follow up to #15861 this commit splits the current unit tests step for the Windows JDK matrix pipeline to two that run Java and Ruby unit tests separately. Closes #15566 (cherry picked from commit c0c213d) Co-authored-by: Dimitrios Liappis <[email protected]>
dliappis
added a commit
that referenced
this pull request
Mar 11, 2024
As a follow up to #15861 this commit splits the current unit tests step for the Windows JDK matrix pipeline to two that run Java and Ruby unit tests separately. Closes #15566 (cherry picked from commit c0c213d) Co-authored-by: Dimitrios Liappis <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Release notes
[rn:skip]
What does this PR do?
This commit allows separate running of Java and Ruby tests on Windows i.e. the same way as we currently do on unix (
unit_tests.sh) via a cli argument.If no argument has been supplied, both tests are run (as it does now).
The wrapper script is also rewritten from old batch style script to powershell.
Why is it important/What is the impact to the user?
It allows us to split the existing Windows CI job in a subsequent PR to separate steps, as we currently do for Linux.
How to test this PR locally
Launch Windows VM using https://github.com/elastic/ingest-dev/blob/main/engineer-productivity/tools/launch_windows_vm.sh
launch powershell.
Git clone this PR and run:
.\ci\unit_tests.ps1 java(or skip the argument to run all)To simulate a failure you can revert c33afd4
Example successful run on Buildkite:
Simulating a failure:
I temporarily reverted the muted Windows test to verify that a failure bubbles up as a test failure:
Related issues