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

MDEV-28645: Reword MariaDB 10.9 Salsa-CI file and add upgrade test from 10.8 #2133

Merged

Conversation

illuusio
Copy link
Contributor

@illuusio illuusio commented May 24, 2022

  • The Jira issue number for this PR is: MDEV-28645

Description

Currently Salsa-CI upgrade topic are bit misleading and incorrect. This PR correct them and adds upgrade test from 10.8

How can this PR be tested?

Check upgrading topics on Salsa-CI run:
https://salsa.debian.org/illuusio/mariadb-server/-/pipelines/384409

Basing the PR against the correct MariaDB version

  • This is a bug fix and the PR is based against the earliest branch in which the bug can be reproduced

Backward compatibility

Nothing this more linting than anything. Does not change behavior or adds more as 10.8 upgrading is tested.

@illuusio illuusio requested a review from ottok as a code owner May 24, 2022 10:03
Copy link
Contributor

@ottok ottok left a comment

Choose a reason for hiding this comment

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

Thanks! Adding a test for upgrades of 10.8 is useful, and unifying naming scheme is a good cleanup to do.

However, using mariadb.org-10.7 to mariadb 10.9 upgrade: would mean that when merging Salsa-CI changes across versions we would need to keep bumping that 10.9 and the time? And this test always runs on a specific branch, so maybe mentioning the target name is redundant? How about using a naming scheme like upgrade from mariadb.org-10.7:? Then we don't need to name the target, as the target is always the commit in question. Or even simpler, just call it upgrade mariadb.org-10.7:?

We should think this through as once we do this change, we should do the same change everywhere to unify the naming, and we don't want to flip the name back and forth.

Tangenting the cleanup, lines like 'service mariadb status # There is no init.d/mysql in MariaDB 10.XXX should always say 'service mariadb status # There is no init.d/mysql in MariaDB 10.5+ and not have the 10.5+ change on merges on newer branches, as the comment is about MariaDB release changes, not any branch specific stuff.

Diff of current 10.6 Salsa-CI in Debian vs upstream MariaDB/server: https://paste.ubuntu.com/p/GR832ZHbPK/

@illuusio illuusio force-pushed the 10.9-MDEV-28645-reword-salsaci-file branch 2 times, most recently from 5ec7dfe to b65c614 Compare May 31, 2022 09:33
@illuusio
Copy link
Contributor Author

Made suggested changes and add test for 10.9. Salsa-CI pipeline can be found on:
https://salsa.debian.org/illuusio/mariadb-server/-/pipelines/384409
Also updated to description

@illuusio illuusio force-pushed the 10.9-MDEV-28645-reword-salsaci-file branch from b65c614 to ba972b4 Compare May 31, 2022 10:01
Copy link
Contributor

@ottok ottok left a comment

Choose a reason for hiding this comment

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

LGTM!

@LinuxJedi LinuxJedi self-requested a review August 31, 2022 07:05
Correct some Salsa-CI upgrade test topics that are wrong
(like having mariadb-10.8 in name) and reword them to
look similar

MariaDB 10.9 Salsa-CI file is missing upgrade test from
10.8 and also upon 10.9. Add it to Salsa-CI file be congruence.
@LinuxJedi LinuxJedi force-pushed the 10.9-MDEV-28645-reword-salsaci-file branch from ba972b4 to df138c6 Compare September 7, 2022 10:56
Copy link
Contributor

@LinuxJedi LinuxJedi left a comment

Choose a reason for hiding this comment

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

No objection here, many thanks.

Not sure if it is possible, but it would be nice if this could be made into some kind of building block rather than copy/paste for each release. A bit like Jenkins Job Builder. But this is out of scope for this PR/ticket.

@LinuxJedi LinuxJedi merged commit eb1c063 into MariaDB:10.9 Sep 7, 2022
@illuusio illuusio deleted the 10.9-MDEV-28645-reword-salsaci-file branch September 7, 2022 13:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
3 participants