Skip to content

Conversation

@Monstrofil
Copy link
Collaborator

This change fixes upstream mariadb upgrade procedure by better baseurl links handling.

Also, upgrades from mariadb 10.3 and 10.4 on CloudLinux 8 are blocked because of the bug in spec which hangs upgrade process .

@github-actions
Copy link

Thank you for contributing to the Leapp project!

Please note that every PR needs to comply with the Leapp Guidelines and must pass all tests in order to be mergeable.
If you want to request a review or rebuild a package in copr, you can use following commands as a comment:

  • review please @oamg/developers to notify leapp developers of the review request
  • /packit copr-build to submit a public copr build using packit

Packit will automatically schedule regression tests for this PR's build and latest upstream leapp build. If you need a different version of leapp from PR#42, use /packit test oamg/leapp#42

It is possible to schedule specific on-demand tests as well. Currently 2 test sets are supported, beaker-minimal and kernel-rt, both can be used to be run on all upgrade paths or just a couple of specific ones.
To launch on-demand tests with packit:

  • /packit test --labels kernel-rt to schedule kernel-rt tests set for all upgrade paths
  • /packit test --labels beaker-minimal-8.9to9.3,kernel-rt-8.9to9.3 to schedule kernel-rt and beaker-minimal test sets for 8.9->9.3 upgrade path

[Deprecated] To launch on-demand regression testing public members of oamg organization can leave the following comment:

  • /rerun to schedule basic regression tests using this pr build and latest upstream leapp build as artifacts
  • /rerun 42 to schedule basic regression tests using this pr build and leapp*PR42* as artifacts
  • /rerun-sst to schedule sst tests using this pr build and latest upstream leapp build as artifacts
  • /rerun-sst 42 to schedule sst tests using this pr build and leapp*PR42* as artifacts

Please open ticket in case you experience technical problem with the CI. (RH internal only)

Note: In case there are problems with tests not being triggered automatically on new PR/commit or pending for a long time, please contact leapp-infra.

Copy link

@azheregelya azheregelya left a comment

Choose a reason for hiding this comment

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

Approved, but check for comment messages please.

url_parts[1] = url_parts[1].replace('$releasever', str(target_major))
return "yum".join(url_parts)
else:
# TODO: fix in https://cloudlinux.atlassian.net/browse/CLOS-3490

Choose a reason for hiding this comment

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

This PR is created in scope of CLOS-3490 as far as i can see. Old code?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Yes, I initially thought the else branch needed adjustment when I wrote that comment, but it turned out all the URLs contain 'yum' - at least all the ones I could find.

Thanks, removed that comment.

# Replace the first occurrence of source_major with target_major after 'yum'
url_parts = mariadb_url.split("yum", 1)
if len(url_parts) == 2:
# Replace major version in "/centos/7/" and /yum/12.0/almalinux9-amd64/,

Choose a reason for hiding this comment

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

/yum/12.0/almalinux9-amd64

Nitpick: yum is a delimiter. It's not included.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I removed it from the URL to avoid confusion.

@Monstrofil Monstrofil force-pushed the clos-3490-fix-upstream-mariadb-upgrade branch from 920e0ca to 4e91b1f Compare August 14, 2025 10:07
@prilr prilr merged commit ebe3f4e into cloudlinux Aug 14, 2025
@prilr prilr deleted the clos-3490-fix-upstream-mariadb-upgrade branch August 14, 2025 10:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants