From c665428cc075dff3b5256a543c37441772b13125 Mon Sep 17 00:00:00 2001 From: lbuckuli Date: Thu, 13 Oct 2016 13:48:40 +0000 Subject: [PATCH] Remove the setting of ODL_VERSION from robot parameters Change-Id: I54fae0f36f8d727867402eee24d54ab5e2e06274 Signed-off-by: lbuckuli Signed-off-by: Peter Gubka --- jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml | 2 +- jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml | 3 ++- jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml | 2 +- jjb/tsdr/tsdr-csit-hbase.yaml | 2 +- jjb/tsdr/tsdr-csit-hsqldb.yaml | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml index a05c84231..4a7297738 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 c3ee0b48d..1f457346e 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 c29e5dc3c..25fdba1f8 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 f348246a7..e75bbb64c 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 63718986d..85c6060e4 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}' -- 2.36.6