diff options
| author | PMR <pmr@pmr-lander> | 2021-02-16 14:05:23 +0000 |
|---|---|---|
| committer | PMR <pmr@pmr-lander> | 2021-02-16 14:05:23 +0000 |
| commit | 8b8bee607a7d3e698c0bb2e8560fc0c95198c457 (patch) | |
| tree | 7e2a7cc00e3eb22c72e04f17cbcf2b6d1824e49b | |
| parent | aa1bb6243347ce68d767b15c78a7c9f8565665ea (diff) | |
| parent | 728a7b3f8fed96f2405ac3392f7d9bb70c3a29ee (diff) | |
Merge #398102 from ~jocave/plainbox-provider-checkbox:miscellaneous-ubuntu-core-improvementssnap-2021-02-23T1430
| -rw-r--r-- | units/miscellanea/jobs.pxu | 2 | ||||
| -rw-r--r-- | units/submission/jobs.pxu | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/units/miscellanea/jobs.pxu b/units/miscellanea/jobs.pxu index 5d51176..4772507 100644 --- a/units/miscellanea/jobs.pxu +++ b/units/miscellanea/jobs.pxu @@ -184,6 +184,8 @@ _description: Test to verify that the system uses production, rather than pre-release, versions of the kernel and the OS. command: check-prerelease.py +requires: + "Ubuntu Core" not in lsb.description plugin: shell category_id: com.canonical.plainbox::miscellanea diff --git a/units/submission/jobs.pxu b/units/submission/jobs.pxu index a8c8c7f..dc5d5a5 100644 --- a/units/submission/jobs.pxu +++ b/units/submission/jobs.pxu @@ -1,9 +1,14 @@ id: dkms_info_json +template-engine: jinja2 plugin: attachment category_id: com.canonical.plainbox::info command: + {%- if __on_ubuntucore__ %} + echo "{}" + {%- else %} dkms_info.py --format json | python3 -m plainbox dev parse dkms-info | \ jq '.dkms_info' + {% endif -%} _description: Attaches json dumps of installed dkms package information. _summary: Attaches json dumps of installed dkms package information. |