Merge lp://staging/~simpoir/landscape-client-charm/sync-charmhelpers-and-keys into lp://staging/landscape-client-charm
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Simon Poirier | ||||
| Approved revision: | 69 | ||||
| Merged at revision: | 69 | ||||
| Proposed branch: | lp://staging/~simpoir/landscape-client-charm/sync-charmhelpers-and-keys | ||||
| Merge into: | lp://staging/landscape-client-charm | ||||
| Diff against target: |
2622 lines (+1686/-161) 24 files modified
Makefile (+1/-2) hooks/charmhelpers/__init__.py (+65/-4) hooks/charmhelpers/core/hookenv.py (+450/-28) hooks/charmhelpers/core/host.py (+170/-11) hooks/charmhelpers/core/host_factory/centos.py (+16/-0) hooks/charmhelpers/core/host_factory/ubuntu.py (+58/-0) hooks/charmhelpers/core/kernel.py (+2/-2) hooks/charmhelpers/core/services/base.py (+18/-7) hooks/charmhelpers/core/strutils.py (+64/-5) hooks/charmhelpers/core/sysctl.py (+21/-10) hooks/charmhelpers/core/templating.py (+18/-9) hooks/charmhelpers/core/unitdata.py (+8/-1) hooks/charmhelpers/fetch/__init__.py (+19/-9) hooks/charmhelpers/fetch/archiveurl.py (+1/-1) hooks/charmhelpers/fetch/bzrurl.py (+2/-2) hooks/charmhelpers/fetch/centos.py (+1/-1) hooks/charmhelpers/fetch/giturl.py (+2/-2) hooks/charmhelpers/fetch/python/__init__.py (+13/-0) hooks/charmhelpers/fetch/python/debug.py (+54/-0) hooks/charmhelpers/fetch/python/packages.py (+154/-0) hooks/charmhelpers/fetch/python/rpdb.py (+56/-0) hooks/charmhelpers/fetch/python/version.py (+32/-0) hooks/charmhelpers/fetch/snap.py (+33/-5) hooks/charmhelpers/fetch/ubuntu.py (+428/-62) |
||||
| To merge this branch: | bzr merge lp://staging/~simpoir/landscape-client-charm/sync-charmhelpers-and-keys | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Daniel Manrique (community) | Approve | ||
| 🤖 Landscape Builder | test results | Approve | |
|
Review via email:
|
|||
Commit message
Sync charmhelpers to avoid key errors on refresh.
Description of the change
Sync charmhelpers. This pulls an upstream change which import keys before updating repos, thus avoid errors.
Testing instructions:
juju deploy ubuntu
juju deploy . --config install_
juju relate landscape-client ubuntu
juju debug-log --replay | grep NO_PUBKEY
# no output after deployment means success.
| 🤖 Landscape Builder (landscape-builder) | # |
| 🤖 Landscape Builder (landscape-builder) wrote | # |
| 🤖 Landscape Builder (landscape-builder) | # |
| 🤖 Landscape Builder (landscape-builder) wrote | # |
| 🤖 Landscape Builder (landscape-builder) | # |
| 🤖 Landscape Builder (landscape-builder) wrote | # |
| 🤖 Landscape Builder (landscape-builder) | # |
| 🤖 Landscape Builder (landscape-builder) wrote | # |
Command: make ci-test
Result: Success
Revno: 69
Branch: lp:~simpoir/landscape-client-charm/sync-charmhelpers-and-keys
Jenkins: https:/