fixing syntax for chaning odl_version in devstack setup

[integration/test.git] / csit / suites / ovsdb / Devstack_Tempest_Tests / 01__single_node_devstack_tempest_tests.robot

diff --git a/csit/suites/ovsdb/Devstack_Tempest_Tests/01__single_node_devstack_tempest_tests.robot b/csit/suites/ovsdb/Devstack_Tempest_Tests/01__single_node_devstack_tempest_tests.robot
index 7b7c45f0b89c02ff4ec3465d6adb7ac3b4d8207e..3ef03849e4c1a308f33339e99f4d0a05279426f4 100644 (file)
--- a/csit/suites/ovsdb/Devstack_Tempest_Tests/01__single_node_devstack_tempest_tests.robot
+++ b/csit/suites/ovsdb/Devstack_Tempest_Tests/01__single_node_devstack_tempest_tests.robot
@@ -7,15 +7,15 @@ Library           RequestsLibrary
 Resource          ../../../libraries/Utils.robot
 
 *** Variables ***
-${ODL_VERSION}                        lithium-SR3
-${OPENSTACK_BRANCH}                   stable/liberty
-${NETWORKING-ODL_BRANCH}              ${OPENSTACK_BRANCH}
-${TEMPEST_REGEX}                      tempest.api.network
-${ODL_BOOT_WAIT_URL}                  restconf/operational/network-topology:network-topology/topology/netvirt:1
+${ODL_VERSION}    lithium-SR3
+${OPENSTACK_BRANCH}    stable/liberty
+${NETWORKING-ODL_BRANCH}    ${OPENSTACK_BRANCH}
+${TEMPEST_REGEX}    tempest.api.network
+${ODL_BOOT_WAIT_URL}    restconf/operational/network-topology:network-topology/topology/netvirt:1
 ${default_devstack_prompt_timeout}    10s
-${devstack_workspace}                 ~/ds_workspace
-${DEVSTACK_SYSTEM_PASSWORD}           # set to empty, but provide for others to override if desired
-${CLEAN_DEVSTACK_HOST}                False
+${devstack_workspace}    ~/ds_workspace
+${DEVSTACK_SYSTEM_PASSWORD}    \    # set to empty, but provide for others to override if desired
+${CLEAN_DEVSTACK_HOST}    False
 
 *** Test Cases ***
 Run Devstack Gate Wrapper
@@ -40,7 +40,7 @@ tempest.api.network
 
 tempest
     [Tags]    exclude
-    Run Tempest Tests    ${TEST_NAME}    1800s
+    Run Tempest Tests    ${TEST_NAME}    900s
 
 *** Keywords ***
 Run Tempest Tests
@@ -48,7 +48,7 @@ Run Tempest Tests
     Write Commands Until Prompt    cd /opt/stack/new/tempest
     Write Commands Until Prompt    sudo rm -rf /opt/stack/new/tempest/.testrepository
     Write Commands Until Prompt    sudo testr init
-    ${results}=    Write Commands Until Prompt    sudo -E testr run ${tempest_regex} --subunit | subunit-trace --no-failure-debug -f    timeout=600s
+    ${results}=    Write Commands Until Prompt    sudo -E testr run ${tempest_regex} --subunit | subunit-trace --no-failure-debug -f    timeout=${timeout}
     Should Contain    ${results}    Failed: 0
     # TODO: also need to verify some non-zero pass count as well as other results are ok (e.g. skipped, etc)
 
@@ -64,7 +64,7 @@ Devstack Suite Setup
     Write Commands Until Prompt    export ODL_BOOT_WAIT_URL=${ODL_BOOT_WAIT_URL}
     ${odl_version_to_install}=    Get Networking ODL Version Of Release    ${ODL_VERSION}
     Write Commands Until Prompt    export DEVSTACK_LOCAL_CONFIG="enable_plugin networking-odl https://git.openstack.org/openstack/networking-odl ${NETWORKING-ODL_BRANCH};"
-    Write Commands Until Prompt    export DEVSTACK_LOCAL_CONFIG+=ODL_NETVIRT_DEBUG_LOGS=True;ODL_RELEASE="${odl_version_to_install};"
+    Write Commands Until Prompt    export DEVSTACK_LOCAL_CONFIG+="ODL_NETVIRT_DEBUG_LOGS=True;ODL_RELEASE=${odl_version_to_install};"
     Write Commands Until Prompt    echo $DEVSTACK_LOCAL_CONFIG
     Write Commands Until Prompt    export OVERRIDE_ZUUL_BRANCH=${OPENSTACK_BRANCH}
     Write Commands Until Prompt    export PYTHONUNBUFFERED=true
@@ -89,7 +89,6 @@ Devstack Suite Setup
     Write Commands Until Prompt    rm -rf devstack-gate
     Write Commands Until Prompt    git clone https://git.openstack.org/openstack-infra/devstack-gate    timeout=30s
 
-
 Clean DevStack Host In Case It Is Not Sterile
     [Documentation]    In upstream CI, the expectation is that the devstack VM is fresh, sterile and ready
     ...    for any version of devstack, networking-odl, and OpenDaylight. During local test development,
@@ -108,7 +107,6 @@ Clean DevStack Host In Case It Is Not Sterile
     Write Commands Until Prompt    sudo ovs-vsctl del-br br-int
     Write Commands Until Prompt    sudo ovs-vsctl del-manager
 
-
 Write Commands Until Prompt
     [Arguments]    ${cmd}    ${timeout}=${default_devstack_prompt_timeout}
     [Documentation]    quick wrapper for Write and Read Until Prompt Keywords to make test cases more readable
@@ -130,4 +128,3 @@ Get Networking ODL Version Of Release
 Show Devstack Debugs
     Write Commands Until Prompt    gunzip /opt/stack/logs/devstacklog.txt.gz
     Write Commands Until Prompt    tail -n1000 /opt/stack/logs/devstacklog.txt    timeout=600s
-