diff options
| author | Sylvain Pineau <sylvain.pineau@canonical.com> | 2017-04-21 12:44:17 +0200 |
|---|---|---|
| committer | Sylvain Pineau <sylvain.pineau@canonical.com> | 2017-04-21 12:44:17 +0200 |
| commit | 10da577a09fd25159a399d38ed2de0cead695b12 (patch) | |
| tree | 0eb2cf4b94715bd29c431a7242086bc597ebaccf /jobs | |
| parent | 02cb70091bf63a6075ee73517157c6280450d8bd (diff) | |
Remove the filter_templates and run_templates scripts
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 f57870e8..7b7047b8 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 75e8e2d6..4db7524d 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 7100fb2b..54ddbc42 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. |