providers:checkbox: Remove {path} requirements to avoid erroneous job duplicates

With the introduction of template units, some requirements needed by the local jobs became obsolete and actually could create problems with the new way of generating jobs from templates. Such a problem quickly happened (see lp:1561821), and similar issues followed, like in lp:1569191. The root cause is that the value of {path} may change from one run to the other, leading plainbox to think there are new jobs to create, which in turn generates "job ID duplicate" exceptions. 

10 files changed, 0 insertions, 54 deletions

diff --git a/jobs/benchmarks.txt.in b/jobs/benchmarks.txt.in
index ee98dec..bdf4ebb 100644
--- a/jobs/benchmarks.txt.in
+++ b/jobs/benchmarks.txt.in
@@ -5,7 +5,6 @@ plugin: shell
 category_id: 2013.com.canonical.plainbox::benchmarks
 id: benchmarks/disk/hdparm-read_{name}
 estimated_duration: 15.0
-requires: device.path == '{path}'
 user: root
 command: hdparm -t /dev/{name}
 _summary: Raw read timing benchmark of {name} using hdparm
@@ -18,7 +17,6 @@ plugin: shell
 category_id: 2013.com.canonical.plainbox::benchmarks
 id: benchmarks/disk/hdparm-cache-read_{name}
 estimated_duration: 10.0
-requires: device.path == '{path}'
 user: root
 command: hdparm -T /dev/{name}
 _summary: Cached read timing benchmark of {name} using hdparm
diff --git a/jobs/disk.txt.in b/jobs/disk.txt.in
index ee045b6..9dc8c40 100644
--- a/jobs/disk.txt.in
+++ b/jobs/disk.txt.in
@@ -10,29 +10,6 @@ _description:
 Displays information about each disk detected on the system under test.
 
 unit: template
-template-imports: from 2013.com.canonical.certification import device
-template-resource: device
-template-filter: device.category == 'DISK' and device.name != ''
-plugin: shell
-category_id: 2013.com.canonical.plainbox::disk
-id: staging/disk/stats_{name}
-requires:
- block_device.{name}_state != 'removable'
-user: root
-command: disk_stats_test {name}
-_summary: Disk statistics for /dev/{name}
-_description:
- This test checks disk stats, generates some activity and rechecks stats to
- verify they've changed. It also verifies that disks appear in the various
- files they're supposed to.
- .
- This test will inspect the following disk:
- .
- product name: {product}
- sysfs path: {path}
- device node path: /dev/{name}
-
-unit: template
 template-resource: device
 template-filter: device.category == 'DISK'
 plugin: shell
@@ -40,7 +17,6 @@ category_id: 2013.com.canonical.plainbox::disk
 id: disk/stats_{name}
 flags: deprecated
 requires:
- device.path == "{path}"
 block_device.{name}_state != 'removable'
 user: root
 command: disk_stats_test {name}
@@ -55,7 +31,6 @@ id: disk/smart_{name}
 estimated_duration: 180.0
 requires:
 package.name == 'smartmontools'
- device.path == "{path}"
 block_device.{name}_smart == 'True'
 _summary:
 Test SMART capabilities for {product}
@@ -72,7 +47,6 @@ category_id: 2013.com.canonical.plainbox::disk
 id: disk/read_performance_{name}
 estimated_duration: 65.0
 requires:
- device.path == "{path}"
 block_device.{name}_state != 'removable'
 _summary: Disk performance test for {product}
 _description: Disk performance test for {product}
@@ -88,7 +62,6 @@ id: disk/storage_device_{name}
 estimated_duration: 375.0
 user: root
 requires:
- device.path == "{path}"
 block_device.{name}_state != 'removable'
 _summary: Disk I/O stress test for {product}
 _description: Disk I/O stress test for {product}
diff --git a/jobs/ethernet.txt.in b/jobs/ethernet.txt.in
index b253a03..2b815d2 100644
--- a/jobs/ethernet.txt.in
+++ b/jobs/ethernet.txt.in
@@ -55,7 +55,6 @@ id: ethernet/multi_nic_device{__index__}_{interface}
 _summary: Multi-NIC Iperf stress testing for NIC {interface}
 estimated_duration: 7400.0
 requires:
- device.path == '{path}'
 package.name == 'iperf'
 package.name == 'ethtool'
 package.name == 'nmap'
@@ -75,7 +74,6 @@ id: ethernet/multi_iperf3_nic_device{__index__}_{interface}
 _summary: Multi-NIC Iperf3 stress testing for NIC {interface}
 estimated_duration: 7400.0
 requires:
- device.path == '{path}'
 package.name == 'iperf3'
 package.name == 'ethtool'
 package.name == 'nmap'
@@ -95,7 +93,6 @@ id: ethernet/ethertool_check_device{__index__}_{interface}
 _summary: ethtool check for NIC {interface}
 estimated_duration: 330.0
 requires:
- device.path == '{path}'
 package.name == 'ethtool'
 command: ethtool {interface}
 _description:
@@ -110,7 +107,6 @@ id: ethernet/maximum_bandwidth_device{__index__}_{interface}
 _summary: Maximum bandwidth test of device {__index__} ({interface})
 estimated_duration: 330.0
 requires:
- device.path == '{path}'
 package.name == 'zenity'
 package.name == 'iperf'
 user: root
@@ -135,7 +131,6 @@ id: ethernet/stress_performance_device{__index__}_{interface}
 _summary: Stress and performance test of ethernet device {__index__} ({interface})
 estimated_duration: 330.0
 requires:
- device.path == '{path}'
 package.name == 'ethtool'
 command: network test -i {interface} -t stress
 _description:
diff --git a/jobs/floppy.txt.in b/jobs/floppy.txt.in
index 24f0f78..fba4f1a 100644
--- a/jobs/floppy.txt.in
+++ b/jobs/floppy.txt.in
@@ -4,7 +4,6 @@ template-filter: device.driver == 'floppy'
 plugin: shell
 category_id: 2013.com.canonical.plainbox::floppy
 id: floppy/check_{name}
-requires: device.path == '{path}'
 _description: Floppy test for {product}
 user: root
 command: floppy_test /dev/{name}
diff --git a/jobs/info.txt.in b/jobs/info.txt.in
index 181113d..f8f632f 100644
--- a/jobs/info.txt.in
+++ b/jobs/info.txt.in
@@ -239,7 +239,6 @@ id: info/hdparm_{name}.txt
 estimated_duration: 1.0
 requires:
 package.name == 'hdparm'
- device.path == '{path}'
 block_device.{name}_state != 'removable'
 user: root
 command: hdparm -I /dev/{name}
diff --git a/jobs/mobilebroadband.txt.in b/jobs/mobilebroadband.txt.in
index d2a8d08..32b3598 100644
--- a/jobs/mobilebroadband.txt.in
+++ b/jobs/mobilebroadband.txt.in
@@ -66,7 +66,6 @@ id: mobilebroadband/maximum_bandwidth_gsm_device{__index__}_{interface}
 depends: mobilebroadband/gsm_connection
 estimated_duration: 330.0
 requires:
- device.path == '{path}'
 package.name == 'zenity'
 package.name == 'iperf'
 environ: TEST_TARGET_FTP TEST_TARGET_IPERF TEST_USER TEST_PASS
@@ -91,7 +90,6 @@ id: mobilebroadband/maximum_bandwidth_cdma_device{__index__}_{interface}
 depends: mobilebroadband/cdma_connection
 estimated_duration: 330.0
 requires:
- device.path == '{path}'
 package.name == 'zenity'
 package.name == 'iperf'
 environ: TEST_TARGET_FTP TEST_TARGET_IPERF TEST_USER TEST_PASS
diff --git a/jobs/networking.txt.in b/jobs/networking.txt.in
index 660a3cc..465249e 100644
--- a/jobs/networking.txt.in
+++ b/jobs/networking.txt.in
@@ -14,7 +14,6 @@ category_id: 2013.com.canonical.plainbox::networking
 id: networking/info_device{__index__}_{interface}
 _summary: Network Information of device {__index__} ({interface})
 estimated_duration: 1.0
-requires: device.path == '{path}'
 command: network_info {interface} | zenity --text-info --title="{interface}"
 _description:
 PURPOSE:
diff --git a/jobs/optical.txt.in b/jobs/optical.txt.in
index e44af6e..ad77185 100644
--- a/jobs/optical.txt.in
+++ b/jobs/optical.txt.in
@@ -16,7 +16,6 @@ template-filter: device.category == 'CDROM'
 plugin: user-interact-verify
 category_id: 2013.com.canonical.plainbox::optical
 id: optical/read_{name}
-requires: device.path == "{path}"
 estimated_duration: 120.0
 user: root
 command: optical_read_test /dev/{name}
@@ -37,7 +36,6 @@ plugin: shell
 category_id: 2013.com.canonical.plainbox::optical
 id: optical/read-automated_{name}
 estimated_duration: 120.0
-requires: device.path == "{path}"
 user: root
 command: optical_read_test /dev/{name}
 _summary:
@@ -53,7 +51,6 @@ category_id: 2013.com.canonical.plainbox::optical
 id: optical/cdrom-write_{name}
 estimated_duration: 120.0
 requires:
- device.path == "{path}"
 optical_drive_{name}.cd_write == 'supported'
 user: root
 command: set -o pipefail; optical_write_test /dev/{name} cd | ansi_parser
@@ -76,7 +73,6 @@ category_id: 2013.com.canonical.plainbox::optical
 id: optical/cdrom-write-automated_{name}
 estimated_duration: 120.0
 requires:
- device.path == "{path}"
 optical_drive_{name}.cd_write == 'supported'
 user: root
 command: set -o pipefail; optical_write_test /dev/{name} cd | ansi_parser
@@ -114,7 +110,6 @@ plugin: user-interact-verify
 category_id: 2013.com.canonical.plainbox::optical
 id: optical/dvd-write_{name}
 requires:
- device.path == "{path}"
 optical_drive_{name}.dvd_write == 'supported'
 estimated_duration: 120.0
 user: root
@@ -138,7 +133,6 @@ category_id: 2013.com.canonical.plainbox::optical
 id: optical/dvd-write-automated_{name}
 estimated_duration: 120.0
 requires:
- device.path == "{path}"
 optical_drive_{name}.dvd_write == 'supported'
 user: root
 command: set -o pipefail; optical_write_test /dev/{name} dvd | ansi_parser
@@ -170,7 +164,6 @@ category_id: 2013.com.canonical.plainbox::optical
 id: optical/bluray-read_{name}
 estimated_duration: 120.0
 requires:
- device.path == "{path}"
 optical_drive_{name}.bd_read == "supported"
 user: root
 command: optical_read_test /dev/{name}
@@ -191,7 +184,6 @@ plugin: user-interact
 category_id: 2013.com.canonical.plainbox::optical
 id: optical/bluray-write_{name}
 requires:
- device.path == "{path}"
 optical_drive_{name}.bd_write == "supported"
 package.name == "growisofs"
 user: root
diff --git a/jobs/suspend.txt.in b/jobs/suspend.txt.in
index ee35095..7fde114 100644
--- a/jobs/suspend.txt.in
+++ b/jobs/suspend.txt.in
@@ -68,7 +68,6 @@ id: suspend/iperf_before_suspend_ether_auto_device{__index__}_{interface}
 depends: ethernet/detect
 estimated_duration: 20.0
 requires:
- device.path == '{path}'
 package.name == 'iperf'
 user: root
 environ: TEST_TARGET_FTP TEST_TARGET_IPERF TEST_USER TEST_PASS
@@ -85,7 +84,6 @@ id: suspend/iperf_before_suspend_wifi_auto_device{__index__}_{interface}
 depends: wireless/wireless_connection
 estimated_duration: 20.0
 requires:
- device.path == '{path}'
 package.name == 'iperf'
 user: root
 environ: TEST_TARGET_FTP TEST_TARGET_IPERF TEST_USER TEST_PASS
@@ -1009,7 +1007,6 @@ id: suspend/iperf_after_suspend_ether_auto_device{__index__}_{interface}
 depends: suspend/suspend_advanced
 estimated_duration: 30.0
 requires:
- device.path == '{path}'
 package.name == 'iperf'
 user: root
 environ: TEST_TARGET_FTP TEST_TARGET_IPERF TEST_USER TEST_PASS
@@ -1026,7 +1023,6 @@ id: suspend/iperf_after_suspend_wifi_auto_device{__index__}_{interface}
 depends: suspend/suspend_advanced
 estimated_duration: 30.0
 requires:
- device.path == '{path}'
 package.name == 'iperf'
 user: root
 environ: TEST_TARGET_FTP TEST_TARGET_IPERF TEST_USER TEST_PASS
diff --git a/jobs/wireless.txt.in b/jobs/wireless.txt.in
index f0892f9..7100fb2 100644
--- a/jobs/wireless.txt.in
+++ b/jobs/wireless.txt.in
@@ -596,7 +596,6 @@ category_id: 2013.com.canonical.plainbox::wireless
 id: wireless/stress_performance_device{__index__}_{interface}
 estimated_duration: 330.0
 requires:
- device.path == '{path}'
 package.name == 'iperf'
 environ: TEST_TARGET_IPERF
 user: root
@@ -650,7 +649,6 @@ plugin: shell
 category_id: 2013.com.canonical.plainbox::wireless
 id: wireless/iwconfig_check_device{__index__}_{interface}
 estimated_duration: 1.2
-requires: device.path == '{path}'
 command: iwconfig {interface}
 _description:
 This test executes iwconfig requests against wireless device {__index__} ({interface}).
@@ -679,7 +677,6 @@ category_id: 2013.com.canonical.plainbox::wireless
 id: wireless/maximum_bandwidth_device{__index__}_{interface}
 estimated_duration: 120.0
 requires:
- device.path == '{path}'
 package.name == 'zenity'
 package.name == 'iperf'
 environ: TEST_TARGET_IPERF