From: Peter Gubka <pgubka@cisco.com>
Date: Fri, 13 Jan 2017 11:22:01 +0000 (+0100)
Subject: Remove ODL_VERSION variable, it is not needed
X-Git-Tag: release/boron-sr3~188
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=5c941f35eb45259f34953ad05afcb31e4dd3551c;p=integration%2Ftest.git

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 ccb55a3cc4..766d2d5900 100644
--- 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 5119c0fd96..4f280a5e62 100644
--- 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 5dcee70394..f8d930b4d9 100644
--- 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 7d2aad3342..dfbc9da4b8 100644
--- 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 83880899df..b46d8838ab 100644
--- 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 b071ed6a0e..d4b255aca8 100644
--- 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 dc272b7f03..8e0194b208 100644
--- 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