Remove pike test workarounds

Change-Id: I1d063e0b0cc9455f2d490477b31efd6c4e86772e
Signed-off-by: Sam Hague <shague@redhat.com>

diff --git a/csit/libraries/L2GatewayOperations.robot b/csit/libraries/L2GatewayOperations.robot
index cdfc3ed72872b99b5af0f70a5dfffb36b86b2f0a..82f24be785c118c0e15e894c48fe799f65d1fc49 100644 (file)
--- a/csit/libraries/L2GatewayOperations.robot
+++ b/csit/libraries/L2GatewayOperations.robot
@@ -296,6 +296,5 @@ Verify Elan Flow Entries
 
 Cleanup L2GW Optional Resources
     [Documentation]    Cleanup resources that are only allocated on certain combos...
-    BuiltIn.Pass_Execution_If    "skip_if_${OPENSTACK_BRANCH}" in @{TEST_TAGS}    Not supported in Ocata/Pike
     CompareStream.Run_Keyword_If_At_Most_Nitrogen    BuiltIn.Pass_Execution    Only run on oxygen and later
     OpenStackOperations.Delete Port    ${HWVTEP_PORT_3}

diff --git a/csit/libraries/Tempest.robot b/csit/libraries/Tempest.robot
index 81958125cd06f0dbd5f2c41c741fbdf364b1e142..8794e3e994f980014a612f908ace7550a6813b4e 100644 (file)
--- a/csit/libraries/Tempest.robot
+++ b/csit/libraries/Tempest.robot
@@ -7,8 +7,6 @@ Resource          SSHKeywords.robot
 Resource          ../variables/Variables.robot
 
 *** Variables ***
-@{stable/ocata_EXCLUSION_REGEXES}    ${EMPTY}
-@{stable/pike_EXCLUSION_REGEXES}    ${EMPTY}
 @{stable/queens_EXCLUSION_REGEXES}    ${EMPTY}
 @{master_EXCLUSION_REGEXES}    ${EMPTY}
 ${BLACKLIST_FILE}    /tmp/blacklist.txt

diff --git a/csit/suites/l2gw/01_Configure_verify_l2gateway.robot b/csit/suites/l2gw/01_Configure_verify_l2gateway.robot
index a5e5e074802ddd1e8bee501a5c59ddb9cc1d662e..91c41e99d869aa0202265eabcd6c9085075adda6 100644 (file)
--- a/csit/suites/l2gw/01_Configure_verify_l2gateway.robot
+++ b/csit/suites/l2gw/01_Configure_verify_l2gateway.robot
@@ -139,8 +139,6 @@ TC13 Ping Between Namespace In Second Network To Vm In First Network
 
 TC14 Create, Update And Attach 2nd Neutron Port to Hwvtep Namespace 1
     [Documentation]    Create and attach 2nd port to HWVTEP in network 1
-    [Tags]    skip_if_stable/ocata    skip_if_stable/pike
-    BuiltIn.Pass_Execution_If    "skip_if_${OPENSTACK_BRANCH}" in @{TEST_TAGS}    Not supported in Ocata/Pike
     CompareStream.Run_Keyword_If_At_Most_Nitrogen    BuiltIn.Pass_Execution    Only run on oxygen and later
     OpenStackOperations.Create Neutron Port With Additional Params    ${NET_1}    ${HWVTEP_PORT_3}    ${SECURITY_GROUP_L2GW_NONE}
     ${port_mac}=    Get Port Mac    ${HWVTEP_PORT_3}    #port_mac[4]
@@ -153,16 +151,12 @@ TC14 Create, Update And Attach 2nd Neutron Port to Hwvtep Namespace 1
 
 TC15 Update Existing L2Gateway With 2nd Port And Verify
     [Documentation]    Add the new port ${NS_PORT3} to existing L2GW ${L2GW_NAME1} that has an existing connection. ${NS_PORT1} is already attached, adding ${NS_PORT3}
-    [Tags]    skip_if_stable/ocata    skip_if_stable/pike
-    BuiltIn.Pass_Execution_If    "skip_if_${OPENSTACK_BRANCH}" in @{TEST_TAGS}    Not supported in Ocata/Pike
     CompareStream.Run_Keyword_If_At_Most_Nitrogen    BuiltIn.Pass_Execution    Only run on oxygen and later
     ${output}=    Wait Until Keyword Succeeds    30s    2s    L2GatewayOperations.Update And Verify L2Gateway    ${HWVTEP_BRIDGE}    ${L2GW_NAME1}
     ...    ${NS_PORT1}    ${NS_PORT3}
 
 TC16 Verify L2Gateway Connection
     [Documentation]    Verify the L2GW connection has the 2nd port. Verify db in hardware vtep emulator tables.
-    [Tags]    skip_if_stable/ocata    skip_if_stable/pike
-    BuiltIn.Pass_Execution_If    "skip_if_${OPENSTACK_BRANCH}" in @{TEST_TAGS}    Not supported in Ocata/Pike
     CompareStream.Run_Keyword_If_At_Most_Nitrogen    BuiltIn.Pass_Execution    Only run on oxygen and later
     Wait Until Keyword Succeeds    30s    2s    L2GatewayOperations.Verify L2Gateway Connection    ${L2GW_NAME1}    ${NET_1}
     Wait Until Keyword Succeeds    30s    2s    L2GatewayOperations.Verify Ovs Tunnel    ${HWVTEP_IP}    ${OVS_IP}
@@ -179,15 +173,11 @@ TC16 Verify L2Gateway Connection
 
 TC17 Dhcp Ip Allocation For Hwvtep Tap Port
     [Documentation]    Verify the 2nd HWVTEP port was able to get an IP address
-    [Tags]    skip_if_stable/ocata    skip_if_stable/pike
-    BuiltIn.Pass_Execution_If    "skip_if_${OPENSTACK_BRANCH}" in @{TEST_TAGS}    Not supported in Ocata/Pike
     CompareStream.Run_Keyword_If_At_Most_Nitrogen    BuiltIn.Pass_Execution    Only run on oxygen and later
     Wait Until Keyword Succeeds    180s    10s    L2GatewayOperations.Namespace Dhclient Verify    ${HWVTEP_NS1}    ${NS_TAP1}    ${port_ip_list[4]}
 
 TC18 Verify Ping From Compute Node Vm To Hwvtep Port 2
     [Documentation]    Verify IP connectivity between VM in net1 and 2nd HWVTEP port in net 1
-    [Tags]    skip_if_stable/ocata    skip_if_stable/pike
-    BuiltIn.Pass_Execution_If    "skip_if_${OPENSTACK_BRANCH}" in @{TEST_TAGS}    Not supported in Ocata/Pike
     CompareStream.Run_Keyword_If_At_Most_Nitrogen    BuiltIn.Pass_Execution    Only run on oxygen and later
     ${output}=    Wait Until Keyword Succeeds    60s    10s    Execute Command on VM Instance    ${NET_1}    ${port_ip_list[0]}
     ...    ping -c 3 ${port_ip_list[4]}
@@ -199,13 +189,10 @@ TC18 Verify Ping From Compute Node Vm To Hwvtep Port 2
 
 TC19 Ping Verification From Namespace Tap To Ovs Vm
     [Documentation]    Verify IP connectivity between 2nd HWVTEP port and VM in compute node
-    [Tags]    skip_if_stable/ocata    skip_if_stable/pike
-    BuiltIn.Pass_Execution_If    "skip_if_${OPENSTACK_BRANCH}" in @{TEST_TAGS}    Not supported in Ocata/Pike
     CompareStream.Run_Keyword_If_At_Most_Nitrogen    BuiltIn.Pass_Execution    Only run on oxygen and later
     Wait Until Keyword Succeeds    30s    5s    L2GatewayOperations.Verify Ping In Namespace Extra Timeout    ${HWVTEP_NS1}    ${port_mac_list[4]}    ${port_ip_list[0]}
 
 TC99 Cleanup L2Gateway Connection Itm Tunnel Port Subnet And Network
-    [Tags]    skip_if_stable/ocata    skip_if_stable/pike
     L2GatewayOperations.Delete L2Gateway Connection    ${L2GW_NAME1}
     L2GatewayOperations.Delete L2Gateway Connection    ${L2GW_NAME2}
     L2GatewayOperations.Delete L2Gateway    ${L2GW_NAME1}

diff --git a/csit/variables/netvirt/Variables.robot b/csit/variables/netvirt/Variables.robot
index a0ec698a524f9f29abd579c1d539833f406d6769..f40c78f67d88429bfdabf3b0551f4f122a840ddc 100644 (file)
--- a/csit/variables/netvirt/Variables.robot
+++ b/csit/variables/netvirt/Variables.robot
@@ -4,8 +4,6 @@ Documentation     Variables for Netvirt Test Suites
 *** Variables ***
 # Exceptions for which we will not create a failure
 @{NETVIRT_DIAG_SERVICES}    OPENFLOW    IFM    ITM    DATASTORE    ELAN    OVSDB
-${CIRROS_stable/ocata}    cirros-0.3.4-x86_64-uec
-${CIRROS_stable/pike}    cirros-0.3.5-x86_64-disk
 ${CIRROS_stable/queens}    cirros-0.3.5-x86_64-disk
 ${CIRROS_master}    cirros-0.3.5-x86_64-disk
 ${DEFAULT_PING_COUNT}    3