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

Merge upstream kayobe-config stable/2024.1 #1300

Merged
merged 9 commits into from
Sep 24, 2024

Conversation

priteau
Copy link
Member

@priteau priteau commented Sep 24, 2024

This is necessary to create tags named stackhpc/16.x.y.z. Without this merge, the tag & release workflow is generating stackhpc/14.0.0.0rc1.x tags, which are also generating wrong release notes.

markgoddard and others added 9 commits June 1, 2023 09:15
skydive != skyline

Change-Id: If57a9d39a77ca02a1cd7f59ae5691fbf39b78964
The kayobe-env script does not update the KOLLA_SOURCE_PATH and
KOLLA_VENV_PATH variables if they are already set.  This can lead to
dangerous and difficult to diagnose issues where Kayobe uses a different
version of Kolla Ansible than expected.

This change updates these variables each time the kayobe-env script is
sourced.

Change-Id: I3b4b0b611750b9c7846ff5f74554aee2f14939e4
Closes-Bug: #2036711
Change-Id: Id34971a3ad2c1704a132f7cf5ca996dd3493906d
Change-Id: I58d25ddc14d742d9ed79db4d5cd2d20a3e2b791a
A few more patches have landed.

kayobe commit: 6c6400f7cee845be0e5143036b5baa6e41c56fa3

Change-Id: Ic72818b070e12c23c4b5c90b0a49c87bdcfdcee9
Change-Id: I6a1a16e473c805a1993c3c5c8eff7484181278f9
Update the URL to the upper-constraints file to point to the redirect
rule on releases.openstack.org so that anyone working on this branch
will switch to the correct upper-constraints list automatically when
the requirements repository branches.

Until the requirements repository has as stable/2024.1 branch, tests will
continue to use the upper-constraints list on master.

Change-Id: Ie1f7284da9b7d4a7ecf226c02e13ca45f87451ea
Change-Id: Ice2551c023db9674d6fd6596209bda3af8df60d6
@priteau priteau self-assigned this Sep 24, 2024
@priteau priteau requested a review from a team as a code owner September 24, 2024 10:26
@priteau priteau merged commit 986657d into stackhpc/2024.1 Sep 24, 2024
11 of 12 checks passed
@priteau priteau deleted the merge-upstream-2024.1 branch September 24, 2024 10:46
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.

5 participants