Merge ~ltrager/maas:script_result_skip into maas:master
Proposed by
Lee Trager
Status: | Merged |
---|---|
Approved by: | Andres Rodriguez |
Approved revision: | f7b546b38aee71d52902b23f60f4910c28ce53aa |
Merge reported by: | MAAS Lander |
Merged at revision: | not available |
Proposed branch: | ~ltrager/maas:script_result_skip |
Merge into: | maas:master |
Diff against target: |
295 lines (+74/-17) 10 files modified
src/maasserver/static/js/angular/directives/script_status.js (+5/-1) src/maasserver/static/js/angular/directives/tests/test_script_status.js (+6/-0) src/maasserver/static/partials/script-results-list.html (+4/-4) src/metadataserver/builtin_scripts/smartctl.py (+7/-0) src/metadataserver/builtin_scripts/tests/test_smartctl.py (+10/-1) src/metadataserver/enum.py (+3/-1) src/metadataserver/migrations/builtin/0018_script_result_skipped.py (+23/-0) src/metadataserver/models/scriptresult.py (+7/-4) src/metadataserver/models/scriptset.py (+2/-0) src/metadataserver/models/tests/test_scriptresult.py (+7/-6) |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Blake Rouse (community) | Approve | ||
MAAS Lander | Approve | ||
Review via email: mp+343139@code.launchpad.net |
Commit message
LP: #1760919 - Allow ScriptResults to be skipped
Scripts may now signal 'skipped' in the result YAML. This tells MAAS the
script was unable to run but does not change the state of the node. The SMART
tests use 'skipped' when SMART is unavailable on a device.
To post a comment you must log in.
UNIT TESTS
-b script_result_skip lp:~ltrager/maas/+git/maas into -b master lp:~maas-committers/maas
STATUS: SUCCESS 52902b23f60f491 0c28ce53aa
COMMIT: f7b546b38aee71d