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

Application refresh with resources on 3.x #973

Merged
merged 7 commits into from
Oct 26, 2023

Conversation

cderici
Copy link
Contributor

@cderici cderici commented Oct 24, 2023

Description

This is a forward port of #960, bringing support for refreshing application with providing resources as arguments.

Fixes #955 and #883 for 3.x track.

QA Steps

QA steps should be the same with #960:

So the fix for the #955 can be tested manually by recreating the scenario above with pylibjuju as follows:

 $ python -m asyncio
>>> import asyncio
>>> from juju import model;m=model.Model();await m.connect()
>>> await m.deploy('ceph-mon', channel='octopus/stable')

Check the resources for that using juju-cli:

  $ juju resources ceph-mon
No resources to display.

Go back to the python repl:

>>> await m.applications['ceph-mon'].refresh(channel='quincy/stable')
This should succeed

And check the resources again external to pylibjuju, you should see the resource is added:

  $ juju resources ceph-juju
Resource     Supplied by  Revision
alert-rules  charmstore   1

Additionally, an integration test for the second part of the PR that adds the resource argument to refresh is added, so just run that, and maybe play with it manually for different charms:

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

All CI tests need to pass.

Notes & Discussion

JUJU-4736

@cderici cderici added the hint/3.x going on main branch label Oct 24, 2023
@cderici cderici requested a review from jack-w-shaw October 24, 2023 22:38
Copy link
Member

@jack-w-shaw jack-w-shaw left a comment

Choose a reason for hiding this comment

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

LGTM

@pytest.mark.asyncio
async def test_upgrade_charm_resource(event_loop):
async with base.CleanModel() as model:
app = await model.deploy('cs:~juju-qa/bionic/upgrade-charm-resource-test-0')
Copy link
Member

Choose a reason for hiding this comment

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

cs in 3.x?

@cderici cderici force-pushed the app-refresh-with-resources-on-3.x branch from b7a13f2 to 300ba5d Compare October 26, 2023 19:33
@cderici
Copy link
Contributor Author

cderici commented Oct 26, 2023

/merge

@jujubot jujubot merged commit d2c1cae into juju:master Oct 26, 2023
4 of 5 checks passed
@cderici cderici mentioned this pull request Oct 26, 2023
jujubot added a commit that referenced this pull request Oct 26, 2023
#980

## What's Changed
* Repository Maintenance Improvements by @cderici in #922
* Stale bot to not bother feature requests by @cderici in #926
* Fix linter issues by @cderici in #928
* Fix docstring typo by @DanielArndt in #927
* Fix asyncio on README by @marceloneppel in #930
* Fix integration/test_application.test_action by @cderici in #932
* Update 3.2 facade clients by @cderici in #931
* [JUJU-4488] Add licence headers to source files on 3.x by @cderici in #934
* Update async tests to use builtin python suite by @DanielArndt in #935
* Pass correct charm url to series selector by @cderici in #942
* Green CI cleanup for python-libjuju by @cderici in #939
* Bring forward support for nested assumes expressions on 3x by @cderici in #943
* Release 3.2.2.0 notes by @cderici in #945
* Cleanup release process for 3.x by @cderici in #946
* Use new DeployFromRepository endpoint for deploy by @cderici in #949
* Handle pending upload resources deployfromrepository by @cderici in #953
* Optimize connection teardown by @cderici in #952
* Use `log.warning` instead of the deprecated `warn` by @sed-i in #954
* Find controller name by endpoint on 3.x track by @cderici in #966
* Optimize & fix unit removal by @cderici in #967
* Allow switch kwarg in refresh to switch to local charms by @jack-w-shaw in #971
* Parse charm URLs consistantly for local charms by @jack-w-shaw in #974
* Juju config directory location fix on 3.x by @cderici in #976
* [JUJU-4779] Ensure valid charm origin for local charm switches by @jack-w-shaw in #978
* Application refresh with resources on 3.x by @cderici in #973

#### Notes & Discussion

JUJU-4851

[JUJU-4488]: https://warthogs.atlassian.net/browse/JUJU-4488?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ
[JUJU-4779]: https://warthogs.atlassian.net/browse/JUJU-4779?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hint/3.x going on main branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

upgrade_charm does not work for ceph-mon
3 participants