From 9286d724ea551152402d53d0e428cdde4c8515e9 Mon Sep 17 00:00:00 2001 From: Peter Gubka Date: Fri, 16 Dec 2016 10:03:39 +0100 Subject: [PATCH] Remove netconf-connecter from usage in carbon for ingest-mixed Instead odl-netconf-topology feature is used and ${USE_NETCONF_CONNECTOR} is set to False. Change-Id: I8a87beb4a13a6e277515db61d6c589bbbd3c3a6c Signed-off-by: Peter Gubka --- jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml index edf86e734..16819f706 100644 --- a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml @@ -58,9 +58,13 @@ - boron: branch: 'stable/boron' jre: 'openjdk8' + install-features: 'odl-restconf,odl-bgpcep-bgp-all,odl-bgpcep-bgp,odl-bgpcep-data-change-counter,odl-netconf-connector-all' + robot-options: '-v USE_NETCONF_CONNECTOR:True -v COUNT:1000000 -v INSERT:10 -v WITHDRAW:9 -v PREFILL:10 -v UPDATE:single -v TEST_DURATION_MULTIPLIER:4' - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' + install-features: 'odl-restconf,odl-bgpcep-bgp-all,odl-bgpcep-bgp,odl-bgpcep-data-change-counter,odl-netconf-connector-all' + robot-options: '-v USE_NETCONF_CONNECTOR:True -v COUNT:1000000 -v INSERT:10 -v WITHDRAW:9 -v PREFILL:10 -v UPDATE:single -v TEST_DURATION_MULTIPLIER:4' install: - only: @@ -69,11 +73,11 @@ scope: 'all' # Features to install - install-features: 'odl-restconf,odl-bgpcep-bgp-all,odl-bgpcep-bgp,odl-bgpcep-data-change-counter,odl-netconf-connector-all' + install-features: 'odl-restconf,odl-bgpcep-bgp-all,odl-bgpcep-bgp,odl-bgpcep-data-change-counter,odl-netconf-topology' # Robot custom options # Increase the TEST_DURATION_MULTIPLIER if the test runs in slower test environment or more complex scenario is chosen - robot-options: '-v USE_NETCONF_CONNECTOR:True -v COUNT:1000000 -v INSERT:10 -v WITHDRAW:9 -v PREFILL:10 -v UPDATE:single -v TEST_DURATION_MULTIPLIER:4' + robot-options: '-v USE_NETCONF_CONNECTOR:False -v COUNT:1000000 -v INSERT:10 -v WITHDRAW:9 -v PREFILL:10 -v UPDATE:single -v TEST_DURATION_MULTIPLIER:4' # Trigger jobs (daily) schedule: 'H H * * *' -- 2.36.6