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

Drop use of get_os_version_codename_swift [xena backport] #870

Merged
merged 2 commits into from
Nov 24, 2023

Conversation

coreycb
Copy link
Contributor

@coreycb coreycb commented Oct 30, 2023

Swift payload upgrades to wallaby or later currently fail because this code is unable to determine the version for wallaby+. For example:

FATAL ERROR: Could not derive swift version for codename: wallaby

We stopped maintaining the SWIFT_CODENAMES and PACKAGE_CODENAMES as of wallaby because the openstack-release package was introduced in wallaby.

We could update the SWIFT_CODENAMES map, but really this map no longer needs to be used. There was a time when the same swift package version existed in two different OpenStack releases, but that is no longer the case [1]. Therefore we can use the same comparison used for OpenStack packages which essentially checks current release (based on the openstack-release package) vs the installation source release.

[1] Current swift versions in Ubuntu are:
2.32.0 bobcat
2.31.1 antelope
2.30.1 zed
2.29.2 yoga
2.28.1 xena
2.27.0 wallaby
2.26.0 victoria
2.25.2 ussuri

Closes-Bug: #2040606
(cherry picked from commit b604d56)

Corey Bryant added 2 commits October 30, 2023 12:10
Swift payload upgrades to wallaby or later currently fail because
this code is unable to determine the version for wallaby+. For
example:

FATAL ERROR: Could not derive swift version for codename: wallaby

We stopped maintaining the SWIFT_CODENAMES and PACKAGE_CODENAMES as of
wallaby because the openstack-release package was introduced in wallaby.

We could update the SWIFT_CODENAMES map, but really this map no longer
needs to be used. There was a time when the same swift package version
existed in two different OpenStack releases, but that is no longer the
case [1]. Therefore we can use the same comparison used for OpenStack
packages which essentially checks current release (based on the
openstack-release package) vs the installation source release.

[1] Current swift versions in Ubuntu are:
2.32.0 bobcat
2.31.1 antelope
2.30.1 zed
2.29.2 yoga
2.28.1 xena
2.27.0 wallaby
2.26.0 victoria
2.25.2 ussuri

Closes-Bug: #2040606
(cherry picked from commit b604d56)
@coreycb coreycb force-pushed the swift-version-xena branch from 2e6018e to 54904e4 Compare October 30, 2023 16:27
@coreycb coreycb requested a review from freyes October 30, 2023 17:40
@coreycb
Copy link
Contributor Author

coreycb commented Nov 15, 2023

I'm not seeing what the test failure is here and am unable to re-run the test. Can someone else re-run it?

@coreycb coreycb closed this Nov 20, 2023
@coreycb coreycb reopened this Nov 20, 2023
@freyes freyes changed the title Drop use of get_os_version_codename_swift Drop use of get_os_version_codename_swift [xena backport] Nov 24, 2023
Copy link
Collaborator

@freyes freyes left a comment

Choose a reason for hiding this comment

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

LGTM

@freyes freyes merged commit 23db587 into juju:stable/xena Nov 24, 2023
5 of 6 checks passed
openstack-mirroring pushed a commit to openstack/charm-swift-proxy that referenced this pull request Dec 1, 2023
Sync charm-helpers to pick up fix for openstack_upgrade_available
that enables successful payload upgrades. This will need backporting
to stable/wallaby.

The openstacksdk version is pinned in test-requirements.txt to enabled
py36 unit tests to run successfully.

juju/charm-helpers#870
Closes-Bug: #2040606
Change-Id: I41fbfc57fe7a623466ab2def77d6b401e0f46b06
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.

2 participants