lp:~mthaddon/mojo/bundle-show-1887199

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:mojo at revision 565

Stuart Bishop (community): Approve on 2020-07-21

Daniel Manrique (community): Approve on 2020-07-20

Canonical IS Reviewers: Pending requested 2020-07-20

Diff: 101 lines (+30/-8)

3 files modified

mojo/phase.py (+6/-6)
mojo/tests/test_utils.py (+7/-1)
mojo/utils.py (+17/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1887199: mojo bundle-show doesn't properly merge/update config files

High

Fix Released

Link a bug report

Related blueprints

567. By Tom Haddon on 2020-07-21

Use deepcopy of original dict to avoid modifying in place

566. By Tom Haddon on 2020-07-20

Make docstring PEP8 compliant

565. By Tom Haddon on 2020-07-20

Fix typo

564. By Tom Haddon on 2020-07-20

Merge dictionaries as part of bundle show, rather than simply using dict update method

563. By Tom Haddon on 2020-07-10

Fix bundle show to match what deploy show does

Reviewed-on: https://code.launchpad.net/~mthaddon/mojo/bundle-show-1886863/+merge/387131
Reviewed-by: Haw Loeung <email address hidden>
Reviewed-by: Daniel Manrique <email address hidden>
Reviewed-by: Guillermo Gonzalez <email address hidden>

562. By Tom Haddon on 2020-07-09

Re-enable script to run tests inside an LXC for CI purposes

Reviewed-on: https://code.launchpad.net/~mthaddon/mojo/run-lxc-test/+merge/387060
Reviewed-by: Stuart Bishop <email address hidden>

561. By Tom Haddon on 2020-07-08

Quieten bzr output from tests and exclude wait.py from black check as it's from an external project

Reviewed-on: https://code.launchpad.net/~mthaddon/mojo/quieten-tests/+merge/387046
Reviewed-by: Benjamin Allot <email address hidden>

560. By Tom Haddon on 2020-07-06

Add wait-for-workload as an option to juju-check-wait phase, defaulting to False

Reviewed-on: https://code.launchpad.net/~mthaddon/mojo/juju-check-wait-for-workload/+merge/386819
Reviewed-by: Stuart Bishop <email address hidden>

559. By Tom Haddon on 2020-07-03

Exclude juju wait from black, as it comes from an external project

Reviewed-on: https://code.launchpad.net/~mthaddon/mojo/ignore-black-wait/+merge/386824
Reviewed-by: Laurent Sesques <email address hidden>

558. By Tom Haddon on 2020-07-03

Fix typo in associated models variable in jenkins contrib script

Reviewed-on: https://code.launchpad.net/~mthaddon/mojo/associated-typo/+merge/386806
Reviewed-by: Benjamin Allot <email address hidden>