Synchronise victoria with upstream #141
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}
elasticsearch-oss package fails to install if we install it with Java: INFO:kolla.common.utils.elasticsearch:could not find java; set JAVA_HOME INFO:kolla.common.utils.elasticsearch:error: %prein(elasticsearch-oss-0:6.8.23-1.noarch) scriptlet failed, exit status 1 INFO:kolla.common.utils.elasticsearch:�[91mError in PREIN scriptlet in rpm package elasticsearch-oss Backport down to ussuri needed. This change also includes a backport of I7d4788f5b63fba24e3b2f9b15c16866ff811d83e: Always use the distro-provided libvirt-python This patch switches masakari-monitors image to follow nova-compute and ceilometer-compute images. This will be used and required after [1] merges. Usage of libvirt-python from PyPI has already proven to be problematic on CentOS Stream in our stable branches. [2] With this patch we avoid those issues as well. [1] https://review.opendev.org/c/openstack/masakari-monitors/+/804913 [2] https://review.opendev.org/c/openstack/kolla/+/797102 Depends-On: https://review.opendev.org/c/openstack/masakari-monitors/+/804913 NOTE(hrw): added removal of libvirt-python from upper-constraints as we have never version of libvirt that Victoria used. This change also includes a backport of I5efab66e487e06abd1a56af97d7e7caa1ebc880d: Use jinja2.pass_context instead of contextfilter The contextfilter decorator was deprecated in jinja2 3.0.0, and has been dropped in 3.1.0. This results in the following warning, and failed attempts to use filters: [WARNING]: Skipping plugin (filters.py) as it seems to be invalid: module 'jinja2' has no attribute 'contextfilter' This change switches to use the pass_context decorator. The minimum version of Jinja2 is raised to 3 to ensure pass_context is present. This change has been updated to also support Jinja2 2.x releases, since the Wallaby upper constraints specify 2.11.3. In practice, most users will not use UC to install kolla. CoAuthored-by: Mark Goddard <mark@stackhpc.com> Finally, amended for Debian Buster to also skip the lower constraint from masakari-monitors. Finally, finally, includes also hotfix for contextfunction. Ie4bccb9ed3f4d8782730c5929abbfa73da215a8c Change-Id: I72d7920acd8d15941c8c57a4186186212b273a38 (cherry picked from commit 976465c)
The -q (aka --disable) option only works if it is the first parameter on the command line. Change-Id: Ia9ab0bdc95e658c17e5be5abefcf96f1c05ee84f Closes-Bug: #1967272 (cherry picked from commit 196b742)
We have 'quiet' mode where only minimal data is printed to the console. But there were no logs at all then. This change generates log files (if 'logs-dir' argument is used) during quiet build. Also enables 'quiet' mode for CI so Zuul will not have to parse 29MB JSON file each time. Change-Id: If7d5c2807f0947a8bbbc1ceb8531c9b9c9287c1f (cherry picked from commit 0cf5b1d)
AArch64 builds fail with "AttributeError: install_layout". This is due to setuptools issue in Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1003252 Switching setuptools to use distutils from stdlib makes error go away. Backports: Xena, Wallaby (this is where it was first reported). Change-Id: I97102e18e4ec47bca94d17d964936f039580b06b (cherry picked from commit 497b40f)
This is I2cbf1f539880d512aa223c3ef3a4b19ee18854ac extended to fix the case when a git repository is used with a git repo. This is probably a rarer use case but, still, we use it in CI for in-review changes testing. Change-Id: I77b0dcd2e9dfd8ea8390a471b80c8954b67ef91b (cherry picked from commit b888f68)
Adds Cyrus SASL packages necessary for the DIGEST-MD5 and SCRAM-SHA-256 mechanisms. These can be used for libvirt SASL authentication. Follow up to I13e19ca29eeab40cd08fa3afe2cdf7531867f81b. Partial-Bug: #1964013 Change-Id: Ic4b6171789c3d360317599310492771bd78828ec (cherry picked from commit 5cc480a) (cherry picked from commit 444bdff)
Regarding rabbitmq and erlang. Change-Id: I6bc8b489a810849744c8bead6b9e350c5d3e36b7 (cherry picked from commit 240b3cf)
github-actions
bot
added
automated
markgoddard
approved these changes
Jun 13, 2022
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 victoria from upstream.