Skip to content
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.

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

Skip SymbolicLinkPreservingTarIT when running on Windows. #5023

Merged
merged 1 commit into from
Nov 1, 2022

Conversation

mch2
Copy link
Member

@mch2 mch2 commented Nov 1, 2022

Signed-off-by: Marc Handalian handalm@amazon.com

Description

Skip SymbolicLinkPreservingTarIT when running on Windows. This test creates symlinks which requires admin privileges to succeed on Windows. The assemble task will only build a zip when performed on Windows, so these tests are not required.

Issues Resolved

#4924

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Commits are signed per the DCO using --signoff
  • Commit changes are listed out in CHANGELOG.md file (See: Changelog)

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

Signed-off-by: Marc Handalian <handalm@amazon.com>
@mch2 mch2 marked this pull request as ready for review November 1, 2022 19:21
@mch2 mch2 requested review from a team and reta as code owners November 1, 2022 19:21
@github-actions
Copy link
Contributor

github-actions bot commented Nov 1, 2022

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Contributor

github-actions bot commented Nov 1, 2022

Gradle Check (Jenkins) Run Completed with:

@codecov-commenter
Copy link

Codecov Report

Merging #5023 (74eabaa) into main (fab4336) will increase coverage by 0.11%.
The diff coverage is 87.64%.

@@             Coverage Diff              @@
##               main    #5023      +/-   ##
============================================
+ Coverage     70.84%   70.96%   +0.11%     
- Complexity    57867    57929      +62     
============================================
  Files          4692     4692              
  Lines        276650   276527     -123     
  Branches      40155    40084      -71     
============================================
+ Hits         196002   196232     +230     
+ Misses        64500    64201     -299     
+ Partials      16148    16094      -54     
Impacted Files Coverage Δ
...java/org/opensearch/upgrade/ValidateInputTask.java 84.61% <0.00%> (ø)
.../src/main/java/org/opensearch/LegacyESVersion.java 59.34% <ø> (-2.37%) ⬇️
...ensearch/action/search/SearchTransportService.java 86.80% <ø> (-0.20%) ⬇️
...va/org/opensearch/action/update/UpdateRequest.java 47.97% <0.00%> (+3.53%) ⬆️
.../cluster/metadata/IndexNameExpressionResolver.java 83.79% <ø> (-0.03%) ⬇️
...va/org/opensearch/cluster/node/DiscoveryNodes.java 89.04% <ø> (-0.86%) ⬇️
.../opensearch/index/stats/IndexingPressureStats.java 33.78% <0.00%> (+1.31%) ⬆️
...rc/main/java/org/opensearch/monitor/fs/FsInfo.java 75.00% <ø> (+1.92%) ⬆️
...nsearch/action/ingest/SimulateProcessorResult.java 86.08% <40.00%> (-2.25%) ⬇️
...ensearch/ingest/common/GrokProcessorGetAction.java 68.88% <100.00%> (+3.67%) ⬆️
... and 470 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@Poojita-Raj Poojita-Raj merged commit 0adb74d into opensearch-project:main Nov 1, 2022
@mch2 mch2 deleted the windows branch November 1, 2022 20:36
@mch2 mch2 added backport 2.x Backport to 2.x branch backport 2.4 Backport to 2.4 branch labels Nov 1, 2022
opensearch-trigger-bot bot pushed a commit that referenced this pull request Nov 1, 2022
Signed-off-by: Marc Handalian <handalm@amazon.com>

Signed-off-by: Marc Handalian <handalm@amazon.com>
(cherry picked from commit 0adb74d)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

# Conflicts:
#	CHANGELOG.md
opensearch-trigger-bot bot pushed a commit that referenced this pull request Nov 1, 2022
Signed-off-by: Marc Handalian <handalm@amazon.com>

Signed-off-by: Marc Handalian <handalm@amazon.com>
(cherry picked from commit 0adb74d)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

# Conflicts:
#	CHANGELOG.md
mch2 pushed a commit that referenced this pull request Nov 1, 2022
Signed-off-by: Marc Handalian <handalm@amazon.com>

Signed-off-by: Marc Handalian <handalm@amazon.com>
(cherry picked from commit 0adb74d)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Signed-off-by: Marc Handalian <handalm@amazon.com>
mch2 pushed a commit that referenced this pull request Nov 1, 2022
Signed-off-by: Marc Handalian <handalm@amazon.com>

Signed-off-by: Marc Handalian <handalm@amazon.com>
(cherry picked from commit 0adb74d)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Signed-off-by: Marc Handalian <handalm@amazon.com>
mch2 pushed a commit that referenced this pull request Nov 1, 2022
)

Signed-off-by: Marc Handalian <handalm@amazon.com>

Signed-off-by: Marc Handalian <handalm@amazon.com>
(cherry picked from commit 0adb74d)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Signed-off-by: Marc Handalian <handalm@amazon.com>

Signed-off-by: Marc Handalian <handalm@amazon.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
mch2 pushed a commit that referenced this pull request Nov 2, 2022
Signed-off-by: Marc Handalian <handalm@amazon.com>

Signed-off-by: Marc Handalian <handalm@amazon.com>
(cherry picked from commit 0adb74d)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Signed-off-by: Marc Handalian <handalm@amazon.com>
mch2 pushed a commit that referenced this pull request Nov 2, 2022
)

Signed-off-by: Marc Handalian <handalm@amazon.com>

Signed-off-by: Marc Handalian <handalm@amazon.com>
(cherry picked from commit 0adb74d)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Signed-off-by: Marc Handalian <handalm@amazon.com>

Signed-off-by: Marc Handalian <handalm@amazon.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@Poojita-Raj Poojita-Raj added backport 1.x backport 1.3 Backport to 1.3 branch labels Nov 16, 2022
@opensearch-trigger-bot
Copy link
Contributor

The backport to 1.x failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/backport-1.x 1.x
# Navigate to the new working tree
pushd ../.worktrees/backport-1.x
# Create a new branch
git switch --create backport/backport-5023-to-1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 0adb74db8889a8730bff8403c914e5c3314c0daa
# Push it to GitHub
git push --set-upstream origin backport/backport-5023-to-1.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/backport-1.x

Then, create a pull request where the base branch is 1.x and the compare/head branch is backport/backport-5023-to-1.x.

@opensearch-trigger-bot
Copy link
Contributor

The backport to 1.3 failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/backport-1.3 1.3
# Navigate to the new working tree
pushd ../.worktrees/backport-1.3
# Create a new branch
git switch --create backport/backport-5023-to-1.3
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 0adb74db8889a8730bff8403c914e5c3314c0daa
# Push it to GitHub
git push --set-upstream origin backport/backport-5023-to-1.3
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/backport-1.3

Then, create a pull request where the base branch is 1.3 and the compare/head branch is backport/backport-5023-to-1.3.

@dblock
Copy link
Member

dblock commented Nov 17, 2022

@mch2 care to backport manually?

@mch2
Copy link
Member Author

mch2 commented Nov 18, 2022

Thanks for the backports @Poojita-Raj!

733a802
f6800ea

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 1.x backport 1.3 Backport to 1.3 branch backport 2.x Backport to 2.x branch backport 2.4 Backport to 2.4 branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants