Remove ODL_VERSION variable, it is not needed

Change-Id: Ib15d49dfa5bea7bb5eef2bdf5477689f963c9749
Signed-off-by: Peter Gubka <pgubka@cisco.com>

diff --git a/csit/libraries/DevstackUtils.robot b/csit/libraries/DevstackUtils.robot
index ccb55a3cc4cd18524197be8d10dfc2cba08f20d5..766d2d59009d58c2e89883ebf7e72c79fc7a6576 100644 (file)
--- a/csit/libraries/DevstackUtils.robot
+++ b/csit/libraries/DevstackUtils.robot
@@ -12,7 +12,6 @@ Resource          OpenStackOperations.robot
 Variables         ../variables/Variables.py
 
 *** Variables ***
-${ODL_VERSION}    lithium-SR3
 ${OPENSTACK_BRANCH}    stable/liberty
 ${NETWORKING-ODL_BRANCH}    ${OPENSTACK_BRANCH}
 ${TEMPEST_REGEX}    tempest.api.network

diff --git a/csit/suites/groupbasedpolicy/GBP/Devstack/Variables.robot b/csit/suites/groupbasedpolicy/GBP/Devstack/Variables.robot
index 5119c0fd96776b5933aae578514caaca344aa3eb..4f280a5e62b5f4c62790c8325cb39b187649f79a 100644 (file)
--- a/csit/suites/groupbasedpolicy/GBP/Devstack/Variables.robot
+++ b/csit/suites/groupbasedpolicy/GBP/Devstack/Variables.robot
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Global variables for GBPSFC 6node topology. Some variables are release specific and their value depend on
-...               ODL_VERSION variable which contains release name and is defined in Jenkins job. Keywords for setting release specific
+...               ODL_STREAM variable which contains release name and is defined in Jenkins job. Keywords for setting release specific
 ...               data are located in this file.
 Variables         ../../../../variables/Variables.py
 

diff --git a/csit/suites/groupbasedpolicy/GBPSFC/6-node/Variables.robot b/csit/suites/groupbasedpolicy/GBPSFC/6-node/Variables.robot
index 5dcee70394354bbf6c0d19f73f32273306fc880a..f8d930b4d9b109c24f509885f483cf9915a48d84 100644 (file)
--- a/csit/suites/groupbasedpolicy/GBPSFC/6-node/Variables.robot
+++ b/csit/suites/groupbasedpolicy/GBPSFC/6-node/Variables.robot
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Global variables for GBPSFC 6node topology. Some variables are release specific and their value depend on
-...               ODL_VERSION variable which contains release name and is defined in Jenkins job. Keywords for setting release specific
+...               ODL_STREAM variable which contains release name and is defined in Jenkins job. Keywords for setting release specific
 ...               data are located in this file.
 Variables         ../../../../variables/Variables.py
 Resource          ../../../../libraries/CompareStream.robot
@@ -51,7 +51,6 @@ Set Test Variables
 
 Set ODL Variables
     [Documentation]    Initialize ODL version specific variables using resource CompareStream.
-    log    ${ODL_VERSION}
     CompareStream.Run_Keyword_If_Less_Than_Beryllium    Set ODL Variables Lithium
     Set ODL Variables Master
 

diff --git a/csit/suites/tsdr/HSQLDB/010_InterfaceMetrics.robot b/csit/suites/tsdr/HSQLDB/010_InterfaceMetrics.robot
index 7d2aad3342038bede37c199978f49d7ec260a411..dfbc9da4b823e53296ca5c68c540d6e0fc1f4d46 100644 (file)
--- a/csit/suites/tsdr/HSQLDB/010_InterfaceMetrics.robot
+++ b/csit/suites/tsdr/HSQLDB/010_InterfaceMetrics.robot
@@ -18,7 +18,6 @@ Variables         ../../../variables/Variables.py
 *** Test Cases ***
 Init Variables
     [Documentation]    Initialize ODL version specific variables
-    log    ${ODL_VERSION}
     CompareStream.Run_Keyword_If_Less_Than_Beryllium    Init Variables Lithium
     Init Variables Master
 

diff --git a/csit/suites/tsdr/HSQLDB/020_FlowMetrics.robot b/csit/suites/tsdr/HSQLDB/020_FlowMetrics.robot
index 83880899df398fa4cb9e76f176e6bc5854e8105e..b46d8838abebb155b38253eb3a64e2786bb417aa 100644 (file)
--- a/csit/suites/tsdr/HSQLDB/020_FlowMetrics.robot
+++ b/csit/suites/tsdr/HSQLDB/020_FlowMetrics.robot
@@ -17,7 +17,6 @@ Variables         ../../../variables/Variables.py
 *** Test Cases ***
 Init Variables
     [Documentation]    Initialize ODL version specific variables
-    log    ${ODL_VERSION}
     CompareStream.Run_Keyword_If_Less_Than_Beryllium    Init Variables Lithium
     Init Variables Master
 

diff --git a/csit/suites/tsdr/HSQLDB/030_FlowTableMetrics.robot b/csit/suites/tsdr/HSQLDB/030_FlowTableMetrics.robot
index b071ed6a0e6f5facc7d2839fbf088f8045bcf6af..d4b255aca8d07d63569f380eecbb18fcf624923f 100644 (file)
--- a/csit/suites/tsdr/HSQLDB/030_FlowTableMetrics.robot
+++ b/csit/suites/tsdr/HSQLDB/030_FlowTableMetrics.robot
@@ -17,7 +17,6 @@ Variables         ../../../variables/Variables.py
 *** Test Cases ***
 Init Variables
     [Documentation]    Initialize ODL version specific variables
-    log    ${ODL_VERSION}
     CompareStream.Run_Keyword_If_Less_Than_Beryllium    Init Variables Lithium
     Init Variables Master
 

diff --git a/csit/suites/tsdr/HSQLDB/040_QueueMetrics.robot b/csit/suites/tsdr/HSQLDB/040_QueueMetrics.robot
index dc272b7f034d7966ab3dbcf1ce6491d79a407661..8e0194b2080570586e04f9d722e0a9627a76e3d8 100644 (file)
--- a/csit/suites/tsdr/HSQLDB/040_QueueMetrics.robot
+++ b/csit/suites/tsdr/HSQLDB/040_QueueMetrics.robot
@@ -17,7 +17,6 @@ Variables         ../../../variables/Variables.py
 *** Test Cases ***
 Init Variables
     [Documentation]    Initialize ODL version specific variables
-    log    ${ODL_VERSION}
     CompareStream.Run_Keyword_If_Less_Than_Beryllium    Init Variables Lithium
     Init Variables Master