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

[OSCI][FEAT] Rollout OSD - Proposal Changelog and Release Notes Project #5718

Merged

Conversation

BigSamu
Copy link
Contributor

@BigSamu BigSamu commented Jan 20, 2024

Description

This PR is a rollout for the Changelog and Release Notes Project proposal in OSD repository. Initial PR related to this work #5519. Rollout is oriented to fix any problems during integration of this feature in OSD.

Issues Resolved

Issue #156 from OpenSearch Project general repo and issue #5509 from OpenSearch-Dashboards repo.

Screenshot

N/A

Testing the changes

N/A

Check List

  • All tests pass
    • yarn test:jest
    • yarn test:jest_integration
  • New functionality includes testing.
  • New functionality has been documented.
  • Update CHANGELOG.md
  • Commits are signed per the DCO using --signoff

BigSamu and others added 30 commits November 21, 2023 16:44
…ge Set worflow

Signed-off-by: Samuel Valdes Gutierrez <[email protected]>
…ge Set worflow

Signed-off-by: Samuel Valdes Gutierrez <[email protected]>
Signed-off-by: Samuel Valdes Gutierrez <[email protected]>
Signed-off-by: Samuel Valdes Gutierrez <[email protected]>
Signed-off-by: Samuel Valdes Gutierrez <[email protected]>
…angelog.md and generate a opensearch-dashboards.release-notes-pkgVersion.md when we make a release, have not implemented deleting all the changeset files in the script

Signed-off-by: Qiwen Li <[email protected]>
Copy link

codecov bot commented Feb 8, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (e83b7ee) 67.03% compared to head (b1e14d6) 67.03%.

Additional details and impacted files
@@                Coverage Diff                 @@
##           feature/changelog    #5718   +/-   ##
==================================================
  Coverage              67.03%   67.03%           
==================================================
  Files                   3295     3295           
  Lines                  63329    63329           
  Branches               10084    10084           
==================================================
  Hits                   42451    42451           
  Misses                 18429    18429           
  Partials                2449     2449           
Flag Coverage Δ
Linux_1 35.23% <ø> (ø)
Linux_2 55.18% <ø> (ø)
Linux_3 43.89% <ø> (-0.01%) ⬇️
Linux_4 35.33% <ø> (ø)
Windows_1 35.26% <ø> (ø)
Windows_2 55.15% <ø> (ø)
Windows_3 43.90% <ø> (-0.01%) ⬇️
Windows_4 35.33% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Signed-off-by: Samuel Valdes Gutierrez <[email protected]>
@ashwin-pc ashwin-pc assigned abbyhu2000 and ashwin-pc and unassigned abbyhu2000 Feb 13, 2024
@ashwin-pc ashwin-pc merged commit efc0fcc into opensearch-project:feature/changelog Feb 22, 2024
33 of 52 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/OpenSearch-Dashboards/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/OpenSearch-Dashboards/backport-2.x
# Create a new branch
git switch --create backport/backport-5718-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 efc0fcc4591a829a21e292e80d494ca96998f268
# Push it to GitHub
git push --set-upstream origin backport/backport-5718-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/OpenSearch-Dashboards/backport-2.x

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

@opensearch-trigger-bot
Copy link
Contributor

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

Then, create a pull request where the base branch is 2.14 and the compare/head branch is backport/backport-5718-to-2.14.

@BionIT
Copy link
Collaborator

BionIT commented Jun 5, 2024

Hi @BigSamu , found this PR has failed backport label, could you address?

@AMoo-Miki
Copy link
Collaborator

AMoo-Miki commented Jun 18, 2024

This should first be merged in main and a PR would be raised from there which was apparently done in #5519.

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.