Merge lp:~pieq/checkbox/fix-1567819 into lp:checkbox

[Pierre Equoy]

[lp:~pieq/checkbox/fix-1567819]

4300. By Pierre Equoy on 2016-04-12

"automatic merge of lp:~pierre-equoy/checkbox/fix-1569191-stress-test-log-time-check/ by tarmac [r=sylvain-pineau][bug=1569191][author=pierre-equoy]"

[Sylvain Pineau (sylvain-pineau)]

See inline comments, this MR does not only contain the {path} cleanup. It's ok to remove the staging job but other changes are not documented and might be better placed/proposed in a separate MR.

review: Needs Fixing

[lp:~pieq/checkbox/fix-1567819]

4301. By Pierre Equoy on 2016-04-13

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.

[Pierre Equoy (pieq)]

@Sylvain: My bad, I modified files that had been modified recently by Rod without merging his changes.

Please check this new MP.

[Sylvain Pineau (sylvain-pineau)]

thanks for the fix, +1

review: Approve

=== modified file 'providers/plainbox-provider-checkbox/jobs/benchmarks.txt.in'
--- providers/plainbox-provider-checkbox/jobs/benchmarks.txt.in	2016-03-21 16:13:00 +0000
+++ providers/plainbox-provider-checkbox/jobs/benchmarks.txt.in	2016-04-13 02:47:49 +0000
@@ -5,7 +5,6 @@
 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 @@
 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

=== modified file 'providers/plainbox-provider-checkbox/jobs/disk.txt.in'
--- providers/plainbox-provider-checkbox/jobs/disk.txt.in	2016-03-21 19:05:56 +0000
+++ providers/plainbox-provider-checkbox/jobs/disk.txt.in	2016-04-13 02:47:49 +0000
@@ -10,29 +10,6 @@
  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 @@
 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 @@
 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 @@
 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 @@
 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}

=== modified file 'providers/plainbox-provider-checkbox/jobs/ethernet.txt.in'
--- providers/plainbox-provider-checkbox/jobs/ethernet.txt.in	2016-03-24 09:03:35 +0000
+++ providers/plainbox-provider-checkbox/jobs/ethernet.txt.in	2016-04-13 02:47:49 +0000
@@ -55,7 +55,6 @@
 _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 @@
 _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 @@
 _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 @@
 _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 @@
 _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:

=== modified file 'providers/plainbox-provider-checkbox/jobs/floppy.txt.in'
--- providers/plainbox-provider-checkbox/jobs/floppy.txt.in	2016-01-15 04:31:50 +0000
+++ providers/plainbox-provider-checkbox/jobs/floppy.txt.in	2016-04-13 02:47:49 +0000
@@ -4,7 +4,6 @@
 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}

=== modified file 'providers/plainbox-provider-checkbox/jobs/info.txt.in'
--- providers/plainbox-provider-checkbox/jobs/info.txt.in	2016-03-24 09:03:35 +0000
+++ providers/plainbox-provider-checkbox/jobs/info.txt.in	2016-04-13 02:47:49 +0000
@@ -239,7 +239,6 @@
 estimated_duration: 1.0
 requires:
  package.name == 'hdparm'
- device.path == '{path}'
  block_device.{name}_state != 'removable'
 user: root
 command: hdparm -I /dev/{name}

=== modified file 'providers/plainbox-provider-checkbox/jobs/mobilebroadband.txt.in'
--- providers/plainbox-provider-checkbox/jobs/mobilebroadband.txt.in	2016-04-11 03:45:22 +0000
+++ providers/plainbox-provider-checkbox/jobs/mobilebroadband.txt.in	2016-04-13 02:47:49 +0000
@@ -66,7 +66,6 @@
 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 @@
 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

=== modified file 'providers/plainbox-provider-checkbox/jobs/networking.txt.in'
--- providers/plainbox-provider-checkbox/jobs/networking.txt.in	2016-01-15 04:31:50 +0000
+++ providers/plainbox-provider-checkbox/jobs/networking.txt.in	2016-04-13 02:47:49 +0000
@@ -14,7 +14,6 @@
 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:

=== modified file 'providers/plainbox-provider-checkbox/jobs/optical.txt.in'
--- providers/plainbox-provider-checkbox/jobs/optical.txt.in	2016-03-21 16:13:00 +0000
+++ providers/plainbox-provider-checkbox/jobs/optical.txt.in	2016-04-13 02:47:49 +0000
@@ -16,7 +16,6 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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

=== modified file 'providers/plainbox-provider-checkbox/jobs/suspend.txt.in'
--- providers/plainbox-provider-checkbox/jobs/suspend.txt.in	2016-04-11 04:36:04 +0000
+++ providers/plainbox-provider-checkbox/jobs/suspend.txt.in	2016-04-13 02:47:49 +0000
@@ -68,7 +68,6 @@
 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 @@
 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 @@
 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 @@
 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

=== modified file 'providers/plainbox-provider-checkbox/jobs/wireless.txt.in'
--- providers/plainbox-provider-checkbox/jobs/wireless.txt.in	2016-01-15 04:31:50 +0000
+++ providers/plainbox-provider-checkbox/jobs/wireless.txt.in	2016-04-13 02:47:49 +0000
@@ -596,7 +596,6 @@
 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 @@
 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 @@
 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