From: Vratko Polak Date: Tue, 7 Jul 2015 16:25:59 +0000 (+0200) Subject: Rework of streams/branches logic X-Git-Tag: release/lithium-sr1~27 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;ds=sidebyside;h=82bea3749fb5b8440955a7c64c07830d536edf38;p=releng%2Fbuilder.git Rework of streams/branches logic 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 Signed-off-by: Thanh Ha --- diff --git a/jjb-templates/daily.yaml b/jjb-templates/daily.yaml index 7edf18a5c..175165671 100644 --- a/jjb-templates/daily.yaml +++ b/jjb-templates/daily.yaml @@ -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 diff --git a/jjb-templates/distribution.yaml b/jjb-templates/distribution.yaml index b2a6db8fc..fb2ed0517 100644 --- a/jjb-templates/distribution.yaml +++ b/jjb-templates/distribution.yaml @@ -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}' diff --git a/jjb-templates/integration.yaml b/jjb-templates/integration.yaml index 9af372c4d..d6ff863ea 100644 --- a/jjb-templates/integration.yaml +++ b/jjb-templates/integration.yaml @@ -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 diff --git a/jjb-templates/merge.yaml b/jjb-templates/merge.yaml index c9591aca2..334d41674 100644 --- a/jjb-templates/merge.yaml +++ b/jjb-templates/merge.yaml @@ -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 diff --git a/jjb-templates/project.yaml b/jjb-templates/project.yaml index cb621af29..0cb05d8b1 100644 --- a/jjb-templates/project.yaml +++ b/jjb-templates/project.yaml @@ -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' diff --git a/jjb-templates/verify.yaml b/jjb-templates/verify.yaml index fbee70119..2af97cd31 100644 --- a/jjb-templates/verify.yaml +++ b/jjb-templates/verify.yaml @@ -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 diff --git a/jjb/aaa/aaa-csit-authn-stable-helium.yaml b/jjb/aaa/aaa-csit-authn-stable-helium.yaml index 8bb7f37ee..f1fe3275f 100644 --- a/jjb/aaa/aaa-csit-authn-stable-helium.yaml +++ b/jjb/aaa/aaa-csit-authn-stable-helium.yaml @@ -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}' - diff --git a/jjb/aaa/aaa-csit-authn.yaml b/jjb/aaa/aaa-csit-authn.yaml index ac20bfaca..f9e669913 100644 --- a/jjb/aaa/aaa-csit-authn.yaml +++ b/jjb/aaa/aaa-csit-authn.yaml @@ -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}' - diff --git a/jjb/aaa/aaa.cfg b/jjb/aaa/aaa.cfg index 34336212b..9e9a7ef03 100644 --- a/jjb/aaa/aaa.cfg +++ b/jjb/aaa/aaa.cfg @@ -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 diff --git a/jjb/alto/alto.cfg b/jjb/alto/alto.cfg index f398810a6..ffa28fee1 100644 --- a/jjb/alto/alto.cfg +++ b/jjb/alto/alto.cfg @@ -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 diff --git a/jjb/autorelease/autorelease-master.yaml b/jjb/autorelease/autorelease-beryllium.yaml similarity index 94% rename from jjb/autorelease/autorelease-master.yaml rename to jjb/autorelease/autorelease-beryllium.yaml index e4a37d69b..54b8fac62 100644 --- a/jjb/autorelease/autorelease-master.yaml +++ b/jjb/autorelease/autorelease-beryllium.yaml @@ -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 diff --git a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml index 8442d11dd..da1e69c8a 100644 --- a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml +++ b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml @@ -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' diff --git a/jjb/bgpcep/bgpcep-python.yaml b/jjb/bgpcep/bgpcep-python.yaml index 065669aee..c7119d2d5 100644 --- a/jjb/bgpcep/bgpcep-python.yaml +++ b/jjb/bgpcep/bgpcep-python.yaml @@ -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]' - diff --git a/jjb/bgpcep/bgpcep.cfg b/jjb/bgpcep/bgpcep.cfg index eef55629c..fb5132267 100644 --- a/jjb/bgpcep/bgpcep.cfg +++ b/jjb/bgpcep/bgpcep.cfg @@ -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 diff --git a/jjb/capwap/capwap-csit-ac.yaml b/jjb/capwap/capwap-csit-ac.yaml index 84e978f93..49b2cf013 100644 --- a/jjb/capwap/capwap-csit-ac.yaml +++ b/jjb/capwap/capwap-csit-ac.yaml @@ -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' diff --git a/jjb/capwap/capwap.cfg b/jjb/capwap/capwap.cfg index 1f570c101..f6a7eb8c6 100644 --- a/jjb/capwap/capwap.cfg +++ b/jjb/capwap/capwap.cfg @@ -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 diff --git a/jjb/controller/controller-csit-clustering.yaml b/jjb/controller/controller-csit-clustering.yaml index ac64433a6..6343fdae8 100644 --- a/jjb/controller/controller-csit-clustering.yaml +++ b/jjb/controller/controller-csit-clustering.yaml @@ -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}' - diff --git a/jjb/controller/controller-csit-netconf-stable-helium.yaml b/jjb/controller/controller-csit-netconf-stable-helium.yaml index 190a93e0b..eaf3f6ef8 100644 --- a/jjb/controller/controller-csit-netconf-stable-helium.yaml +++ b/jjb/controller/controller-csit-netconf-stable-helium.yaml @@ -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}' - diff --git a/jjb/controller/controller-csit-netconf.yaml b/jjb/controller/controller-csit-netconf.yaml index 2a0474f1b..52fee0d81 100644 --- a/jjb/controller/controller-csit-netconf.yaml +++ b/jjb/controller/controller-csit-netconf.yaml @@ -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}' - diff --git a/jjb/controller/controller-csit-nsf-stable-helium.yaml b/jjb/controller/controller-csit-nsf-stable-helium.yaml index 90452a35d..e967bc7ac 100644 --- a/jjb/controller/controller-csit-nsf-stable-helium.yaml +++ b/jjb/controller/controller-csit-nsf-stable-helium.yaml @@ -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}' - diff --git a/jjb/controller/controller.cfg b/jjb/controller/controller.cfg index 9d49b5b94..5431633ee 100644 --- a/jjb/controller/controller.cfg +++ b/jjb/controller/controller.cfg @@ -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 diff --git a/jjb/coretutorials/coretutorials.cfg b/jjb/coretutorials/coretutorials.cfg index de43ac149..e35b25918 100644 --- a/jjb/coretutorials/coretutorials.cfg +++ b/jjb/coretutorials/coretutorials.cfg @@ -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 diff --git a/jjb/defense4all/defense4all.cfg b/jjb/defense4all/defense4all.cfg index 42ddd11be..ae3d9a4c8 100644 --- a/jjb/defense4all/defense4all.cfg +++ b/jjb/defense4all/defense4all.cfg @@ -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 diff --git a/jjb/didm/didm.cfg b/jjb/didm/didm.cfg index bb16ff1be..a9237c43c 100644 --- a/jjb/didm/didm.cfg +++ b/jjb/didm/didm.cfg @@ -1,6 +1,8 @@ -BRANCHES: -- master: +STREAMS: +- beryllium: + branch: master jdks: openjdk7 -- stable/lithium: +- stable-lithium: + branch: stable/lithium jdks: openjdk7 DEPENDENCIES: odlparent diff --git a/jjb/discovery/discovery.cfg b/jjb/discovery/discovery.cfg index 68a71d930..eb87e8c8b 100644 --- a/jjb/discovery/discovery.cfg +++ b/jjb/discovery/discovery.cfg @@ -1,4 +1,5 @@ -BRANCHES: -- master: +STREAMS: +- beryllium: + branch: master jdks: openjdk7 DEPENDENCIES: odlparent diff --git a/jjb/dlux/dlux.cfg b/jjb/dlux/dlux.cfg index c40071ead..ce56cd201 100644 --- a/jjb/dlux/dlux.cfg +++ b/jjb/dlux/dlux.cfg @@ -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 diff --git a/jjb/docs/docs.cfg b/jjb/docs/docs.cfg index c40071ead..ce56cd201 100644 --- a/jjb/docs/docs.cfg +++ b/jjb/docs/docs.cfg @@ -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 diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml index d3c1820b6..20825df88 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml @@ -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' diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.cfg b/jjb/groupbasedpolicy/groupbasedpolicy.cfg index 3a1b40530..df9e7bd64 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy.cfg +++ b/jjb/groupbasedpolicy/groupbasedpolicy.cfg @@ -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 diff --git a/jjb/integration/integration-csit-basic-stable-helium.yaml b/jjb/integration/integration-csit-basic-stable-helium.yaml index bbb1127b1..ba2b7410f 100644 --- a/jjb/integration/integration-csit-basic-stable-helium.yaml +++ b/jjb/integration/integration-csit-basic-stable-helium.yaml @@ -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' diff --git a/jjb/integration/integration-csit-basic.yaml b/jjb/integration/integration-csit-basic.yaml index ced48b117..b90a4c046 100644 --- a/jjb/integration/integration-csit-basic.yaml +++ b/jjb/integration/integration-csit-basic.yaml @@ -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' diff --git a/jjb/integration/integration-jobs.yaml b/jjb/integration/integration-jobs.yaml index 6c172d7c2..90e37e518 100644 --- a/jjb/integration/integration-jobs.yaml +++ b/jjb/integration/integration-jobs.yaml @@ -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}' @@ -10,99 +10,99 @@ - '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' @@ -113,8 +113,8 @@ 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}, @@ -135,7 +135,7 @@ integration-distribution-merge-{stream} - job-template: - name: 'integration-csit-verify-{stream}' + name: 'integration-csit-verify-1node-{stream}' project-type: freestyle node: dynamic_robot @@ -464,4 +464,3 @@ publishers: - email-notification: email-prefix: '[integration]' - diff --git a/jjb/integration/integration-python.yaml b/jjb/integration/integration-python.yaml index 0bee35724..06f9bd4e3 100644 --- a/jjb/integration/integration-python.yaml +++ b/jjb/integration/integration-python.yaml @@ -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 diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml index 82da11798..73e7ddd19 100644 --- a/jjb/integration/integration-templates.yaml +++ b/jjb/integration/integration-templates.yaml @@ -954,4 +954,3 @@ inclusion-flag: 'off' display-table: true format: csv - diff --git a/jjb/iotdm/iotdm-csit-basic.yaml b/jjb/iotdm/iotdm-csit-basic.yaml index d72e8f2a2..54fcb2340 100644 --- a/jjb/iotdm/iotdm-csit-basic.yaml +++ b/jjb/iotdm/iotdm-csit-basic.yaml @@ -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' diff --git a/jjb/iotdm/iotdm.cfg b/jjb/iotdm/iotdm.cfg index 4bfdf75fa..016f03f6a 100644 --- a/jjb/iotdm/iotdm.cfg +++ b/jjb/iotdm/iotdm.cfg @@ -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 diff --git a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml index d051cbbaf..8524b7a26 100644 --- a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml +++ b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml @@ -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' diff --git a/jjb/l2switch/l2switch-csit-scalability.yaml b/jjb/l2switch/l2switch-csit-scalability.yaml index 6319e6d4e..233961a05 100644 --- a/jjb/l2switch/l2switch-csit-scalability.yaml +++ b/jjb/l2switch/l2switch-csit-scalability.yaml @@ -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}' - diff --git a/jjb/l2switch/l2switch-csit-switch-stable-helium.yaml b/jjb/l2switch/l2switch-csit-switch-stable-helium.yaml index e935d71c7..4b3f58e26 100644 --- a/jjb/l2switch/l2switch-csit-switch-stable-helium.yaml +++ b/jjb/l2switch/l2switch-csit-switch-stable-helium.yaml @@ -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}' - diff --git a/jjb/l2switch/l2switch-csit-switch.yaml b/jjb/l2switch/l2switch-csit-switch.yaml index 0b162eeda..36eb26e40 100644 --- a/jjb/l2switch/l2switch-csit-switch.yaml +++ b/jjb/l2switch/l2switch-csit-switch.yaml @@ -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}' - diff --git a/jjb/l2switch/l2switch.cfg b/jjb/l2switch/l2switch.cfg index 6b3460e66..156504fa1 100644 --- a/jjb/l2switch/l2switch.cfg +++ b/jjb/l2switch/l2switch.cfg @@ -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 diff --git a/jjb/lacp/lacp-csit-lacp.yaml b/jjb/lacp/lacp-csit-lacp.yaml index 8a078d27a..fd8326f64 100644 --- a/jjb/lacp/lacp-csit-lacp.yaml +++ b/jjb/lacp/lacp-csit-lacp.yaml @@ -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}' - diff --git a/jjb/lacp/lacp.cfg b/jjb/lacp/lacp.cfg index f8717b1ed..c88069e0e 100644 --- a/jjb/lacp/lacp.cfg +++ b/jjb/lacp/lacp.cfg @@ -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 diff --git a/jjb/lispflowmapping/lispflowmapping-csit-all-stable-helium.yaml b/jjb/lispflowmapping/lispflowmapping-csit-all-stable-helium.yaml index 9bd92c7f1..b5b0891ae 100644 --- a/jjb/lispflowmapping/lispflowmapping-csit-all-stable-helium.yaml +++ b/jjb/lispflowmapping/lispflowmapping-csit-all-stable-helium.yaml @@ -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}' - diff --git a/jjb/lispflowmapping/lispflowmapping-csit-all.yaml b/jjb/lispflowmapping/lispflowmapping-csit-all.yaml index 11545965b..dd21b3d37 100644 --- a/jjb/lispflowmapping/lispflowmapping-csit-all.yaml +++ b/jjb/lispflowmapping/lispflowmapping-csit-all.yaml @@ -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}' - diff --git a/jjb/lispflowmapping/lispflowmapping.cfg b/jjb/lispflowmapping/lispflowmapping.cfg index 3e471aeb2..94384d31f 100644 --- a/jjb/lispflowmapping/lispflowmapping.cfg +++ b/jjb/lispflowmapping/lispflowmapping.cfg @@ -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 diff --git a/jjb/nemo/nemo.cfg b/jjb/nemo/nemo.cfg index 5b3c057b8..2bdec4169 100644 --- a/jjb/nemo/nemo.cfg +++ b/jjb/nemo/nemo.cfg @@ -1,4 +1,5 @@ -BRANCHES: -- master: +STREAMS: +- beryllium: + branch: master jdks: openjdk7,openjdk8 DEPENDENCIES: controller,yangtools,odlparent diff --git a/jjb/neutron/neutron.cfg b/jjb/neutron/neutron.cfg index a423af553..f9b04926e 100644 --- a/jjb/neutron/neutron.cfg +++ b/jjb/neutron/neutron.cfg @@ -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 diff --git a/jjb/nic/nic-csit-basic.yaml b/jjb/nic/nic-csit-basic.yaml index 8b90bae49..8a4488318 100644 --- a/jjb/nic/nic-csit-basic.yaml +++ b/jjb/nic/nic-csit-basic.yaml @@ -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' diff --git a/jjb/nic/nic.cfg b/jjb/nic/nic.cfg index 9458cbcac..230fd2ba4 100644 --- a/jjb/nic/nic.cfg +++ b/jjb/nic/nic.cfg @@ -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 diff --git a/jjb/odlparent/odlparent.cfg b/jjb/odlparent/odlparent.cfg index c40071ead..ce56cd201 100644 --- a/jjb/odlparent/odlparent.cfg +++ b/jjb/odlparent/odlparent.cfg @@ -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 diff --git a/jjb/openflowjava/openflowjava.cfg b/jjb/openflowjava/openflowjava.cfg index c089311f4..13729319b 100644 --- a/jjb/openflowjava/openflowjava.cfg +++ b/jjb/openflowjava/openflowjava.cfg @@ -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 diff --git a/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily-lithium-redesign.yaml index 121257249..13d5a3cfa 100644 --- a/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily-lithium-redesign.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily-lithium-redesign.yaml @@ -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' diff --git a/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily.yaml index 931b53089..2657a1815 100644 --- a/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily.yaml @@ -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' diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml index af4f6ceb5..c92b1b9c6 100644 --- a/jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml @@ -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' diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-performance-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-performance-lithium-redesign.yaml index ed1a05a48..7fef892cc 100644 --- a/jjb/openflowplugin/openflowplugin-csit-cbench-performance-lithium-redesign.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-cbench-performance-lithium-redesign.yaml @@ -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' diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-performance.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-performance.yaml index f8ad74192..bcb74b6af 100644 --- a/jjb/openflowplugin/openflowplugin-csit-cbench-performance.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-cbench-performance.yaml @@ -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' diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml index cb1ea4e9e..478c942a9 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml @@ -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: diff --git a/jjb/openflowplugin/openflowplugin-csit-config-performance-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-config-performance-lithium-redesign.yaml index 1c53e5e76..9f66d8898 100644 --- a/jjb/openflowplugin/openflowplugin-csit-config-performance-lithium-redesign.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-config-performance-lithium-redesign.yaml @@ -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' diff --git a/jjb/openflowplugin/openflowplugin-csit-config-performance.yaml b/jjb/openflowplugin/openflowplugin-csit-config-performance.yaml index 2b0284ab0..8abbef49c 100644 --- a/jjb/openflowplugin/openflowplugin-csit-config-performance.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-config-performance.yaml @@ -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' diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services-lithium-redesign.yaml index 621d1c849..5e090b828 100644 --- a/jjb/openflowplugin/openflowplugin-csit-flow-services-lithium-redesign.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-flow-services-lithium-redesign.yaml @@ -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' diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services-more-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services-more-lithium-redesign.yaml index 0bc3ac63b..e208b1504 100644 --- a/jjb/openflowplugin/openflowplugin-csit-flow-services-more-lithium-redesign.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-flow-services-more-lithium-redesign.yaml @@ -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' diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services-more.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services-more.yaml index 7708d14bb..9db1756bb 100644 --- a/jjb/openflowplugin/openflowplugin-csit-flow-services-more.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-flow-services-more.yaml @@ -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}' - diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services-stable-helium.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services-stable-helium.yaml index d27d0f8b4..d712cf48f 100644 --- a/jjb/openflowplugin/openflowplugin-csit-flow-services-stable-helium.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-flow-services-stable-helium.yaml @@ -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}' - diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml index 9f2539ee8..6eb00a186 100644 --- a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml @@ -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}' - diff --git a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-lithium-redesign.yaml index dce0b1ea9..9426fa97b 100644 --- a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-lithium-redesign.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-lithium-redesign.yaml @@ -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' diff --git a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml index e212aae0c..46f67982a 100644 --- a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml @@ -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' diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity-lithium-redesign.yaml index 9fbbf7070..1fe10156a 100644 --- a/jjb/openflowplugin/openflowplugin-csit-longevity-lithium-redesign.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-longevity-lithium-redesign.yaml @@ -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: diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml index 4ea4f4972..a0ecd681f 100644 --- a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml @@ -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: diff --git a/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily-lithium-redesign.yaml index a16e183a3..e142f59f5 100644 --- a/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily-lithium-redesign.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily-lithium-redesign.yaml @@ -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' diff --git a/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily.yaml index 90e0ce093..b04c08ff0 100644 --- a/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily.yaml @@ -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' diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability-daily-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability-daily-lithium-redesign.yaml index dfcd52b72..183bff711 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scalability-daily-lithium-redesign.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scalability-daily-lithium-redesign.yaml @@ -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' diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability-daily.yaml index bc8d2de8a..1acc99a01 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scalability-daily.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scalability-daily.yaml @@ -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' diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability-lithium-redesign.yaml index cb9190158..8abb25610 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scalability-lithium-redesign.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scalability-lithium-redesign.yaml @@ -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}' - diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability.yaml index 664e6fe21..05eac77b4 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scalability.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scalability.yaml @@ -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}' - diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-lithium-redesign.yaml index 42e3532a6..aa2e1d3a8 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-lithium-redesign.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-lithium-redesign.yaml @@ -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' diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml index a8836797f..4a81401a8 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml @@ -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' diff --git a/jjb/openflowplugin/openflowplugin-csit-statistics-basic-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-statistics-basic-lithium-redesign.yaml index 19ac18889..67a9645b6 100644 --- a/jjb/openflowplugin/openflowplugin-csit-statistics-basic-lithium-redesign.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-statistics-basic-lithium-redesign.yaml @@ -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: '' - diff --git a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-lithium-redesign.yaml index 008fcd78f..db3de0987 100644 --- a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-lithium-redesign.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-lithium-redesign.yaml @@ -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' diff --git a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml index 34d269066..d4fcb3da9 100644 --- a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml @@ -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' diff --git a/jjb/openflowplugin/openflowplugin.cfg b/jjb/openflowplugin/openflowplugin.cfg index bc075d827..29c006292 100644 --- a/jjb/openflowplugin/openflowplugin.cfg +++ b/jjb/openflowplugin/openflowplugin.cfg @@ -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 diff --git a/jjb/ovsdb/ovsdb-csit-netvirt.yaml b/jjb/ovsdb/ovsdb-csit-netvirt.yaml index cec783201..e45a11306 100644 --- a/jjb/ovsdb/ovsdb-csit-netvirt.yaml +++ b/jjb/ovsdb/ovsdb-csit-netvirt.yaml @@ -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' diff --git a/jjb/ovsdb/ovsdb-csit-southbound.yaml b/jjb/ovsdb/ovsdb-csit-southbound.yaml index f7dfead56..57561531e 100644 --- a/jjb/ovsdb/ovsdb-csit-southbound.yaml +++ b/jjb/ovsdb/ovsdb-csit-southbound.yaml @@ -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' diff --git a/jjb/ovsdb/ovsdb.cfg b/jjb/ovsdb/ovsdb.cfg index 1d1f2e05e..54830fbe2 100644 --- a/jjb/ovsdb/ovsdb.cfg +++ b/jjb/ovsdb/ovsdb.cfg @@ -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 diff --git a/jjb/packetcable/packetcable.cfg b/jjb/packetcable/packetcable.cfg index acc9d6989..47bc78fec 100644 --- a/jjb/packetcable/packetcable.cfg +++ b/jjb/packetcable/packetcable.cfg @@ -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 diff --git a/jjb/persistence/persistence.cfg b/jjb/persistence/persistence.cfg index 16e7287df..3e7915f7f 100644 --- a/jjb/persistence/persistence.cfg +++ b/jjb/persistence/persistence.cfg @@ -1,5 +1,7 @@ -BRANCHES: -- master: +STREAMS: +- beryllium: + branch: master jdks: openjdk7,openjdk8 -- stable/lithium: +- stable-lithium: + branch: stable/lithium jdks: openjdk7,openjdk8 diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml index 4f93ff324..742749a55 100644 --- a/jjb/releng-defaults.yaml +++ b/jjb/releng-defaults.yaml @@ -87,4 +87,3 @@ # Mininet configuration mininet-image: 'rk-c-el6-mininet' mininet-vms: 1 - diff --git a/jjb/reservation/reservation.cfg b/jjb/reservation/reservation.cfg index cd70ad612..ab259c257 100644 --- a/jjb/reservation/reservation.cfg +++ b/jjb/reservation/reservation.cfg @@ -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 diff --git a/jjb/sdninterfaceapp/sdninterfaceapp.cfg b/jjb/sdninterfaceapp/sdninterfaceapp.cfg index 6b103ac2d..4f2ffb5c1 100644 --- a/jjb/sdninterfaceapp/sdninterfaceapp.cfg +++ b/jjb/sdninterfaceapp/sdninterfaceapp.cfg @@ -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 diff --git a/jjb/sfc/sfc-python.yaml b/jjb/sfc/sfc-python.yaml index 34f6dc579..8839563fb 100644 --- a/jjb/sfc/sfc-python.yaml +++ b/jjb/sfc/sfc-python.yaml @@ -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 diff --git a/jjb/sfc/sfc.cfg b/jjb/sfc/sfc.cfg index 7faeacc46..dc72a8051 100644 --- a/jjb/sfc/sfc.cfg +++ b/jjb/sfc/sfc.cfg @@ -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 diff --git a/jjb/snbi/snbi.cfg b/jjb/snbi/snbi.cfg index c40071ead..ce56cd201 100644 --- a/jjb/snbi/snbi.cfg +++ b/jjb/snbi/snbi.cfg @@ -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 diff --git a/jjb/snmp/snmp-csit-basic.yaml b/jjb/snmp/snmp-csit-basic.yaml index d43e3a311..3a76ab273 100644 --- a/jjb/snmp/snmp-csit-basic.yaml +++ b/jjb/snmp/snmp-csit-basic.yaml @@ -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' diff --git a/jjb/snmp/snmp.cfg b/jjb/snmp/snmp.cfg index 19c3192d4..3fd843f31 100644 --- a/jjb/snmp/snmp.cfg +++ b/jjb/snmp/snmp.cfg @@ -1,5 +1,7 @@ -BRANCHES: -- master: +STREAMS: +- beryllium: + branch: master jdks: openjdk7 -- stable/lithium: +- stable-lithium: + branch: stable/lithium jdks: openjdk7 diff --git a/jjb/snmp4sdn/snmp4sdn.cfg b/jjb/snmp4sdn/snmp4sdn.cfg index c4c115a32..06ae5453a 100644 --- a/jjb/snmp4sdn/snmp4sdn.cfg +++ b/jjb/snmp4sdn/snmp4sdn.cfg @@ -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 diff --git a/jjb/sxp/sxp.cfg b/jjb/sxp/sxp.cfg index d0fc3da0e..44e26020f 100644 --- a/jjb/sxp/sxp.cfg +++ b/jjb/sxp/sxp.cfg @@ -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 diff --git a/jjb/tcpmd5/tcpmd5.cfg b/jjb/tcpmd5/tcpmd5.cfg index cd3ec0473..4ab923336 100644 --- a/jjb/tcpmd5/tcpmd5.cfg +++ b/jjb/tcpmd5/tcpmd5.cfg @@ -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 diff --git a/jjb/toolkit/toolkit.cfg b/jjb/toolkit/toolkit.cfg index 4ae16ff41..fd6c3cf0d 100644 --- a/jjb/toolkit/toolkit.cfg +++ b/jjb/toolkit/toolkit.cfg @@ -1,4 +1,5 @@ DEPENDENCIES: odlparent,controller -BRANCHES: +STREAMS: - master: + branch: master jdks: openjdk7 diff --git a/jjb/topoprocessing/topoprocessing.cfg b/jjb/topoprocessing/topoprocessing.cfg index 78a97acf7..e01dd52e1 100644 --- a/jjb/topoprocessing/topoprocessing.cfg +++ b/jjb/topoprocessing/topoprocessing.cfg @@ -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 diff --git a/jjb/tsdr/tsdr-csit-h2.yaml b/jjb/tsdr/tsdr-csit-h2.yaml index 392ac2bbb..72ff78c4c 100644 --- a/jjb/tsdr/tsdr-csit-h2.yaml +++ b/jjb/tsdr/tsdr-csit-h2.yaml @@ -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}' - diff --git a/jjb/tsdr/tsdr-csit-hbase.yaml b/jjb/tsdr/tsdr-csit-hbase.yaml index b988b56f8..3dee72ff7 100644 --- a/jjb/tsdr/tsdr-csit-hbase.yaml +++ b/jjb/tsdr/tsdr-csit-hbase.yaml @@ -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}' - diff --git a/jjb/tsdr/tsdr.cfg b/jjb/tsdr/tsdr.cfg index ca41d5399..ae042dad9 100644 --- a/jjb/tsdr/tsdr.cfg +++ b/jjb/tsdr/tsdr.cfg @@ -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 diff --git a/jjb/ttp/ttp.cfg b/jjb/ttp/ttp.cfg index c40071ead..ce56cd201 100644 --- a/jjb/ttp/ttp.cfg +++ b/jjb/ttp/ttp.cfg @@ -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 diff --git a/jjb/usc/usc-csit-channel.yaml b/jjb/usc/usc-csit-channel.yaml index 89b907b50..075532dc3 100644 --- a/jjb/usc/usc-csit-channel.yaml +++ b/jjb/usc/usc-csit-channel.yaml @@ -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}' - diff --git a/jjb/usc/usc.cfg b/jjb/usc/usc.cfg index 001b0d6cc..691d27ac2 100644 --- a/jjb/usc/usc.cfg +++ b/jjb/usc/usc.cfg @@ -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 diff --git a/jjb/vpnservice/vpnservice-csit-vpnservice.yaml b/jjb/vpnservice/vpnservice-csit-vpnservice.yaml index 96ad47f0c..c82a5ee4a 100644 --- a/jjb/vpnservice/vpnservice-csit-vpnservice.yaml +++ b/jjb/vpnservice/vpnservice-csit-vpnservice.yaml @@ -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}' - diff --git a/jjb/vpnservice/vpnservice.cfg b/jjb/vpnservice/vpnservice.cfg index 087f8b39a..ac61ca99a 100644 --- a/jjb/vpnservice/vpnservice.cfg +++ b/jjb/vpnservice/vpnservice.cfg @@ -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 diff --git a/jjb/vtn/vtn-csit-coordinator.yaml b/jjb/vtn/vtn-csit-coordinator.yaml index caacb4ae6..ef4175b7e 100644 --- a/jjb/vtn/vtn-csit-coordinator.yaml +++ b/jjb/vtn/vtn-csit-coordinator.yaml @@ -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' diff --git a/jjb/vtn/vtn-csit-manager-stable-helium.yaml b/jjb/vtn/vtn-csit-manager-stable-helium.yaml index 9616344eb..0691c320e 100644 --- a/jjb/vtn/vtn-csit-manager-stable-helium.yaml +++ b/jjb/vtn/vtn-csit-manager-stable-helium.yaml @@ -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}' - diff --git a/jjb/vtn/vtn-csit-manager.yaml b/jjb/vtn/vtn-csit-manager.yaml index b12b79106..d0f0dd620 100644 --- a/jjb/vtn/vtn-csit-manager.yaml +++ b/jjb/vtn/vtn-csit-manager.yaml @@ -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}' - diff --git a/jjb/vtn/vtn.cfg b/jjb/vtn/vtn.cfg index 8a0d6cffc..a6b3f3f12 100644 --- a/jjb/vtn/vtn.cfg +++ b/jjb/vtn/vtn.cfg @@ -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 diff --git a/jjb/yangtools/yangtools-verify.yaml b/jjb/yangtools/yangtools-verify.yaml index dd231f554..f6cbc0709 100644 --- a/jjb/yangtools/yangtools-verify.yaml +++ b/jjb/yangtools/yangtools-verify.yaml @@ -13,7 +13,7 @@ mvnver: "Maven 3.2.5" stream: - - master: + - beryllium: branch: master project: 'yangtools' diff --git a/jjb/yangtools/yangtools.cfg b/jjb/yangtools/yangtools.cfg index 9a2286655..a52658855 100644 --- a/jjb/yangtools/yangtools.cfg +++ b/jjb/yangtools/yangtools.cfg @@ -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 diff --git a/scripts/jjb-init-project.py b/scripts/jjb-init-project.py index 6e6b96698..c2ec67040 100644 --- a/scripts/jjb-init-project.py +++ b/scripts/jjb-init-project.py @@ -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) diff --git a/scripts/jjblib.py b/scripts/jjblib.py index 2eea9bd78..51cf9c046 100644 --- a/scripts/jjblib.py +++ b/scripts/jjblib.py @@ -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