OpenSearch icon indicating copy to clipboard operation
OpenSearch copied to clipboard

Removing changelog entry for the released fix

Open sgup432 opened this issue 1 year ago • 3 comments

Description

Removing the change log entry as this fix is being released in 2.14. See https://github.com/opensearch-project/OpenSearch/pull/13591

Related Issues

Resolves #[Issue number to be closed when this PR is merged]

Check List

  • [x] New functionality includes testing.
    • [x] All tests pass
  • [x] New functionality has been documented.
    • [x] New functionality has javadoc added
  • [x] Failing checks are inspected and point to the corresponding known issue(s) (See: Troubleshooting Failing Builds)
  • [x] Commits are signed per the DCO using --signoff
  • [x] Commit changes are listed out in CHANGELOG.md file (See: Changelog)
  • ~[ ] Public documentation issue/PR created~

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.

sgup432 avatar May 08 '24 00:05 sgup432

@andrross Can you check this one?

sgup432 avatar May 08 '24 00:05 sgup432

:x: Gradle check result for 6e78cec11da22a4914387de5e047fd2bfaac725d: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

github-actions[bot] avatar May 08 '24 00:05 github-actions[bot]

@sgup432 The release notes file should be the same across branches as well. I think this entry needs to be added there.

andrross avatar May 08 '24 16:05 andrross

@sgup432 Friendly ping :) Let's get this fixed before the next release.

andrross avatar May 23 '24 20:05 andrross

@andrross Looking into this. Somehow missed this.

sgup432 avatar May 23 '24 21:05 sgup432

Ok I so need to do below:

  1. Need to remove this from 2.x branch CHANGELOG as well.
  2. Update release note for 2.x
  3. Update release note for main branch as well here.

sgup432 avatar May 23 '24 22:05 sgup432

@andrross I have updated main branch changelog and release notes in this PR. And fixed for 2.x here - https://github.com/opensearch-project/OpenSearch/pull/13863

sgup432 avatar May 29 '24 00:05 sgup432

And fixed for 2.x here - #13863

We can automatically backport from main, FYI after this is merged.

dblock avatar May 29 '24 12:05 dblock

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

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