Merge lp:~tcuthbert/mojo/mojo-specs into lp:mojo/mojo-specs

Proposed by Thomas Cuthbert
Status: Merged
Approved by: Paul Gear
Approved revision: no longer in the source branch.
Merged at revision: 131
Proposed branch: lp:~tcuthbert/mojo/mojo-specs
Merge into: lp:mojo/mojo-specs
Diff against target: 66 lines (+51/-0)
3 files modified
charm-testing/rsyslog/collect (+4/-0)
charm-testing/rsyslog/deploy (+23/-0)
charm-testing/rsyslog/manifest (+24/-0)
To merge this branch: bzr merge lp:~tcuthbert/mojo/mojo-specs
Reviewer Review Type Date Requested Status
Paul Gear (community) Approve
Review via email: mp+363714@code.launchpad.net

Commit message

add rsyslog charm test

To post a comment you must log in.
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Revision history for this message
Paul Gear (paulgear) wrote :

LGTM

review: Approve
lp:~tcuthbert/mojo/mojo-specs updated
131. By Thomas Cuthbert

add rsyslog charm test

Reviewed-on: https://code.launchpad.net/~tcuthbert/mojo/mojo-specs/+merge/363714
Reviewed-by: Paul Gear <email address hidden>

Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision 131

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory 'charm-testing/rsyslog'
2=== added file 'charm-testing/rsyslog/collect'
3--- charm-testing/rsyslog/collect 1970-01-01 00:00:00 +0000
4+++ charm-testing/rsyslog/collect 2019-03-06 05:58:51 +0000
5@@ -0,0 +1,4 @@
6+rsyslog cs:rsyslog
7+rsyslog-forwarder-ha cs:rsyslog-forwarder-ha
8+haproxy cs:haproxy
9+nrpe cs:nrpe
10
11=== added file 'charm-testing/rsyslog/deploy'
12--- charm-testing/rsyslog/deploy 1970-01-01 00:00:00 +0000
13+++ charm-testing/rsyslog/deploy 2019-03-06 05:58:51 +0000
14@@ -0,0 +1,23 @@
15+# vim: set filetype=yaml sw=2:
16+rsyslog:
17+ series: bionic
18+ services:
19+ rsyslog:
20+ charm: rsyslog
21+ haproxy:
22+ charm: haproxy
23+ rsyslog-forwarder-ha:
24+ charm: rsyslog-forwarder-ha
25+ nrpe:
26+ charm: nrpe
27+ options:
28+ export_nagios_definitions: true
29+ sub_postfix: ""
30+ hostgroups: ci-rsyslog-testing
31+ nagios_host_context: ci-rsyslog-testing
32+ nagios_hostname_type: unit
33+ relations:
34+ - ['rsyslog:aggregator', 'rsyslog-forwarder-ha:syslog']
35+ - ['haproxy:juju-info', 'rsyslog-forwarder-ha:juju-info']
36+ - ['rsyslog', 'nrpe']
37+ - ['haproxy:nrpe-external-master', 'nrpe:nrpe-external-master']
38
39=== added file 'charm-testing/rsyslog/manifest'
40--- charm-testing/rsyslog/manifest 1970-01-01 00:00:00 +0000
41+++ charm-testing/rsyslog/manifest 2019-03-06 05:58:51 +0000
42@@ -0,0 +1,24 @@
43+# Collect, pre-deploy (lint, etc.) deploy and check the initial charm
44+# We need to clean the build directory first in case a previous build
45+# was using a version that is different from the upstream (e.g. git vs. charmstore)
46+script config=clean-build-dir
47+# Now collect
48+collect config=collect
49+script config=pre-deploy PHASE=initial
50+deploy config=deploy wait=true
51+nagios-check skip-checks='check_swap,check_etc_bzr,check_log_archive_status,check_ksplice,check_haproxy' retry=3 sleep=60
52+verify config=post-deploy retry=3 sleep=60 PHASE=initial
53+# Now test an upgrade to the new charm if UPGRADE_CHARM is set
54+stop-on return-code=99 config=check-upgrade-charm UPGRADE_CHARM=${UPGRADE_CHARM}
55+script config=create-upgrade-collect UPGRADE_CHARM=${UPGRADE_CHARM}
56+collect config=collect-upgrade
57+script config=upgrade-charm
58+juju-check-wait
59+nagios-check skip-checks='check_swap,check_etc_bzr,check_log_archive_status,check_ksplice,check_haproxy' retry=3 sleep=60
60+verify config=post-deploy retry=3 sleep=60 PHASE=upgrade
61+# Now redeploy the model, and test a deployment from scratch (with the updated charm in place)
62+script config=redeploy-model
63+script config=pre-deploy PHASE=redeploy
64+deploy config=deploy wait=true
65+nagios-check skip-checks='check_swap,check_etc_bzr,check_log_archive_status,check_ksplice,check_haproxy' retry=3 sleep=60
66+verify config=post-deploy retry=3 sleep=60 PHASE=redeploy

Subscribers

People subscribed via source and target branches

to all changes: