Rework of streams/branches logic 59/24059/6
authorVratko Polak <vrpolak@cisco.com>
Tue, 7 Jul 2015 16:25:59 +0000 (18:25 +0200)
committerThanh Ha <thanh.ha@linuxfoundation.org>
Fri, 7 Aug 2015 16:09:25 +0000 (12:09 -0400)
This patch changes jobs names with 'master' to 'beryllium' and uses the
release stream as the job name and maps to the correct branch via the
branch setting in each job.

BRANCHES are no more, new segment of config file will look like this:
STREAMS:
- beryllium:
    branch: master
    jdks: openjdk8
- stable-lithium:
    branch: stable/lithium
    jdks: openjdk7,openjdk8
- stable-helium:
    branch: stable/helium
    jdks: openjdk7

Also rename integration job template patterns as follows:

    csit-verify ==> csit-verify-1node
    csit-1node-cds ==> csit-1node
    csit-periodic-1node-cds ==> csit-1node-periodic
    csit-3node-cds ==> csit-3node

More details in e-mail discussions:
https://lists.opendaylight.org/pipermail/release/2015-July/003139.html
https://lists.opendaylight.org/pipermail/integration-dev/2015-July/003796.html

Change-Id: I7a8fc92660f94fd9d5a06a7d7d3ff533dc7e3a70
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
115 files changed:
jjb-templates/daily.yaml
jjb-templates/distribution.yaml
jjb-templates/integration.yaml
jjb-templates/merge.yaml
jjb-templates/project.yaml
jjb-templates/verify.yaml
jjb/aaa/aaa-csit-authn-stable-helium.yaml
jjb/aaa/aaa-csit-authn.yaml
jjb/aaa/aaa.cfg
jjb/alto/alto.cfg
jjb/autorelease/autorelease-beryllium.yaml [moved from jjb/autorelease/autorelease-master.yaml with 94% similarity]
jjb/bgpcep/bgpcep-csit-userfeatures.yaml
jjb/bgpcep/bgpcep-python.yaml
jjb/bgpcep/bgpcep.cfg
jjb/capwap/capwap-csit-ac.yaml
jjb/capwap/capwap.cfg
jjb/controller/controller-csit-clustering.yaml
jjb/controller/controller-csit-netconf-stable-helium.yaml
jjb/controller/controller-csit-netconf.yaml
jjb/controller/controller-csit-nsf-stable-helium.yaml
jjb/controller/controller.cfg
jjb/coretutorials/coretutorials.cfg
jjb/defense4all/defense4all.cfg
jjb/didm/didm.cfg
jjb/discovery/discovery.cfg
jjb/dlux/dlux.cfg
jjb/docs/docs.cfg
jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml
jjb/groupbasedpolicy/groupbasedpolicy.cfg
jjb/integration/integration-csit-basic-stable-helium.yaml
jjb/integration/integration-csit-basic.yaml
jjb/integration/integration-jobs.yaml
jjb/integration/integration-python.yaml
jjb/integration/integration-templates.yaml
jjb/iotdm/iotdm-csit-basic.yaml
jjb/iotdm/iotdm.cfg
jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
jjb/l2switch/l2switch-csit-scalability.yaml
jjb/l2switch/l2switch-csit-switch-stable-helium.yaml
jjb/l2switch/l2switch-csit-switch.yaml
jjb/l2switch/l2switch.cfg
jjb/lacp/lacp-csit-lacp.yaml
jjb/lacp/lacp.cfg
jjb/lispflowmapping/lispflowmapping-csit-all-stable-helium.yaml
jjb/lispflowmapping/lispflowmapping-csit-all.yaml
jjb/lispflowmapping/lispflowmapping.cfg
jjb/nemo/nemo.cfg
jjb/neutron/neutron.cfg
jjb/nic/nic-csit-basic.yaml
jjb/nic/nic.cfg
jjb/odlparent/odlparent.cfg
jjb/openflowjava/openflowjava.cfg
jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily-lithium-redesign.yaml
jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily.yaml
jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml
jjb/openflowplugin/openflowplugin-csit-cbench-performance-lithium-redesign.yaml
jjb/openflowplugin/openflowplugin-csit-cbench-performance.yaml
jjb/openflowplugin/openflowplugin-csit-clustering.yaml
jjb/openflowplugin/openflowplugin-csit-config-performance-lithium-redesign.yaml
jjb/openflowplugin/openflowplugin-csit-config-performance.yaml
jjb/openflowplugin/openflowplugin-csit-flow-services-lithium-redesign.yaml
jjb/openflowplugin/openflowplugin-csit-flow-services-more-lithium-redesign.yaml
jjb/openflowplugin/openflowplugin-csit-flow-services-more.yaml
jjb/openflowplugin/openflowplugin-csit-flow-services-stable-helium.yaml
jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-lithium-redesign.yaml
jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml
jjb/openflowplugin/openflowplugin-csit-longevity-lithium-redesign.yaml
jjb/openflowplugin/openflowplugin-csit-longevity.yaml
jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily-lithium-redesign.yaml
jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily.yaml
jjb/openflowplugin/openflowplugin-csit-scalability-daily-lithium-redesign.yaml
jjb/openflowplugin/openflowplugin-csit-scalability-daily.yaml
jjb/openflowplugin/openflowplugin-csit-scalability-lithium-redesign.yaml
jjb/openflowplugin/openflowplugin-csit-scalability.yaml
jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-lithium-redesign.yaml
jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml
jjb/openflowplugin/openflowplugin-csit-statistics-basic-lithium-redesign.yaml
jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-lithium-redesign.yaml
jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml
jjb/openflowplugin/openflowplugin.cfg
jjb/ovsdb/ovsdb-csit-netvirt.yaml
jjb/ovsdb/ovsdb-csit-southbound.yaml
jjb/ovsdb/ovsdb.cfg
jjb/packetcable/packetcable.cfg
jjb/persistence/persistence.cfg
jjb/releng-defaults.yaml
jjb/reservation/reservation.cfg
jjb/sdninterfaceapp/sdninterfaceapp.cfg
jjb/sfc/sfc-python.yaml
jjb/sfc/sfc.cfg
jjb/snbi/snbi.cfg
jjb/snmp/snmp-csit-basic.yaml
jjb/snmp/snmp.cfg
jjb/snmp4sdn/snmp4sdn.cfg
jjb/sxp/sxp.cfg
jjb/tcpmd5/tcpmd5.cfg
jjb/toolkit/toolkit.cfg
jjb/topoprocessing/topoprocessing.cfg
jjb/tsdr/tsdr-csit-h2.yaml
jjb/tsdr/tsdr-csit-hbase.yaml
jjb/tsdr/tsdr.cfg
jjb/ttp/ttp.cfg
jjb/usc/usc-csit-channel.yaml
jjb/usc/usc.cfg
jjb/vpnservice/vpnservice-csit-vpnservice.yaml
jjb/vpnservice/vpnservice.cfg
jjb/vtn/vtn-csit-coordinator.yaml
jjb/vtn/vtn-csit-manager-stable-helium.yaml
jjb/vtn/vtn-csit-manager.yaml
jjb/vtn/vtn.cfg
jjb/yangtools/yangtools-verify.yaml
jjb/yangtools/yangtools.cfg
scripts/jjb-init-project.py
scripts/jjblib.py

index 7edf18a5c5ff48c4c38ce3a1edf5d800fad064bc..1751656716668904123ccab4a0de7fdb07ce32ce 100644 (file)
@@ -7,8 +7,8 @@
     # builder and pushes to Sonar analysis.
     #
     # Required Variables:
-    #     stream:    branch with - in place of / (eg. stable-helium)
-    #     branch:    branch (eg. stable/helium)
+    #     stream:    release stream (eg. stable-lithium or beryllium)
+    #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
     node: dynamic_verify
index b2a6db8fc962e887a8d1d037d33d640e588d21e4..fb2ed0517eb34ac92ff565d9ee9e9381b3cee574 100644 (file)
@@ -1,6 +1,10 @@
 - job-template:
     name: 'PROJECT-distribution-{stream}'
 
+    # Required variables:
+    #     stream:    release stream (eg. stable-lithium or beryllium)
+    #     branch:    git branch (eg. stable/lithium or master)
+
     project-type: maven
     node: dynamic_merge
     jdk: '{jdk}'
index 9af372c4d4b4cf65ae958949dda5ee153b1e6603..d6ff863ea02cd1c7dc5fc670f0550194b98d1e66 100644 (file)
@@ -9,8 +9,8 @@
     # is successfully built.
     #
     # Required Variables:
-    #     stream:    branch with - in place of / (eg. stable-helium)
-    #     branch:    branch (eg. stable/helium)
+    #     stream:    release stream (eg. stable-lithium or beryllium)
+    #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
     node: dynamic_merge
index c9591aca26c66cf12997df821c67e162788d2ece..334d41674973455bfc0bdb27dbe1dbe9c39f8df5 100644 (file)
@@ -7,8 +7,8 @@
     # and deploy artifacts to Nexus.
     #
     # Required Variables:
-    #     stream:    branch with - in place of / (eg. stable-helium)
-    #     branch:    branch (eg. stable/helium)
+    #     stream:    release stream (eg. stable-lithium or beryllium)
+    #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
     node: dynamic_merge
index cb621af2989e34b946f9b5698242135dadf4bd3f..0cb05d8b1c24cd7a2aef5dedbb63834f6a8274ce 100644 (file)
@@ -8,8 +8,8 @@
     jobs:
 JOB_TEMPLATES
 
-    # stream:    branch with - in place of / (eg. stable-helium)
-    # branch:    branch (eg. stable/helium)
+    # stream:    release stream (eg. stable-lithium or beryllium)
+    # branch:    git branch (eg. stable/lithium or master)
     STREAMS
     project: 'PROJECT'
 
index fbee70119952adda830f3a870cd8e440bdd045cf..2af97cd31179bf83fc1a785c3bb056bdc46a33d4 100644 (file)
@@ -6,8 +6,8 @@
     # The purpose of this job template is to setup a ODL verify job
     #
     # Required Variables:
-    #     stream:    branch with - in place of / (eg. stable-helium)
-    #     branch:    branch (eg. stable/helium)
+    #     stream:    release stream (eg. stable-lithium or beryllium)
+    #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: matrix
     node: matrix_master
index 8bb7f37eea06cf31e7f3ba92c11e5336a1029499..f1fe3275fc8289e2873292275b191dc2d55c11f9 100644 (file)
@@ -2,7 +2,7 @@
     name: aaa-csit-authn-stable-helium
     jobs:
         - '{project}-csit-1node-imds-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-{functionality}-{stream}'
+        - '{project}-csit-verify-1node-{functionality}-{stream}'
 
     # The project name
     project: 'aaa'
@@ -29,4 +29,3 @@
 
     # Trigger jobs (upstream dependencies)
     trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},aaa-distribution-{stream}'
-
index ac20bfacafe413b361a9638c27f14554cb0f458c..f9e669913643e29d2e1feb026c96b575a561de08 100644 (file)
@@ -1,8 +1,8 @@
 - project:
     name: aaa-csit-authn
     jobs:
-        - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-{functionality}-{stream}'
+        - '{project}-csit-1node-{functionality}-{install}-{stream}'
+        - '{project}-csit-verify-1node-{functionality}-{stream}'
 
     # The project name
     project: 'aaa'
@@ -12,7 +12,7 @@
 
     # Project branches
     stream:
-        - master:
+        - beryllium:
             branch: 'master'
         - stable-lithium:
             branch: 'stable/lithium'
@@ -31,4 +31,3 @@
 
     # Trigger jobs (upstream dependencies)
     trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},aaa-distribution-{stream}'
-
index 34336212bc92379976c18cf718903dafac81b15d..9e9a7ef03fd543a9f4193dd7bbf8dc95a9ee8654 100644 (file)
@@ -1,8 +1,11 @@
-BRANCHES:
-- master:
+STREAMS:
+- beryllium:
+    branch: master
     jdks: openjdk7
-- stable/helium:
+- stable-lithium:
+    branch: stable/lithium
     jdks: openjdk7
-- stable/lithium:
+- stable-helium:
+    branch: stable/helium
     jdks: openjdk7
 DEPENDENCIES: yangtools,controller
index f398810a6f4871de3c447cc247052f89440ad41b..ffa28fee1a3aa85301f355d21eada19ba7de0b2b 100644 (file)
@@ -1,6 +1,8 @@
-BRANCHES:
-- master:
+STREAMS:
+- beryllium:
+    branch: master
     jdks: openjdk7
-- stable/lithium:
+- stable-lithium:
+    branch: stable/lithium
     jdks: openjdk7
 DEPENDENCIES: controller,yangtools,odlparent,l2switch
similarity index 94%
rename from jjb/autorelease/autorelease-master.yaml
rename to jjb/autorelease/autorelease-beryllium.yaml
index e4a37d69b32063378b4e0a85af6e29842d8e39f6..54b8fac626b88aae47d876723c7fb2d62377c0f2 100644 (file)
@@ -1,16 +1,16 @@
-# Lithium build jobs
+# Beryllium build jobs
 
 - project:
-    name: autorelease-master
+    name: autorelease-beryllium
     jobs:
-        - 'autorelease-daily-master'
+        - 'autorelease-daily-beryllium'
 
     branch: 'master'
     project: 'releng/autorelease'
     jdk: 'openjdk7'
 
 - job-template:
-    name: 'autorelease-daily-master'
+    name: 'autorelease-daily-beryllium'
 
     project-type: maven
     node: dynamic_autorelease
index 8442d11dd63c18806b88859b8ca7f003eae794a6..da1e69c8a8727e4cc05beaabc276fd612b89a6c4 100644 (file)
@@ -1,8 +1,8 @@
 - project:
     name: bgpcep-csit-userfeatures
     jobs:
-        - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-{functionality}-{stream}'
+        - '{project}-csit-1node-{functionality}-{install}-{stream}'
+        - '{project}-csit-verify-1node-{functionality}-{stream}'
 
     # The project name
     project: 'bgpcep'
@@ -12,7 +12,7 @@
 
     # Project branches
     stream:
-        - master:
+        - beryllium:
             branch: 'master'
         - stable-lithium:
             branch: 'stable/lithium'
index 065669aeea18318542f25e9f31bf88ffc64df283..c7119d2d5cc5cd3a7dc223967cec5875946a82ac 100644 (file)
@@ -3,10 +3,10 @@
     jobs:
         - 'bgpcep-verify-python-{stream}'
 
-    # stream:    branch with - in place of / (eg. stable-helium)
-    # branch:    branch (eg. stable/helium)
+    # stream:    release stream (eg. stable-lithium or beryllium)
+    # branch:    git branch (eg. stable/lithium or master)
     stream:
-        - master:
+        - beryllium:
             branch: 'master'
         - stable-lithium:
             branch: 'stable/lithium'
@@ -22,8 +22,8 @@
     # The purpose of this job template is to setup a ODL verify job
     #
     # Required Variables:
-    #     stream:    branch with - in place of / (eg. stable-helium)
-    #     branch:    branch (eg. stable/helium)
+    #     stream:    release stream (eg. stable-lithium or beryllium)
+    #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: freestyle
     node: dynamic_verify
@@ -89,4 +89,3 @@
     publishers:
         - email-notification:
             email-prefix: '[bgpcep]'
-
index eef55629c6dfc1caa5cf1cab7d083915672f6ac3..fb51322679dfd5540ea3314bd82059e25dcb1a60 100644 (file)
@@ -1,10 +1,13 @@
-BRANCHES:
-- master:
+STREAMS:
+- beryllium:
+    branch: master
     jdks: openjdk7,openjdk8
-- stable/helium:
-    jdks: openjdk7
-- stable/lithium:
+- stable-lithium:
+    branch: stable/lithium
     jdks: openjdk7,openjdk8
+- stable-helium:
+    branch: stable/helium
+    jdks: openjdk7
 MVN_GOALS: -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean -DrepoBuild install javadoc:aggregate
 MVN_OPTS: -Xmx1024m -XX:MaxPermSize=256m
 DEPENDENCIES: odlparent,yangtools,controller,tcpmd5
index 84e978f93a951cf8dba1ccf952b987e7de51d888..49b2cf013c341f470544fd3d9c0c2dd88726aaa3 100644 (file)
@@ -1,8 +1,8 @@
 - project:
     name: capwap-csit-ac
     jobs:
-        - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-{functionality}-{stream}'
+        - '{project}-csit-1node-{functionality}-{install}-{stream}'
+        - '{project}-csit-verify-1node-{functionality}-{stream}'
 
     # The project name
     project: 'capwap'
@@ -12,7 +12,7 @@
 
     # Project branches
     stream:
-        - master:
+        - beryllium:
             branch: 'master'
         - stable-lithium:
             branch: 'stable/lithium'
index 1f570c101d1d3800569454f6ad8494135fc39118..f6a7eb8c6b3fd87ed0fa2c7804a4dce57bef9438 100644 (file)
@@ -1,6 +1,8 @@
-BRANCHES:
-- master:
+STREAMS:
+- beryllium:
+    branch: master
     jdks: openjdk7
-- stable/lithium:
+- stable-lithium:
+    branch: stable/lithium
     jdks: openjdk7
 DEPENDENCIES: controller,yangtools,odlparent
index ac64433a669ee2cbccf1201bd6e30fcd0a0edea8..6343fdae80dea34dd0e5e88072d0fc106f37cac3 100644 (file)
@@ -1,7 +1,7 @@
 - project:
     name: controller-csit-clustering
     jobs:
-        - '{project}-csit-3node-cds-{functionality}-{install}-{stream}'
+        - '{project}-csit-3node-{functionality}-{install}-{stream}'
 
     # The project name
     project: 'controller'
@@ -11,7 +11,7 @@
 
     # Project branches
     stream:
-        - master:
+        - beryllium:
             branch: 'master'
         - stable-lithium:
             branch: 'stable/lithium'
@@ -30,4 +30,3 @@
 
     # Trigger jobs (upstream dependencies)
     trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream}'
-
index 190a93e0b2da698b6d2fd0299eff4b1f9a1e2750..eaf3f6ef88bbc8ec66286c83dd225d0e5d55b61c 100644 (file)
@@ -2,7 +2,7 @@
     name: controller-csit-netconf-stable-helium
     jobs:
         - '{project}-csit-1node-imds-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-{functionality}-{stream}'
+        - '{project}-csit-verify-1node-{functionality}-{stream}'
 
     # The project name
     project: 'controller'
@@ -29,4 +29,3 @@
 
     # Trigger jobs (upstream dependencies)
     trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream}'
-
index 2a0474f1bf03eb3273a3a961400dd314b9c50f25..52fee0d81533c317393b004d0254fd26f60c4890 100644 (file)
@@ -1,8 +1,8 @@
 - project:
     name: controller-csit-netconf
     jobs:
-        - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-{functionality}-{stream}'
+        - '{project}-csit-1node-{functionality}-{install}-{stream}'
+        - '{project}-csit-verify-1node-{functionality}-{stream}'
 
     # The project name
     project: 'controller'
@@ -12,7 +12,7 @@
 
     # Project branches
     stream:
-        - master:
+        - beryllium:
             branch: 'master'
         - stable-lithium:
             branch: 'stable/lithium'
@@ -31,4 +31,3 @@
 
     # Trigger jobs (upstream dependencies)
     trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream}'
-
index 90452a35d5cbe59d4f17c7fc0f80762cede60519..e967bc7ac99b429c1bd6240d8e2ed61109814ee0 100644 (file)
@@ -2,7 +2,7 @@
     name: controller-csit-nsf-stable-helium
     jobs:
         - '{project}-csit-1node-imds-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-{functionality}-{stream}'
+        - '{project}-csit-verify-1node-{functionality}-{stream}'
 
     # The project name
     project: 'controller'
@@ -29,4 +29,3 @@
 
     # Trigger jobs (upstream dependencies)
     trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream}'
-
index 9d49b5b94c3ab1a7a12ddfc94707a021730b481e..5431633ee0649537a38b5897593926231e1642a3 100644 (file)
@@ -1,10 +1,13 @@
-BRANCHES:
-- master:
+STREAMS:
+- beryllium:
+    branch: master
     jdks: openjdk7,openjdk8
-- stable/helium:
-    jdks: openjdk7
-- stable/lithium:
+- stable-lithium:
+    branch: stable/lithium
     jdks: openjdk7,openjdk8
+- stable-helium:
+    branch: stable/helium
+    jdks: openjdk7
 MVN_GOALS: -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install -Pintegrationtests,docs
 MVN_OPTS: -Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true
 DEPENDENCIES: yangtools,aaa
index de43ac1498d25d6e320c2cefad643ab676fc8ddc..e35b25918eb260def6b2b614e83b9bef9d238af6 100644 (file)
@@ -1,6 +1,8 @@
-BRANCHES:
-- master:
+STREAMS:
+- beryllium:
+    branch: master
     jdks: openjdk7
-- stable/lithium:
+- stable-lithium:
+    branch: stable/lithium
     jdks: openjdk7
 DEPENDENCIES: odlparent,yangtools,controller
index 42ddd11be2f71b3edc10d2beb6dbc8f1d6656d40..ae3d9a4c8bf481fc90bbbab061b36284d53658da 100644 (file)
@@ -1,9 +1,12 @@
-BRANCHES:
-- master:
+STREAMS:
+- beryllium:
+    branch: master
     jdks: openjdk7
-- stable/helium:
+- stable-lithium:
+    branch: stable/lithium
     jdks: openjdk7
-- stable/lithium:
+- stable-helium:
+    branch: stable/helium
     jdks: openjdk7
 DEPENDENCIES: odlparent
 POM: dfapp/pom.xml
index bb16ff1be46f1e9c75bd592e821ed09a2830e189..a9237c43c4242e65860be4abce8e38be115eaa58 100644 (file)
@@ -1,6 +1,8 @@
-BRANCHES:
-- master:
+STREAMS:
+- beryllium:
+    branch: master
     jdks: openjdk7
-- stable/lithium:
+- stable-lithium:
+    branch: stable/lithium
     jdks: openjdk7
 DEPENDENCIES: odlparent
index 68a71d9307a688792faf64830121514cb3573cd1..eb87e8c8b067c19ee35b1c3d7f0435a39304846d 100644 (file)
@@ -1,4 +1,5 @@
-BRANCHES:
-- master:
+STREAMS:
+- beryllium:
+    branch: master
     jdks: openjdk7
 DEPENDENCIES: odlparent
index c40071eadded69b64cd66d49e1508ae3c63b5243..ce56cd201f0fca48419975acb13d38af5817c762 100644 (file)
@@ -1,7 +1,10 @@
-BRANCHES:
-- master:
+STREAMS:
+- beryllium:
+    branch: master
     jdks: openjdk7
-- stable/helium:
+- stable-lithium:
+    branch: stable/lithium
     jdks: openjdk7
-- stable/lithium:
+- stable-helium:
+    branch: stable/helium
     jdks: openjdk7
index c40071eadded69b64cd66d49e1508ae3c63b5243..ce56cd201f0fca48419975acb13d38af5817c762 100644 (file)
@@ -1,7 +1,10 @@
-BRANCHES:
-- master:
+STREAMS:
+- beryllium:
+    branch: master
     jdks: openjdk7
-- stable/helium:
+- stable-lithium:
+    branch: stable/lithium
     jdks: openjdk7
-- stable/lithium:
+- stable-helium:
+    branch: stable/helium
     jdks: openjdk7
index d3c1820b6286581a21d33c85a75e6ed9758fae21..20825df88e808da8894547352fd1c587d1b99f39 100644 (file)
@@ -1,7 +1,7 @@
 - project:
     name: groupbasedpolicy-csit-clustering
     jobs:
-        - '{project}-csit-3node-cds-{functionality}-{install}-{stream}'
+        - '{project}-csit-3node-{functionality}-{install}-{stream}'
 
 
     # The project name
@@ -12,7 +12,7 @@
 
     # Project branches
     stream:
-        - master:
+        - beryllium:
             branch: 'master'
         - stable-lithium:
             branch: 'stable/lithium'
index 3a1b40530323713670da577eacc31bcfb464e7e8..df9e7bd64012189baffd182a21ba460e827475a0 100644 (file)
@@ -1,9 +1,12 @@
-BRANCHES:
-- master:
+STREAMS:
+- beryllium:
+    branch: master
     jdks: openjdk7
-- stable/helium:
+- stable-lithium:
+    branch: stable/lithium
     jdks: openjdk7
-- stable/lithium:
+- stable-helium:
+    branch: stable/helium
     jdks: openjdk7
 MVN_GOALS: -U clean install findbugs:findbugs -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
 MVN_OPTS: -Xmx1024m -XX:MaxPermSize=256m
index bbb1127b1e18eda7ddeab9cdafde23a183d5dfd4..ba2b7410f16dba37db1aeaa7568c27b796983d41 100644 (file)
@@ -2,8 +2,8 @@
     name: integration-csit-basic-stable-helium
     jobs:
         - '{project}-csit-1node-imds-{functionality}-{install}-{stream}'
-        - '{project}-csit-3node-cds-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-{functionality}-{stream}'
+        - '{project}-csit-3node-{functionality}-{install}-{stream}'
+        - '{project}-csit-verify-1node-{functionality}-{stream}'
 
     # The project name
     project: 'integration'
index ced48b117ed5aa6282af79fab03e35d8466f535e..b90a4c04660ec7fe02826b4b81d911bdc3df6955 100644 (file)
@@ -1,9 +1,9 @@
 - project:
     name: integration-csit-basic
     jobs:
-        - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
-        - '{project}-csit-3node-cds-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-{functionality}-{stream}'
+        - '{project}-csit-1node-{functionality}-{install}-{stream}'
+        - '{project}-csit-3node-{functionality}-{install}-{stream}'
+        - '{project}-csit-verify-1node-{functionality}-{stream}'
 
     # The project name
     project: 'integration'
@@ -13,7 +13,7 @@
 
     # Project branches
     stream:
-        - master:
+        - beryllium:
             branch: 'master'
         - stable-lithium:
             branch: 'stable/lithium'
index 6c172d7c2c82d3e0cb4327c10b65ff6c92f9e6a5..90e37e5188433af67d99e2e0a9478ca44319c463 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: integration-jobs
     jobs:
-        - 'integration-csit-verify-{stream}'
+        - 'integration-csit-verify-1node-{stream}'
         - 'integration-distribution-verify-{stream}'
         - 'integration-distribution-merge-{stream}'
         - 'integration-distribution-offline-{stream}'
         - 'integration-patch-test-{stream}'
 
     stream:
-        - master:
+        - beryllium:
             branch: 'master'
             csit-list: >
-                aaa-csit-1node-cds-authn-only-{stream},
-                aaa-csit-1node-cds-authn-all-{stream},
-                bgpcep-csit-1node-cds-userfeatures-only-{stream},
-                bgpcep-csit-1node-cds-userfeatures-all-{stream},
-                capwap-csit-1node-cds-ac-only-{stream},
-                capwap-csit-1node-cds-ac-all-{stream},
-                controller-csit-1node-cds-netconf-only-{stream},
-                controller-csit-1node-cds-netconf-all-{stream},
-                controller-csit-3node-cds-clustering-only-{stream},
-                controller-csit-3node-cds-clustering-all-{stream},
-                integration-csit-3node-cds-basic-only-{stream},
-                integration-csit-3node-cds-basic-all-{stream},
+                aaa-csit-1node-authn-only-{stream},
+                aaa-csit-1node-authn-all-{stream},
+                bgpcep-csit-1node-userfeatures-only-{stream},
+                bgpcep-csit-1node-userfeatures-all-{stream},
+                capwap-csit-1node-ac-only-{stream},
+                capwap-csit-1node-ac-all-{stream},
+                controller-csit-1node-netconf-only-{stream},
+                controller-csit-1node-netconf-all-{stream},
+                controller-csit-3node-clustering-only-{stream},
+                controller-csit-3node-clustering-all-{stream},
+                integration-csit-3node-basic-only-{stream},
+                integration-csit-3node-basic-all-{stream},
                 integration-distribution-offline-{stream},
-                l2switch-csit-1node-cds-switch-only-{stream},
-                l2switch-csit-1node-cds-switch-all-{stream},
-                l2switch-csit-1node-cds-scalability-only-{stream},
-                l2switch-csit-1node-cds-scalability-all-{stream},
-                lispflowmapping-csit-1node-cds-all-only-{stream},
-                lispflowmapping-csit-1node-cds-all-all-{stream},
-                nic-csit-1node-cds-basic-all-{stream},
-                nic-csit-1node-cds-basic-only-{stream},
-                openflowplugin-csit-1node-cds-flow-services-only-{stream},
-                openflowplugin-csit-1node-cds-flow-services-all-{stream},
-                openflowplugin-csit-1node-cds-flow-services-more-only-{stream},
-                openflowplugin-csit-1node-cds-flow-services-more-all-{stream},
-                openflowplugin-csit-1node-cds-scalability-only-{stream},
-                openflowplugin-csit-1node-cds-scalability-all-{stream},
-                openflowplugin-csit-1node-cds-cbench-performance-only-{stream},
-                openflowplugin-csit-1node-cds-config-performance-only-{stream},
-                ovsdb-csit-1node-cds-netvirt-only-{stream},
-                ovsdb-csit-1node-cds-netvirt-all-{stream},
-                ovsdb-csit-1node-cds-southbound-only-{stream},
-                ovsdb-csit-1node-cds-southbound-all-{stream},
-                snmp-csit-1node-cds-basic-only-{stream},
-                snmp-csit-1node-cds-basic-all-{stream},
-                tsdr-csit-1node-cds-h2-datastore-only-{stream},
-                tsdr-csit-1node-cds-h2-datastore-all-{stream},
-                tsdr-csit-1node-cds-hbase-datastore-only-{stream},
-                tsdr-csit-1node-cds-hbase-datastore-all-{stream},
-                usc-csit-1node-cds-channel-only-{stream},
-                usc-csit-1node-cds-channel-all-{stream},
-                vpnservice-csit-1node-cds-vpnservice-only-{stream},
-                vpnservice-csit-1node-cds-vpnservice-all-{stream},
-                vtn-csit-1node-cds-manager-only-{stream},
-                vtn-csit-1node-cds-manager-all-{stream}
+                l2switch-csit-1node-switch-only-{stream},
+                l2switch-csit-1node-switch-all-{stream},
+                l2switch-csit-1node-scalability-only-{stream},
+                l2switch-csit-1node-scalability-all-{stream},
+                lispflowmapping-csit-1node-all-only-{stream},
+                lispflowmapping-csit-1node-all-all-{stream},
+                nic-csit-1node-basic-all-{stream},
+                nic-csit-1node-basic-only-{stream},
+                openflowplugin-csit-1node-flow-services-only-{stream},
+                openflowplugin-csit-1node-flow-services-all-{stream},
+                openflowplugin-csit-1node-flow-services-more-only-{stream},
+                openflowplugin-csit-1node-flow-services-more-all-{stream},
+                openflowplugin-csit-1node-scalability-only-{stream},
+                openflowplugin-csit-1node-scalability-all-{stream},
+                openflowplugin-csit-1node-cbench-performance-only-{stream},
+                openflowplugin-csit-1node-config-performance-only-{stream},
+                ovsdb-csit-1node-netvirt-only-{stream},
+                ovsdb-csit-1node-netvirt-all-{stream},
+                ovsdb-csit-1node-southbound-only-{stream},
+                ovsdb-csit-1node-southbound-all-{stream},
+                snmp-csit-1node-basic-only-{stream},
+                snmp-csit-1node-basic-all-{stream},
+                tsdr-csit-1node-h2-datastore-only-{stream},
+                tsdr-csit-1node-h2-datastore-all-{stream},
+                tsdr-csit-1node-hbase-datastore-only-{stream},
+                tsdr-csit-1node-hbase-datastore-all-{stream},
+                usc-csit-1node-channel-only-{stream},
+                usc-csit-1node-channel-all-{stream},
+                vpnservice-csit-1node-vpnservice-only-{stream},
+                vpnservice-csit-1node-vpnservice-all-{stream},
+                vtn-csit-1node-manager-only-{stream},
+                vtn-csit-1node-manager-all-{stream}
 
         - stable-lithium:
             branch: 'stable/lithium'
             csit-list: >
-                aaa-csit-1node-cds-authn-only-{stream},
-                aaa-csit-1node-cds-authn-all-{stream},
-                bgpcep-csit-1node-cds-userfeatures-only-{stream},
-                bgpcep-csit-1node-cds-userfeatures-all-{stream},
-                capwap-csit-1node-cds-ac-only-{stream},
-                capwap-csit-1node-cds-ac-all-{stream},
-                controller-csit-1node-cds-netconf-only-{stream},
-                controller-csit-1node-cds-netconf-all-{stream},
-                controller-csit-3node-cds-clustering-only-{stream},
-                controller-csit-3node-cds-clustering-all-{stream},
-                integration-csit-3node-cds-basic-only-{stream},
-                integration-csit-3node-cds-basic-all-{stream},
+                aaa-csit-1node-authn-only-{stream},
+                aaa-csit-1node-authn-all-{stream},
+                bgpcep-csit-1node-userfeatures-only-{stream},
+                bgpcep-csit-1node-userfeatures-all-{stream},
+                capwap-csit-1node-ac-only-{stream},
+                capwap-csit-1node-ac-all-{stream},
+                controller-csit-1node-netconf-only-{stream},
+                controller-csit-1node-netconf-all-{stream},
+                controller-csit-3node-clustering-only-{stream},
+                controller-csit-3node-clustering-all-{stream},
+                integration-csit-3node-basic-only-{stream},
+                integration-csit-3node-basic-all-{stream},
                 integration-distribution-offline-{stream},
-                l2switch-csit-1node-cds-switch-only-{stream},
-                l2switch-csit-1node-cds-switch-all-{stream},
-                l2switch-csit-1node-cds-scalability-only-{stream},
-                l2switch-csit-1node-cds-scalability-all-{stream},
-                lispflowmapping-csit-1node-cds-all-only-{stream},
-                lispflowmapping-csit-1node-cds-all-all-{stream},
-                nic-csit-1node-cds-basic-all-{stream},
-                nic-csit-1node-cds-basic-only-{stream},
-                openflowplugin-csit-1node-cds-flow-services-only-{stream},
-                openflowplugin-csit-1node-cds-flow-services-all-{stream},
-                openflowplugin-csit-1node-cds-flow-services-more-only-{stream},
-                openflowplugin-csit-1node-cds-flow-services-more-all-{stream},
-                openflowplugin-csit-1node-cds-scalability-only-{stream},
-                openflowplugin-csit-1node-cds-scalability-all-{stream},
-                openflowplugin-csit-1node-cds-cbench-performance-only-{stream},
-                openflowplugin-csit-1node-cds-config-performance-only-{stream},
-                ovsdb-csit-1node-cds-netvirt-only-{stream},
-                ovsdb-csit-1node-cds-netvirt-all-{stream},
-                ovsdb-csit-1node-cds-southbound-only-{stream},
-                ovsdb-csit-1node-cds-southbound-all-{stream},
-                snmp-csit-1node-cds-basic-only-{stream},
-                snmp-csit-1node-cds-basic-all-{stream},
-                usc-csit-1node-cds-channel-only-{stream},
-                usc-csit-1node-cds-channel-all-{stream},
-                vpnservice-csit-1node-cds-vpnservice-only-{stream},
-                vpnservice-csit-1node-cds-vpnservice-all-{stream},
-                vtn-csit-1node-cds-manager-only-{stream},
-                vtn-csit-1node-cds-manager-all-{stream}
+                l2switch-csit-1node-switch-only-{stream},
+                l2switch-csit-1node-switch-all-{stream},
+                l2switch-csit-1node-scalability-only-{stream},
+                l2switch-csit-1node-scalability-all-{stream},
+                lispflowmapping-csit-1node-all-only-{stream},
+                lispflowmapping-csit-1node-all-all-{stream},
+                nic-csit-1node-basic-all-{stream},
+                nic-csit-1node-basic-only-{stream},
+                openflowplugin-csit-1node-flow-services-only-{stream},
+                openflowplugin-csit-1node-flow-services-all-{stream},
+                openflowplugin-csit-1node-flow-services-more-only-{stream},
+                openflowplugin-csit-1node-flow-services-more-all-{stream},
+                openflowplugin-csit-1node-scalability-only-{stream},
+                openflowplugin-csit-1node-scalability-all-{stream},
+                openflowplugin-csit-1node-cbench-performance-only-{stream},
+                openflowplugin-csit-1node-config-performance-only-{stream},
+                ovsdb-csit-1node-netvirt-only-{stream},
+                ovsdb-csit-1node-netvirt-all-{stream},
+                ovsdb-csit-1node-southbound-only-{stream},
+                ovsdb-csit-1node-southbound-all-{stream},
+                snmp-csit-1node-basic-only-{stream},
+                snmp-csit-1node-basic-all-{stream},
+                usc-csit-1node-channel-only-{stream},
+                usc-csit-1node-channel-all-{stream},
+                vpnservice-csit-1node-vpnservice-only-{stream},
+                vpnservice-csit-1node-vpnservice-all-{stream},
+                vtn-csit-1node-manager-only-{stream},
+                vtn-csit-1node-manager-all-{stream}
 
         - stable-helium:
             branch: 'stable/helium'
                 controller-csit-1node-imds-netconf-all-{stream},
                 controller-csit-1node-imds-nsf-only-{stream},
                 controller-csit-1node-imds-nsf-all-{stream},
-                integration-csit-3node-cds-basic-only-{stream},
-                integration-csit-3node-cds-basic-all-{stream},
+                integration-csit-3node-basic-only-{stream},
+                integration-csit-3node-basic-all-{stream},
                 l2switch-csit-1node-imds-switch-only-{stream},
                 l2switch-csit-1node-imds-switch-all-{stream},
                 lispflowmapping-csit-1node-imds-all-only-{stream},
         integration-distribution-merge-{stream}
 
 - job-template:
-    name: 'integration-csit-verify-{stream}'
+    name: 'integration-csit-verify-1node-{stream}'
 
     project-type: freestyle
     node: dynamic_robot
     publishers:
         - email-notification:
             email-prefix: '[integration]'
-
index 0bee357248a2017f65f80f266857cefad33a3208..06f9bd4e3a04b0c7309e8de4445e28759d46d7ca 100644 (file)
@@ -3,10 +3,10 @@
     jobs:
         - 'integration-verify-python-{stream}'
 
-    # stream:    branch with - in place of / (eg. stable-helium)
-    # branch:    branch (eg. stable/helium)
+    # stream:    release stream (eg. stable-lithium or beryllium)
+    # branch:    git branch (eg. stable/lithium or master)
     stream:
-        - master:
+        - beryllium:
             branch: 'master'
         - stable-lithium:
             branch: 'stable/lithium'
@@ -22,8 +22,8 @@
     # The purpose of this job template is to setup a ODL verify job
     #
     # Required Variables:
-    #     stream:    branch with - in place of / (eg. stable-helium)
-    #     branch:    branch (eg. stable/helium)
+    #     stream:    release stream (eg. stable-lithium or beryllium)
+    #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: freestyle
     node: dynamic_verify
index 82da1179890c97025a3bd0fa54d81a44021c28c1..73e7ddd190ff68dfad1377d227a238b99f6ad018 100644 (file)
                 inclusion-flag: 'off'
                 display-table: true
                 format: csv
-
index d72e8f2a2fcc8136e68e85c18d969534e3f1cd5b..54fcb234071ec9800c18a7c311636df2fffbf622 100644 (file)
@@ -1,8 +1,8 @@
 - project:
     name: iotdm-csit-basic
     jobs:
-        - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-{functionality}-{stream}'
+        - '{project}-csit-1node-{functionality}-{install}-{stream}'
+        - '{project}-csit-verify-1node-{functionality}-{stream}'
 
     # The project name
     project: 'iotdm'
@@ -12,7 +12,7 @@
 
     # Project branches
     stream:
-        - master:
+        - beryllium:
             branch: 'master'
         - stable-lithium:
             branch: 'stable/lithium'
index 4bfdf75fa38f806ae519590e49ad24dbc7a2523a..016f03f6afe3b76455459f78fe13cffa83c1149e 100644 (file)
@@ -1,6 +1,8 @@
-BRANCHES:
-- master:
+STREAMS:
+- beryllium:
+    branch: master
     jdks: openjdk7,openjdk8
-- stable/lithium:
+- stable-lithium:
+    branch: stable/lithium
     jdks: openjdk7,openjdk8
 DEPENDENCIES: controller,yangtools,odlparent,aaa
index d051cbbaf748f478f66afdb9d46c079f098376bb..8524b7a268918332f34fcde1024d13b7627bccf8 100644 (file)
@@ -1,7 +1,7 @@
 - project:
     name: l2switch-csit-host-scalability-daily
     jobs:
-        - '{project}-csit-periodic-1node-cds-{functionality}-{install}-{stream}'
+        - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
 
     # The project name
     project: 'l2switch'
@@ -11,7 +11,7 @@
 
     # Project branches
     stream:
-        - master:
+        - beryllium:
             branch: 'master'
         - stable-lithium:
             branch: 'stable/lithium'
index 6319e6d4ef037ecb3f5fefddd76e9dd279a91a73..233961a05bcd3b3958d80c3ff48968406db231b4 100644 (file)
@@ -1,8 +1,8 @@
 - project:
     name: l2switch-csit-scalability
     jobs:
-        - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-{functionality}-{stream}'
+        - '{project}-csit-1node-{functionality}-{install}-{stream}'
+        - '{project}-csit-verify-1node-{functionality}-{stream}'
 
     # The project name
     project: 'l2switch'
@@ -12,7 +12,7 @@
 
     # Project branches
     stream:
-        - master:
+        - beryllium:
             branch: 'master'
         - stable-lithium:
             branch: 'stable/lithium'
@@ -31,4 +31,3 @@
 
     # Trigger jobs (upstream dependencies)
     trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream},l2switch-distribution-{stream}'
-
index e935d71c7fffe93c626ddfdd043ad61b25c6eadb..4b3f58e263720fe78abc18454b238bdadc2af7b6 100644 (file)
@@ -2,7 +2,7 @@
     name: l2switch-csit-switch-stable-helium
     jobs:
         - '{project}-csit-1node-imds-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-{functionality}-{stream}'
+        - '{project}-csit-verify-1node-{functionality}-{stream}'
 
     # The project name
     project: 'l2switch'
@@ -29,4 +29,3 @@
 
     # Trigger jobs (upstream dependencies)
     trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream},l2switch-distribution-{stream}'
-
index 0b162eedaeb2ce617291bd52f157383862554bd2..36eb26e400171cd959eb7dd51d86b2773a5e1f41 100644 (file)
@@ -1,8 +1,8 @@
 - project:
     name: l2switch-csit-switch
     jobs:
-        - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-{functionality}-{stream}'
+        - '{project}-csit-1node-{functionality}-{install}-{stream}'
+        - '{project}-csit-verify-1node-{functionality}-{stream}'
 
     # The project name
     project: 'l2switch'
@@ -12,7 +12,7 @@
 
     # Project branches
     stream:
-        - master:
+        - beryllium:
             branch: 'master'
         - stable-lithium:
             branch: 'stable/lithium'
@@ -31,4 +31,3 @@
 
     # Trigger jobs (upstream dependencies)
     trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream},l2switch-distribution-{stream}'
-
index 6b3460e66a99162ab5266961543b7cd1807b09fa..156504fa1bab6f97607b3d674bc506488dcf4959 100644 (file)
@@ -1,9 +1,12 @@
-BRANCHES:
-- master:
+STREAMS:
+- beryllium:
+    branch: master
     jdks: openjdk7
-- stable/helium:
+- stable-lithium:
+    branch: stable/lithium
     jdks: openjdk7
-- stable/lithium:
+- stable-helium:
+    branch: stable/helium
     jdks: openjdk7
 MVN_GOALS: -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install
 MVN_OPTS: -Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true
index 8a078d27a5f324c6d853c5bafbc1d7453c37a9b8..fd8326f64a0b1f71a8a8680861d1cd747edd22d3 100644 (file)
@@ -1,8 +1,8 @@
 - project:
     name: lacp-csit-lacp
     jobs:
-        - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-{functionality}-{stream}'
+        - '{project}-csit-1node-{functionality}-{install}-{stream}'
+        - '{project}-csit-verify-1node-{functionality}-{stream}'
 
     # The project name
     project: 'lacp'
@@ -12,7 +12,7 @@
 
     # Project branches
     stream:
-        - master:
+        - beryllium:
             branch: 'master'
         - stable-lithium:
             branch: 'stable/lithium'
@@ -31,4 +31,3 @@
 
     # Trigger jobs (upstream dependencies)
     trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream},lacp-distribution-{stream}'
-
index f8717b1ede9f9433a17db077881ef0d2c98a0378..c88069e0e4c23aaed964110f531b331c51e62b4e 100644 (file)
@@ -1,7 +1,9 @@
-BRANCHES:
-- master:
+STREAMS:
+- beryllium:
+    branch: master
     jdks: openjdk7
-- stable/lithium:
+- stable-lithium:
+    branch: stable/lithium
     jdks: openjdk7
 MVN_GOALS: clean install javadoc:aggregate -DrepoBuild -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
 MVN_OPTS: -Xmx1024m -XX:MaxPermSize=256m
index 9bd92c7f135e02a65608f031cd82be9b93280f22..b5b0891aee36bdc2e1ff14c072089fd2e7edf957 100644 (file)
@@ -2,7 +2,7 @@
     name: lispflowmapping-csit-all-stable-helium
     jobs:
         - '{project}-csit-1node-imds-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-{functionality}-{stream}'
+        - '{project}-csit-verify-1node-{functionality}-{stream}'
 
     # The project name
     project: 'lispflowmapping'
@@ -29,4 +29,3 @@
 
     # Trigger jobs (upstream dependencies)
     trigger-jobs: 'odlparent-distribution-{stream},yangtools-distribution-{stream},controller-distribution-{stream},neutron-distribution-{stream},lispflowmapping-distribution-{stream}'
-
index 11545965b2ddea84bc76d82273652aaf6c2348c1..dd21b3d372c7b7fb3ce7a6eaebfb6b15b79016f5 100644 (file)
@@ -1,8 +1,8 @@
 - project:
     name: lispflowmapping-csit-all
     jobs:
-        - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-{functionality}-{stream}'
+        - '{project}-csit-1node-{functionality}-{install}-{stream}'
+        - '{project}-csit-verify-1node-{functionality}-{stream}'
 
     # The project name
     project: 'lispflowmapping'
@@ -12,7 +12,7 @@
 
     # Project branches
     stream:
-        - master:
+        - beryllium:
             branch: 'master'
         - stable-lithium:
             branch: 'stable/lithium'
@@ -31,4 +31,3 @@
 
     # Trigger jobs (upstream dependencies)
     trigger-jobs: 'odlparent-distribution-{stream},yangtools-distribution-{stream},controller-distribution-{stream},neutron-distribution-{stream},lispflowmapping-distribution-{stream}'
-
index 3e471aeb20ee493b75a98af131b8aafe93b08b8a..94384d31f13feed19394956872c96fb1a4d6f3bd 100644 (file)
@@ -1,9 +1,12 @@
 MVN_GOALS: clean install javadoc:aggregate -DrepoBuild -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
-BRANCHES:
-- master:
+STREAMS:
+- beryllium:
+    branch: master
     jdks: openjdk7,openjdk8
-- stable/helium:
-    jdks: openjdk7
-- stable/lithium:
+- stable-lithium:
+    branch: stable/lithium
     jdks: openjdk7,openjdk8
+- stable-helium:
+    branch: stable/helium
+    jdks: openjdk7
 DEPENDENCIES: controller,odlparent,yangtools,neutron
index 5b3c057b83bc4377587628951a94daf5437c43db..2bdec41693cf90363d51ad1e7650192dddc1b76c 100644 (file)
@@ -1,4 +1,5 @@
-BRANCHES:
-- master:
+STREAMS:
+- beryllium:
+    branch: master
     jdks: openjdk7,openjdk8
 DEPENDENCIES: controller,yangtools,odlparent
index a423af5535181416edf42199a892a325acc7c810..f9b04926e972b51132837ba73c71cddb7bba6ed8 100644 (file)
@@ -1,6 +1,8 @@
 DEPENDENCIES: odlparent,aaa
-BRANCHES:
-- master:
+STREAMS:
+- beryllium:
+    branch: master
     jdks: openjdk7,openjdk8
-- stable/lithium:
+- stable-lithium:
+    branch: stable/lithium
     jdks: openjdk7,openjdk8
index 8b90bae4977dc890d658be320dd6b02529c193ac..8a4488318aeec766eb74b3bc8644fa8aa24d1650 100644 (file)
@@ -1,8 +1,8 @@
 - project:
     name: nic-csit-basic
     jobs:
-        - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-{functionality}-{stream}'
+        - '{project}-csit-1node-{functionality}-{install}-{stream}'
+        - '{project}-csit-verify-1node-{functionality}-{stream}'
 
     # The project name
     project: 'nic'
@@ -12,7 +12,7 @@
 
     # Project branches
     stream:
-        - master:
+        - beryllium:
             branch: 'master'
         - stable-lithium:
             branch: 'stable/lithium'
index 9458cbcacd4c1e8217aa883b0e2ad2136151c8bc..230fd2ba4ea12a9e52d810b47c059094645b4095 100644 (file)
@@ -1,6 +1,8 @@
-BRANCHES:
-- master:
+STREAMS:
+- beryllium:
+    branch: master
     jdks: openjdk7
-- stable/lithium:
+- stable-lithium:
+    branch: stable/lithium
     jdks: openjdk7
 DEPENDENCIES: controller,odlparent,vtn,yangtools,groupbasedpolicy
index c40071eadded69b64cd66d49e1508ae3c63b5243..ce56cd201f0fca48419975acb13d38af5817c762 100644 (file)
@@ -1,7 +1,10 @@
-BRANCHES:
-- master:
+STREAMS:
+- beryllium:
+    branch: master
     jdks: openjdk7
-- stable/helium:
+- stable-lithium:
+    branch: stable/lithium
     jdks: openjdk7
-- stable/lithium:
+- stable-helium:
+    branch: stable/helium
     jdks: openjdk7
index c089311f4b86e1443ef956289e032f1b6f828ba9..13729319b7b7d1a6862813879475957af9b44ae6 100644 (file)
@@ -1,8 +1,11 @@
-BRANCHES:
-- master:
+STREAMS:
+- beryllium:
+    branch: master
     jdks: openjdk7,openjdk8
-- stable/helium:
-    jdks: openjdk7
-- stable/lithium:
+- stable-lithium:
+    branch: stable/lithium
     jdks: openjdk7,openjdk8
+- stable-helium:
+    branch: stable/helium
+    jdks: openjdk7
 DEPENDENCIES: yangtools,controller
index 121257249700fdc8b9b3e184def45e12fcd7d9db..13d5a3cfad7437d4ee2b5ce23749030850806e6c 100644 (file)
@@ -1,7 +1,7 @@
 - project:
     name: openflowplugin-csit-bulk-matic-ds-daily-lithium-redesign
     jobs:
-        - '{project}-csit-periodic-1node-cds-{functionality}-{install}-{stream}'
+        - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
 
     # The project name
     project: 'openflowplugin'
@@ -11,7 +11,7 @@
 
     # Project branches
     stream:
-        - master:
+        - beryllium:
             branch: 'master'
         - stable-lithium:
             branch: 'stable/lithium'
index 931b530899f7bf01578f1d1e3d8c72deb6cdcbb9..2657a18159d3b5092c4965192f9ae05a21b1e957 100644 (file)
@@ -1,7 +1,7 @@
 - project:
     name: openflowplugin-csit-bulk-matic-ds-daily
     jobs:
-        - '{project}-csit-periodic-1node-cds-{functionality}-{install}-{stream}'
+        - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
 
     # The project name
     project: 'openflowplugin'
@@ -11,7 +11,7 @@
 
     # Project branches
     stream:
-        - master:
+        - beryllium:
             branch: 'master'
         - stable-lithium:
             branch: 'stable/lithium'
index af4f6ceb50129085e50e0a0cf2c0c54802d137ea..c92b1b9c642a8259126cc70ddb5ae226920b5f49 100644 (file)
@@ -1,7 +1,7 @@
 - project:
     name: openflowplugin-csit-cbench-daily
     jobs:
-        - '{project}-csit-periodic-1node-cds-{functionality}-{install}-{stream}'
+        - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
 
     # The project name
     project: 'openflowplugin'
@@ -11,7 +11,7 @@
 
     # Project branches
     stream:
-        - master:
+        - beryllium:
             branch: 'master'
         - stable-lithium:
             branch: 'stable/lithium'
index ed1a05a48681ce67b31c79b8bd5e87fbffdd5a07..7fef892cc96b9ac5f8352db5209f156d2a6e70f0 100644 (file)
@@ -1,7 +1,7 @@
 - project:
     name: openflowplugin-csit-cbench-performance-lithium-redesign
     jobs:
-        - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
+        - '{project}-csit-1node-{functionality}-{install}-{stream}'
 
     # The project name
     project: 'openflowplugin'
@@ -11,7 +11,7 @@
 
     # Project branches
     stream:
-        - master:
+        - beryllium:
             branch: 'master'
         - stable-lithium:
             branch: 'stable/lithium'
index f8ad74192869134d0eea2114704d3d9a4222d6ac..bcb74b6aff48031a7576dc5b0cd08db6afb23b47 100644 (file)
@@ -1,7 +1,7 @@
 - project:
     name: openflowplugin-csit-cbench-performance
     jobs:
-        - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
+        - '{project}-csit-1node-{functionality}-{install}-{stream}'
 
     # The project name
     project: 'openflowplugin'
@@ -11,7 +11,7 @@
 
     # Project branches
     stream:
-        - master:
+        - beryllium:
             branch: 'master'
         - stable-lithium:
             branch: 'stable/lithium'
index cb1ea4e9e6ca4a4065e29403750a7b5c6db50add..478c942a9befab051f088ae5739b891b727fdcee 100644 (file)
@@ -1,7 +1,7 @@
 - project:
     name: openflowplugin-csit-clustering
     jobs:
-        - '{project}-csit-3node-cds-{functionality}-{install}-{stream}'
+        - '{project}-csit-3node-{functionality}-{install}-{stream}'
 
     # The project name
     project: 'openflowplugin'
@@ -11,7 +11,7 @@
 
     # Project branches
     stream:
-        - master:
+        - beryllium:
             branch: 'master'
 
     install:
index 1c53e5e760010697d3fa4c488ba767cf07b875b0..9f66d88986ae4455bc23507490aa75b73b5e8a58 100644 (file)
@@ -1,7 +1,7 @@
 - project:
     name: openflowplugin-csit-config-performance-lithium-redesign
     jobs:
-        - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
+        - '{project}-csit-1node-{functionality}-{install}-{stream}'
 
     # The project name
     project: 'openflowplugin'
@@ -11,7 +11,7 @@
 
     # Project branches
     stream:
-        - master:
+        - beryllium:
             branch: 'master'
         - stable-lithium:
             branch: 'stable/lithium'
index 2b0284ab07b08d4d8b054fc091ebf445923d5df3..8abbef49c23e8b78324b6c67bce33858e02141fd 100644 (file)
@@ -1,7 +1,7 @@
 - project:
     name: openflowplugin-csit-config-performance
     jobs:
-        - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
+        - '{project}-csit-1node-{functionality}-{install}-{stream}'
 
     # The project name
     project: 'openflowplugin'
@@ -11,7 +11,7 @@
 
     # Project branches
     stream:
-        - master:
+        - beryllium:
             branch: 'master'
         - stable-lithium:
             branch: 'stable/lithium'
index 621d1c8499803feb90ca66837580d1ed74d25876..5e090b828fd2208d9e409d30691cf04824009d90 100644 (file)
@@ -1,7 +1,7 @@
 - project:
     name: openflowplugin-csit-flow-services-lithium-redesign
     jobs:
-        - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
+        - '{project}-csit-1node-{functionality}-{install}-{stream}'
 
     # The project name
     project: 'openflowplugin'
@@ -11,7 +11,7 @@
 
     # Project branches
     stream:
-        - master:
+        - beryllium:
             branch: 'master'
         - stable-lithium:
             branch: 'stable/lithium'
index 0bc3ac63b137527613d3eb9bbba6f4eee08b685d..e208b1504be524a0a01166b79c7cab883da37634 100644 (file)
@@ -1,7 +1,7 @@
 - project:
     name: openflowplugin-csit-flow-services-more-lithium-redesign
     jobs:
-        - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
+        - '{project}-csit-1node-{functionality}-{install}-{stream}'
 
     # The project name
     project: 'openflowplugin'
@@ -11,7 +11,7 @@
 
     # Project branches
     stream:
-        - master:
+        - beryllium:
             branch: 'master'
         - stable-lithium:
             branch: 'stable/lithium'
index 7708d14bb634340eedb7c883427b2dd00b591f4f..9db1756bb603d06ae3751674e1f2feddf0b80a50 100644 (file)
@@ -1,8 +1,8 @@
 - project:
     name: openflowplugin-csit-flow-services-more
     jobs:
-        - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-{functionality}-{stream}'
+        - '{project}-csit-1node-{functionality}-{install}-{stream}'
+        - '{project}-csit-verify-1node-{functionality}-{stream}'
 
     # The project name
     project: 'openflowplugin'
@@ -12,7 +12,7 @@
 
     # Project branches
     stream:
-        - master:
+        - beryllium:
             branch: 'master'
         - stable-lithium:
             branch: 'stable/lithium'
@@ -31,4 +31,3 @@
 
     # Trigger jobs (upstream dependencies)
     trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'
-
index d27d0f8b4f47ca0d5cda6c77e42ecf71d48ef513..d712cf48f2a52c5bcbe5afb9023b07d4782869e8 100644 (file)
@@ -2,7 +2,7 @@
     name: openflowplugin-csit-flow-services-stable-helium
     jobs:
         - '{project}-csit-1node-imds-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-{functionality}-{stream}'
+        - '{project}-csit-verify-1node-{functionality}-{stream}'
 
     # The project name
     project: 'openflowplugin'
@@ -29,4 +29,3 @@
 
     # Trigger jobs (upstream dependencies)
     trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'
-
index 9f2539ee8e5ffd501a0a3d6f465c9c8c5d67b0c4..6eb00a186a6c2cd9b638a429f68a3d5ffb076151 100644 (file)
@@ -1,8 +1,8 @@
 - project:
     name: openflowplugin-csit-flow-services
     jobs:
-        - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-{functionality}-{stream}'
+        - '{project}-csit-1node-{functionality}-{install}-{stream}'
+        - '{project}-csit-verify-1node-{functionality}-{stream}'
 
     # The project name
     project: 'openflowplugin'
@@ -12,7 +12,7 @@
 
     # Project branches
     stream:
-        - master:
+        - beryllium:
             branch: 'master'
         - stable-lithium:
             branch: 'stable/lithium'
@@ -31,4 +31,3 @@
 
     # Trigger jobs (upstream dependencies)
     trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'
-
index dce0b1ea9a781fddcb8bcf140b0b6f1beaa1684d..9426fa97b69966b8f6a5f872727f4282f8ae7317 100644 (file)
@@ -1,7 +1,7 @@
 - project:
     name: openflowplugin-csit-link-scalability-daily-lithium-redesign
     jobs:
-        - '{project}-csit-periodic-1node-cds-{functionality}-{install}-{stream}'
+        - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
 
     # The project name
     project: 'openflowplugin'
@@ -11,7 +11,7 @@
 
     # Project branches
     stream:
-        - master:
+        - beryllium:
             branch: 'master'
         - stable-lithium:
             branch: 'stable/lithium'
index e212aae0cffbcf5fa6492229ed3f532288c869ed..46f67982a4344a37139acc8c2c063b03adfb647b 100644 (file)
@@ -1,7 +1,7 @@
 - project:
     name: openflowplugin-csit-link-scalability-daily
     jobs:
-        - '{project}-csit-periodic-1node-cds-{functionality}-{install}-{stream}'
+        - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
 
     # The project name
     project: 'openflowplugin'
@@ -11,7 +11,7 @@
 
     # Project branches
     stream:
-        - master:
+        - beryllium:
             branch: 'master'
         - stable-lithium:
             branch: 'stable/lithium'
index 9fbbf7070fac1d8394fce9aca905d7a5a1c204c0..1fe10156a065a0ee475c8b50e6d26094a342addc 100644 (file)
@@ -1,7 +1,7 @@
 - project:
     name: openflowplugin-csit-longevity-lithium-redesign
     jobs:
-        - '{project}-csit-periodic-1node-cds-{functionality}-{install}-{stream}'
+        - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
 
     # The project name
     project: 'openflowplugin'
@@ -11,7 +11,7 @@
 
     # Project branches
     stream:
-        - master:
+        - beryllium:
             branch: 'master'
 
     install:
index 4ea4f497216743878e3d1cecfc0d65f7882e8f42..a0ecd681feb4b8c5176ef4e9060b4c36a15a603f 100644 (file)
@@ -1,7 +1,7 @@
 - project:
     name: openflowplugin-csit-longevity
     jobs:
-        - '{project}-csit-periodic-1node-cds-{functionality}-{install}-{stream}'
+        - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
 
     # The project name
     project: 'openflowplugin'
@@ -11,7 +11,7 @@
 
     # Project branches
     stream:
-        - master:
+        - beryllium:
             branch: 'master'
 
     install:
index a16e183a3a7423694ee2acf0e31705932b23c9ca..e142f59f5af5e218205dfde0fcaa09fd848b7123 100644 (file)
@@ -1,7 +1,7 @@
 - project:
     name: openflowplugin-csit-rpc-time-measure-daily-lithium-redesign
     jobs:
-        - '{project}-csit-periodic-1node-cds-{functionality}-{install}-{stream}'
+        - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
 
     # The project name
     project: 'openflowplugin'
@@ -11,7 +11,7 @@
 
     # Project branches
     stream:
-        - master:
+        - beryllium:
             branch: 'master'
         - stable-lithium:
             branch: 'stable/lithium'
index 90e0ce0935316f02fc3b05378a9a2878892ae9d2..b04c08ff07003b0ab8d6ffd57242a72e1dd46911 100644 (file)
@@ -1,7 +1,7 @@
 - project:
     name: openflowplugin-csit-rpc-time-measure-daily
     jobs:
-        - '{project}-csit-periodic-1node-cds-{functionality}-{install}-{stream}'
+        - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
 
     # The project name
     project: 'openflowplugin'
@@ -11,7 +11,7 @@
 
     # Project branches
     stream:
-        - master:
+        - beryllium:
             branch: 'master'
         - stable-lithium:
             branch: 'stable/lithium'
index dfcd52b72a2d8ef3eca0af9f2468b749d3211b35..183bff711d4ca8ce0170e96bfc6059bd9d6d48a4 100644 (file)
@@ -1,7 +1,7 @@
 - project:
     name: openflowplugin-csit-scalability-daily-lithium-redesign
     jobs:
-        - '{project}-csit-periodic-1node-cds-{functionality}-{install}-{stream}'
+        - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
 
     # The project name
     project: 'openflowplugin'
@@ -11,7 +11,7 @@
 
     # Project branches
     stream:
-        - master:
+        - beryllium:
             branch: 'master'
         - stable-lithium:
             branch: 'stable/lithium'
index bc8d2de8a0c4d78be600d9a42b63800ba987bf10..1acc99a01f873568f8d1d699c93f7291c7a57a7b 100644 (file)
@@ -1,7 +1,7 @@
 - project:
     name: openflowplugin-csit-scalability-daily
     jobs:
-        - '{project}-csit-periodic-1node-cds-{functionality}-{install}-{stream}'
+        - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
 
     # The project name
     project: 'openflowplugin'
@@ -11,7 +11,7 @@
 
     # Project branches
     stream:
-        - master:
+        - beryllium:
             branch: 'master'
         - stable-lithium:
             branch: 'stable/lithium'
index cb9190158c1b3826f9968a3bdae4e33f5042331e..8abb25610630fa488c7435cbfae3c54a50df2257 100644 (file)
@@ -1,7 +1,7 @@
 - project:
     name: openflowplugin-csit-scalability-lithium-redesign
     jobs:
-        - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
+        - '{project}-csit-1node-{functionality}-{install}-{stream}'
 
     # The project name
     project: 'openflowplugin'
@@ -11,7 +11,7 @@
 
     # Project branches
     stream:
-        - master:
+        - beryllium:
             branch: 'master'
         - stable-lithium:
             branch: 'stable/lithium'
@@ -30,4 +30,3 @@
 
     # Trigger jobs (upstream dependencies)
     trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'
-
index 664e6fe217e6d53143e506acaa66c36d77c0189c..05eac77b47e88ac067f281dd0e9737141a9def55 100644 (file)
@@ -1,8 +1,8 @@
 - project:
     name: openflowplugin-csit-scalability
     jobs:
-        - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-{functionality}-{stream}'
+        - '{project}-csit-1node-{functionality}-{install}-{stream}'
+        - '{project}-csit-verify-1node-{functionality}-{stream}'
 
     # The project name
     project: 'openflowplugin'
@@ -12,7 +12,7 @@
 
     # Project branches
     stream:
-        - master:
+        - beryllium:
             branch: 'master'
         - stable-lithium:
             branch: 'stable/lithium'
@@ -31,4 +31,3 @@
 
     # Trigger jobs (upstream dependencies)
     trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'
-
index 42e3532a66f3fb8226087a3047b0afcd904e4465..aa2e1d3a8a7f58ee226e92de76c8a3c01436e95d 100644 (file)
@@ -1,7 +1,7 @@
 - project:
     name: openflowplugin-csit-scale-stats-collection-daily-lithium-redesign
     jobs:
-        - '{project}-csit-periodic-1node-cds-{functionality}-{install}-{stream}'
+        - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
 
     # The project name
     project: 'openflowplugin'
@@ -11,7 +11,7 @@
 
     # Project branches
     stream:
-        - master:
+        - beryllium:
             branch: 'master'
         - stable-lithium:
             branch: 'stable/lithium'
index a8836797f08c40b2010ec07a056aee482a613fe0..4a81401a80943856ac8ac6cbc582e8e747811bfa 100644 (file)
@@ -1,7 +1,7 @@
 - project:
     name: openflowplugin-csit-scale-stats-collection-daily
     jobs:
-        - '{project}-csit-periodic-1node-cds-{functionality}-{install}-{stream}'
+        - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
 
     # The project name
     project: 'openflowplugin'
@@ -11,7 +11,7 @@
 
     # Project branches
     stream:
-        - master:
+        - beryllium:
             branch: 'master'
         - stable-lithium:
             branch: 'stable/lithium'
index 19ac1888979ab194776284a2e4ff501f8bdf3e2f..67a9645b69cac76be2d1947169ee35f5096d6c10 100644 (file)
@@ -1,7 +1,7 @@
 - project:
     name: openflowplugin-csit-statistics-basic-lithium-redesign
     jobs:
-        - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
+        - '{project}-csit-1node-{functionality}-{install}-{stream}'
 
     # The project name
     project: 'openflowplugin'
@@ -11,7 +11,7 @@
 
     # Project branches
     stream:
-        - master:
+        - beryllium:
             branch: 'master'
 
     install:
@@ -26,4 +26,3 @@
 
     # Trigger jobs (upstream dependencies)
     trigger-jobs: ''
-
index 008fcd78f5d61f154eedd873b4d42a866353aabe..db3de0987881f7ab5e66eb519c30177862c506dc 100644 (file)
@@ -1,7 +1,7 @@
 - project:
     name: openflowplugin-csit-sw-scalability-daily-lithium-redesign
     jobs:
-        - '{project}-csit-periodic-1node-cds-{functionality}-{install}-{stream}'
+        - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
 
     # The project name
     project: 'openflowplugin'
@@ -11,7 +11,7 @@
 
     # Project branches
     stream:
-        - master:
+        - beryllium:
             branch: 'master'
         - stable-lithium:
             branch: 'stable/lithium'
index 34d2690661d94092b20bc99233c904498ed4b66c..d4fcb3da9e33896890fbd6b2ccb5f73a4d66c160 100644 (file)
@@ -1,7 +1,7 @@
 - project:
     name: openflowplugin-csit-sw-scalability-daily
     jobs:
-        - '{project}-csit-periodic-1node-cds-{functionality}-{install}-{stream}'
+        - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
 
     # The project name
     project: 'openflowplugin'
@@ -11,7 +11,7 @@
 
     # Project branches
     stream:
-        - master:
+        - beryllium:
             branch: 'master'
         - stable-lithium:
             branch: 'stable/lithium'
index bc075d8270b2225cd760ab421d779b8a9d132edd..29c006292470d4f2b65ab06ddef3c1f4622a0796 100644 (file)
@@ -1,10 +1,13 @@
-BRANCHES:
-- master:
+STREAMS:
+- beryllium:
+    branch: master
     jdks: openjdk7,openjdk8
-- stable/helium:
-    jdks: openjdk7
-- stable/lithium:
+- stable-lithium:
+    branch: stable/lithium
     jdks: openjdk7,openjdk8
+- stable-helium:
+    branch: stable/helium
+    jdks: openjdk7
 MVN_GOALS: -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install javadoc:aggregate
 #MVN_OPTS: -Xmx1024m -XX:MaxPermSize=256m
 DEPENDENCIES: yangtools,controller,openflowjava
index cec783201557adcf6ddbc55b042d9d309c4cb24e..e45a11306f9dc769a733a4fc02e3fa8987720100 100644 (file)
@@ -1,8 +1,8 @@
 - project:
     name: ovsdb-csit-netvirt
     jobs:
-        - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-{functionality}-{stream}'
+        - '{project}-csit-1node-{functionality}-{install}-{stream}'
+        - '{project}-csit-verify-1node-{functionality}-{stream}'
 
     # The project name
     project: 'ovsdb'
@@ -12,7 +12,7 @@
 
     # Project branches
     stream:
-        - master:
+        - beryllium:
             branch: 'master'
         - stable-lithium:
             branch: 'stable/lithium'
index f7dfead56289f53cd65ef5fd7f83585a5e3d6e0c..57561531e9ac093e1c7bb09a409f1f5b7e72cc8e 100644 (file)
@@ -1,8 +1,8 @@
 - project:
     name: ovsdb-csit-southbound
     jobs:
-        - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-{functionality}-{stream}'
+        - '{project}-csit-1node-{functionality}-{install}-{stream}'
+        - '{project}-csit-verify-1node-{functionality}-{stream}'
    # The project name
     project: 'ovsdb'
 
@@ -11,7 +11,7 @@
 
     # Project branches
     stream:
-        - master:
+        - beryllium:
             branch: 'master'
         - stable-lithium:
             branch: 'stable/lithium'
index 1d1f2e05ee04f0bd0ce09d8b78335456f39e3a41..54830fbe2e29b37f985fbfa8829de2172efeee47 100644 (file)
@@ -1,9 +1,12 @@
-BRANCHES:
-- master:
+STREAMS:
+- beryllium:
+    branch: master
     jdks: openjdk7
-- stable/helium:
+- stable-lithium:
+    branch: stable/lithium
     jdks: openjdk7
-- stable/lithium:
+- stable-helium:
+    branch: stable/helium
     jdks: openjdk7
 DEPENDENCIES: odlparent,controller,yangtools,openflowplugin,neutron
 JOB_TEMPLATES: verify,merge,daily,distribution,integration
index acc9d69890bec5d8be6ed2de1fa1c76f5f5a9b7f..47bc78fec28803f782c6542c9a0ca27eea641d76 100644 (file)
@@ -1,8 +1,11 @@
-BRANCHES:
-- master:
+STREAMS:
+- beryllium:
+    branch: master
     jdks: openjdk7
-- stable/helium:
+- stable-lithium:
+    branch: stable/lithium
     jdks: openjdk7
-- stable/lithium:
+- stable-helium:
+    branch: stable/helium
     jdks: openjdk7
 DEPENDENCIES: controller,yangtools
index 16e7287df7da07bcd9da5f58029859d17b596430..3e7915f7fda3dd82d382c9a083742b09ccd7146b 100644 (file)
@@ -1,5 +1,7 @@
-BRANCHES:
-- master:
+STREAMS:
+- beryllium:
+    branch: master
     jdks: openjdk7,openjdk8
-- stable/lithium:
+- stable-lithium:
+    branch: stable/lithium
     jdks: openjdk7,openjdk8
index 4f93ff324423e6f30014c26a10c69673f530ffdc..742749a55eafb1aedd23791e44ec64c67b7bffbc 100644 (file)
@@ -87,4 +87,3 @@
     # Mininet configuration
     mininet-image: 'rk-c-el6-mininet'
     mininet-vms: 1
-
index cd70ad612d86bc3e9f49fb35eb11f37cf22d82a1..ab259c2570dbef5b110e64ed63565d92429626c6 100644 (file)
@@ -1,6 +1,8 @@
-BRANCHES:
-- master:
+STREAMS:
+- beryllium:
+    branch: master
     jdks: openjdk7
-- stable/lithium:
+- stable-lithium:
+    branch: stable/lithium
     jdks: openjdk7
 DEPENDENCIES: odlparent,controller,yangtools,groupbasedpolicy
index 6b103ac2dc8ffdcbd07afa3e227e1c4b80b2bcaf..4f2ffb5c1f94e1739fa957a450d78d573f4797f2 100644 (file)
@@ -1,9 +1,12 @@
-BRANCHES:
-- master:
+STREAMS:
+- beryllium:
+    branch: master
     jdks: openjdk7,openjdk8
-- stable/helium:
-    jdks: openjdk7
-- stable/lithium:
+- stable-lithium:
+    branch: stable/lithium
     jdks: openjdk7,openjdk8
+- stable-helium:
+    branch: stable/helium
+    jdks: openjdk7
 MVN_GOALS: clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
 DEPENDENCIES: odlparent,bgpcep
index 34f6dc579135d8860c75922ff829ec36e9915223..8839563fb3554abcd910ee5136f7107885b6b73d 100644 (file)
@@ -3,10 +3,10 @@
     jobs:
         - 'sfc-verify-python-{stream}'
 
-    # stream:    branch with - in place of / (eg. stable-helium)
-    # branch:    branch (eg. stable/helium)
+    # stream:    release stream (eg. stable-lithium or beryllium)
+    # branch:    git branch (eg. stable/lithium or master)
     stream:
-        - master:
+        - beryllium:
             branch: 'master'
 
     project: 'sfc'
@@ -20,8 +20,8 @@
     # The purpose of this job template is to setup a ODL verify job
     #
     # Required Variables:
-    #     stream:    branch with - in place of / (eg. stable-helium)
-    #     branch:    branch (eg. stable/helium)
+    #     stream:    release stream (eg. stable-lithium or beryllium)
+    #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: freestyle
     node: dynamic_verify
index 7faeacc46d6af35ebd0e3e4a9917d300f757cf85..dc72a80516ff12031d0899172bd92407b7f34080 100644 (file)
@@ -1,9 +1,12 @@
-BRANCHES:
-- master:
+STREAMS:
+- beryllium:
+    branch: master
     jdks: openjdk7
-- stable/helium:
+- stable-lithium:
+    branch: stable/lithium
     jdks: openjdk7
-- stable/lithium:
+- stable-helium:
+    branch: stable/helium
     jdks: openjdk7
 MVN_OPTS: -Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true
 DEPENDENCIES: odlparent,yangtools,controller,openflowplugin,ovsdb,lispflowmapping
index c40071eadded69b64cd66d49e1508ae3c63b5243..ce56cd201f0fca48419975acb13d38af5817c762 100644 (file)
@@ -1,7 +1,10 @@
-BRANCHES:
-- master:
+STREAMS:
+- beryllium:
+    branch: master
     jdks: openjdk7
-- stable/helium:
+- stable-lithium:
+    branch: stable/lithium
     jdks: openjdk7
-- stable/lithium:
+- stable-helium:
+    branch: stable/helium
     jdks: openjdk7
index d43e3a311da1b04f3aaa51cf9384075a17d4a223..3a76ab273a0899a0a4a9075a27a6adb8c9ea028e 100644 (file)
@@ -1,8 +1,8 @@
 - project:
     name: snmp-csit-basic
     jobs:
-        - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-{functionality}-{stream}'
+        - '{project}-csit-1node-{functionality}-{install}-{stream}'
+        - '{project}-csit-verify-1node-{functionality}-{stream}'
 
     # The project name
     project: 'snmp'
@@ -12,7 +12,7 @@
 
     # Project branches
     stream:
-        - master:
+        - beryllium:
             branch: 'master'
         - stable-lithium:
             branch: 'stable/lithium'
index 19c3192d410210f80c5d5e745ed6033d5911e276..3fd843f31492483956522064f540a06a2dc31dae 100644 (file)
@@ -1,5 +1,7 @@
-BRANCHES:
-- master:
+STREAMS:
+- beryllium:
+    branch: master
     jdks: openjdk7
-- stable/lithium:
+- stable-lithium:
+    branch: stable/lithium
     jdks: openjdk7
index c4c115a32a00f3fa80d32ef748ac85e16d7637d5..06ae5453aabbd1a6b0ae49c92eaec70de331ab07 100644 (file)
@@ -1,8 +1,11 @@
-BRANCHES:
-- master:
+STREAMS:
+- beryllium:
+    branch: master
     jdks: openjdk7
-- stable/helium:
+- stable-lithium:
+    branch: stable/lithium
     jdks: openjdk7
-- stable/lithium:
+- stable-helium:
+    branch: stable/helium
     jdks: openjdk7
 DEPENDENCIES: odlparent,controller,yangtools
index d0fc3da0e45baf9e8d89e1e44a41bec8c9707b0a..44e26020f52415c2b15f820ed5584a1160fe1399 100644 (file)
@@ -1,9 +1,12 @@
-BRANCHES:
-- master:
+STREAMS:
+- beryllium:
+    branch: master
     jdks: openjdk7
-- stable/helium:
+- stable-lithium:
+    branch: stable/lithium
     jdks: openjdk7
-- stable/lithium:
+- stable-helium:
+    branch: stable/helium
     jdks: openjdk7
 # MVN_GOALS: clean install javadoc:aggregate -DrepoBuild -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
 MVN_OPTS: -Xmx1024m -XX:MaxPermSize=256m
index cd3ec04733a0200435372829c72f871ec8390328..4ab923336cd8b68f2ee6632812df818fbe738688 100644 (file)
@@ -1,10 +1,13 @@
-BRANCHES:
-- master:
+STREAMS:
+- beryllium:
+    branch: master
     jdks: openjdk7,openjdk8
-- stable/helium:
-    jdks: openjdk7
-- stable/lithium:
+- stable-lithium:
+    branch: stable/lithium
     jdks: openjdk7,openjdk8
+- stable-helium:
+    branch: stable/helium
+    jdks: openjdk7
 MVN_GOALS: -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean -DrepoBuild install javadoc:aggregate
 MVN_OPTS: -Xmx1024m -XX:MaxPermSize=256m
 DEPENDENCIES: odlparent,yangtools,controller
index 4ae16ff4141ba23da5b3172e5936256e94d9a966..fd6c3cf0df5d296319e5bcd049548b0dfb44e584 100644 (file)
@@ -1,4 +1,5 @@
 DEPENDENCIES: odlparent,controller
-BRANCHES:
+STREAMS:
 - master:
+    branch: master
     jdks: openjdk7
index 78a97acf7896812699379203c275c12756eac657..e01dd52e19ccdb0d2bb9d820f7f83848de923015 100644 (file)
@@ -1,6 +1,8 @@
-BRANCHES:
-- master:
+STREAMS:
+- beryllium:
+    branch: master
     jdks: openjdk7,openjdk8
-- stable/lithium:
+- stable-lithium:
+    branch: stable/lithium
     jdks: openjdk7,openjdk8
 DEPENDENCIES: controller,yangtools
index 392ac2bbbd117266a11d61199beda0bee321b987..72ff78c4c46b658c769460d731e8e8967feb7611 100644 (file)
@@ -1,8 +1,8 @@
 - project:
     name: tsdr-csit-h2
     jobs:
-        - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-{functionality}-{stream}'
+        - '{project}-csit-1node-{functionality}-{install}-{stream}'
+        - '{project}-csit-verify-1node-{functionality}-{stream}'
 
     # The project name
     project: 'tsdr'
@@ -12,7 +12,7 @@
 
     # Project branches
     stream:
-        - master:
+        - beryllium:
             branch: 'master'
         - stable-lithium:
             branch: 'stable/lithium'
@@ -31,4 +31,3 @@
 
     # Trigger jobs (upstream dependencies)
     trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream},tsdr-distribution-{stream}'
-
index b988b56f8a9baf5a5c1efd7373d212396f0cfea4..3dee72ff769424c02a37843a958111d7f19df904 100644 (file)
@@ -1,8 +1,8 @@
 - project:
     name: tsdr-csit-hbase
     jobs:
-        - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-{functionality}-{stream}'
+        - '{project}-csit-1node-{functionality}-{install}-{stream}'
+        - '{project}-csit-verify-1node-{functionality}-{stream}'
 
     # The project name
     project: 'tsdr'
@@ -12,7 +12,7 @@
 
     # Project branches
     stream:
-        - master:
+        - beryllium:
             branch: 'master'
         - stable-lithium:
             branch: 'stable/lithium'
@@ -31,4 +31,3 @@
 
     # Trigger jobs (upstream dependencies)
     trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream},tsdr-distribution-{stream}'
-
index ca41d539926e1750067612345148dd0f791dc702..ae042dad93f956cb968e5e3f51cf9c245d29efde 100644 (file)
@@ -1,7 +1,9 @@
-BRANCHES:
-- master:
+STREAMS:
+- beryllium:
+    branch: master
     jdks: openjdk7
-- stable/lithium:
+- stable-lithium:
+    branch: stable/lithium
     jdks: openjdk7
 MVN_GOALS: clean install javadoc:aggregate -DrepoBuild -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
 MVN_OPTS: -Xmx1024m -XX:MaxPermSize=256m
index c40071eadded69b64cd66d49e1508ae3c63b5243..ce56cd201f0fca48419975acb13d38af5817c762 100644 (file)
@@ -1,7 +1,10 @@
-BRANCHES:
-- master:
+STREAMS:
+- beryllium:
+    branch: master
     jdks: openjdk7
-- stable/helium:
+- stable-lithium:
+    branch: stable/lithium
     jdks: openjdk7
-- stable/lithium:
+- stable-helium:
+    branch: stable/helium
     jdks: openjdk7
index 89b907b50dc84836c027f52dd2561d6299acad69..075532dc391b66dcb5aa429f9a23075600e07c9c 100644 (file)
@@ -1,8 +1,8 @@
 - project:
     name: usc-csit-channel
     jobs:
-        - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-{functionality}-{stream}'
+        - '{project}-csit-1node-{functionality}-{install}-{stream}'
+        - '{project}-csit-verify-1node-{functionality}-{stream}'
 
     # The project name
     project: 'usc'
@@ -12,7 +12,7 @@
 
     # Project branches
     stream:
-        - master:
+        - beryllium:
             branch: 'master'
         - stable-lithium:
             branch: 'stable/lithium'
@@ -31,4 +31,3 @@
 
     # Trigger jobs (upstream dependencies)
     trigger-jobs: 'odlparent-distribution-{stream},yangtools-distribution-{stream},controller-distribution-{stream},usc-distribution-{stream}'
-
index 001b0d6ccb2960f5b50eeabc75a8081c968a2171..691d27ac24b9fd2a9d7deb7ef3c371ec1fe82908 100644 (file)
@@ -1,6 +1,8 @@
-BRANCHES:
-- master:
+STREAMS:
+- beryllium:
+    branch: master
     jdks: openjdk7,openjdk8
-- stable/lithium:
+- stable-lithium:
+    branch: stable/lithium
     jdks: openjdk7,openjdk8
 DEPENDENCIES: controller,yangtools,odlparent
index 96ad47f0c29c25c312f54fc5e933fca6317d74ff..c82a5ee4a6581ace4afc88cd3a847bd4458419f0 100644 (file)
@@ -1,8 +1,8 @@
 - project:
     name: vpnservice-csit-vpnservice
     jobs:
-        - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-{functionality}-{stream}'
+        - '{project}-csit-1node-{functionality}-{install}-{stream}'
+        - '{project}-csit-verify-1node-{functionality}-{stream}'
 
     # The project name
     project: 'vpnservice'
@@ -12,7 +12,7 @@
 
     # Project branches
     stream:
-        - master:
+        - beryllium:
             branch: 'master'
         - stable-lithium:
             branch: 'stable/lithium'
@@ -35,4 +35,3 @@
 
     # Trigger jobs (upstream dependencies)
     trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream},vpnservice-distribution-{stream}'
-
index 087f8b39a8a188ed879a3193f2a5d2bd0060fdd2..ac61ca99a9665d60ddc106a5a7d837d2e98d6a06 100644 (file)
@@ -1,6 +1,8 @@
-BRANCHES:
-- master:
+STREAMS:
+- beryllium:
+    branch: master
     jdks: openjdk7
-- stable/lithium:
+- stable-lithium:
+    branch: stable/lithium
     jdks: openjdk7
 DEPENDENCIES: controller,yangtools,odlparent,openflowplugin
index caacb4ae662e5f2c8dbab55399dffc56dba5b064..ef4175b7e7d942fe40191b5bca5085894db66490 100644 (file)
@@ -1,8 +1,8 @@
 - project:
     name: vtn-csit-vtn-coordinator
     jobs:
-        - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-{functionality}-{stream}'
+        - '{project}-csit-1node-{functionality}-{install}-{stream}'
+        - '{project}-csit-verify-1node-{functionality}-{stream}'
 
     # The project name
     project: 'vtn'
@@ -12,7 +12,7 @@
 
     # Project branches
     stream:
-        - master:
+        - beryllium:
             branch: 'master'
         - stable-lithium:
             branch: 'stable/lithium'
index 9616344ebdbd2bf81a29ebe99d7335470ea3921b..0691c320e478c6da56dd96b067ca53d269b43ae7 100644 (file)
@@ -2,7 +2,7 @@
     name: vtn-csit-manager-stable-helium
     jobs:
         - '{project}-csit-1node-imds-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-{functionality}-{stream}'
+        - '{project}-csit-verify-1node-{functionality}-{stream}'
 
     # The project name
     project: 'vtn'
@@ -29,4 +29,3 @@
 
     # Trigger jobs (upstream dependencies)
     trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream},vtn-distribution-{stream}'
-
index b12b79106c2a3fb608d665a6f403fbba462c651d..d0f0dd620cbd45dc102809cd49298ad8dd33a1f1 100644 (file)
@@ -1,8 +1,8 @@
 - project:
     name: vtn-csit-manager
     jobs:
-        - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-{functionality}-{stream}'
+        - '{project}-csit-1node-{functionality}-{install}-{stream}'
+        - '{project}-csit-verify-1node-{functionality}-{stream}'
 
     # The project name
     project: 'vtn'
@@ -12,7 +12,7 @@
 
     # Project branches
     stream:
-        - master:
+        - beryllium:
             branch: 'master'
         - stable-lithium:
             branch: 'stable/lithium'
@@ -31,4 +31,3 @@
 
     # Trigger jobs (upstream dependencies)
     trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream},vtn-distribution-{stream}'
-
index 8a0d6cffce96de4cd5442510d634f8b344e17d68..a6b3f3f12d359021d5c97a9b92ebe9c5d2f9f655 100644 (file)
@@ -1,9 +1,12 @@
-BRANCHES:
-- master:
+STREAMS:
+- beryllium:
+    branch: master
     jdks: openjdk7
-- stable/helium:
+- stable-lithium:
+    branch: stable/lithium
     jdks: openjdk7
-- stable/lithium:
+- stable-helium:
+    branch: stable/helium
     jdks: openjdk7
 DEPENDENCIES: odlparent,controller,yangtools,openflowplugin,ovsdb,neutron
 MVN_GOALS: clean install -V -Pintegrationtests,strictcheck,docs -Dvtn.build.jobs=2 -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
index dd231f5543fd2a3ae43395ce5b973f1e7581b42f..f6cbc070906e6ac82b3b9f0d70c91b9c554ad86b 100644 (file)
@@ -13,7 +13,7 @@
             mvnver: "Maven 3.2.5"
 
     stream:
-        - master:
+        - beryllium:
             branch: master
 
     project: 'yangtools'
index 9a228665574aa5d603788e0d3d39a36a8d0cb01f..a52658855cfa997d2d03e74199f32e3bad898c53 100644 (file)
@@ -1,9 +1,12 @@
-BRANCHES:
-- master:
+STREAMS:
+- beryllium:
+    branch: master
     jdks: openjdk7,openjdk8
-- stable/helium:
-    jdks: openjdk7
-- stable/lithium:
+- stable-lithium:
+    branch: stable/lithium
     jdks: openjdk7,openjdk8
+- stable-helium:
+    branch: stable/helium
+    jdks: openjdk7
 DEPENDENCIES: odlparent
 JOB_TEMPLATES: merge,daily,distribution,integration,sonar
index 6e6b96698695321fdfc07061955cd17aa6c18a34..c2ec670407bb29ba7984b09783f1cd5932c9ca48 100644 (file)
@@ -50,35 +50,34 @@ if os.path.isfile(project_conf):
 ####################
 # Handle Templates #
 ####################
-if cfg.get('JOB_TEMPLATES'):
-    templates = cfg.get('JOB_TEMPLATES')
+if cfg.get("JOB_TEMPLATES"):
+    templates = cfg.get("JOB_TEMPLATES")
 else:
     templates = "verify,merge,daily,distribution,integration,sonar"
 templates += ",clm"  # ensure we always create a clm job for all projects
 
-###################
-# Handle Branches #
-###################
-branches = OrderedDict()
-if cfg.get('BRANCHES'):
-    for branch in cfg.get('BRANCHES'):
-        for b in branch:
-            branches.update({b: branch[b]})
+##################
+# Handle Streams #
+##################
+streams = OrderedDict()
+if cfg.get("STREAMS"):  # this is a list of single-key dicts
+    for stream_dict in cfg.get("STREAMS"):
+        streams.update(stream_dict)
 else:
-    branches.update({"master": {"jdks": "openjdk7"}})
+    streams = {"beryllium": jjblib.STREAM_DEFAULTS["beryllium"]}
 
-sonar_branch = list(branches.items())[0][0]
+first_stream = streams.iterkeys().next()  # Keep master branch at top.
+sonar_branch = streams[first_stream]["branch"]
 # Create YAML to list branches to create jobs for
-streams = "stream:\n"
-for branch, options in branches.items():
-    streams = streams + ("        - %s:\n"
-                         "            branch: '%s'\n" %
-                         (branch.replace('/', '-'),
-                          branch))
-    streams = streams + "            jdk: %s\n" % options["jdks"].split(",")[0].strip()  # noqa
-    streams = streams + "            jdks:\n"
+str_streams = "stream:\n"
+for stream, options in streams.items():
+    str_streams += ("        - %s:\n"
+                    "            branch: '%s'\n" %
+                    (stream, options["branch"]))
+    str_streams += "            jdk: %s\n" % options["jdks"].split(',')[0].strip()  # noqa
+    str_streams += "            jdks:\n"
     for jdk in options["jdks"].split(","):
-        streams = streams + "                - %s\n" % jdk.strip()
+        str_streams += "                - %s\n" % jdk.strip()
 
 ###############
 # Handle JDKS #
@@ -155,13 +154,13 @@ if not os.path.exists(project_dir):
     os.makedirs(project_dir)
 
 print("project: %s\n"
-      "branches: %s\n"
+      "streams: %s\n"
       "goals: %s\n"
       "options: %s\n"
       "dependencies: %s\n"
       "artifacts: %s" %
       (project,
-       branches,
+       str_streams,
        mvn_goals,
        mvn_opts,
        dependencies,
@@ -190,7 +189,7 @@ with open(project_file, "w") as outfile:
                     line = re.sub("JOB_TEMPLATES", job_templates_yaml, line)
                     line = re.sub("PROJECT", project.project, line)
                     line = re.sub("DISABLED", disabled, line)
-                    line = re.sub("STREAMS", streams, line)
+                    line = re.sub("STREAMS", str_streams, line)
                     line = re.sub("POM", pom, line)
                     line = re.sub("MAVEN_GOALS", mvn_goals, line)
                     line = re.sub("MAVEN_OPTS", mvn_opts, line)
index 2eea9bd784f5ba5a1decbc3b6659aee491e00e05..51cf9c046dde1e441c622722adeeb6115d7ff954 100644 (file)
@@ -1,4 +1,5 @@
 import argparse
+import collections
 import os
 
 import yaml
@@ -17,7 +18,8 @@ def parse_jjb_args():
                               "job is built successfully.\n\n"
                               "Example: aaa,controller,yangtools"))
     parser.add_argument("-t", "--templates", help="Job templates to use")
-    parser.add_argument("-b", "--branches", help="Git Branches to build")
+    parser.add_argument("-s", "--streams",
+                        help="Release streams to fill with default options")
     parser.add_argument("-p", "--pom", help="Path to pom.xml to use in Maven "
                                             "build (Default: pom.xml")
     parser.add_argument("-g", "--mvn-goals", help="Maven Goals")
@@ -29,17 +31,24 @@ def parse_jjb_args():
     return parser.parse_args()
 
 
+STREAM_DEFAULTS = collections.OrderedDict([
+    ("beryllium", {"branch": "master", "jdks": "openjdk7"}),
+    ("stable-lithium", {"branch": "stable/lithium", "jdks": "openjdk7"}),
+    ("stable-helium", {"branch": "stable/helium", "jdks": "openjdk7"}),
+])
+
+
 def create_template_config(project_dir, args):
     cfg_data = dict()
 
     if args.templates:
         cfg_data["JOB_TEMPLATES"] = args.templates
 
-    if args.branches:
-        branch_list = list()
-        for branch in args.branches.split(","):
-            branch_list.append({branch: {"jdks": "openjdk7"}})
-        cfg_data["BRANCHES"] = branch_list
+    if args.streams:
+        stream_list = list()
+        for stream in args.streams.split(","):
+            stream_list.append({stream: STREAM_DEFAULTS[stream]})
+        cfg_data["STREAMS"] = stream_list
 
     if args.pom:
         cfg_data["POM"] = args.pom