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] Add test orchestrator script to trigger remote workflow runner outside functional test repo for cypress tests #986

Merged
merged 1 commit into from
Apr 1, 2024

Conversation

opensearch-trigger-bot[bot]
Copy link
Contributor

Backport 76270ea from #971

…e functional test repo for cypress tests (#971)

Issue details - opensearch-project/OpenSearch-Dashboards#5392

Signed-off-by: manasvinibs <[email protected]>
(cherry picked from commit 76270ea)
@kavilla kavilla merged commit 6cb31c2 into 2.x Apr 1, 2024
38 of 41 checks passed
@github-actions github-actions bot deleted the backport/backport-971-to-2.x branch April 1, 2024 16:41
@opensearch-trigger-bot
Copy link
Contributor Author

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
cd .worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-986-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 6cb31c229c32bf08b0ebd79d2b6e566cdbd21eba
# Push it to GitHub
git push --set-upstream origin backport/backport-986-to-2.x
# Go back to the original working tree
cd ../..
# 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-986-to-2.x.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants