~vultaire/charm-juju-controller:functest-fix

Branch merges

Propose for merging

Merged into charm-juju-controller:master at revision 5fb92590ad858507172a49f0c0d346d06036b50e

Xav Paice (community): Approve on 2021-08-19

🤖 prod-jenkaas-bootstack (community): Approve (continuous-integration) on 2021-08-19

BootStack Reviewers: Pending requested 2021-07-28

Diff: 81 lines (+6/-17)

5 files modified

src/tests/functional/tests/bundles/overlays/bionic.yaml.j2 (+0/-3)
src/tests/functional/tests/bundles/overlays/focal.yaml.j2 (+0/-3)
src/tests/functional/tests/bundles/overlays/local-charm-overlay.yaml.j2 (+1/-1)
src/tests/functional/tests/tests_juju_controller.py (+3/-10)
src/tox.ini (+2/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

bcb1ef1... by Paul Goins on 2021-07-28

Minimized code

* Removed unused bits
* replaced model.async_block_until with model.block_until (slight
  simplification)

559f997... by Paul Goins on 2021-07-28

Removed local charm deployment via zaza

juju-controller is deployed into the nested Juju environment living on
the ubuntu unit; it is not used in the parent environment at all, so it
should be removed.

0c19ad9... by Paul Goins on 2021-07-28

Fixed and reworked overlays

* Moved the templated local charm clause to
  local-charm-overlay.yaml.j2, reducing duplication between the
  bionic/focal overlays.

* Added missing num_units clause.

80d1cea... by Paul Goins on 2021-07-28

Fixed pathing to modified ubuntu charm

b2751b9... by Xav Paice on 2021-08-10

Minor update to README.md format

Reviewed-on: https://code.launchpad.net/~llama-charmers/charm-juju-controller/+git/charm-juju-controller/+merge/406274
Reviewed-by: James Troup <email address hidden>
Reviewed-by: 🤖 prod-jenkaas-bootstack <email address hidden>
Reviewed-by: Drew Freiberger <email address hidden>

f99ca37... by Drew Freiberger on 2021-08-10

resolved ambiguity in README and removed deprecated landscape-client:registration example

e71de94... by Xav Paice on 2021-07-28

Minor update to README.md format

a49a21f... by Adam Dyess on 2021-07-28

Add Monitoring for juju-db installed by snap

Reviewed-on: https://code.launchpad.net/~llama-charmers/charm-juju-controller/+git/charm-juju-controller/+merge/406258
Reviewed-by: Xav Paice <email address hidden>
Reviewed-by: Paul Goins <email address hidden>
Reviewed-by: 🤖 prod-jenkaas-bootstack <email address hidden>

b440406... by Adam Dyess on 2021-07-27

fix monitoring issue when juju-db snap is installed

633b89b... by Celia Wang on 2021-04-15

Add ubuntu unit workload msg ''

Reviewed-on: https://code.launchpad.net/~ziyiwang/charm-juju-controller/+git/charm-juju-controller/+merge/401162
Reviewed-by: Xav Paice <email address hidden>