[JUJU-1970] Revise local refresh #742
Merged
Conversation
This file contains 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
|
/merge |
instead of passing channel to the SetCharm
cderici
force-pushed
the
revise-local-refresh
branch
from
5b9bdb1
to
f41e893
Compare
|
/merge |
|
Didn't realize this doesn't have a review yet :) |
juanmanuel-tirado
approved these changes
Oct 17, 2022
|
/merge |
jujubot
added a commit
that referenced
this pull request
Oct 18, 2022
…o-2.9 #744 #### 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 ```
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.
Description
This change revises the
local_refresh()(i.e.application.upgrade_charm()with a local charm) to use theapp_facade.GetCharmURLOrigin()to get the origin of the currently running application charm, instead of trying to passchannelto theSetCharmlike before.We already implemented this when revising
upgrade_charmin #729, but the upgrade local was missed (we talked about it but I forgot to include it).This should fix the
tests/integration/test_application.py::test_upgrade_local_charmthat's currently failing in the CI runs.QA Steps
The integration test mentioned above is revised a little bit, so it should pass. QA with different types and shapes of local charms would be appreciated.