Merge lp:~hloeung/mojo/mojo-specs-skip-load-checks into lp:mojo/mojo-specs

Proposed by Haw Loeung
Status: Merged
Approved by: Thomas Cuthbert
Approved revision: 150
Merged at revision: 150
Proposed branch: lp:~hloeung/mojo/mojo-specs-skip-load-checks
Merge into: lp:mojo/mojo-specs
Diff against target: 26 lines (+3/-3)
1 file modified
charm-testing/manifest (+3/-3)
To merge this branch: bzr merge lp:~hloeung/mojo/mojo-specs-skip-load-checks
Reviewer Review Type Date Requested Status
Mojo Maintainers Pending
Review via email: mp+378215@code.launchpad.net

This proposal supersedes a proposal from 2020-01-29.

Commit message

Skip load checks, CI shouldn't fail because of this

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

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

Revision history for this message
Canonical IS Mergebot (canonical-is-mergebot) wrote :

Change successfully merged at revision 150

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'charm-testing/manifest'
2--- charm-testing/manifest 2018-08-30 05:34:41 +0000
3+++ charm-testing/manifest 2020-01-29 00:45:47 +0000
4@@ -6,7 +6,7 @@
5 collect config=collect
6 script config=pre-deploy PHASE=initial
7 deploy config=deploy wait=true
8-nagios-check skip-checks='check_swap,check_etc_bzr,check_log_archive_status,check_ksplice' retry=3 sleep=60
9+nagios-check skip-checks='check_load,check_swap,check_etc_bzr,check_log_archive_status,check_ksplice' retry=3 sleep=60
10 verify config=post-deploy retry=3 sleep=60 PHASE=initial
11 # Now test an upgrade to the new charm if UPGRADE_CHARM is set
12 stop-on return-code=99 config=check-upgrade-charm UPGRADE_CHARM=${UPGRADE_CHARM}
13@@ -14,11 +14,11 @@
14 collect config=collect-upgrade
15 script config=upgrade-charm
16 juju-check-wait
17-nagios-check skip-checks='check_swap,check_etc_bzr,check_log_archive_status,check_ksplice' retry=3 sleep=60
18+nagios-check skip-checks='check_load,check_swap,check_etc_bzr,check_log_archive_status,check_ksplice' retry=3 sleep=60
19 verify config=post-deploy retry=3 sleep=60 PHASE=upgrade
20 # Now redeploy the model, and test a deployment from scratch (with the updated charm in place)
21 script config=redeploy-model
22 script config=pre-deploy PHASE=redeploy
23 deploy config=deploy wait=true
24-nagios-check skip-checks='check_swap,check_etc_bzr,check_log_archive_status,check_ksplice' retry=3 sleep=60
25+nagios-check skip-checks='check_load,check_swap,check_etc_bzr,check_log_archive_status,check_ksplice' retry=3 sleep=60
26 verify config=post-deploy retry=3 sleep=60 PHASE=redeploy

Subscribers

People subscribed via source and target branches

to all changes: