Merge ~mertkirpici/juju-lint:lp/1903973 into juju-lint:master

Proposed by Mert Kirpici
Status: Merged
Approved by: Robert Gildein
Approved revision: 781eb217164c44206ef48dbaab8a3a51e3400ca1
Merged at revision: 10e3c65e4507e577dc88ca8c89855e750f919234
Proposed branch: ~mertkirpici/juju-lint:lp/1903973
Merge into: juju-lint:master
Diff against target: 26 lines (+2/-2)
2 files modified
contrib/canonical-rules.yaml (+1/-1)
jujulint/lint.py (+1/-1)
Reviewer Review Type Date Requested Status
Robert Gildein Approve
🤖 prod-jenkaas-bootstack continuous-integration Approve
Andrea Ieri Approve
Review via email: mp+452569@code.launchpad.net

Commit message

LP #1903973

Description of the change

fix: declare hw-health to be metal only

The canonical-rules ruleset was skipped during the first handling of this issue

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
🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Andrea Ieri (aieri) wrote :

LGTM

review: Approve
Revision history for this message
🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :
review: Approve (continuous-integration)
Revision history for this message
Robert Gildein (rgildein) wrote :

LGTM

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

Change successfully merged at revision 10e3c65e4507e577dc88ca8c89855e750f919234

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/contrib/canonical-rules.yaml b/contrib/canonical-rules.yaml
2index 05982c5..4190af6 100644
3--- a/contrib/canonical-rules.yaml
4+++ b/contrib/canonical-rules.yaml
5@@ -96,7 +96,7 @@ subordinates:
6 thruk-agent:
7 where: on nagios
8 hw-health:
9- where: host only
10+ where: metal only
11 logrotated:
12 where: all
13 local-users:
14diff --git a/jujulint/lint.py b/jujulint/lint.py
15index 5f764a9..8fa3f97 100755
16--- a/jujulint/lint.py
17+++ b/jujulint/lint.py
18@@ -237,7 +237,7 @@ class Linter:
19 If the input value does not match the expected format, it is returned
20 without the change.
21 """
22- if type(val) != str:
23+ if not isinstance(val, str):
24 return val
25
26 try:

Subscribers

People subscribed via source and target branches