For virtual tests we don't really care about the virtual device MAC address or it's device name since in automated environments like Beaker they can change with every run. If this happens the hash that is computed from the configuration changes and breaks comparison of test results between individual runs.
This patch adds following entries into hash_ignore: r'guest\d+..*hwaddr', r'host\d+..*tap\d*.hwaddr' r'host\d+..*tap\d*.devname'
Signed-off-by: Jan Tluka jtluka@redhat.com --- .../phase1/virtual_bridge_2_vlans_over_bond.py | 8 ++++++-- .../phase1/virtual_bridge_vlan_in_guest.py | 8 ++++++-- .../phase1/virtual_bridge_vlan_in_host.py | 8 ++++++-- ...l_ovs_bridge_2_vlans_over_active_backup_bond.py | 24 ++++++++++++++++++---- .../phase2/virtual_ovs_bridge_vlan_in_guest.py | 24 ++++++++++++++++++---- .../phase2/virtual_ovs_bridge_vlan_in_host.py | 24 ++++++++++++++++++---- 6 files changed, 78 insertions(+), 18 deletions(-)
diff --git a/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_bond.py b/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_bond.py index e1c7796..e3ef381 100644 --- a/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_bond.py +++ b/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_bond.py @@ -256,7 +256,9 @@ for setting in offload_settings: hash_ignore=['kernel_release', 'redhat_release', r'guest\d+.hostname', - r'guest\d+..*hwaddr']) + r'guest\d+..*hwaddr', + r'host\d+..*tap\d*.hwaddr', + r'host\d+..*tap\d*.devname']) for offload in setting: result_udp.set_parameter(offload[0], offload[1]) result_udp.add_tag(product_name) @@ -308,7 +310,9 @@ for setting in offload_settings: hash_ignore=['kernel_release', 'redhat_release', r'guest\d+.hostname', - r'guest\d+..*hwaddr']) + r'guest\d+..*hwaddr', + r'host\d+..*tap\d*.hwaddr', + r'host\d+..*tap\d*.devname']) for offload in setting: result_udp.set_parameter(offload[0], offload[1]) result_udp.add_tag(product_name) diff --git a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py index 041ce8a..3cad4f3 100644 --- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py +++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py @@ -178,7 +178,9 @@ for setting in offload_settings: hash_ignore=['kernel_release', 'redhat_release', r'guest\d+.hostname', - r'guest\d+..*hwaddr']) + r'guest\d+..*hwaddr', + r'host\d+..*tap\d*.hwaddr', + r'host\d+..*tap\d*.devname']) for offload in setting: result_udp.set_parameter(offload[0], offload[1]) result_udp.add_tag(product_name) @@ -227,7 +229,9 @@ for setting in offload_settings: hash_ignore=['kernel_release', 'redhat_release', r'guest\d+.hostname', - r'guest\d+..*hwaddr']) + r'guest\d+..*hwaddr', + r'host\d+..*tap\d*.hwaddr', + r'host\d+..*tap\d*.devname']) for offload in setting: result_udp.set_parameter(offload[0], offload[1]) result_udp.add_tag(product_name) diff --git a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py index 249e925..bfacb51 100644 --- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py +++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py @@ -178,7 +178,9 @@ for setting in offload_settings: hash_ignore=['kernel_release', 'redhat_release', r'guest\d+.hostname', - r'guest\d+..*hwaddr']) + r'guest\d+..*hwaddr', + r'host\d+..*tap\d*.hwaddr', + r'host\d+..*tap\d*.devname']) for offload in setting: result_udp.set_parameter(offload[0], offload[1]) result_udp.add_tag(product_name) @@ -227,7 +229,9 @@ for setting in offload_settings: hash_ignore=['kernel_release', 'redhat_release', r'guest\d+.hostname', - r'guest\d+..*hwaddr']) + r'guest\d+..*hwaddr', + r'host\d+..*tap\d*.hwaddr', + r'host\d+..*tap\d*.devname']) for offload in setting: result_udp.set_parameter(offload[0], offload[1]) result_udp.add_tag(product_name) diff --git a/recipes/regression_tests/phase2/virtual_ovs_bridge_2_vlans_over_active_backup_bond.py b/recipes/regression_tests/phase2/virtual_ovs_bridge_2_vlans_over_active_backup_bond.py index 4f824a0..5586501 100644 --- a/recipes/regression_tests/phase2/virtual_ovs_bridge_2_vlans_over_active_backup_bond.py +++ b/recipes/regression_tests/phase2/virtual_ovs_bridge_2_vlans_over_active_backup_bond.py @@ -211,7 +211,11 @@ for setting in offload_settings: "tcp_ipv4_result", hash_ignore=[ 'kernel_release', - 'redhat_release']) + 'redhat_release', + r'guest\d+.hostname', + r'guest\d+..*hwaddr', + r'host\d+..*tap\d*.hwaddr', + r'host\d+..*tap\d*.devname']) for offload in setting: result_tcp.set_parameter(offload[0], offload[1]) result_tcp.add_tag(product_name) @@ -230,7 +234,11 @@ for setting in offload_settings: "udp_ipv4_result", hash_ignore=[ 'kernel_release', - 'redhat_release']) + 'redhat_release', + r'guest\d+.hostname', + r'guest\d+..*hwaddr', + r'host\d+..*tap\d*.hwaddr', + r'host\d+..*tap\d*.devname']) for offload in setting: result_udp.set_parameter(offload[0], offload[1]) result_udp.add_tag(product_name) @@ -259,7 +267,11 @@ for setting in offload_settings: "tcp_ipv6_result", hash_ignore=[ 'kernel_release', - 'redhat_release']) + 'redhat_release', + r'guest\d+.hostname', + r'guest\d+..*hwaddr', + r'host\d+..*tap\d*.hwaddr', + r'host\d+..*tap\d*.devname']) for offload in setting: result_tcp.set_parameter(offload[0], offload[1]) result_tcp.add_tag(product_name) @@ -278,7 +290,11 @@ for setting in offload_settings: "udp_ipv6_result", hash_ignore=[ 'kernel_release', - 'redhat_release']) + 'redhat_release', + r'guest\d+.hostname', + r'guest\d+..*hwaddr', + r'host\d+..*tap\d*.hwaddr', + r'host\d+..*tap\d*.devname']) for offload in setting: result_udp.set_parameter(offload[0], offload[1]) result_udp.add_tag(product_name) diff --git a/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_guest.py b/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_guest.py index a2298f7..3406bd9 100644 --- a/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_guest.py +++ b/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_guest.py @@ -143,7 +143,11 @@ for setting in offload_settings: "tcp_ipv4_result", hash_ignore=[ 'kernel_release', - 'redhat_release']) + 'redhat_release', + r'guest\d+.hostname', + r'guest\d+..*hwaddr', + r'host\d+..*tap\d*.hwaddr', + r'host\d+..*tap\d*.devname']) for offload in setting: result_tcp.set_parameter(offload[0], offload[1]) result_tcp.add_tag(product_name) @@ -162,7 +166,11 @@ for setting in offload_settings: "udp_ipv4_result", hash_ignore=[ 'kernel_release', - 'redhat_release']) + 'redhat_release', + r'guest\d+.hostname', + r'guest\d+..*hwaddr', + r'host\d+..*tap\d*.hwaddr', + r'host\d+..*tap\d*.devname']) for offload in setting: result_udp.set_parameter(offload[0], offload[1]) result_udp.add_tag(product_name) @@ -188,7 +196,11 @@ for setting in offload_settings: "tcp_ipv6_result", hash_ignore=[ 'kernel_release', - 'redhat_release']) + 'redhat_release', + r'guest\d+.hostname', + r'guest\d+..*hwaddr', + r'host\d+..*tap\d*.hwaddr', + r'host\d+..*tap\d*.devname']) for offload in setting: result_tcp.set_parameter(offload[0], offload[1]) result_tcp.add_tag(product_name) @@ -207,7 +219,11 @@ for setting in offload_settings: "udp_ipv6_result", hash_ignore=[ 'kernel_release', - 'redhat_release']) + 'redhat_release', + r'guest\d+.hostname', + r'guest\d+..*hwaddr', + r'host\d+..*tap\d*.hwaddr', + r'host\d+..*tap\d*.devname']) for offload in setting: result_udp.set_parameter(offload[0], offload[1]) result_udp.add_tag(product_name) diff --git a/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_host.py b/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_host.py index 105b84a..61a9e55 100644 --- a/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_host.py +++ b/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_host.py @@ -141,7 +141,11 @@ for setting in offload_settings: "tcp_ipv4_result", hash_ignore=[ 'kernel_release', - 'redhat_release']) + 'redhat_release', + r'guest\d+.hostname', + r'guest\d+..*hwaddr', + r'host\d+..*tap\d*.hwaddr', + r'host\d+..*tap\d*.devname']) for offload in setting: result_tcp.set_parameter(offload[0], offload[1]) result_tcp.add_tag(product_name) @@ -160,7 +164,11 @@ for setting in offload_settings: "udp_ipv4_result", hash_ignore=[ 'kernel_release', - 'redhat_release']) + 'redhat_release', + r'guest\d+.hostname', + r'guest\d+..*hwaddr', + r'host\d+..*tap\d*.hwaddr', + r'host\d+..*tap\d*.devname']) for offload in setting: result_udp.set_parameter(offload[0], offload[1]) result_udp.add_tag(product_name) @@ -187,7 +195,11 @@ for setting in offload_settings: "tcp_ipv6_result", hash_ignore=[ 'kernel_release', - 'redhat_release']) + 'redhat_release', + r'guest\d+.hostname', + r'guest\d+..*hwaddr', + r'host\d+..*tap\d*.hwaddr', + r'host\d+..*tap\d*.devname']) for offload in setting: result_tcp.set_parameter(offload[0], offload[1]) result_tcp.add_tag(product_name) @@ -206,7 +218,11 @@ for setting in offload_settings: "udp_ipv6_result", hash_ignore=[ 'kernel_release', - 'redhat_release']) + 'redhat_release', + r'guest\d+.hostname', + r'guest\d+..*hwaddr', + r'host\d+..*tap\d*.hwaddr', + r'host\d+..*tap\d*.devname']) for offload in setting: result_udp.set_parameter(offload[0], offload[1]) result_udp.add_tag(product_name)
On Thu, Oct 29, 2015 at 11:04:22AM +0100, Jan Tluka wrote:
For virtual tests we don't really care about the virtual device MAC address or it's device name since in automated environments like Beaker they can change with every run. If this happens the hash that is computed from the configuration changes and breaks comparison of test results between individual runs.
This patch adds following entries into hash_ignore: r'guest\d+..*hwaddr', r'host\d+..*tap\d*.hwaddr' r'host\d+..*tap\d*.devname'
Signed-off-by: Jan Tluka jtluka@redhat.com
Acked-by: Ondrej Lichtner olichtne@redhat.com
lnst-developers@lists.fedorahosted.org