Synchronise master with upstream #427
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
This reverts commit 64f171c. Reason for revert: Let's switch to master Change-Id: I28f474015ffd000a3c2cf4c461c3c2f2b8959b0b
Change-Id: I1f9bc50b71f55dd5f579d1536a7ab63d5d554d1e
Change-Id: I4f852176918531ea19210961fd1b4fa63bc0ecca
... because stestr is now used instead of nose. Also drop the VIRTUAL_ENV environment which is now automatically set by tox. Change-Id: Ied6e20f5b1dc5de384f29d317bec998e86f26efa
The original script used --incremental-history-name and compressed full backups as gzip streams. This failed because mariabackup expects an actual decompressed base directory for incremental backups. This patch: - Decompresses the latest full backup into a temporary directory - Uses that as --incremental-basedir - Aligns the backup flow with official Mariabackup documentation: https://mariadb.com/kb/en/incremental-backup-and-restore-with-mariabackup/ This makes the incremental process reliable and fully supported. Closes-Bug: #2111620 Change-Id: I562ce5e54752015863a20bf113bce74a69e02331
Ubuntu images were occasionally failing to build due to unavailability or slowness of the official Ubuntu security repositories. Although Kolla uses `mirror://` URLs to leverage Ubuntu mirror infrastructure, the original `/etc/apt/sources.list.d/ubuntu.sources` file was still present, causing the system to fallback to default sources. This commit aligns Ubuntu behavior with Debian by explicitly removing the distro `.sources` file and relying solely on the sources configured by Kolla. This ensures consistent and reproducible builds both in CI and on local environments. Closes-Bug: #2112140 Change-Id: I00bcb30662bb12ed8711b28a64ef1941dcce893a
Change-Id: I1ba004df309667460aa152928f789aaf6be6051f
Change-Id: Ifd664de82a81830eeda8ccc019b22ee93768635e
This patch bump proxysql 2.7.x to 3.0.x Change-Id: I30d5093c1997b1ac99a762983248b8d29e677ba3
Depends-On: https://review.opendev.org/c/openstack/kolla-ansible/+/949478 Change-Id: I4507fb60d361ea504459a4b502d6f6c42a327064
We have multiple CI issues currently, make the kolla-ansible-debian-upgrade job non-voting so that we can merge fixes in order. Signed-off-by: Dr. Jens Harbott <harbott@osism.tech> Change-Id: I2d7137f3d01eb28f7693113fb690069e2760820f
Kolla Ansible now generates ProxySQL query rules not only based on the schema name (schemaname), but also on the username. This is needed to properly route queries that are executed before a database schema is selected, such as `SET AUTOCOMMIT` or `ROLLBACK`. To support this, the ProxySQL config sanity check must correctly deduplicate rules based on both `schemaname` and `username`, and avoid false positives when both types are used simultaneously. This change adjusts the logic in `kolla_proxysql_config_sync` to: - recognize rules by key `schema:<schemaname>` or `user:<username>` - assign unique rule IDs only to truly distinct rules - log and skip exact duplicates with appropriate context This fix is required to support the Kolla Ansible patch below. Needed-By: https://review.opendev.org/c/openstack/kolla-ansible/+/951599 Change-Id: I99acd1984ee555a5b6c731e6ee460a33677060d0
The dibbler-client package has been removed from upstream Rocky repos, breaking neutron-l3-agent container image builds on RL9. Since the 2025.1 release, package is no longer used in Neutron has been removed because the project is stale and functionality was untested [1]. This change removes the package from the image build for all distributions. [1] https://review.opendev.org/c/openstack/neutron/+/934283 Closes-Bug: #2112575 Change-Id: I35b233a499c6bf1861b376fc441dc8081cfaf5d6 Signed-off-by: Alex Welsh <alex@stackhpc.com>
github-actions
bot
added
automated
priteau
approved these changes
Jun 16, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR contains a snapshot of master from upstream master.