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

Resolve windows opensearch-env.bat having variable delayed expansion issues on OPENSEARCH_HOME assignment introduced in #6956 #7080

Conversation

peterzhuamazon
Copy link
Member

@peterzhuamazon peterzhuamazon commented Apr 10, 2023

Description

Resolve windows opensearch-env.bat having variable delayed expansion issues on OPENSEARCH_HOME assignment introduced in #6956

Issues Resolved

#6956 (comment)
opensearch-project/security#2657

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.

@peterzhuamazon peterzhuamazon added bug Something isn't working windows backport 1.x backport 2.x Backport to 2.x branch labels Apr 10, 2023
@peterzhuamazon peterzhuamazon self-assigned this Apr 10, 2023
@peterzhuamazon peterzhuamazon changed the title Resolve windows opensearch-env.bat having variable delayed expansion issues on OPENSEARCH_HOME assignment Resolve windows opensearch-env.bat having variable delayed expansion issues on OPENSEARCH_HOME assignment introduced in #6956 Apr 10, 2023
@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

…issues on OPENSEARCH_HOME assignment

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
@peterzhuamazon peterzhuamazon force-pushed the resolve-windows-oshome-error branch from 560be68 to 1a1d678 Compare April 11, 2023 17:05
@peterzhuamazon
Copy link
Member Author

Hi @andrross I have resolved the changelog comment you mentioned.
Please review again.
Thanks!

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

Copy link
Member

@DarshitChanpura DarshitChanpura left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will hopefully solve Windows CI woes across plugins. Ty @peterzhuamazon !!

@peterzhuamazon peterzhuamazon merged commit 810b985 into opensearch-project:main Apr 11, 2023
@peterzhuamazon peterzhuamazon deleted the resolve-windows-oshome-error branch April 11, 2023 19:12
@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-7080-to-1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 810b98555ea612cbae8310bf670cd515eb8cab34
# Push it to GitHub
git push --set-upstream origin backport/backport-7080-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-7080-to-1.x.

@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

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

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-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-7080-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 810b98555ea612cbae8310bf670cd515eb8cab34
# Push it to GitHub
git push --set-upstream origin backport/backport-7080-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/backport-2.x

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

@peterzhuamazon
Copy link
Member Author

Will create backports of this soon.

@peterzhuamazon
Copy link
Member Author

It merged now.
Rebuilding the 3.0.0 artifacts which would take some time.
Thanks.

opensearch-trigger-bot bot pushed a commit that referenced this pull request Apr 11, 2023
…issues on OPENSEARCH_HOME assignment introduced in #6956 (#7080)

* Resolve windows opensearch-env.bat having variable delayed expansion issues on OPENSEARCH_HOME assignment

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Remove changelog entry

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

---------

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
(cherry picked from commit 810b985)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
peterzhuamazon pushed a commit that referenced this pull request Apr 11, 2023
…issues on OPENSEARCH_HOME assignment introduced in #6956 (#7080) (#7109)

* Resolve windows opensearch-env.bat having variable delayed expansion issues on OPENSEARCH_HOME assignment



* Remove changelog entry



---------


(cherry picked from commit 810b985)

Signed-off-by: Peter Zhu <zhujiaxi@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>
@peterzhuamazon peterzhuamazon added backport 2.x Backport to 2.x branch and removed backport 2.x Backport to 2.x branch labels Apr 11, 2023
opensearch-trigger-bot bot pushed a commit that referenced this pull request Apr 11, 2023
…issues on OPENSEARCH_HOME assignment introduced in #6956 (#7080)

* Resolve windows opensearch-env.bat having variable delayed expansion issues on OPENSEARCH_HOME assignment

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Remove changelog entry

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

---------

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
(cherry picked from commit 810b985)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
peterzhuamazon pushed a commit that referenced this pull request Apr 11, 2023
…issues on OPENSEARCH_HOME assignment introduced in #6956 (#7080) (#7111)

* Resolve windows opensearch-env.bat having variable delayed expansion issues on OPENSEARCH_HOME assignment



* Remove changelog entry



---------


(cherry picked from commit 810b985)

Signed-off-by: Peter Zhu <zhujiaxi@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>
austintlee pushed a commit to austintlee/OpenSearch that referenced this pull request Apr 28, 2023
…issues on OPENSEARCH_HOME assignment introduced in opensearch-project#6956 (opensearch-project#7080)

* Resolve windows opensearch-env.bat having variable delayed expansion issues on OPENSEARCH_HOME assignment

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Remove changelog entry

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

---------

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 1.x backport 2.x Backport to 2.x branch bug Something isn't working skip-changelog windows
Projects
Development

Successfully merging this pull request may close these issues.

7 participants