Merge lp:~mthaddon/mojo/remove-check-juju into lp:mojo/mojo-specs

Proposed by Tom Haddon
Status: Merged
Merged at revision: 15
Proposed branch: lp:~mthaddon/mojo/remove-check-juju
Merge into: lp:mojo/mojo-specs
Diff against target: 45 lines (+3/-8)
4 files modified
font-ubuntu-com/manifest-verify (+1/-1)
juju-intro/manifest-verify (+1/-1)
mojo-how-to/manifest-verify (+1/-1)
mojo-spec-helpers/tests/check-juju (+0/-5)
To merge this branch: bzr merge lp:~mthaddon/mojo/remove-check-juju
Reviewer Review Type Date Requested Status
Laurent Sesques Approve
Review via email: mp+281073@code.launchpad.net

Description of the change

Mojo now supports a "juju-check-wait" phase, which confirms the environment has reached a steady state and that juju status is clean. Update fonts.u.c and mojo.c.c specs to use that.

To post a comment you must log in.
lp:~mthaddon/mojo/remove-check-juju updated
16. By Tom Haddon

Also need to remove from juju-intro

Revision history for this message
Laurent Sesques (sajoupa) wrote :

looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'font-ubuntu-com/manifest-verify'
2--- font-ubuntu-com/manifest-verify 2015-11-27 13:16:34 +0000
3+++ font-ubuntu-com/manifest-verify 2015-12-21 09:52:48 +0000
4@@ -1,4 +1,4 @@
5 # Check juju
6-verify config=scripts/check-juju
7+juju-check-wait
8 # The service is up and running, let's verify it
9 verify config=scripts/verify-nrpe
10
11=== removed symlink 'font-ubuntu-com/scripts/check-juju'
12=== target was u'../../mojo-spec-helpers/tests/check-juju'
13=== removed symlink 'juju-intro/check-juju'
14=== target was u'../mojo-spec-helpers/tests/check-juju'
15=== modified file 'juju-intro/manifest-verify'
16--- juju-intro/manifest-verify 2015-09-08 08:23:46 +0000
17+++ juju-intro/manifest-verify 2015-12-21 09:52:48 +0000
18@@ -1,4 +1,4 @@
19 # Checking juju status
20-verify config=check-juju
21+juju-check-wait
22 # Running all naigos checks to confirm service is working as expected
23 verify config=verify-nrpe
24
25=== removed symlink 'mojo-how-to/check-juju'
26=== target was u'../mojo-spec-helpers/tests/check-juju'
27=== modified file 'mojo-how-to/manifest-verify'
28--- mojo-how-to/manifest-verify 2015-09-03 06:57:32 +0000
29+++ mojo-how-to/manifest-verify 2015-12-21 09:52:48 +0000
30@@ -1,4 +1,4 @@
31 # Check juju
32-verify config=check-juju
33+juju-check-wait
34 # The service is up and running, let's verify it
35 verify config=verify-nrpe
36
37=== removed file 'mojo-spec-helpers/tests/check-juju'
38--- mojo-spec-helpers/tests/check-juju 2015-09-03 06:32:08 +0000
39+++ mojo-spec-helpers/tests/check-juju 1970-01-01 00:00:00 +0000
40@@ -1,5 +0,0 @@
41-#!/usr/bin/python
42-import utils.mojo_utils as mojo_utils
43-
44-mojo_utils.juju_check_hooks_complete()
45-mojo_utils.juju_status_check_and_wait()

Subscribers

People subscribed via source and target branches

to all changes: