From 8452c48c8b3f28ceccbea1e7d42b649238d8f497 Mon Sep 17 00:00:00 2001 From: selias Date: Wed, 15 Feb 2017 10:36:14 +0100 Subject: [PATCH] HC Test: address job failures - make HC package download script correctly use the OS variable - force HC restart after netconf suite, to clean up leftover interfaces - remove EXPECTED_FAILING tag from vhost-user suite, VPP bug was fixed - add EXPECTED_FAILING tag to reflexive test case of plugin-acl suite Change-Id: Id56eb52a5e22718de31aa5bef27159a5a531b244 Signed-off-by: selias --- resources/tools/download_hc_build_pkgs.sh | 2 +- tests/func/honeycomb/mgmt-cfg-int-apihcnc-func.robot | 2 +- tests/func/honeycomb/mgmt-cfg-intvhost-apihc-apivat-func.robot | 3 +-- tests/func/honeycomb/mgmt-cfg-pluginacl-apihc-apivat-func.robot | 3 +++ 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/resources/tools/download_hc_build_pkgs.sh b/resources/tools/download_hc_build_pkgs.sh index 3847c4ab1c..312d9f3353 100755 --- a/resources/tools/download_hc_build_pkgs.sh +++ b/resources/tools/download_hc_build_pkgs.sh @@ -23,7 +23,7 @@ OS=$2 # Download the latest VPP and VPP plugin .deb packages URL="https://nexus.fd.io/service/local/artifact/maven/content" VER="LATEST" -REPO="fd.io.${STREAM}.ubuntu.trusty.main" +REPO="fd.io.${STREAM}.${OS}" VPP_GROUP="io.fd.vpp" NSH_GROUP="io.fd.nsh_sfc" VPP_ARTIFACTS="vpp vpp-dbg vpp-dev vpp-dpdk-dev vpp-dpdk-dkms vpp-lib vpp-plugins vpp-api-java" diff --git a/tests/func/honeycomb/mgmt-cfg-int-apihcnc-func.robot b/tests/func/honeycomb/mgmt-cfg-int-apihcnc-func.robot index 118a4c67f7..0aabf4fc9f 100644 --- a/tests/func/honeycomb/mgmt-cfg-int-apihcnc-func.robot +++ b/tests/func/honeycomb/mgmt-cfg-int-apihcnc-func.robot @@ -22,7 +22,7 @@ | Documentation | *Netconf test suite. Contains test cases that need to bypass\ | ... | REST API.* | Force Tags | honeycomb_sanity -| Suite Teardown | Run Keyword If Any Tests Failed +| Suite Teardown | ... | Restart Honeycomb And VPP And Clear Persisted Configuration | ${node} *** Variables *** diff --git a/tests/func/honeycomb/mgmt-cfg-intvhost-apihc-apivat-func.robot b/tests/func/honeycomb/mgmt-cfg-intvhost-apihc-apivat-func.robot index cbc9b3fb6f..1f5719aff5 100644 --- a/tests/func/honeycomb/mgmt-cfg-intvhost-apihc-apivat-func.robot +++ b/tests/func/honeycomb/mgmt-cfg-intvhost-apihc-apivat-func.robot @@ -26,8 +26,7 @@ | Resource | resources/libraries/robot/default.robot | Resource | resources/libraries/robot/honeycomb/honeycomb.robot | Resource | resources/libraries/robot/honeycomb/vhost_user.robot -# vhost-user as server failing due to VPP bug (VPP-562) -| Force Tags | honeycomb_sanity | EXPECTED_FAILING +| Force Tags | honeycomb_sanity | Suite Teardown | Run Keyword If Any Tests Failed | ... | Restart Honeycomb And VPP And Clear Persisted Configuration | ${node} | Documentation | *Honeycomb vhost-user interface management test suite.* diff --git a/tests/func/honeycomb/mgmt-cfg-pluginacl-apihc-apivat-func.robot b/tests/func/honeycomb/mgmt-cfg-pluginacl-apihc-apivat-func.robot index c4c58a863c..b0f202fd3c 100644 --- a/tests/func/honeycomb/mgmt-cfg-pluginacl-apihc-apivat-func.robot +++ b/tests/func/honeycomb/mgmt-cfg-pluginacl-apihc-apivat-func.robot @@ -328,6 +328,8 @@ | | ... | to VPP interface 2 and receive it from interface 1(this should create\ | | ... | a reflexive "permit" rule) Finally, send the original packet again\ | | ... | and receive it from interface 2. +| | [Tags] | EXPCETED_FAILING +# Bug VPP-633, VPP crashes when any packet hits a reflexive rule | | [Teardown] | Run Keywords | | ... | Read plugin-ACL configuration from VAT | ${node} | AND | | ... | Clear plugin-acl Settings | ${node} | ${dut_to_tg_if1} | AND @@ -625,6 +627,7 @@ | | ... | and receive it from interface 2. | | [Tags] | EXPECTED_FAILING # routed interfaces not yet supported by ACL plugin (no Jira id available) +# Bug VPP-633, VPP crashes when any packet hits a reflexive rule | | Given Setup Interface IPs And Routes For IPv4 plugin-acl Test | | ... | icmp | ${acl_name_reflex} | | And Add ARP on DUT -- 2.16.6