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

Changed @Ignore to @AwaitsFix #1245

Merged
merged 2 commits into from
Oct 13, 2023
Merged

Conversation

kennyzhang0819
Copy link
Contributor

Closes #1244

Changed @ignore to @AwaitsFix in SecureWorkflowRestApiIT

CheckList:

  • Commits are signed per the DCO using --signoff

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: Jinlin Zhang <[email protected]>
Signed-off-by: Jinlin Zhang <[email protected]>
@AWSHurneyt AWSHurneyt merged commit c2f45de into opensearch-project:main Oct 13, 2023
13 of 15 checks passed
@opensearch-trigger-bot
Copy link
Contributor

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

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

@AWSHurneyt
Copy link
Collaborator

@kennyzhang0819 Looks like the auto backport for this PR failed. Could you please manually create a backport PR? To do that, you'd want to:

  1. Create a dev branch from the 2.x branch.
  2. Copy the changes from this PR to that branch (I usually use git cherry-pick to do this).
  3. Create a new PR from your 2.x dev branch to the 2.x branch in alerting repo.

kennyzhang0819 added a commit to kennyzhang0819/opensearch-alerting that referenced this pull request Oct 14, 2023
* Changed @ignore to @AwaitsFix

Signed-off-by: Jinlin Zhang <[email protected]>

* added bugUrl

Signed-off-by: Jinlin Zhang <[email protected]>

---------

Signed-off-by: Jinlin Zhang <[email protected]>
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.

[BUG] Forbidden annotation org.junit.Ignore used instead of AwaitsFix
3 participants