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

Backport 2.x #1092 #1093 #1094

Merged

Conversation

peterzhuamazon
Copy link
Member

@peterzhuamazon peterzhuamazon commented Oct 30, 2023

Description

Backport 2.x #1092 #1093

Issues Resolved

#1073

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: Peter Zhu <zhujiaxi@amazon.com>
* Onboarding jenkins prod docker images to github actions

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

* Add temurin

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

* Add temurin

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

* Add more

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

* Add more

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

* Add more

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

---------

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
@peterzhuamazon peterzhuamazon added the enhancement New feature or request label Oct 30, 2023
@peterzhuamazon peterzhuamazon self-assigned this Oct 30, 2023
@peterzhuamazon peterzhuamazon changed the base branch from main to 2.x October 30, 2023 23:40
@opensearch-trigger-bot opensearch-trigger-bot bot added infra Changes to infrastructure, testing, CI/CD, pipelines, etc. backport 2.x labels Oct 30, 2023
@peterzhuamazon peterzhuamazon changed the title Backport #1092 #1093 Backport 2.x #1092 #1093 Oct 30, 2023
@peterzhuamazon peterzhuamazon merged commit 7267369 into opensearch-project:2.x Oct 30, 2023
3 of 6 checks passed
@peterzhuamazon peterzhuamazon deleted the issues-1073-backport-2.x branch October 30, 2023 23:48
@opensearch-trigger-bot
Copy link

The backport to 2.x failed:

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

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/anomaly-detection/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/anomaly-detection/backport-2.x
# Create a new branch
git switch --create backport-1094-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 72673698e062b061e8c6734c4dd52d43208ffa3d
# Push it to GitHub
git push --set-upstream origin backport-1094-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/anomaly-detection/backport-2.x

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x enhancement New feature or request infra Changes to infrastructure, testing, CI/CD, pipelines, etc.
Projects
Development

Successfully merging this pull request may close these issues.

None yet

2 participants