landscape-client-charm

Merge lp://staging/~afreiberger/landscape-client-charm/add-juju-annotations into lp://staging/landscape-client-charm

  1. add-juju-annotations
  2. Merge into trunk
Proposed by Drew Freiberger
Status: Rejected
Rejected by: Haw Loeung
Proposed branch: lp://staging/~afreiberger/landscape-client-charm/add-juju-annotations
Merge into: lp://staging/landscape-client-charm
Diff against target: 193 lines (+119/-3)
4 files modified
config.yaml (+13/-2)
hooks/hooks.py (+8/-1)
hooks/install.py (+34/-0)
scripts/write_juju_annotations.py (+64/-0)
To merge this branch: bzr merge lp://staging/~afreiberger/landscape-client-charm/add-juju-annotations
Reviewer Review Type Date Requested Status
🤖 Landscape Builder test results Needs Fixing
Simon Poirier (community) Needs Fixing
Review via email: mp+413315@code.staging.launchpad.net

Commit message

Add cronjob and charm config for registering juju agents as Landscape annotations.

Description of the change

Based on previous efforts (which are then obsolete) by:
* @xavpaice https://code.launchpad.net/~xavpaice/landscape-client-charm/add_tags/+merge/407578
* @exsdev https://code.launchpad.net/~exsdev/landscape-client-charm/juju-app-annotator
* @stephanpampel https://code.launchpad.net/~stephanpampel/landscape-client-charm/landscape-client-charm/+merge/411409

Add hook and cronjob for registering juju apps as Landscape annotations
Can be enabled via config flag juju-annotations-enabled (default=false)

Details 'juju-annotations-enabled':
        Periodically updates landscape annotations (key:value) for each juju agent
        found on the machine and the juju availability-zone (AZ) of the machine.
        Key is 'juju-${application}' OR 'juju-az-${AZ}' if an AZ is set.
        Value is 'deployed=true' OR 'deployed=false' if the agent got removed.
        Example: juju-landscape-client:deployed=true
        Cronjob runs every 5 min, update frequency depends on exchange-interval.

To post a comment you must log in.
Revision history for this message
🤖 Landscape Builder (landscape-builder) :
review: Abstain (executing tests)
Revision history for this message
🤖 Landscape Builder (landscape-builder) wrote :

Command: make ci-test
Result: Fail
Revno: 74
Branch: lp:~afreiberger/landscape-client-charm/add-juju-annotations
Jenkins: https://jenkins.canonical.com/landscape/job/latch-test-xenial/1498/

review: Needs Fixing (test results)
lp://staging/~afreiberger/landscape-client-charm/add-juju-annotations updated
75. By Drew Freiberger

Address import issues

Revision history for this message
🤖 Landscape Builder (landscape-builder) :
review: Abstain (executing tests)
Revision history for this message
🤖 Landscape Builder (landscape-builder) wrote :

Command: make ci-test
Result: Fail
Revno: 75
Branch: lp:~afreiberger/landscape-client-charm/add-juju-annotations
Jenkins: https://jenkins.canonical.com/landscape/job/latch-test-xenial/1499/

review: Needs Fixing (test results)
lp://staging/~afreiberger/landscape-client-charm/add-juju-annotations updated
76. By Drew Freiberger

py3 updates for write-juju-annotations.py

77. By Drew Freiberger

Rename annotations script

Revision history for this message
🤖 Landscape Builder (landscape-builder) :
review: Abstain (executing tests)
Revision history for this message
🤖 Landscape Builder (landscape-builder) wrote :

Command: make ci-test
Result: Fail
Revno: 77
Branch: lp:~afreiberger/landscape-client-charm/add-juju-annotations
Jenkins: https://jenkins.canonical.com/landscape/job/latch-test-xenial/1500/

review: Needs Fixing (test results)
lp://staging/~afreiberger/landscape-client-charm/add-juju-annotations updated
78. By Drew Freiberger

fix data-path for juju annotations cronjob

Revision history for this message
🤖 Landscape Builder (landscape-builder) :
review: Abstain (executing tests)
Revision history for this message
🤖 Landscape Builder (landscape-builder) wrote :

Command: make ci-test
Result: Fail
Revno: 78
Branch: lp:~afreiberger/landscape-client-charm/add-juju-annotations
Jenkins: https://jenkins.canonical.com/landscape/job/latch-test-xenial/1501/

review: Needs Fixing (test results)
lp://staging/~afreiberger/landscape-client-charm/add-juju-annotations updated
79. By Drew Freiberger

Fixed path to annotations script

Revision history for this message
🤖 Landscape Builder (landscape-builder) :
review: Abstain (executing tests)
Revision history for this message
🤖 Landscape Builder (landscape-builder) wrote :

Command: make ci-test
Result: Fail
Revno: 79
Branch: lp:~afreiberger/landscape-client-charm/add-juju-annotations
Jenkins: https://jenkins.canonical.com/landscape/job/latch-test-xenial/1502/

review: Needs Fixing (test results)
lp://staging/~afreiberger/landscape-client-charm/add-juju-annotations updated
80. By Drew Freiberger

Annotations - Detect multiple dashes in unit names and add unit number along with app name

Revision history for this message
Drew Freiberger (afreiberger) wrote :

I've completed manual functional testing and am satisfied with this feature implementation now.

Ready for review by Landscape team.

Revision history for this message
🤖 Landscape Builder (landscape-builder) :
review: Abstain (executing tests)
Revision history for this message
🤖 Landscape Builder (landscape-builder) wrote :

Command: make ci-test
Result: Fail
Revno: 80
Branch: lp:~afreiberger/landscape-client-charm/add-juju-annotations
Jenkins: https://jenkins.canonical.com/landscape/job/latch-test-xenial/1503/

review: Needs Fixing (test results)
lp://staging/~afreiberger/landscape-client-charm/add-juju-annotations updated
81. By Drew Freiberger

Add clarification to config.yaml for annotations

Revision history for this message
🤖 Landscape Builder (landscape-builder) :
review: Abstain (executing tests)
Revision history for this message
🤖 Landscape Builder (landscape-builder) wrote :

Command: make ci-test
Result: Fail
Revno: 81
Branch: lp:~afreiberger/landscape-client-charm/add-juju-annotations
Jenkins: https://jenkins.canonical.com/landscape/job/latch-test-xenial/1505/

review: Needs Fixing (test results)
lp://staging/~afreiberger/landscape-client-charm/add-juju-annotations updated
82. By Drew Freiberger

Fix ordering of config-changed for juju-annotations cronjob

Revision history for this message
🤖 Landscape Builder (landscape-builder) :
review: Abstain (executing tests)
Revision history for this message
🤖 Landscape Builder (landscape-builder) wrote :

Command: make ci-test
Result: Fail
Revno: 82
Branch: lp:~afreiberger/landscape-client-charm/add-juju-annotations
Jenkins: https://jenkins.canonical.com/landscape/job/latch-test-xenial/1506/

review: Needs Fixing (test results)
lp://staging/~afreiberger/landscape-client-charm/add-juju-annotations updated
83. By Drew Freiberger

Fix regex for annotations

Revision history for this message
🤖 Landscape Builder (landscape-builder) :
review: Abstain (executing tests)
Revision history for this message
🤖 Landscape Builder (landscape-builder) wrote :

Command: make ci-test
Result: Fail
Revno: 83
Branch: lp:~afreiberger/landscape-client-charm/add-juju-annotations
Jenkins: https://jenkins.canonical.com/landscape/job/latch-test-xenial/1507/

review: Needs Fixing (test results)
Revision history for this message
🤖 Landscape Builder (landscape-builder) :
review: Abstain (executing tests)
Revision history for this message
🤖 Landscape Builder (landscape-builder) wrote :

Command: make ci-test
Result: Fail
Revno: 83
Branch: lp:~afreiberger/landscape-client-charm/add-juju-annotations
Jenkins: https://jenkins.canonical.com/landscape/job/latch-test-xenial/1510/

review: Needs Fixing (test results)
Revision history for this message
Drew Freiberger (afreiberger) wrote :

Update from landscape team is that this is going to be superceded by work being done to allow client-side tag manipulation directly. This branch is being held available as the underlying branch published at cs:~afreiberger/landscape-client.

Revision history for this message
🤖 Landscape Builder (landscape-builder) :
review: Abstain (executing tests)
Revision history for this message
🤖 Landscape Builder (landscape-builder) wrote :

Command: make ci-test
Result: Fail
Revno: 83
Branch: lp:~afreiberger/landscape-client-charm/add-juju-annotations
Jenkins: https://jenkins.canonical.com/landscape/job/latch-test-xenial/1517/

review: Needs Fixing (test results)
Revision history for this message
Simon Poirier (simpoir) wrote :

First, this changes needs some test coverage (for both hooks and the externally-called `write_juju_annotations.py` script), and fixing broken tests (which might be mostly covered by my comments below).

review: Needs Fixing
Revision history for this message
🤖 Landscape Builder (landscape-builder) :
review: Abstain (executing tests)
Revision history for this message
🤖 Landscape Builder (landscape-builder) wrote :

Command: make ci-test
Result: Fail
Revno: 83
Branch: lp:~afreiberger/landscape-client-charm/add-juju-annotations
Jenkins: https://jenkins.canonical.com/landscape/job/latch-test-xenial/1521/

review: Needs Fixing (test results)
Revision history for this message
🤖 Landscape Builder (landscape-builder) :
review: Abstain (executing tests)
Revision history for this message
🤖 Landscape Builder (landscape-builder) wrote :

Command: make ci-test
Result: Fail
Revno: 83
Branch: lp:~afreiberger/landscape-client-charm/add-juju-annotations
Jenkins: https://jenkins.canonical.com/landscape/job/latch-test-xenial/1536/

review: Needs Fixing (test results)
Revision history for this message
🤖 Landscape Builder (landscape-builder) :
review: Abstain (executing tests)
Revision history for this message
🤖 Landscape Builder (landscape-builder) wrote :

Command: make ci-test
Result: Fail
Revno: 83
Branch: lp:~afreiberger/landscape-client-charm/add-juju-annotations
Jenkins: https://jenkins.canonical.com/landscape/job/latch-test-xenial/1539/

review: Needs Fixing (test results)
Revision history for this message
🤖 Landscape Builder (landscape-builder) :
review: Abstain (executing tests)
Revision history for this message
🤖 Landscape Builder (landscape-builder) wrote :

Command: make ci-test
Result: Fail
Revno: 83
Branch: lp:~afreiberger/landscape-client-charm/add-juju-annotations
Jenkins: https://jenkins.canonical.com/landscape/job/latch-test-xenial/1544/

review: Needs Fixing (test results)
Revision history for this message
🤖 Landscape Builder (landscape-builder) :
review: Abstain (executing tests)
Revision history for this message
🤖 Landscape Builder (landscape-builder) wrote :

Command: make ci-test
Result: Fail
Revno: 83
Branch: lp:~afreiberger/landscape-client-charm/add-juju-annotations
Jenkins: https://jenkins.canonical.com/landscape/job/latch-test-xenial/1549/

review: Needs Fixing (test results)

Unmerged revisions

83. By Drew Freiberger

Fix regex for annotations

82. By Drew Freiberger

Fix ordering of config-changed for juju-annotations cronjob

81. By Drew Freiberger

Add clarification to config.yaml for annotations

80. By Drew Freiberger

Annotations - Detect multiple dashes in unit names and add unit number along with app name

79. By Drew Freiberger

Fixed path to annotations script

78. By Drew Freiberger

fix data-path for juju annotations cronjob

77. By Drew Freiberger

Rename annotations script

76. By Drew Freiberger

py3 updates for write-juju-annotations.py

75. By Drew Freiberger

Address import issues

74. By Drew Freiberger

Update juju-annotations to be an external root cron

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: