From: Ondrej Lichtner <olichtne(a)redhat.com&gt; When generating the hash of a result we were supposed to ignore the parameters "kernel_release" and "redhat_release", instead we were ignoring "kernel-release" and "redhat-release". This patch fixes the issue. In case of virtual tests I also added two more regex-es that ignore the hostname and mac addresses of the guest machines as these will almost certainly be different between runs since we always generate new guests. Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com&gt; --- recipes/regression_tests/phase1/3_vlans.py | 16 +++++------ .../regression_tests/phase1/3_vlans_over_bond.py | 16 +++++------ recipes/regression_tests/phase1/bonding_test.py | 16 +++++------ .../phase1/virtual_bridge_2_vlans_over_bond.py | 24 ++++++++++------ .../phase1/virtual_bridge_vlan_in_guest.py | 24 ++++++++++------ .../phase1/virtual_bridge_vlan_in_host.py | 24 ++++++++++------ .../regression_tests/phase2/3_vlans_over_team.py | 16 +++++------ recipes/regression_tests/phase2/team_test.py | 32 +++++++++++----------- ...l_ovs_bridge_2_vlans_over_active_backup_bond.py | 16 +++++------ .../phase2/virtual_ovs_bridge_vlan_in_guest.py | 16 +++++------ .../phase2/virtual_ovs_bridge_vlan_in_host.py | 16 +++++------ 11 files changed, 120 insertions(+), 96 deletions(-) diff --git a/recipes/regression_tests/phase1/3_vlans.py b/recipes/regression_tests/phase1/3_vlans.py index 0109ba0..158816f 100644 --- a/recipes/regression_tests/phase1/3_vlans.py +++ b/recipes/regression_tests/phase1/3_vlans.py @@ -152,8 +152,8 @@ for vlan1 in vlans: result_tcp.set_parameter('netperf_client_on_vlan', vlan2) if product_name is not None: result_tcp.set_tag(product_name) - res_hash = result_tcp.generate_hash(['kernel-release', - 'redhat-release']) + res_hash = result_tcp.generate_hash(['kernel_release', + 'redhat_release']) result_tcp.set_tag(res_hash) baseline = None @@ -175,8 +175,8 @@ for vlan1 in vlans: result_udp.set_parameter('netperf_client_on_vlan', vlan2) if product_name is not None: result_udp.set_tag(product_name) - res_hash = result_udp.generate_hash(['kernel-release', - 'redhat-release']) + res_hash = result_udp.generate_hash(['kernel_release', + 'redhat_release']) result_udp.set_tag(res_hash) baseline = None @@ -235,8 +235,8 @@ for vlan1 in vlans: result_tcp.set_parameter('netperf_client_on_vlan', vlan2) if product_name is not None: result_tcp.set_tag(product_name) - res_hash = result_tcp.generate_hash(['kernel-release', - 'redhat-release']) + res_hash = result_tcp.generate_hash(['kernel_release', + 'redhat_release']) result_tcp.set_tag(res_hash) baseline = None @@ -258,8 +258,8 @@ for vlan1 in vlans: result_udp.set_parameter('netperf_client_on_vlan', vlan2) if product_name is not None: result_udp.set_tag(product_name) - res_hash = result_udp.generate_hash(['kernel-release', - 'redhat-release']) + res_hash = result_udp.generate_hash(['kernel_release', + 'redhat_release']) result_udp.set_tag(res_hash) baseline = None diff --git a/recipes/regression_tests/phase1/3_vlans_over_bond.py b/recipes/regression_tests/phase1/3_vlans_over_bond.py index 4dae207..372c689 100644 --- a/recipes/regression_tests/phase1/3_vlans_over_bond.py +++ b/recipes/regression_tests/phase1/3_vlans_over_bond.py @@ -154,8 +154,8 @@ for vlan1 in vlans: result_tcp.set_parameter('netperf_client_on_vlan', vlan2) if product_name is not None: result_tcp.set_tag(product_name) - res_hash = result_tcp.generate_hash(['kernel-release', - 'redhat-release']) + res_hash = result_tcp.generate_hash(['kernel_release', + 'redhat_release']) result_tcp.set_tag(res_hash) baseline = None @@ -177,8 +177,8 @@ for vlan1 in vlans: result_udp.set_parameter('netperf_client_on_vlan', vlan2) if product_name is not None: result_udp.set_tag(product_name) - res_hash = result_udp.generate_hash(['kernel-release', - 'redhat-release']) + res_hash = result_udp.generate_hash(['kernel_release', + 'redhat_release']) result_udp.set_tag(res_hash) baseline = None @@ -237,8 +237,8 @@ for vlan1 in vlans: result_tcp.set_parameter('netperf_client_on_vlan', vlan2) if product_name is not None: result_tcp.set_tag(product_name) - res_hash = result_tcp.generate_hash(['kernel-release', - 'redhat-release']) + res_hash = result_tcp.generate_hash(['kernel_release', + 'redhat_release']) result_tcp.set_tag(res_hash) baseline = None @@ -260,8 +260,8 @@ for vlan1 in vlans: result_udp.set_parameter('netperf_client_on_vlan', vlan2) if product_name is not None: result_udp.set_tag(product_name) - res_hash = result_udp.generate_hash(['kernel-release', - 'redhat-release']) + res_hash = result_udp.generate_hash(['kernel_release', + 'redhat_release']) result_udp.set_tag(res_hash) baseline = None diff --git a/recipes/regression_tests/phase1/bonding_test.py b/recipes/regression_tests/phase1/bonding_test.py index e59d830..5c4777b 100644 --- a/recipes/regression_tests/phase1/bonding_test.py +++ b/recipes/regression_tests/phase1/bonding_test.py @@ -138,8 +138,8 @@ for offload in offloads: result_tcp.set_parameter(offload, state) if product_name is not None: result_tcp.set_tag(product_name) - res_hash = result_tcp.generate_hash(['kernel-release', - 'redhat-release']) + res_hash = result_tcp.generate_hash(['kernel_release', + 'redhat_release']) result_tcp.set_tag(res_hash) baseline = None @@ -158,8 +158,8 @@ for offload in offloads: result_udp.set_parameter(offload, state) if product_name is not None: result_udp.set_tag(product_name) - res_hash = result_udp.generate_hash(['kernel-release', - 'redhat-release']) + res_hash = result_udp.generate_hash(['kernel_release', + 'redhat_release']) result_udp.set_tag(res_hash) baseline = None @@ -213,8 +213,8 @@ for offload in offloads: result_tcp.set_parameter(offload, state) if product_name is not None: result_tcp.set_tag(product_name) - res_hash = result_tcp.generate_hash(['kernel-release', - 'redhat-release']) + res_hash = result_tcp.generate_hash(['kernel_release', + 'redhat_release']) result_tcp.set_tag(res_hash) baseline = None @@ -234,8 +234,8 @@ for offload in offloads: result_udp.set_parameter(offload, state) if product_name is not None: result_udp.set_tag(product_name) - res_hash = result_udp.generate_hash(['kernel-release', - 'redhat-release']) + res_hash = result_udp.generate_hash(['kernel_release', + 'redhat_release']) result_udp.set_tag(res_hash) baseline = None 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 69e0605..87cfd08 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 @@ -204,8 +204,10 @@ for offload in offloads: result_tcp.set_parameter(offload, state) if product_name is not None: result_tcp.set_tag(product_name) - res_hash = result_tcp.generate_hash(['kernel-release', - 'redhat-release']) + res_hash = result_tcp.generate_hash(['kernel_release', + 'redhat_release', + r'guest\d+\.hostname', + r'guest\d+\..*hwaddr']) result_tcp.set_tag(res_hash) baseline = None @@ -224,8 +226,10 @@ for offload in offloads: result_udp.set_parameter(offload, state) if product_name is not None: result_udp.set_tag(product_name) - res_hash = result_udp.generate_hash(['kernel-release', - 'redhat-release']) + res_hash = result_udp.generate_hash(['kernel_release', + 'redhat_release', + r'guest\d+\.hostname', + r'guest\d+\..*hwaddr']) result_udp.set_tag(res_hash) baseline = None @@ -282,8 +286,10 @@ for offload in offloads: result_tcp.set_parameter(offload, state) if product_name is not None: result_tcp.set_tag(product_name) - res_hash = result_tcp.generate_hash(['kernel-release', - 'redhat-release']) + res_hash = result_tcp.generate_hash(['kernel_release', + 'redhat_release', + r'guest\d+\.hostname', + r'guest\d+\..*hwaddr']) result_tcp.set_tag(res_hash) baseline = None @@ -303,8 +309,10 @@ for offload in offloads: result_udp.set_parameter(offload, state) if product_name is not None: result_udp.set_tag(product_name) - res_hash = result_udp.generate_hash(['kernel-release', - 'redhat-release']) + res_hash = result_udp.generate_hash(['kernel_release', + 'redhat_release', + r'guest\d+\.hostname', + r'guest\d+\..*hwaddr']) result_udp.set_tag(res_hash) baseline = None 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 e7ef089..4766980 100644 --- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py +++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py @@ -139,8 +139,10 @@ for offload in offloads: result_tcp.set_parameter(offload, state) if product_name is not None: result_tcp.set_tag(product_name) - res_hash = result_tcp.generate_hash(['kernel-release', - 'redhat-release']) + res_hash = result_tcp.generate_hash(['kernel_release', + 'redhat_release', + r'guest\d+\.hostname', + r'guest\d+\..*hwaddr']) result_tcp.set_tag(res_hash) baseline = None @@ -159,8 +161,10 @@ for offload in offloads: result_udp.set_parameter(offload, state) if product_name is not None: result_udp.set_tag(product_name) - res_hash = result_udp.generate_hash(['kernel-release', - 'redhat-release']) + res_hash = result_udp.generate_hash(['kernel_release', + 'redhat_release', + r'guest\d+\.hostname', + r'guest\d+\..*hwaddr']) result_udp.set_tag(res_hash) baseline = None @@ -215,8 +219,10 @@ for offload in offloads: result_tcp.set_parameter(offload, state) if product_name is not None: result_tcp.set_tag(product_name) - res_hash = result_tcp.generate_hash(['kernel-release', - 'redhat-release']) + res_hash = result_tcp.generate_hash(['kernel_release', + 'redhat_release', + r'guest\d+\.hostname', + r'guest\d+\..*hwaddr']) result_tcp.set_tag(res_hash) baseline = None @@ -236,8 +242,10 @@ for offload in offloads: result_udp.set_parameter(offload, state) if product_name is not None: result_udp.set_tag(product_name) - res_hash = result_udp.generate_hash(['kernel-release', - 'redhat-release']) + res_hash = result_udp.generate_hash(['kernel_release', + 'redhat_release', + r'guest\d+\.hostname', + r'guest\d+\..*hwaddr']) result_udp.set_tag(res_hash) baseline = None 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 d32b1e0..cb708ca 100644 --- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py +++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py @@ -138,8 +138,10 @@ for offload in offloads: result_tcp.set_parameter(offload, state) if product_name is not None: result_tcp.set_tag(product_name) - res_hash = result_tcp.generate_hash(['kernel-release', - 'redhat-release']) + res_hash = result_tcp.generate_hash(['kernel_release', + 'redhat_release', + r'guest\d+\.hostname', + r'guest\d+\..*hwaddr']) result_tcp.set_tag(res_hash) baseline = None @@ -158,8 +160,10 @@ for offload in offloads: result_udp.set_parameter(offload, state) if product_name is not None: result_udp.set_tag(product_name) - res_hash = result_udp.generate_hash(['kernel-release', - 'redhat-release']) + res_hash = result_udp.generate_hash(['kernel_release', + 'redhat_release', + r'guest\d+\.hostname', + r'guest\d+\..*hwaddr']) result_udp.set_tag(res_hash) baseline = None @@ -213,8 +217,10 @@ for offload in offloads: result_tcp.set_parameter(offload, state) if product_name is not None: result_tcp.set_tag(product_name) - res_hash = result_tcp.generate_hash(['kernel-release', - 'redhat-release']) + res_hash = result_tcp.generate_hash(['kernel_release', + 'redhat_release', + r'guest\d+\.hostname', + r'guest\d+\..*hwaddr']) result_tcp.set_tag(res_hash) baseline = None @@ -234,8 +240,10 @@ for offload in offloads: result_udp.set_parameter(offload, state) if product_name is not None: result_udp.set_tag(product_name) - res_hash = result_udp.generate_hash(['kernel-release', - 'redhat-release']) + res_hash = result_udp.generate_hash(['kernel_release', + 'redhat_release', + r'guest\d+\.hostname', + r'guest\d+\..*hwaddr']) result_udp.set_tag(res_hash) baseline = None diff --git a/recipes/regression_tests/phase2/3_vlans_over_team.py b/recipes/regression_tests/phase2/3_vlans_over_team.py index 86c59b0..a6dbd49 100644 --- a/recipes/regression_tests/phase2/3_vlans_over_team.py +++ b/recipes/regression_tests/phase2/3_vlans_over_team.py @@ -156,8 +156,8 @@ for vlan1 in vlans: result_tcp.set_parameter('netperf_client_on_vlan', vlan2) if product_name is not None: result_tcp.set_tag(product_name) - res_hash = result_tcp.generate_hash(['kernel-release', - 'redhat-release']) + res_hash = result_tcp.generate_hash(['kernel_release', + 'redhat_release']) result_tcp.set_tag(res_hash) baseline = None @@ -179,8 +179,8 @@ for vlan1 in vlans: result_udp.set_parameter('netperf_client_on_vlan', vlan2) if product_name is not None: result_udp.set_tag(product_name) - res_hash = result_udp.generate_hash(['kernel-release', - 'redhat-release']) + res_hash = result_udp.generate_hash(['kernel_release', + 'redhat_release']) result_udp.set_tag(res_hash) baseline = None @@ -237,8 +237,8 @@ for vlan1 in vlans: result_tcp.set_parameter('netperf_client_on_vlan', vlan2) if product_name is not None: result_tcp.set_tag(product_name) - res_hash = result_tcp.generate_hash(['kernel-release', - 'redhat-release']) + res_hash = result_tcp.generate_hash(['kernel_release', + 'redhat_release']) result_tcp.set_tag(res_hash) baseline = None @@ -260,8 +260,8 @@ for vlan1 in vlans: result_udp.set_parameter('netperf_client_on_vlan', vlan2) if product_name is not None: result_udp.set_tag(product_name) - res_hash = result_udp.generate_hash(['kernel-release', - 'redhat-release']) + res_hash = result_udp.generate_hash(['kernel_release', + 'redhat_release']) result_udp.set_tag(res_hash) baseline = None diff --git a/recipes/regression_tests/phase2/team_test.py b/recipes/regression_tests/phase2/team_test.py index 0ecc25c..95dcfd8 100644 --- a/recipes/regression_tests/phase2/team_test.py +++ b/recipes/regression_tests/phase2/team_test.py @@ -141,8 +141,8 @@ for offload in offloads: result_tcp.set_parameter('netperf_client', "testmachine2") if product_name is not None: result_tcp.set_tag(product_name) - res_hash = result_tcp.generate_hash(['kernel-release', - 'redhat-release']) + res_hash = result_tcp.generate_hash(['kernel_release', + 'redhat_release']) result_tcp.set_tag(res_hash) baseline = None @@ -164,8 +164,8 @@ for offload in offloads: result_udp.set_parameter('netperf_client', "testmachine2") if product_name is not None: result_udp.set_tag(product_name) - res_hash = result_udp.generate_hash(['kernel-release', - 'redhat-release']) + res_hash = result_udp.generate_hash(['kernel_release', + 'redhat_release']) result_udp.set_tag(res_hash) baseline = None @@ -221,8 +221,8 @@ for offload in offloads: result_tcp.set_parameter('netperf_client', "testmachine2") if product_name is not None: result_tcp.set_tag(product_name) - res_hash = result_tcp.generate_hash(['kernel-release', - 'redhat-release']) + res_hash = result_tcp.generate_hash(['kernel_release', + 'redhat_release']) result_tcp.set_tag(res_hash) baseline = None @@ -244,8 +244,8 @@ for offload in offloads: result_udp.set_parameter('netperf_client', "testmachine2") if product_name is not None: result_udp.set_tag(product_name) - res_hash = result_udp.generate_hash(['kernel-release', - 'redhat-release']) + res_hash = result_udp.generate_hash(['kernel_release', + 'redhat_release']) result_udp.set_tag(res_hash) baseline = None @@ -330,8 +330,8 @@ for offload in offloads: result_tcp.set_parameter('netperf_client', "testmachine1") if product_name is not None: result_tcp.set_tag(product_name) - res_hash = result_tcp.generate_hash(['kernel-release', - 'redhat-release']) + res_hash = result_tcp.generate_hash(['kernel_release', + 'redhat_release']) result_tcp.set_tag(res_hash) baseline = None @@ -353,8 +353,8 @@ for offload in offloads: result_udp.set_parameter('netperf_client', "testmachine1") if product_name is not None: result_udp.set_tag(product_name) - res_hash = result_udp.generate_hash(['kernel-release', - 'redhat-release']) + res_hash = result_udp.generate_hash(['kernel_release', + 'redhat_release']) result_udp.set_tag(res_hash) baseline = None @@ -410,8 +410,8 @@ for offload in offloads: result_tcp.set_parameter('netperf_client', "testmachine1") if product_name is not None: result_tcp.set_tag(product_name) - res_hash = result_tcp.generate_hash(['kernel-release', - 'redhat-release']) + res_hash = result_tcp.generate_hash(['kernel_release', + 'redhat_release']) result_tcp.set_tag(res_hash) baseline = None @@ -433,8 +433,8 @@ for offload in offloads: result_udp.set_parameter('netperf_client', "testmachine1") if product_name is not None: result_udp.set_tag(product_name) - res_hash = result_udp.generate_hash(['kernel-release', - 'redhat-release']) + res_hash = result_udp.generate_hash(['kernel_release', + 'redhat_release']) result_udp.set_tag(res_hash) baseline = None 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 a35d446..833e19e 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 @@ -206,8 +206,8 @@ for offload in offloads: result_tcp.set_parameter(offload, state) if product_name is not None: result_tcp.set_tag(product_name) - res_hash = result_tcp.generate_hash(['kernel-release', - 'redhat-release']) + res_hash = result_tcp.generate_hash(['kernel_release', + 'redhat_release']) result_tcp.set_tag(res_hash) baseline = None @@ -226,8 +226,8 @@ for offload in offloads: result_udp.set_parameter(offload, state) if product_name is not None: result_udp.set_tag(product_name) - res_hash = result_udp.generate_hash(['kernel-release', - 'redhat-release']) + res_hash = result_udp.generate_hash(['kernel_release', + 'redhat_release']) result_udp.set_tag(res_hash) baseline = None @@ -284,8 +284,8 @@ for offload in offloads: result_tcp.set_parameter(offload, state) if product_name is not None: result_tcp.set_tag(product_name) - res_hash = result_tcp.generate_hash(['kernel-release', - 'redhat-release']) + res_hash = result_tcp.generate_hash(['kernel_release', + 'redhat_release']) result_tcp.set_tag(res_hash) baseline = None @@ -305,8 +305,8 @@ for offload in offloads: result_udp.set_parameter(offload, state) if product_name is not None: result_udp.set_tag(product_name) - res_hash = result_udp.generate_hash(['kernel-release', - 'redhat-release']) + res_hash = result_udp.generate_hash(['kernel_release', + 'redhat_release']) result_udp.set_tag(res_hash) baseline = None 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 89c3469..fc1f015 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 @@ -138,8 +138,8 @@ for offload in offloads: result_tcp.set_parameter(offload, state) if product_name is not None: result_tcp.set_tag(product_name) - res_hash = result_tcp.generate_hash(['kernel-release', - 'redhat-release']) + res_hash = result_tcp.generate_hash(['kernel_release', + 'redhat_release']) result_tcp.set_tag(res_hash) baseline = None @@ -158,8 +158,8 @@ for offload in offloads: result_udp.set_parameter(offload, state) if product_name is not None: result_udp.set_tag(product_name) - res_hash = result_udp.generate_hash(['kernel-release', - 'redhat-release']) + res_hash = result_udp.generate_hash(['kernel_release', + 'redhat_release']) result_udp.set_tag(res_hash) baseline = None @@ -214,8 +214,8 @@ for offload in offloads: result_tcp.set_parameter(offload, state) if product_name is not None: result_tcp.set_tag(product_name) - res_hash = result_tcp.generate_hash(['kernel-release', - 'redhat-release']) + res_hash = result_tcp.generate_hash(['kernel_release', + 'redhat_release']) result_tcp.set_tag(res_hash) baseline = None @@ -235,8 +235,8 @@ for offload in offloads: result_udp.set_parameter(offload, state) if product_name is not None: result_udp.set_tag(product_name) - res_hash = result_udp.generate_hash(['kernel-release', - 'redhat-release']) + res_hash = result_udp.generate_hash(['kernel_release', + 'redhat_release']) result_udp.set_tag(res_hash) baseline = None 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 d15f2be..5a6ec5f 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 @@ -137,8 +137,8 @@ for offload in offloads: result_tcp.set_parameter(offload, state) if product_name is not None: result_tcp.set_tag(product_name) - res_hash = result_tcp.generate_hash(['kernel-release', - 'redhat-release']) + res_hash = result_tcp.generate_hash(['kernel_release', + 'redhat_release']) result_tcp.set_tag(res_hash) baseline = None @@ -157,8 +157,8 @@ for offload in offloads: result_udp.set_parameter(offload, state) if product_name is not None: result_udp.set_tag(product_name) - res_hash = result_udp.generate_hash(['kernel-release', - 'redhat-release']) + res_hash = result_udp.generate_hash(['kernel_release', + 'redhat_release']) result_udp.set_tag(res_hash) baseline = None @@ -212,8 +212,8 @@ for offload in offloads: result_tcp.set_parameter(offload, state) if product_name is not None: result_tcp.set_tag(product_name) - res_hash = result_tcp.generate_hash(['kernel-release', - 'redhat-release']) + res_hash = result_tcp.generate_hash(['kernel_release', + 'redhat_release']) result_tcp.set_tag(res_hash) baseline = None @@ -233,8 +233,8 @@ for offload in offloads: result_udp.set_parameter(offload, state) if product_name is not None: result_udp.set_tag(product_name) - res_hash = result_udp.generate_hash(['kernel-release', - 'redhat-release']) + res_hash = result_udp.generate_hash(['kernel_release', + 'redhat_release']) result_udp.set_tag(res_hash) baseline = None -- 2.5.0