Fix changelog divergence for 2.x on main #7409

kotwanikunal · 2023-05-03T23:13:33Z

Description

Fixes changelog divergence for 2.x on main

Related Issues

N/A

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.

CHANGELOG.md

saratvemulapalli · 2023-05-03T23:31:16Z

CHANGELOG.md

@@ -86,13 +79,23 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

 ## [Unreleased 2.x]
 ### Added
- [Extensions] Moving Extensions APIs to protobuf serialization. ([#6960](https://github.com/opensearch-project/OpenSearch/pull/6960))
- [Extensions] Add IdentityPlugin into core to support Extension identities ([#7246](https://github.com/opensearch-project/OpenSearch/pull/7246))
+- [Extensions] Moving Extensions APIs to support cross versions via protobuf. ([#6960](https://github.com/opensearch-project/OpenSearch/pull/6960))


My apologies, I've just merged in another PR #7403 which fixes this.
You might end up in merge conflicts.

github-actions · 2023-05-03T23:50:56Z

Gradle Check (Jenkins) Run Completed with:

RESULT: FAILURE ❌
URL: https://build.ci.opensearch.org/job/gradle-check/14846/
CommitID: 1f5a962
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 · 2023-05-03T23:50:58Z

Gradle Check (Jenkins) Run Completed with:

RESULT: SUCCESS ✅
URL: https://build.ci.opensearch.org/job/gradle-check/14841/
CommitID: 815e037

github-actions · 2023-05-03T23:52:29Z

Gradle Check (Jenkins) Run Completed with:

RESULT: SUCCESS ✅
URL: https://build.ci.opensearch.org/job/gradle-check/14840/
CommitID: be14fd0

saratvemulapalli · 2023-05-03T23:52:44Z

CHANGELOG.md

@@ -106,4 +109,4 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 ### Security

 [Unreleased 3.0]: https://github.com/opensearch-project/OpenSearch/compare/2.x...HEAD
-[Unreleased 2.x]: https://github.com/opensearch-project/OpenSearch/compare/2.5...2.x
+[Unreleased 2.x]: https://github.com/opensearch-project/OpenSearch/compare/2....2.x


Lost 7 in 2.7 :/

Sorry. Got drowned in too many branches. Updated

github-actions · 2023-05-03T23:55:07Z

Gradle Check (Jenkins) Run Completed with:

RESULT: SUCCESS ✅
URL: https://build.ci.opensearch.org/job/gradle-check/14842/
CommitID: 87daf52

codecov-commenter · 2023-05-03T23:55:15Z

Codecov Report

Merging #7409 (87daf52) into main (eacfb70) will not change coverage.
The diff coverage is n/a.

❗ Current head 87daf52 differs from pull request most recent head 31b75fd. Consider uploading reports for the commit 31b75fd to get more accurate results

📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more

@@            Coverage Diff            @@
##               main    #7409   +/-   ##
=========================================
  Coverage     70.53%   70.53%           
  Complexity    59554    59554           
=========================================
  Files          4877     4877           
  Lines        285807   285807           
  Branches      41164    41164           
=========================================
  Hits         201602   201602           
  Misses        67610    67610           
  Partials      16595    16595

Signed-off-by: Kunal Kotwani <kkotwani@amazon.com>

github-actions · 2023-05-04T00:11:33Z

Gradle Check (Jenkins) Run Completed with:

RESULT: SUCCESS ✅
URL: https://build.ci.opensearch.org/job/gradle-check/14843/
CommitID: 7acf0e1

github-actions · 2023-05-04T00:21:35Z

Gradle Check (Jenkins) Run Completed with:

RESULT: UNSTABLE ❕
TEST FAILURES:

      1 org.opensearch.search.SearchWeightedRoutingIT.testSearchAggregationWithNetworkDisruption_FailOpenEnabled
      1 org.opensearch.indices.replication.SegmentReplicationIT.testScrollCreatedOnReplica
      1 org.opensearch.indices.replication.SegmentReplicationIT.testCancellation
      1 org.opensearch.action.admin.cluster.node.tasks.ResourceAwareTasksTests.testTaskResourceTrackingDuringTaskCancellation

URL: https://build.ci.opensearch.org/job/gradle-check/14844/
CommitID: bd8b4cd
Please review all flaky tests that succeeded after retry and create an issue if one does not already exist to track the flaky failure.

github-actions · 2023-05-04T00:22:00Z

Gradle Check (Jenkins) Run Completed with:

RESULT: SUCCESS ✅
URL: https://build.ci.opensearch.org/job/gradle-check/14848/
CommitID: b8829f8

github-actions · 2023-05-04T00:30:44Z

Gradle Check (Jenkins) Run Completed with:

RESULT: UNSTABLE ❕
TEST FAILURES:

      1 org.opensearch.index.remote.RemoteRefreshSegmentPressureServiceTests.testValidateSegmentUploadLag

URL: https://build.ci.opensearch.org/job/gradle-check/14850/
CommitID: 31b75fd
Please review all flaky tests that succeeded after retry and create an issue if one does not already exist to track the flaky failure.

Signed-off-by: Kunal Kotwani <kkotwani@amazon.com> Signed-off-by: Shivansh Arora <hishiv@amazon.com>

kotwanikunal requested review from reta, anasalkouz, andrross, Bukhtawar, CEHENKLE, dblock, gbbafna, setiah, kartg, mch2, nknize, owaiskazi19, Rishikesh1159, ryanbogan, saratvemulapalli, shwetathareja, dreamer-89, tlfeng and VachaShah as code owners May 3, 2023 23:13

kotwanikunal force-pushed the fix-changelog-main branch from be14fd0 to 815e037 Compare May 3, 2023 23:16

saratvemulapalli approved these changes May 3, 2023

View reviewed changes

saratvemulapalli reviewed May 3, 2023

View reviewed changes

CHANGELOG.md Outdated Show resolved Hide resolved

kotwanikunal force-pushed the fix-changelog-main branch from 815e037 to 87daf52 Compare May 3, 2023 23:22

mch2 approved these changes May 3, 2023

View reviewed changes

saratvemulapalli reviewed May 3, 2023

View reviewed changes

kotwanikunal force-pushed the fix-changelog-main branch 3 times, most recently from 1f5a962 to b8829f8 Compare May 3, 2023 23:49

saratvemulapalli reviewed May 3, 2023

View reviewed changes

This was referenced May 3, 2023

Bump jetty-server from 9.4.49.v20220914 to 9.4.51.v20230217 in hdfs-fixture. #7405

Merged

[Backport 2.x] Moving concurrent-search out of sandbox plugin to core behind feature… #7408

Merged

Fix changelog divergence for 2.x on main

31b75fd

Signed-off-by: Kunal Kotwani <kkotwani@amazon.com>

kotwanikunal force-pushed the fix-changelog-main branch from b8829f8 to 31b75fd Compare May 3, 2023 23:56

mch2 merged commit 01e5c29 into opensearch-project:main May 4, 2023

shiv0408 pushed a commit to Gaurav614/OpenSearch that referenced this pull request Apr 25, 2024

Fix changelog divergence for 2.x on main (opensearch-project#7409)

e130265

Signed-off-by: Kunal Kotwani <kkotwani@amazon.com> Signed-off-by: Shivansh Arora <hishiv@amazon.com>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix changelog divergence for 2.x on main #7409

Fix changelog divergence for 2.x on main #7409

kotwanikunal commented May 3, 2023

saratvemulapalli May 3, 2023

github-actions bot commented May 3, 2023

github-actions bot commented May 3, 2023

github-actions bot commented May 3, 2023

saratvemulapalli May 3, 2023

kotwanikunal May 3, 2023

github-actions bot commented May 3, 2023

codecov-commenter commented May 3, 2023 •

edited

Loading

github-actions bot commented May 4, 2023

github-actions bot commented May 4, 2023

github-actions bot commented May 4, 2023

github-actions bot commented May 4, 2023

Fix changelog divergence for 2.x on main #7409

Fix changelog divergence for 2.x on main #7409

Conversation

kotwanikunal commented May 3, 2023

Description

Related Issues

Check List

saratvemulapalli May 3, 2023

Choose a reason for hiding this comment

github-actions bot commented May 3, 2023

Gradle Check (Jenkins) Run Completed with:

github-actions bot commented May 3, 2023

Gradle Check (Jenkins) Run Completed with:

github-actions bot commented May 3, 2023

Gradle Check (Jenkins) Run Completed with:

saratvemulapalli May 3, 2023

Choose a reason for hiding this comment

kotwanikunal May 3, 2023

Choose a reason for hiding this comment

github-actions bot commented May 3, 2023

Gradle Check (Jenkins) Run Completed with:

codecov-commenter commented May 3, 2023 • edited Loading

Codecov Report

github-actions bot commented May 4, 2023

Gradle Check (Jenkins) Run Completed with:

github-actions bot commented May 4, 2023

Gradle Check (Jenkins) Run Completed with:

github-actions bot commented May 4, 2023

Gradle Check (Jenkins) Run Completed with:

github-actions bot commented May 4, 2023

Gradle Check (Jenkins) Run Completed with:

codecov-commenter commented May 3, 2023 •

edited

Loading