From 6ee6113bf1481d18afd435718cf021cbab6deba2 Mon Sep 17 00:00:00 2001 From: Thanh Ha Date: Mon, 8 Aug 2016 20:51:56 -0400 Subject: [PATCH] Create Carbon jobs for csit Change-Id: I760c6a8d7cf3244c8bba37f4d41c03b75ee00a29 Signed-off-by: Thanh Ha --- jjb/aaa/aaa-csit-authn.yaml | 5 ++++- jjb/aaa/aaa-csit-idmlite.yaml | 5 ++++- jjb/alto/alto-csit-setup.yaml | 5 ++++- jjb/armoury/armoury-csit-basic.yaml | 5 ++++- jjb/autorelease/autorelease-projects.yaml | 7 ++++++- jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml | 5 ++++- jjb/bgpcep/bgpcep-csit-bgpclustering.yaml | 5 ++++- jjb/bgpcep/bgpcep-csit-throughpcep.yaml | 5 ++++- jjb/bgpcep/bgpcep-csit-userfeatures.yaml | 5 ++++- jjb/bgpcep/bgpcep-pcepy.yaml | 4 +++- jjb/capwap/capwap-csit-ac.yaml | 5 ++++- jjb/centinel/centinel-csit-basic.yaml | 5 ++++- jjb/controller/controller-csit-akka1.yaml | 5 ++++- .../controller-csit-clustering.yaml | 5 ++++- .../controller-csit-rest-cars-perf.yaml | 5 ++++- .../controller-csit-rest-clust-cars-perf.yaml | 5 ++++- jjb/didm/didm-csit-discovery.yaml | 5 ++++- jjb/docs/docs-rtd.yaml | 4 +++- jjb/eman/eman-csit-model.yaml | 5 ++++- ...groupbasedpolicy-csit-1node-openstack.yaml | 6 +++++- .../groupbasedpolicy-csit-3node.yaml | 5 ++++- .../groupbasedpolicy-csit-6node.yaml | 5 ++++- .../groupbasedpolicy-csit-clustering.yaml | 5 ++++- .../distribution-csit-userfeatures.yaml | 5 ++++- jjb/iotdm/iotdm-csit-basic.yaml | 5 ++++- .../l2switch-csit-host-scalability-daily.yaml | 5 ++++- jjb/l2switch/l2switch-csit-scalability.yaml | 5 ++++- jjb/l2switch/l2switch-csit-switch.yaml | 5 ++++- jjb/lacp/lacp-csit-lacp.yaml | 5 ++++- .../lispflowmapping-csit-msmr.yaml | 5 ++++- .../lispflowmapping-csit-performance.yaml | 5 ++++- jjb/mdsal/mdsal-csit-bindingv1.yaml | 6 +++++- .../mdsal-csit-periodic-dsbenchmark.yaml | 5 ++++- .../messaging4transport-csit-basic.yaml | 5 ++++- jjb/natapp/natapp-csit-basic.yaml | 6 ++++-- jjb/nemo/nemo-csit-engine.yaml | 5 ++++- jjb/netconf/netconf-clustering-scale.yaml | 5 ++++- jjb/netconf/netconf-clustering.yaml | 5 ++++- jjb/netconf/netconf-scale.yaml | 5 ++++- jjb/netconf/netconf-userfeatures.yaml | 5 ++++- jjb/netide/netide-csit-basic.yaml | 5 ++++- .../netvirt-csit-1node-multi-openstack.yaml | 5 ++++- .../netvirt-csit-3node-multi-openstack.yaml | 5 ++++- jjb/netvirt/netvirt-csit-clustering.yaml | 5 ++++- jjb/netvirt/netvirt-csit.yaml | 5 ++++- ...vpnservice-csit-1node-multi-openstack.yaml | 5 ++++- ...vpnservice-csit-3node-multi-openstack.yaml | 5 ++++- .../netvirt-vpnservice-patch-test.yaml | 8 +++++++- jjb/nic/nic-csit-basic.yaml | 5 ++++- jjb/nic/nic-csit-vtnrenderer.yaml | 5 ++++- jjb/ocpplugin/ocpplugin-csit-basic.yaml | 5 ++++- jjb/ocpplugin/ocpplugin-csit-scalability.yaml | 5 ++++- jjb/of-config/of-config-csit-basic.yaml | 5 ++++- ...t-bulk-matic-ds-daily-helium-redesign.yaml | 5 ++++- ...enflowplugin-csit-bulk-matic-ds-daily.yaml | 5 ++++- ...atic-clustering-daily-helium-redesign.yaml | 6 ++++-- ...ugin-csit-bulkomatic-clustering-daily.yaml | 6 ++++-- ...gin-csit-cbench-daily-helium-redesign.yaml | 5 ++++- .../openflowplugin-csit-cbench-daily.yaml | 5 ++++- ...it-cbench-performance-helium-redesign.yaml | 5 ++++- ...penflowplugin-csit-cbench-performance.yaml | 5 ++++- ...lugin-csit-clustering-helium-redesign.yaml | 6 ++++-- .../openflowplugin-csit-clustering.yaml | 6 ++++-- ...it-config-performance-helium-redesign.yaml | 6 ++++-- ...penflowplugin-csit-config-performance.yaml | 6 ++++-- ...in-csit-flow-services-helium-redesign.yaml | 5 ++++- .../openflowplugin-csit-flow-services.yaml | 5 ++++- ...ink-scalability-daily-helium-redesign.yaml | 5 ++++- ...lowplugin-csit-link-scalability-daily.yaml | 5 ++++- ...plugin-csit-longevity-helium-redesign.yaml | 5 ++++- .../openflowplugin-csit-longevity.yaml | 5 ++++- ...pc-time-measure-daily-helium-redesign.yaml | 5 ++++- ...lowplugin-csit-rpc-time-measure-daily.yaml | 5 ++++- ...sit-scalability-daily-helium-redesign.yaml | 5 ++++- ...openflowplugin-csit-scalability-daily.yaml | 5 ++++- ...ugin-csit-scalability-helium-redesign.yaml | 5 ++++- .../openflowplugin-csit-scalability.yaml | 5 ++++- ...tats-collection-daily-helium-redesign.yaml | 5 ++++- ...gin-csit-scale-stats-collection-daily.yaml | 5 ++++- ...-sw-scalability-daily-helium-redesign.yaml | 5 ++++- ...nflowplugin-csit-sw-scalability-daily.yaml | 5 ++++- .../openflowplugin-patch-test.yaml | 19 +++++++++++++++++-- jjb/ovsdb/ovsdb-csit-clustering.yaml | 5 ++++- jjb/ovsdb/ovsdb-csit-scalability-daily.yaml | 5 ++++- jjb/ovsdb/ovsdb-csit-southbound.yaml | 5 ++++- jjb/ovsdb/ovsdb-patch-test.yaml | 12 ++++++++++-- jjb/packetcable/packetcable-csit-pcmm.yaml | 5 ++++- .../sdninterfaceapp-csit-basic.yaml | 5 ++++- jjb/sfc/sfc-csit-clustering.yaml | 5 ++++- jjb/sfc/sfc-csit-rest-basic.yaml | 5 ++++- jjb/snmp/snmp-csit-basic.yaml | 5 ++++- jjb/sxp/sxp-csit-basic.yaml | 5 ++++- jjb/sxp/sxp-csit-filtering.yaml | 5 ++++- jjb/sxp/sxp-csit-topology.yaml | 5 ++++- ...opoprocessing-csit-topology-operation.yaml | 5 ++++- jjb/tsdr/tsdr-csit-cassandra.yaml | 5 ++++- jjb/tsdr/tsdr-csit-hbase.yaml | 5 ++++- jjb/tsdr/tsdr-csit-hsqldb.yaml | 5 ++++- jjb/unimgr/unimgr-csit-basic.yaml | 5 ++++- jjb/usc/usc-csit-channel.yaml | 5 ++++- jjb/usc/usc-csit-tcp.yaml | 5 ++++- jjb/usecplugin/usecplugin-csit-basic.yaml | 6 ++++-- .../vpnservice-csit-vpnservice.yaml | 5 ++++- jjb/vtn/vtn-csit-3node-manager.yaml | 5 ++++- jjb/vtn/vtn-csit-coordinator.yaml | 5 ++++- jjb/vtn/vtn-csit-manager.yaml | 5 ++++- jjb/vtn/vtn-manager-csit-1node-openstack.yaml | 5 ++++- 107 files changed, 452 insertions(+), 117 deletions(-) diff --git a/jjb/aaa/aaa-csit-authn.yaml b/jjb/aaa/aaa-csit-authn.yaml index 75261fe47..2870b2401 100644 --- a/jjb/aaa/aaa-csit-authn.yaml +++ b/jjb/aaa/aaa-csit-authn.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' diff --git a/jjb/aaa/aaa-csit-idmlite.yaml b/jjb/aaa/aaa-csit-idmlite.yaml index 97aac93f3..3558d90de 100644 --- a/jjb/aaa/aaa-csit-idmlite.yaml +++ b/jjb/aaa/aaa-csit-idmlite.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' diff --git a/jjb/alto/alto-csit-setup.yaml b/jjb/alto/alto-csit-setup.yaml index e55028614..acb999d8a 100644 --- a/jjb/alto/alto-csit-setup.yaml +++ b/jjb/alto/alto-csit-setup.yaml @@ -11,9 +11,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' diff --git a/jjb/armoury/armoury-csit-basic.yaml b/jjb/armoury/armoury-csit-basic.yaml index dd694f9ee..5044d9dde 100644 --- a/jjb/armoury/armoury-csit-basic.yaml +++ b/jjb/armoury/armoury-csit-basic.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml index 07799ed2e..ef8d3eb01 100644 --- a/jjb/autorelease/autorelease-projects.yaml +++ b/jjb/autorelease/autorelease-projects.yaml @@ -7,9 +7,14 @@ - 'autorelease-site-verify-{stream}' stream: + - carbon: + next-release-tag: Carbon + branch: 'master' + jdk: 'openjdk8' + integration-test: carbon - boron: next-release-tag: Boron - branch: 'master' + branch: 'stable/boron' jdk: 'openjdk8' integration-test: boron - beryllium: diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml index 531e0415c..b66f9e9db 100644 --- a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml @@ -11,9 +11,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml index 8d55be0bd..536b29a70 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml @@ -11,9 +11,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' diff --git a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml index c7b89292a..fd78b28d0 100644 --- a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml +++ b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml @@ -11,9 +11,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' diff --git a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml index 1c35df72e..94e867bea 100644 --- a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml +++ b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' diff --git a/jjb/bgpcep/bgpcep-pcepy.yaml b/jjb/bgpcep/bgpcep-pcepy.yaml index 2bda04a88..551e0395d 100644 --- a/jjb/bgpcep/bgpcep-pcepy.yaml +++ b/jjb/bgpcep/bgpcep-pcepy.yaml @@ -6,8 +6,10 @@ # stream: release stream (eg. stable-lithium or beryllium) # branch: git branch (eg. stable/lithium or master) stream: - - boron: + - carbon: branch: 'master' + - boron: + branch: 'stable/boron' - beryllium: branch: 'stable/beryllium' - stable-lithium: diff --git a/jjb/capwap/capwap-csit-ac.yaml b/jjb/capwap/capwap-csit-ac.yaml index 0a734bfa0..7300bce14 100644 --- a/jjb/capwap/capwap-csit-ac.yaml +++ b/jjb/capwap/capwap-csit-ac.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' diff --git a/jjb/centinel/centinel-csit-basic.yaml b/jjb/centinel/centinel-csit-basic.yaml index 0b62e97a9..d7f754c7f 100644 --- a/jjb/centinel/centinel-csit-basic.yaml +++ b/jjb/centinel/centinel-csit-basic.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' diff --git a/jjb/controller/controller-csit-akka1.yaml b/jjb/controller/controller-csit-akka1.yaml index 7da6caf1f..74c1e9366 100644 --- a/jjb/controller/controller-csit-akka1.yaml +++ b/jjb/controller/controller-csit-akka1.yaml @@ -11,9 +11,12 @@ # Project branches. Boron for actual testing, Beryllium for sanity. stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' diff --git a/jjb/controller/controller-csit-clustering.yaml b/jjb/controller/controller-csit-clustering.yaml index d4e05e217..cc5a46b8c 100644 --- a/jjb/controller/controller-csit-clustering.yaml +++ b/jjb/controller/controller-csit-clustering.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' diff --git a/jjb/controller/controller-csit-rest-cars-perf.yaml b/jjb/controller/controller-csit-rest-cars-perf.yaml index 0ac92e7e4..2cc5dc825 100644 --- a/jjb/controller/controller-csit-rest-cars-perf.yaml +++ b/jjb/controller/controller-csit-rest-cars-perf.yaml @@ -11,9 +11,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' diff --git a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml index 453dbffd1..e2b1932ce 100644 --- a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml +++ b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml @@ -11,9 +11,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' diff --git a/jjb/didm/didm-csit-discovery.yaml b/jjb/didm/didm-csit-discovery.yaml index cdcecae52..6abc1f212 100644 --- a/jjb/didm/didm-csit-discovery.yaml +++ b/jjb/didm/didm-csit-discovery.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' diff --git a/jjb/docs/docs-rtd.yaml b/jjb/docs/docs-rtd.yaml index e9f1b4921..edfbb7c48 100644 --- a/jjb/docs/docs-rtd.yaml +++ b/jjb/docs/docs-rtd.yaml @@ -5,8 +5,10 @@ - 'docs-verify-rtd-{stream}' stream: - - boron: + - carbon: branch: 'master' + - boron: + branch: 'stable/boron' - beryllium: branch: 'stable/beryllium' diff --git a/jjb/eman/eman-csit-model.yaml b/jjb/eman/eman-csit-model.yaml index d9844866c..9f7d2c65a 100644 --- a/jjb/eman/eman-csit-model.yaml +++ b/jjb/eman/eman-csit-model.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' install: - only: diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml index 107ab5ade..6657f82c3 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml @@ -10,10 +10,14 @@ functionality: 'openstack' stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' + install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf' - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml index bc427b4fe..7f146a273 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml index ff13ecb1f..4b9d9680d 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml index 245ce43bb..2833c0609 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' diff --git a/jjb/integration/distribution/distribution-csit-userfeatures.yaml b/jjb/integration/distribution/distribution-csit-userfeatures.yaml index c2acf2b51..745e7ff06 100644 --- a/jjb/integration/distribution/distribution-csit-userfeatures.yaml +++ b/jjb/integration/distribution/distribution-csit-userfeatures.yaml @@ -11,9 +11,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' # TODO: Add Beryllium when everything is backported there. diff --git a/jjb/iotdm/iotdm-csit-basic.yaml b/jjb/iotdm/iotdm-csit-basic.yaml index c7dfdc4fa..36d0ed742 100644 --- a/jjb/iotdm/iotdm-csit-basic.yaml +++ b/jjb/iotdm/iotdm-csit-basic.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' diff --git a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml index 70c60fc7a..571843202 100644 --- a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml +++ b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml @@ -11,9 +11,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' diff --git a/jjb/l2switch/l2switch-csit-scalability.yaml b/jjb/l2switch/l2switch-csit-scalability.yaml index 4382b6b42..131fbea00 100644 --- a/jjb/l2switch/l2switch-csit-scalability.yaml +++ b/jjb/l2switch/l2switch-csit-scalability.yaml @@ -11,9 +11,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' diff --git a/jjb/l2switch/l2switch-csit-switch.yaml b/jjb/l2switch/l2switch-csit-switch.yaml index 970751c70..2e8bbd71f 100644 --- a/jjb/l2switch/l2switch-csit-switch.yaml +++ b/jjb/l2switch/l2switch-csit-switch.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' diff --git a/jjb/lacp/lacp-csit-lacp.yaml b/jjb/lacp/lacp-csit-lacp.yaml index 1d3d1302b..c2e1c4b50 100644 --- a/jjb/lacp/lacp-csit-lacp.yaml +++ b/jjb/lacp/lacp-csit-lacp.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' diff --git a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml index 1c8d6a142..162b0ff06 100644 --- a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml +++ b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' diff --git a/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml b/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml index c76676d0a..5efc332b6 100644 --- a/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml +++ b/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml @@ -11,9 +11,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' - beryllium: branch: 'stable/beryllium' jre: 'openjdk8' diff --git a/jjb/mdsal/mdsal-csit-bindingv1.yaml b/jjb/mdsal/mdsal-csit-bindingv1.yaml index 278c23e81..5335da924 100644 --- a/jjb/mdsal/mdsal-csit-bindingv1.yaml +++ b/jjb/mdsal/mdsal-csit-bindingv1.yaml @@ -11,10 +11,14 @@ # Project branches. Boron for actual testing, Beryllium for sanity. stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' robot-options: '-v JAVA_OPTIONS:-Xmx6656m' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' + robot-options: '-v JAVA_OPTIONS:-Xmx6656m' - beryllium: branch: 'stable/beryllium' diff --git a/jjb/mdsal/mdsal-csit-periodic-dsbenchmark.yaml b/jjb/mdsal/mdsal-csit-periodic-dsbenchmark.yaml index 263893758..948b809ce 100644 --- a/jjb/mdsal/mdsal-csit-periodic-dsbenchmark.yaml +++ b/jjb/mdsal/mdsal-csit-periodic-dsbenchmark.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' diff --git a/jjb/messaging4transport/messaging4transport-csit-basic.yaml b/jjb/messaging4transport/messaging4transport-csit-basic.yaml index 91858970f..f2a3357df 100644 --- a/jjb/messaging4transport/messaging4transport-csit-basic.yaml +++ b/jjb/messaging4transport/messaging4transport-csit-basic.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' diff --git a/jjb/natapp/natapp-csit-basic.yaml b/jjb/natapp/natapp-csit-basic.yaml index 72620136b..a6d246f91 100644 --- a/jjb/natapp/natapp-csit-basic.yaml +++ b/jjb/natapp/natapp-csit-basic.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' install: - only: @@ -30,4 +33,3 @@ # Trigger jobs (upstream dependencies) trigger-jobs: 'openflowplugin-distribution-{stream},natapp-distribution-{stream}' - diff --git a/jjb/nemo/nemo-csit-engine.yaml b/jjb/nemo/nemo-csit-engine.yaml index c49547c49..dc6a21119 100644 --- a/jjb/nemo/nemo-csit-engine.yaml +++ b/jjb/nemo/nemo-csit-engine.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' diff --git a/jjb/netconf/netconf-clustering-scale.yaml b/jjb/netconf/netconf-clustering-scale.yaml index 74528bd06..751ee7024 100644 --- a/jjb/netconf/netconf-clustering-scale.yaml +++ b/jjb/netconf/netconf-clustering-scale.yaml @@ -11,9 +11,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' diff --git a/jjb/netconf/netconf-clustering.yaml b/jjb/netconf/netconf-clustering.yaml index de0d01ad9..dc8aa3d06 100644 --- a/jjb/netconf/netconf-clustering.yaml +++ b/jjb/netconf/netconf-clustering.yaml @@ -11,9 +11,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' diff --git a/jjb/netconf/netconf-scale.yaml b/jjb/netconf/netconf-scale.yaml index 48cb63b9b..b1f9b4819 100644 --- a/jjb/netconf/netconf-scale.yaml +++ b/jjb/netconf/netconf-scale.yaml @@ -11,9 +11,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' diff --git a/jjb/netconf/netconf-userfeatures.yaml b/jjb/netconf/netconf-userfeatures.yaml index 77692ee60..93f1cdb6b 100644 --- a/jjb/netconf/netconf-userfeatures.yaml +++ b/jjb/netconf/netconf-userfeatures.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' diff --git a/jjb/netide/netide-csit-basic.yaml b/jjb/netide/netide-csit-basic.yaml index d347c0dd2..436170333 100644 --- a/jjb/netide/netide-csit-basic.yaml +++ b/jjb/netide/netide-csit-basic.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' diff --git a/jjb/netvirt/netvirt-csit-1node-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-1node-multi-openstack.yaml index a2f96288f..5927d2911 100644 --- a/jjb/netvirt/netvirt-csit-1node-multi-openstack.yaml +++ b/jjb/netvirt/netvirt-csit-1node-multi-openstack.yaml @@ -10,9 +10,12 @@ functionality: 'openstack' stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' diff --git a/jjb/netvirt/netvirt-csit-3node-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-3node-multi-openstack.yaml index f4a4d8d76..fc1c774a5 100644 --- a/jjb/netvirt/netvirt-csit-3node-multi-openstack.yaml +++ b/jjb/netvirt/netvirt-csit-3node-multi-openstack.yaml @@ -10,9 +10,12 @@ functionality: 'openstack' stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' diff --git a/jjb/netvirt/netvirt-csit-clustering.yaml b/jjb/netvirt/netvirt-csit-clustering.yaml index d29217e85..b5ce68817 100644 --- a/jjb/netvirt/netvirt-csit-clustering.yaml +++ b/jjb/netvirt/netvirt-csit-clustering.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' diff --git a/jjb/netvirt/netvirt-csit.yaml b/jjb/netvirt/netvirt-csit.yaml index d2f8c15cd..51c0a5648 100644 --- a/jjb/netvirt/netvirt-csit.yaml +++ b/jjb/netvirt/netvirt-csit.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' diff --git a/jjb/netvirt/netvirt-vpnservice-csit-1node-multi-openstack.yaml b/jjb/netvirt/netvirt-vpnservice-csit-1node-multi-openstack.yaml index 53cf4584a..fac01da37 100644 --- a/jjb/netvirt/netvirt-vpnservice-csit-1node-multi-openstack.yaml +++ b/jjb/netvirt/netvirt-vpnservice-csit-1node-multi-openstack.yaml @@ -10,9 +10,12 @@ functionality: 'openstack' stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' openstack: - mitaka: diff --git a/jjb/netvirt/netvirt-vpnservice-csit-3node-multi-openstack.yaml b/jjb/netvirt/netvirt-vpnservice-csit-3node-multi-openstack.yaml index f06abf401..876f09993 100644 --- a/jjb/netvirt/netvirt-vpnservice-csit-3node-multi-openstack.yaml +++ b/jjb/netvirt/netvirt-vpnservice-csit-3node-multi-openstack.yaml @@ -10,9 +10,12 @@ functionality: 'openstack' stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' openstack: - mitaka: diff --git a/jjb/netvirt/netvirt-vpnservice-patch-test.yaml b/jjb/netvirt/netvirt-vpnservice-patch-test.yaml index 4e9b6fecc..b5b2df7f9 100644 --- a/jjb/netvirt/netvirt-vpnservice-patch-test.yaml +++ b/jjb/netvirt/netvirt-vpnservice-patch-test.yaml @@ -8,8 +8,14 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jdk: 'openjdk8' csit-list: > netvirt-vpnservice-csit-1node-openstack-mitaka-openstack-{stream} + + - boron: + branch: 'stable/boron' + jdk: 'openjdk8' + csit-list: > + netvirt-vpnservice-csit-1node-openstack-mitaka-openstack-{stream} diff --git a/jjb/nic/nic-csit-basic.yaml b/jjb/nic/nic-csit-basic.yaml index d595e54dc..636fe1787 100644 --- a/jjb/nic/nic-csit-basic.yaml +++ b/jjb/nic/nic-csit-basic.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' diff --git a/jjb/nic/nic-csit-vtnrenderer.yaml b/jjb/nic/nic-csit-vtnrenderer.yaml index 30697dab8..79855c405 100644 --- a/jjb/nic/nic-csit-vtnrenderer.yaml +++ b/jjb/nic/nic-csit-vtnrenderer.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' diff --git a/jjb/ocpplugin/ocpplugin-csit-basic.yaml b/jjb/ocpplugin/ocpplugin-csit-basic.yaml index a7c1e96a1..0d00827bc 100644 --- a/jjb/ocpplugin/ocpplugin-csit-basic.yaml +++ b/jjb/ocpplugin/ocpplugin-csit-basic.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' install: - only: diff --git a/jjb/ocpplugin/ocpplugin-csit-scalability.yaml b/jjb/ocpplugin/ocpplugin-csit-scalability.yaml index f37713bbc..12644994d 100644 --- a/jjb/ocpplugin/ocpplugin-csit-scalability.yaml +++ b/jjb/ocpplugin/ocpplugin-csit-scalability.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' install: - only: diff --git a/jjb/of-config/of-config-csit-basic.yaml b/jjb/of-config/of-config-csit-basic.yaml index 7a795ec76..acad73675 100644 --- a/jjb/of-config/of-config-csit-basic.yaml +++ b/jjb/of-config/of-config-csit-basic.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' diff --git a/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily-helium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily-helium-redesign.yaml index 6ddada5eb..42ff20a73 100644 --- a/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily-helium-redesign.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily-helium-redesign.yaml @@ -11,9 +11,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily.yaml index 1286a3b41..edd6e4b9e 100644 --- a/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily.yaml @@ -11,9 +11,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily-helium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily-helium-redesign.yaml index 26769765d..9b80fb562 100644 --- a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily-helium-redesign.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily-helium-redesign.yaml @@ -11,9 +11,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' install: - only: @@ -30,4 +33,3 @@ # Trigger jobs (upstream dependencies) trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}' - diff --git a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily.yaml index 6d3308c75..6ee46aa96 100644 --- a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily.yaml @@ -11,9 +11,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' install: - only: @@ -30,4 +33,3 @@ # Trigger jobs (upstream dependencies) trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}' - diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-daily-helium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-daily-helium-redesign.yaml index 2f9275f35..6468a1b3b 100644 --- a/jjb/openflowplugin/openflowplugin-csit-cbench-daily-helium-redesign.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-cbench-daily-helium-redesign.yaml @@ -11,9 +11,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml index e3ab2cc51..3260786da 100644 --- a/jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml @@ -11,9 +11,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-performance-helium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-performance-helium-redesign.yaml index 7185b67ff..1d76820be 100644 --- a/jjb/openflowplugin/openflowplugin-csit-cbench-performance-helium-redesign.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-cbench-performance-helium-redesign.yaml @@ -11,9 +11,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-performance.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-performance.yaml index ff8bd6570..18840b861 100644 --- a/jjb/openflowplugin/openflowplugin-csit-cbench-performance.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-cbench-performance.yaml @@ -11,9 +11,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-helium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-helium-redesign.yaml index 23803830b..2f1fe1307 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering-helium-redesign.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering-helium-redesign.yaml @@ -11,9 +11,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' install: - only: @@ -27,4 +30,3 @@ # Trigger jobs (upstream dependencies) trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}' - diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml index 2947c75cb..928beb429 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml @@ -11,9 +11,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' install: - only: @@ -27,4 +30,3 @@ # Trigger jobs (upstream dependencies) trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}' - diff --git a/jjb/openflowplugin/openflowplugin-csit-config-performance-helium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-config-performance-helium-redesign.yaml index ccd1dd4b2..a969e9ab8 100644 --- a/jjb/openflowplugin/openflowplugin-csit-config-performance-helium-redesign.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-config-performance-helium-redesign.yaml @@ -11,9 +11,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' install: - only: @@ -37,4 +40,3 @@ 02-plot-yaxis: 'seconds' 02-plot-group: 'Stats Collect Performance' 02-plot-data-file: 'times.csv' - diff --git a/jjb/openflowplugin/openflowplugin-csit-config-performance.yaml b/jjb/openflowplugin/openflowplugin-csit-config-performance.yaml index 3a9152863..c24df399e 100644 --- a/jjb/openflowplugin/openflowplugin-csit-config-performance.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-config-performance.yaml @@ -11,9 +11,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' install: - only: @@ -37,4 +40,3 @@ 02-plot-yaxis: 'seconds' 02-plot-group: 'Stats Collect Performance' 02-plot-data-file: 'times.csv' - diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services-helium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services-helium-redesign.yaml index 6205911fc..832afd7b0 100644 --- a/jjb/openflowplugin/openflowplugin-csit-flow-services-helium-redesign.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-flow-services-helium-redesign.yaml @@ -11,9 +11,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml index f7ceab262..212d3aa15 100644 --- a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml @@ -11,9 +11,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-helium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-helium-redesign.yaml index ad4dc476f..0e39cbec8 100644 --- a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-helium-redesign.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-helium-redesign.yaml @@ -11,9 +11,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml index 6181bb0e3..b9b9f3475 100644 --- a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml @@ -11,9 +11,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity-helium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity-helium-redesign.yaml index 24a8ca115..449a37fb4 100644 --- a/jjb/openflowplugin/openflowplugin-csit-longevity-helium-redesign.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-longevity-helium-redesign.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml index 38582d2d0..c34ee5be8 100644 --- a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily-helium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily-helium-redesign.yaml index d3d4760fc..d904beb3a 100644 --- a/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily-helium-redesign.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily-helium-redesign.yaml @@ -11,9 +11,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily.yaml index d43ce8c15..1fd2c9ab0 100644 --- a/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily.yaml @@ -11,9 +11,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability-daily-helium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability-daily-helium-redesign.yaml index f3021cfac..ad4504ca0 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scalability-daily-helium-redesign.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scalability-daily-helium-redesign.yaml @@ -11,9 +11,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability-daily.yaml index 1e04849ca..32819da6a 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scalability-daily.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scalability-daily.yaml @@ -11,9 +11,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability-helium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability-helium-redesign.yaml index 42bc8d4d9..6b4b7abcb 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scalability-helium-redesign.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scalability-helium-redesign.yaml @@ -11,9 +11,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability.yaml index 1b6dd8ca6..9e31b0a3f 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scalability.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scalability.yaml @@ -11,9 +11,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-helium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-helium-redesign.yaml index 065e76f7d..dd00f6511 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-helium-redesign.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-helium-redesign.yaml @@ -11,9 +11,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml index 2f27eb0a5..033fe811b 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml @@ -11,9 +11,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-helium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-helium-redesign.yaml index 5e7e28fc7..a4013091b 100644 --- a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-helium-redesign.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-helium-redesign.yaml @@ -11,9 +11,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml index b09c59a73..40d609c08 100644 --- a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml @@ -11,9 +11,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-patch-test.yaml b/jjb/openflowplugin/openflowplugin-patch-test.yaml index 9672802f2..b1d2c10d2 100644 --- a/jjb/openflowplugin/openflowplugin-patch-test.yaml +++ b/jjb/openflowplugin/openflowplugin-patch-test.yaml @@ -8,7 +8,7 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jdk: 'openjdk8' csit-list: > @@ -24,6 +24,22 @@ openflowplugin-csit-3node-clustering-only-{stream}, openflowplugin-csit-3node-clustering-helium-redesign-only-{stream} + - boron: + branch: 'stable/boron' + jdk: 'openjdk8' + csit-list: > + openflowplugin-csit-1node-flow-services-only-{stream}, + openflowplugin-csit-1node-flow-services-helium-redesign-only-{stream}, + openflowplugin-csit-1node-flow-services-all-{stream}, + openflowplugin-csit-1node-scalability-only-{stream}, + openflowplugin-csit-1node-scalability-helium-redesign-only-{stream}, + openflowplugin-csit-1node-cbench-performance-only-{stream}, + openflowplugin-csit-1node-cbench-performance-helium-redesign-only-{stream}, + openflowplugin-csit-1node-config-performance-only-{stream}, + openflowplugin-csit-1node-config-performance-helium-redesign-only-{stream}, + openflowplugin-csit-3node-clustering-only-{stream}, + openflowplugin-csit-3node-clustering-helium-redesign-only-{stream} + - beryllium: branch: 'stable/beryllium' jdk: 'openjdk7' @@ -39,4 +55,3 @@ openflowplugin-csit-1node-config-performance-lithium-redesign-only-{stream}, openflowplugin-csit-3node-clustering-only-{stream}, openflowplugin-csit-3node-clustering-lithium-redesign-only-{stream} - diff --git a/jjb/ovsdb/ovsdb-csit-clustering.yaml b/jjb/ovsdb/ovsdb-csit-clustering.yaml index e6aac723b..9282deddc 100644 --- a/jjb/ovsdb/ovsdb-csit-clustering.yaml +++ b/jjb/ovsdb/ovsdb-csit-clustering.yaml @@ -11,9 +11,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' diff --git a/jjb/ovsdb/ovsdb-csit-scalability-daily.yaml b/jjb/ovsdb/ovsdb-csit-scalability-daily.yaml index 54ce4ded5..9cfc0c3a8 100644 --- a/jjb/ovsdb/ovsdb-csit-scalability-daily.yaml +++ b/jjb/ovsdb/ovsdb-csit-scalability-daily.yaml @@ -11,9 +11,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' diff --git a/jjb/ovsdb/ovsdb-csit-southbound.yaml b/jjb/ovsdb/ovsdb-csit-southbound.yaml index c4f588bc7..f3f999a36 100644 --- a/jjb/ovsdb/ovsdb-csit-southbound.yaml +++ b/jjb/ovsdb/ovsdb-csit-southbound.yaml @@ -11,9 +11,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' diff --git a/jjb/ovsdb/ovsdb-patch-test.yaml b/jjb/ovsdb/ovsdb-patch-test.yaml index b625a322a..a61a6dac8 100644 --- a/jjb/ovsdb/ovsdb-patch-test.yaml +++ b/jjb/ovsdb/ovsdb-patch-test.yaml @@ -8,7 +8,7 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jdk: 'openjdk8' csit-list: > @@ -16,10 +16,18 @@ ovsdb-csit-1node-southbound-all-{stream}, ovsdb-csit-3node-clustering-only-{stream} + - boron: + branch: 'stable/boron' + jdk: 'openjdk8' + csit-list: > + ovsdb-csit-1node-southbound-only-{stream}, + ovsdb-csit-1node-southbound-all-{stream}, + ovsdb-csit-3node-clustering-only-{stream} + - beryllium: branch: 'stable/beryllium' jdk: 'openjdk7' csit-list: > ovsdb-csit-1node-southbound-only-{stream}, ovsdb-csit-1node-southbound-all-{stream}, - ovsdb-csit-3node-clustering-only-{stream} \ No newline at end of file + ovsdb-csit-3node-clustering-only-{stream} diff --git a/jjb/packetcable/packetcable-csit-pcmm.yaml b/jjb/packetcable/packetcable-csit-pcmm.yaml index 6ebd11f6b..357cbbb1a 100644 --- a/jjb/packetcable/packetcable-csit-pcmm.yaml +++ b/jjb/packetcable/packetcable-csit-pcmm.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' diff --git a/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml b/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml index 2c27cc4a3..26794a1da 100644 --- a/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml +++ b/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' diff --git a/jjb/sfc/sfc-csit-clustering.yaml b/jjb/sfc/sfc-csit-clustering.yaml index 63857fd08..a5694ea5d 100644 --- a/jjb/sfc/sfc-csit-clustering.yaml +++ b/jjb/sfc/sfc-csit-clustering.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' diff --git a/jjb/sfc/sfc-csit-rest-basic.yaml b/jjb/sfc/sfc-csit-rest-basic.yaml index d971eccca..039238c5c 100644 --- a/jjb/sfc/sfc-csit-rest-basic.yaml +++ b/jjb/sfc/sfc-csit-rest-basic.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' diff --git a/jjb/snmp/snmp-csit-basic.yaml b/jjb/snmp/snmp-csit-basic.yaml index 6bf6c0942..d776758d2 100644 --- a/jjb/snmp/snmp-csit-basic.yaml +++ b/jjb/snmp/snmp-csit-basic.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' diff --git a/jjb/sxp/sxp-csit-basic.yaml b/jjb/sxp/sxp-csit-basic.yaml index 182609865..e184c6b64 100644 --- a/jjb/sxp/sxp-csit-basic.yaml +++ b/jjb/sxp/sxp-csit-basic.yaml @@ -11,9 +11,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' diff --git a/jjb/sxp/sxp-csit-filtering.yaml b/jjb/sxp/sxp-csit-filtering.yaml index a92ff5dc4..a96419831 100644 --- a/jjb/sxp/sxp-csit-filtering.yaml +++ b/jjb/sxp/sxp-csit-filtering.yaml @@ -11,9 +11,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' diff --git a/jjb/sxp/sxp-csit-topology.yaml b/jjb/sxp/sxp-csit-topology.yaml index ee8714bd0..315635679 100644 --- a/jjb/sxp/sxp-csit-topology.yaml +++ b/jjb/sxp/sxp-csit-topology.yaml @@ -11,9 +11,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' diff --git a/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml b/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml index 0723848d7..759b1c897 100644 --- a/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml +++ b/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' diff --git a/jjb/tsdr/tsdr-csit-cassandra.yaml b/jjb/tsdr/tsdr-csit-cassandra.yaml index f8697733f..c8b2547ff 100644 --- a/jjb/tsdr/tsdr-csit-cassandra.yaml +++ b/jjb/tsdr/tsdr-csit-cassandra.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' diff --git a/jjb/tsdr/tsdr-csit-hbase.yaml b/jjb/tsdr/tsdr-csit-hbase.yaml index b4d834c40..f348246a7 100644 --- a/jjb/tsdr/tsdr-csit-hbase.yaml +++ b/jjb/tsdr/tsdr-csit-hbase.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' diff --git a/jjb/tsdr/tsdr-csit-hsqldb.yaml b/jjb/tsdr/tsdr-csit-hsqldb.yaml index fcffa322c..63718986d 100644 --- a/jjb/tsdr/tsdr-csit-hsqldb.yaml +++ b/jjb/tsdr/tsdr-csit-hsqldb.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' diff --git a/jjb/unimgr/unimgr-csit-basic.yaml b/jjb/unimgr/unimgr-csit-basic.yaml index 15e2f44bf..f92da132f 100644 --- a/jjb/unimgr/unimgr-csit-basic.yaml +++ b/jjb/unimgr/unimgr-csit-basic.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' diff --git a/jjb/usc/usc-csit-channel.yaml b/jjb/usc/usc-csit-channel.yaml index 3f207ef1c..723d998c1 100644 --- a/jjb/usc/usc-csit-channel.yaml +++ b/jjb/usc/usc-csit-channel.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' diff --git a/jjb/usc/usc-csit-tcp.yaml b/jjb/usc/usc-csit-tcp.yaml index 8d21c1f64..07251d07c 100644 --- a/jjb/usc/usc-csit-tcp.yaml +++ b/jjb/usc/usc-csit-tcp.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' diff --git a/jjb/usecplugin/usecplugin-csit-basic.yaml b/jjb/usecplugin/usecplugin-csit-basic.yaml index a611bead6..910cbab58 100644 --- a/jjb/usecplugin/usecplugin-csit-basic.yaml +++ b/jjb/usecplugin/usecplugin-csit-basic.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' @@ -33,4 +36,3 @@ # Trigger jobs (upstream dependencies) trigger-jobs: 'openflowplugin-distribution-{stream},usecplugin-distribution-{stream}' - diff --git a/jjb/vpnservice/vpnservice-csit-vpnservice.yaml b/jjb/vpnservice/vpnservice-csit-vpnservice.yaml index 753c57eed..b60525bb3 100644 --- a/jjb/vpnservice/vpnservice-csit-vpnservice.yaml +++ b/jjb/vpnservice/vpnservice-csit-vpnservice.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' diff --git a/jjb/vtn/vtn-csit-3node-manager.yaml b/jjb/vtn/vtn-csit-3node-manager.yaml index fcb3b743f..6a7d86d79 100644 --- a/jjb/vtn/vtn-csit-3node-manager.yaml +++ b/jjb/vtn/vtn-csit-3node-manager.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' install: - only: diff --git a/jjb/vtn/vtn-csit-coordinator.yaml b/jjb/vtn/vtn-csit-coordinator.yaml index 70da3aa9d..0daa0230e 100644 --- a/jjb/vtn/vtn-csit-coordinator.yaml +++ b/jjb/vtn/vtn-csit-coordinator.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' diff --git a/jjb/vtn/vtn-csit-manager.yaml b/jjb/vtn/vtn-csit-manager.yaml index 3248ac413..95c5058dd 100644 --- a/jjb/vtn/vtn-csit-manager.yaml +++ b/jjb/vtn/vtn-csit-manager.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' diff --git a/jjb/vtn/vtn-manager-csit-1node-openstack.yaml b/jjb/vtn/vtn-manager-csit-1node-openstack.yaml index 8f0409884..87f0a00b6 100644 --- a/jjb/vtn/vtn-manager-csit-1node-openstack.yaml +++ b/jjb/vtn/vtn-manager-csit-1node-openstack.yaml @@ -10,9 +10,12 @@ functionality: 'neutron' stream: - - boron: + - carbon: branch: 'master' jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' -- 2.36.6