Adjust BGPCEP test to BGPCEP-877 bug fix

[integration/test.git] / csit / libraries / Tempest.robot

diff --git a/csit/libraries/Tempest.robot b/csit/libraries/Tempest.robot
index ebe75154ab00e80863ee1b382a6e99bab78e3155..fb98481ee1c7cf82749ec1c5412a06babe9faf8d 100644 (file)
--- a/csit/libraries/Tempest.robot
+++ b/csit/libraries/Tempest.robot
@@ -7,9 +7,8 @@ Resource          SSHKeywords.robot
 Resource          ../variables/Variables.robot
 
 *** Variables ***
-@{stable/ocata_EXCLUSION_REGEXES}    ${EMPTY}
-@{stable/pike_EXCLUSION_REGEXES}    ${EMPTY}
 @{stable/queens_EXCLUSION_REGEXES}    ${EMPTY}
+@{stable/rocky_EXCLUSION_REGEXES}    ${EMPTY}
 @{master_EXCLUSION_REGEXES}    ${EMPTY}
 ${BLACKLIST_FILE}    /tmp/blacklist.txt
 ${TEMPEST_DIR}    /opt/stack/tempest
@@ -36,7 +35,7 @@ Run Tempest Tests Without Debug
     BuiltIn.Return From Keyword If    "skip_if_${OPENSTACK_BRANCH}" in @{TEST_TAGS}
     BuiltIn.Return From Keyword If    "skip_if_${SECURITY_GROUP_MODE}" in @{TEST_TAGS}
     BuiltIn.Return From Keyword If    "skip_if_${ODL_SNAT_MODE}" in @{TEST_TAGS}
-    ${tempest_conn_id} =    SSHLibrary.Open Connection    ${OS_CONTROL_NODE_IP}    prompt=${DEFAULT_LINUX_PROMPT_STRICT}
+    ${tempest_conn_id} =    SSHLibrary.Open Connection    ${OS_CNTL_IP}    prompt=${DEFAULT_LINUX_PROMPT_STRICT}
     SSHKeywords.Flexible SSH Login    ${OS_USER}    ${DEVSTACK_SYSTEM_PASSWORD}
     DevstackUtils.Write Commands Until Prompt    source ${DEVSTACK_DEPLOY_PATH}/openrc admin admin
     DevstackUtils.Write Commands Until Prompt    cd ${TEMPEST_DIRectory}
@@ -46,7 +45,7 @@ Run Tempest Tests Without Debug
     # There are tons of deprecation error messages when we use ostestr in our CSIT environment (openstack via devstack)
     # The robot log files are very large and one culprit is all these deprecation warnings. If we redirect stderr to
     # /dev/null we should be able to ignore them. We will miss any other errors, however.
-    ${output} =    DevstackUtils.Write Commands Until Prompt And Log    ostestr --regex ${tempest_regex} 2>/dev/null    timeout=${timeout}
+    ${output} =    DevstackUtils.Write Commands Until Prompt And Log    ostestr --regex ${tempest_regex}    timeout=${timeout}
     SSHLibrary.Close Connection
     BuiltIn.Should Contain    ${output}    Failed: 0
 
@@ -59,7 +58,7 @@ Run Tempest Tests With Debug
     BuiltIn.Return From Keyword If    "skip_if_${OPENSTACK_BRANCH}" in @{TEST_TAGS}
     BuiltIn.Return From Keyword If    "skip_if_${SECURITY_GROUP_MODE}" in @{TEST_TAGS}
     BuiltIn.Return From Keyword If    "skip_if_${ODL_SNAT_MODE}" in @{TEST_TAGS}
-    ${tempest_conn_id} =    SSHLibrary.Open Connection    ${OS_CONTROL_NODE_IP}    prompt=${DEFAULT_LINUX_PROMPT_STRICT}
+    ${tempest_conn_id} =    SSHLibrary.Open Connection    ${OS_CNTL_IP}    prompt=${DEFAULT_LINUX_PROMPT_STRICT}
     SSHKeywords.Flexible SSH Login    ${OS_USER}    ${DEVSTACK_SYSTEM_PASSWORD}
     DevstackUtils.Write Commands Until Prompt    source ${DEVSTACK_DEPLOY_PATH}/openrc admin admin
     DevstackUtils.Write Commands Until Prompt    cd ${TEMPEST_DIRectory}
@@ -91,8 +90,12 @@ Log In To Tempest Executor And Setup Test Environment
     OpenStackOperations.Create Network    ${EXTERNAL_NET_NAME}    --external --default --provider-network-type flat --provider-physical-network ${PUBLIC_PHYSICAL_NETWORK}
     OpenStackOperations.Create Subnet    ${EXTERNAL_NET_NAME}    ${EXTERNAL_SUBNET_NAME}    ${EXTERNAL_SUBNET}    --gateway ${EXTERNAL_GATEWAY} --allocation-pool ${EXTERNAL_SUBNET_ALLOCATION_POOL}
     OpenStackOperations.List Networks
-    ${control_node_conn_id} =    SSHLibrary.Open Connection    ${OS_CONTROL_NODE_IP}    prompt=${DEFAULT_LINUX_PROMPT_STRICT}
+    ${control_node_conn_id} =    SSHLibrary.Open Connection    ${OS_CNTL_IP}    prompt=${DEFAULT_LINUX_PROMPT_STRICT}
     SSHKeywords.Flexible SSH Login    ${OS_USER}
+    DevstackUtils.Write Commands Until Prompt And Log    sudo pip install -U --verbose pip    timeout=120s
+    DevstackUtils.Write Commands Until Prompt And Log    sudo pip install -U --verbose os-testr>=1.0.0    timeout=120s
+    DevstackUtils.Write Commands Until Prompt And Log    ostestr --version
+    DevstackUtils.Write Commands Until Prompt And Log    testr init
     DevstackUtils.Write Commands Until Prompt    source ${DEVSTACK_DEPLOY_PATH}/openrc admin admin
     DevstackUtils.Write Commands Until Prompt    sudo rm -rf /opt/stack/tempest/.testrepository
     ${net_id} =    OpenStackOperations.Get Net Id    ${EXTERNAL_NET_NAME}
@@ -130,4 +133,4 @@ Create Blacklist File
     : FOR    ${exclusion}    IN    @{${OPENSTACK_BRANCH}_EXCLUSION_REGEXES}
     \    OperatingSystem.Append To File    ${BLACKLIST_FILE}    ${exclusion}\n
     OperatingSystem.Log File    ${BLACKLIST_FILE}
-    SSHKeywords.Copy File To Remote System    ${OS_CONTROL_NODE_IP}    ${BLACKLIST_FILE}    ${BLACKLIST_FILE}
+    SSHKeywords.Copy File To Remote System    ${OS_CNTL_IP}    ${BLACKLIST_FILE}    ${BLACKLIST_FILE}