From: lbuckuli <lbuckuli@cisco.com>
Date: Thu, 13 Oct 2016 13:48:40 +0000 (+0000)
Subject: Remove the setting of ODL_VERSION from robot parameters
X-Git-Tag: release/boron-sr3~426
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=c665428cc075dff3b5256a543c37441772b13125;p=releng%2Fbuilder.git

Remove the setting of ODL_VERSION from robot parameters

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

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
index a05c842314..4a7297738e 100644
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
@@ -36,7 +36,7 @@
     install-features: 'odl-groupbasedpolicy-ofoverlay,odl-groupbasedpolicy-ui,odl-restconf-all'
 
     # Robot custom options
-    robot-options: '-v ODL_VERSION:{stream}'
+    robot-options: ''
 
     # Trigger jobs (upstream dependencies)
     trigger-jobs: 'groupbasedpolicy-distribution-{stream},
diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
index c3ee0b48d7..1f457346ec 100644
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
@@ -38,7 +38,8 @@
                        odl-restconf-all'
 
     # Robot custom options
-    robot-options: '-v ODL_VERSION:{stream}'
+    robot-options: ''
+
 
     # Trigger jobs (upstream dependencies)
     trigger-jobs: 'groupbasedpolicy-distribution-{stream},
diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml
index c29e5dc3c1..25fdba1f88 100644
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml
@@ -32,7 +32,7 @@
     install-features: 'odl-groupbasedpolicy-ofoverlay,odl-groupbasedpolicy-ui,odl-restconf-all'
 
     # Robot custom options
-    robot-options: '-v ODL_VERSION:{stream}'
+    robot-options: ''
 
     # Trigger jobs (upstream dependencies)
     trigger-jobs: 'neutron-distribution-{stream},
diff --git a/jjb/tsdr/tsdr-csit-hbase.yaml b/jjb/tsdr/tsdr-csit-hbase.yaml
index f348246a7d..e75bbb64c7 100644
--- a/jjb/tsdr/tsdr-csit-hbase.yaml
+++ b/jjb/tsdr/tsdr-csit-hbase.yaml
@@ -32,7 +32,7 @@
     install-features: 'odl-restconf,odl-tsdr-hbase,odl-tsdr-openflow-statistics-collector,odl-tsdr-netflow-statistics-collector,odl-tsdr-syslog-collector'
 
     # Robot custom options
-    robot-options: '-v ODL_VERSION:master'
+    robot-options: ''
 
     # Trigger jobs (upstream dependencies)
     trigger-jobs: 'openflowjava-distribution-{stream},openflowplugin-distribution-{stream},tsdr-distribution-{stream}'
diff --git a/jjb/tsdr/tsdr-csit-hsqldb.yaml b/jjb/tsdr/tsdr-csit-hsqldb.yaml
index 63718986d3..85c6060e42 100644
--- a/jjb/tsdr/tsdr-csit-hsqldb.yaml
+++ b/jjb/tsdr/tsdr-csit-hsqldb.yaml
@@ -32,7 +32,7 @@
     install-features: 'odl-restconf,odl-tsdr-hsqldb,odl-tsdr-openflow-statistics-collector,odl-tsdr-netflow-statistics-collector,odl-tsdr-syslog-collector'
 
     # Robot custom options
-    robot-options: '-v ODL_VERSION:master'
+    robot-options: ''
 
     # Trigger jobs (upstream dependencies)
     trigger-jobs: 'openflowjava-distribution-{stream},openflowplugin-distribution-{stream},tsdr-distribution-{stream}'