Skip to content

Commit fbbaf78

Browse files
authored
Merge pull request #688 from cderici/release-2.9.11
#688 ## What's Changed * Add REPL quickstart subsection by @sed-i in #676 * Revision of test onos.charm by @juanmanuel-tirado in #686 * [JUJU-1353] Parse assume directives. by @juanmanuel-tirado in #685 * Replace deprecated juju.loop() calls from examples and documentation by @ittner in #687 * Fixed the bundle run when the channel is None by @oEscal in #664 [JUJU-1353]: https://warthogs.atlassian.net/browse/JUJU-1353?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ
2 parents e12896b + e8c9a73 commit fbbaf78

5 files changed

Lines changed: 28 additions & 11 deletions

File tree

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.9.10
1+
2.9.11

docs/changelog.rst

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,24 @@
11
Changelog
22
---------
33

4-
2.9.10
4+
2.9.11
55
^^^^^^
66

7-
Thursday June 9 2022
7+
Monday July 11 2022
88

99
## What's Changed
1010

11+
* Add REPL quickstart subsection by @sed-i in https://github.com/juju/python-libjuju/pull/676
12+
* Revision of test onos.charm by @juanmanuel-tirado in https://github.com/juju/python-libjuju/pull/686
13+
* [JUJU-1353] Parse assume directives. by @juanmanuel-tirado in https://github.com/juju/python-libjuju/pull/685
14+
* Replace deprecated juju.loop() calls from examples and documentation by @ittner in https://github.com/juju/python-libjuju/pull/687
15+
* Fixed the bundle run when the channel is None by @oEscal in https://github.com/juju/python-libjuju/pull/664
16+
17+
2.9.10
18+
^^^^^^
19+
20+
Thursday June 9 2022
21+
1122
* [JUJU-1155] Avoid incorrectly setting `series: kubernetes` for sidecar charms in k8s bundles by @cderici in https://github.com/juju/python-libjuju/pull/679
1223
* [JUJU-1172] Visiting the pylibjuju CI by @cderici in https://github.com/juju/python-libjuju/pull/681
1324
* [JUJU-1124] Avoid sending path across the wire for local resource file name by @cderici in https://github.com/juju/python-libjuju/pull/678

tests/bundle/bundle.yaml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
11
series: xenial
2-
services:
2+
applications:
33
wordpress:
4-
charm: "cs:trusty/wordpress-2"
4+
charm: "wordpress"
5+
series: "xenial"
6+
channel: "candidate"
57
num_units: 1
68
annotations:
79
"gui-x": "339.5"
810
"gui-y": "-171"
911
to:
1012
- "0"
1113
mysql:
12-
charm: "cs:trusty/mysql-26"
14+
charm: "mysql"
15+
series: "trusty"
16+
channel: "candidate"
1317
num_units: 1
1418
annotations:
1519
"gui-x": "79.5"
@@ -21,7 +25,7 @@ relations:
2125
- "mysql:db"
2226
machines:
2327
"0":
24-
series: trusty
28+
series: xenial
2529
constraints: "arch=amd64 cores=1 cpu-power=100 mem=1740 root-disk=8192"
2630
"1":
2731
series: trusty

tests/integration/bundle/bundle-include-base64.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
series: xenial
22
applications:
33
ghost:
4-
charm: "cs:ghost-19"
4+
charm: "ghost"
55
num_units: 1
66
mysql:
7-
charm: "cs:trusty/mysql-57"
7+
charm: "mysql"
8+
channel: "candidate"
9+
series: "trusty"
810
num_units: 1
911
options:
1012
max-connections: 2

tests/integration/test_application.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ async def test_upgrade_charm_resource(event_loop):
226226
@pytest.mark.asyncio
227227
async def test_trusted(event_loop):
228228
async with base.CleanModel() as model:
229-
await model.deploy('cs:~juju-qa/bundle/basic-trusted-1', trust=True)
229+
await model.deploy('ubuntu', trust=True)
230230

231231
ubuntu_app = model.applications['ubuntu']
232232
trusted = await ubuntu_app.get_trusted()
@@ -241,7 +241,7 @@ async def test_trusted(event_loop):
241241
@pytest.mark.asyncio
242242
async def test_app_remove_wait_flag(event_loop):
243243
async with base.CleanModel() as model:
244-
app = await model.deploy('cs:ubuntu')
244+
app = await model.deploy('ubuntu')
245245
a_name = app.name
246246
await model.wait_for_idle(status="active")
247247

0 commit comments

Comments
 (0)