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

chore: supply a script to update tidb-dashboard #7610

Merged

Conversation

baurine
Copy link
Contributor

@baurine baurine commented Dec 22, 2023

What problem does this PR solve?

Issue Number: Close #7612

What is changed and how does it work?

Because the tidb-dashboard repo may abandon to use release-version file to express its version, so we need to adjust the scripts to get tidb-dashbboard version.

This PR supplies a new script scripts/update-dashobard, when we need to update the tidb-dashobard in PD side, we just need to run the following command:

$ ./scripts/update-dashboard <new_dashboard_version>

Then commit and push the changes.

That ok, it simplifies the multiple steps before.

This script will persist a dashboard version in a file named scripts/dashboard-version, so now we can explicitly know which dashboard version this PD embeds, while we don't know before.

This PR also delete the scripts/embed-dashboard-ui.ps1 and build.ps1 files, which I think they are un-used anymore.

Release note

None.

Copy link
Contributor

ti-chi-bot bot commented Dec 22, 2023

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • HuSharp
  • rleungx

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot bot added do-not-merge/needs-linked-issue release-note-none Denotes a PR that doesn't merit a release note. labels Dec 22, 2023
Copy link
Contributor

ti-chi-bot bot commented Dec 22, 2023

Hi @baurine. Thanks for your PR.

I'm waiting for a tikv member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@ti-chi-bot ti-chi-bot bot added the needs-ok-to-test Indicates a PR created by contributors and need ORG member send '/ok-to-test' to start testing. label Dec 22, 2023
@ti-chi-bot ti-chi-bot bot requested review from disksing and nolouch December 22, 2023 08:29
@ti-chi-bot ti-chi-bot bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Dec 22, 2023
@baurine baurine marked this pull request as draft December 22, 2023 08:29
@ti-chi-bot ti-chi-bot bot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. and removed do-not-merge/needs-linked-issue labels Dec 22, 2023
Copy link

codecov bot commented Dec 22, 2023

Codecov Report

Merging #7610 (627ba29) into master (d3551ea) will decrease coverage by 0.11%.
The diff coverage is n/a.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #7610      +/-   ##
==========================================
- Coverage   74.88%   74.78%   -0.11%     
==========================================
  Files         459      459              
  Lines       50647    50647              
==========================================
- Hits        37925    37874      -51     
- Misses       9385     9425      +40     
- Partials     3337     3348      +11     
Flag Coverage Δ
unittests 74.78% <ø> (-0.11%) ⬇️

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

@baurine baurine force-pushed the chore/modify-tidb-dashboard-update-strategy branch from 63f34da to 160a6f3 Compare December 22, 2023 08:46
@baurine baurine marked this pull request as ready for review December 22, 2023 08:46
@ti-chi-bot ti-chi-bot bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Dec 22, 2023
@@ -0,0 +1,3 @@
# This file is updated by running scripts/update-dashboard.sh
# Don't edit it manullay
2023.12.18.1
Copy link
Contributor Author

Choose a reason for hiding this comment

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

tidb-dashboard version will change to x.y.z (likes 7.6.0) style in the future, same as TiDB/TiKV/PD.

@baurine
Copy link
Contributor Author

baurine commented Dec 22, 2023

/cc @mornyx @shhdgit PTAL as well, thanks~

@HuSharp
Copy link
Member

HuSharp commented Dec 25, 2023

/ok-to-test

@ti-chi-bot ti-chi-bot bot added ok-to-test Indicates a PR is ready to be tested. and removed needs-ok-to-test Indicates a PR created by contributors and need ORG member send '/ok-to-test' to start testing. labels Dec 25, 2023
@ti-chi-bot ti-chi-bot bot added the status/LGT1 Indicates that a PR has LGTM 1. label Dec 26, 2023
Copy link
Contributor

ti-chi-bot bot commented Dec 26, 2023

@mornyx: Thanks for your review. The bot only counts approvals from reviewers and higher roles in list, but you're still welcome to leave your comments.

In response to this:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

@ti-chi-bot ti-chi-bot bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Dec 27, 2023
@nolouch
Copy link
Contributor

nolouch commented Dec 27, 2023

/merge

Copy link
Contributor

ti-chi-bot bot commented Dec 27, 2023

@nolouch: It seems you want to merge this PR, I will help you trigger all the tests:

/run-all-tests

You only need to trigger /merge once, and if the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

If you have any questions about the PR merge process, please refer to pr process.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

Copy link
Contributor

ti-chi-bot bot commented Dec 27, 2023

This pull request has been accepted and is ready to merge.

Commit hash: 160a6f3

@ti-chi-bot ti-chi-bot bot added the status/can-merge Indicates a PR has been approved by a committer. label Dec 27, 2023
@ti-chi-bot ti-chi-bot bot merged commit b35b0cd into tikv:master Dec 27, 2023
23 checks passed
@baurine baurine deleted the chore/modify-tidb-dashboard-update-strategy branch December 27, 2023 09:18
@ti-chi-bot
Copy link
Member

@baurine: new pull request created to branch release-7.5: #7632.

In response to this:

/cherry-pick release-7.5

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

ti-chi-bot pushed a commit to ti-chi-bot/pd that referenced this pull request Dec 27, 2023
close tikv#7612

Signed-off-by: baurine <[email protected]>

Co-authored-by: ti-chi-bot[bot] <108142056+ti-chi-bot[bot]@users.noreply.github.com>
@ti-chi-bot
Copy link
Member

@baurine: new pull request created to branch release-7.1: #7633.

In response to this:

/cherry-pick release-7.1

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

ti-chi-bot pushed a commit to ti-chi-bot/pd that referenced this pull request Dec 27, 2023
close tikv#7612

Signed-off-by: baurine <[email protected]>

Co-authored-by: ti-chi-bot[bot] <108142056+ti-chi-bot[bot]@users.noreply.github.com>
@baurine
Copy link
Contributor Author

baurine commented Dec 27, 2023

/cherry-pick release-6.5

@ti-chi-bot
Copy link
Member

@baurine: new pull request created to branch release-6.5: #7634.

In response to this:

/cherry-pick release-6.5

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

ti-chi-bot pushed a commit to ti-chi-bot/pd that referenced this pull request Dec 27, 2023
close tikv#7612

Signed-off-by: baurine <[email protected]>

Co-authored-by: ti-chi-bot[bot] <108142056+ti-chi-bot[bot]@users.noreply.github.com>
baurine added a commit to baurine/pd that referenced this pull request Feb 19, 2024
close tikv#7612

Signed-off-by: baurine <[email protected]>

Co-authored-by: ti-chi-bot[bot] <108142056+ti-chi-bot[bot]@users.noreply.github.com>
baurine added a commit to baurine/pd that referenced this pull request Feb 28, 2024
close tikv#7612

Signed-off-by: baurine <[email protected]>

Co-authored-by: ti-chi-bot[bot] <108142056+ti-chi-bot[bot]@users.noreply.github.com>
baurine added a commit to baurine/pd that referenced this pull request Mar 27, 2024
close tikv#7612

Signed-off-by: baurine <[email protected]>

Co-authored-by: ti-chi-bot[bot] <108142056+ti-chi-bot[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ok-to-test Indicates a PR is ready to be tested. release-note-none Denotes a PR that doesn't merit a release note. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Modify update tidb-dashboard strategy
6 participants