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.

Sign up for GitHub

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

Jump to bottom

[JUJU-1979] Backport upgrade-charm fixes onto 2.9 #744

Merged
merged 22 commits into from Oct 18, 2022
Merged

[JUJU-1979] Backport upgrade-charm fixes onto 2.9 #744

merged 22 commits into from Oct 18, 2022

Conversation

cderici
Copy link
Member

@cderici cderici commented Oct 17, 2022

Description

This cherry-picks the upgrade-charm fixes from #729 and #742 to bring them onto 2.9 branch.

Includes the fix for the juju.errors.JujuAPIError: missing base name or channel not valid error when upgrading local charms.

QA Steps

Same QA Steps for #729 and #742 should work here.

tox -e integration -- tests/integration/test_application.py::test_upgrade_local_charm

tox -e integration -- tests/integration/test_charmhub.py::test_list_resources

tox -e integration -- tests/integration/test_application.py::test_upgrade_charm_switch_channel

@cderici
Add list_resources method for charmhub module
fbdab09
@cderici
Revise the application.upgrade_charm (refresh)
009e9c3 
fixes juju#728
@cderici
Add test_upgrade_charm_switch_channel in integration/test_application
2868736
@cderici
Add another charm into the upgrade_charm test to solidify
64c7d80
@cderici
Add an integration test for charmhub.list_resources
3ad1f69
@cderici
Make sure we still support CharmStore charms
0d1e0e7
@cderici
Fix application.refresh to point to the correct charm origin
02ee3ca
@cderici
Change application.refresh test to use juju-qa-test
71d55d6
@cderici
Small fix for the CharmStore path in application.refresh
9d34a32
@cderici
Throw in the necessary error checks for facade calls
e940db0
@cderici
Refactor and cleanup code & test for application.refresh
a7250b2
@cderici
Revise the logic to accommodate switch
b06b7ea
@cderici
Add app.refresh test switch from CS to CH
d04ed93
@cderici
Merge the refresh logic for CharmHub and CharmStore
5caf36f
@cderici
Add comments for the application.refresh logic
ec82740
@cderici
Fix imports
128dca4
@cderici
Revise the upgrade local charm to use the GetCharmURLOrigin
5d843ec 
instead of passing channel to the SetCharm
@cderici
Revise the test_upgrade_local_charm
ec03404
@cderici
Add series info to a local test charm
04f65fd
@cderici
Fix linter
1deb0e2
@cderici
Revert back to regular string formatting for Python 3.5
ab249ec 
I can't believe this shit wouldn't let go :)
@cderici
More python3.5 string formatting to keep py35 support
37eacb6
juanmanuel-tirado
juanmanuel-tirado approved these changes Oct 18, 2022
View reviewed changes
Copy link
Contributor

@juanmanuel-tirado juanmanuel-tirado left a comment

Choose a reason for hiding this comment

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

LG2M

Thanks for the cherry-picking

@cderici
Copy link
Member Author

cderici commented Oct 18, 2022

/merge

@jujubot jujubot merged commit 0bafc11 into juju:2.9 Oct 18, 2022
@juanmanuel-tirado juanmanuel-tirado mentioned this pull request Jan 18, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@juanmanuel-tirado juanmanuel-tirado juanmanuel-tirado approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@cderici @juanmanuel-tirado @jujubot