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] Fix backport issues for CHANGELOG.md file #4978

Merged
merged 1 commit into from
Nov 8, 2022

Conversation

opensearch-trigger-bot[bot]
Copy link
Contributor

Backport 171d141 from #4977.

@opensearch-trigger-bot opensearch-trigger-bot bot requested review from a team and reta as code owners October 28, 2022 20:06
@kotwanikunal
Copy link
Member

It works 🙂

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@codecov-commenter
Copy link

codecov-commenter commented Oct 28, 2022

Codecov Report

Merging #4978 (c93a048) into 2.x (213b966) will decrease coverage by 0.03%.
The diff coverage is n/a.

@@             Coverage Diff              @@
##                2.x    #4978      +/-   ##
============================================
- Coverage     70.70%   70.67%   -0.04%     
- Complexity    57627    57674      +47     
============================================
  Files          4620     4620              
  Lines        276210   276210              
  Branches      40421    40421              
============================================
- Hits         195295   195205      -90     
- Misses        64555    64763     +208     
+ Partials      16360    16242     -118     
Impacted Files Coverage Δ
...adonly/AddIndexBlockClusterStateUpdateRequest.java 0.00% <0.00%> (-75.00%) ⬇️
...readonly/TransportVerifyShardIndexBlockAction.java 9.75% <0.00%> (-58.54%) ⬇️
...ch/transport/ReceiveTimeoutTransportException.java 50.00% <0.00%> (-50.00%) ⬇️
...cluster/coordination/PendingClusterStateStats.java 20.00% <0.00%> (-48.00%) ⬇️
...opensearch/persistent/PersistentTasksExecutor.java 22.22% <0.00%> (-44.45%) ⬇️
...pensearch/indices/breaker/CircuitBreakerStats.java 27.77% <0.00%> (-41.67%) ⬇️
...indices/readonly/TransportAddIndexBlockAction.java 20.68% <0.00%> (-37.94%) ⬇️
...java/org/opensearch/threadpool/ThreadPoolInfo.java 56.25% <0.00%> (-37.50%) ⬇️
...g/opensearch/geometry/utils/StandardValidator.java 21.21% <0.00%> (-33.34%) ⬇️
.../indices/readonly/AddIndexBlockRequestBuilder.java 0.00% <0.00%> (-33.34%) ⬇️
... and 511 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@kotwanikunal
Copy link
Member

Unrelated:

org.opensearch.repositories.s3.RepositoryS3ClientYamlTestSuiteIT > test {yaml=repository_s3/20_repository_permanent_credentials/Try to create repository with broken endpoint override and named client} FAILED
    java.lang.AssertionError: Failure at [repository_s3/20_repository_permanent_credentials:99]: expected [2xx] status code but api [snapshot.create] returned [400 Bad Request] [{"error":{"root_cause":[{"type":"invalid_snapshot_name_exception","reason":"[repository_permanent:snapshot-one] Invalid snapshot name [snapshot-one], snapshot with the same name already exists","stack_trace":"InvalidSnapshotNameException[[repository_permanent:snapshot-one] 

#4069

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

Copy link
Member

@dblock dblock left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change makes it that backported changes don't appear in CHANGELOG. So the CHANGELOG will be incorrect :(

@kotwanikunal
Copy link
Member

This change makes it that backported changes don't appear in CHANGELOG. So the CHANGELOG will be incorrect :(

This is part 1 of 2. I am working on automating CHANGELOG backporting, which is part 2.
This will still cause the Changelog Verifier to fail, needing a human to just fix the changelog, and making sure they have the entry in the correct version.

IMHO this is more reliable, given folks were missing out on changes all together. More behind that rationale here - #4977 (comment)

@dblock
Copy link
Member

dblock commented Nov 1, 2022

@kotwanikunal After this we need to go through commits on 2.x and update CHANGELOG to be correct :(

@github-actions
Copy link
Contributor

github-actions bot commented Nov 1, 2022

Gradle Check (Jenkins) Run Completed with:

@kotwanikunal
Copy link
Member

@kotwanikunal After this we need to go through commits on 2.x and update CHANGELOG to be correct :(

@dblock Please check - #4936 (comment)

@github-actions
Copy link
Contributor

github-actions bot commented Nov 2, 2022

Gradle Check (Jenkins) Run Completed with:

Signed-off-by: Kunal Kotwani <[email protected]>

Signed-off-by: Kunal Kotwani <[email protected]>
(cherry picked from commit 171d141)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

# Conflicts:
#	CHANGELOG.md
@kotwanikunal kotwanikunal force-pushed the backport/backport-4977-to-2.x branch from 038a207 to ef78bfe Compare November 4, 2022 22:14
@kotwanikunal
Copy link
Member

Skipping changelog since #5082 is taking care of it.

@github-actions
Copy link
Contributor

github-actions bot commented Nov 4, 2022

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Contributor

github-actions bot commented Nov 8, 2022

Gradle Check (Jenkins) Run Completed with:

@dblock dblock merged commit 8b8b5db into 2.x Nov 8, 2022
@github-actions github-actions bot deleted the backport/backport-4977-to-2.x branch November 8, 2022 17:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants