diff options
| author | PMR <pmr@pmr-lander> | 2017-04-25 08:05:01 +0000 |
|---|---|---|
| committer | PMR <pmr@pmr-lander> | 2017-04-25 08:05:01 +0000 |
| commit | 7519e519749f87e4564acc0fa2460b2226543728 (patch) | |
| tree | f8c180387d495bc1410a5aa342e7c034ada0980d /jobs | |
| parent | b9e22ad480e61248aa6da1478e1ec1b3b7aa2910 (diff) | |
| parent | 10da577a09fd25159a399d38ed2de0cead695b12 (diff) | |
Merge #322942 from ~sylvain-pineau/plainbox-provider-checkbox:remove_template_filter
Diffstat (limited to 'jobs')
| -rw-r--r-- | jobs/ethernet.txt.in | 2 | ||||
| -rw-r--r-- | jobs/optical.txt.in | 5 | ||||
| -rw-r--r-- | jobs/wireless.txt.in | 2 |
3 files changed, 3 insertions, 6 deletions
diff --git a/jobs/ethernet.txt.in b/jobs/ethernet.txt.in index f57870e..7b7047b 100644 --- a/jobs/ethernet.txt.in +++ b/jobs/ethernet.txt.in @@ -23,7 +23,7 @@ id: ethernet/info_automated requires: executable.name == 'ip' device.category == 'NETWORK' -command: udev_resource | filter_templates -w "category=NETWORK" | awk "/interface: / { print \$2 }" | xargs -n 1 network_info +command: udev_resource -f NETWORK | awk "/interface: / { print \$2 }" | xargs -n 1 network_info estimated_duration: 30.0 _summary: Gather info on current state of network devices diff --git a/jobs/optical.txt.in b/jobs/optical.txt.in index 75e8e2d..4db7524 100644 --- a/jobs/optical.txt.in +++ b/jobs/optical.txt.in @@ -5,10 +5,7 @@ requires: device.category == 'CDROM' estimated_duration: 1.2 _summary: Displays discovered optical drives _description: Detects optical drives (CD/DVD) attached to the system. -command: - cat <<'EOF' | run_templates -t -s 'udev_resource | filter_templates -w "category=CDROM"' | sed '/^$/d' - $vendor $product - EOF +command: udev_resource -l CDROM unit: template template-resource: device diff --git a/jobs/wireless.txt.in b/jobs/wireless.txt.in index 7100fb2..54ddbc4 100644 --- a/jobs/wireless.txt.in +++ b/jobs/wireless.txt.in @@ -27,7 +27,7 @@ id: wireless/info_automated requires: package.name == 'network-manager' device.category == 'WIRELESS' -command: udev_resource | filter_templates -w "category=WIRELESS" | awk "/interface: / { print \$2 }" | xargs -n 1 network_info +command: udev_resource -f WIRELESS | awk "/interface: / { print \$2 }" | xargs -n 1 network_info estimated_duration: 1.2 _description: This is an automated test to gather some info on the current state of your wireless devices. If no devices are found, the test will exit with an error. |