From: Anil Belur Date: Mon, 26 Feb 2018 02:43:21 +0000 (+1000) Subject: Create Fluorine jobs and bump Oxygen branch X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=releng%2Fbuilder.git;a=commitdiff_plain;h=d2dbe00f26c3fd709f069d917b6d466d7bda4115 Create Fluorine jobs and bump Oxygen branch Oxygen branch cutting to reflect new stable/oxygen branches and move master to Fluorine. JIRA: RELENG-794 Change-Id: I21831211ab5b3a1458354355c3cfbb88bb5bb3ec Signed-off-by: Anil Belur --- diff --git a/jjb/aaa/aaa-csit-authn.yaml b/jjb/aaa/aaa-csit-authn.yaml index f4a0125c5..1360004a5 100644 --- a/jjb/aaa/aaa-csit-authn.yaml +++ b/jjb/aaa/aaa-csit-authn.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/aaa/aaa-csit-keystone.yaml b/jjb/aaa/aaa-csit-keystone.yaml index 67d646f67..f4483c246 100644 --- a/jjb/aaa/aaa-csit-keystone.yaml +++ b/jjb/aaa/aaa-csit-keystone.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/aaa/aaa-csit-tls.yaml b/jjb/aaa/aaa-csit-tls.yaml index 7898be659..c557db0bb 100644 --- a/jjb/aaa/aaa-csit-tls.yaml +++ b/jjb/aaa/aaa-csit-tls.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/aaa/aaa-patch-test.yaml b/jjb/aaa/aaa-patch-test.yaml index 48a261785..d630199be 100644 --- a/jjb/aaa/aaa-patch-test.yaml +++ b/jjb/aaa/aaa-patch-test.yaml @@ -9,8 +9,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml index 9ce1c94c5..f4e71ff3d 100644 --- a/jjb/aaa/aaa.yaml +++ b/jjb/aaa/aaa.yaml @@ -1,4 +1,22 @@ --- +- project: + name: aaa-fluorine + jobs: + - '{project-name}-distribution-check-{stream}' + - odl-maven-jobs + + stream: fluorine + project: 'aaa' + project-name: 'aaa' + branch: 'master' + mvn-settings: 'aaa-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' + email-upstream: '[aaa] [odlparent] [yangtools] [controller]' + + # Used by the release job + staging-profile-id: 9318cf3c82c33 + - project: name: aaa-oxygen jobs: @@ -8,7 +26,7 @@ stream: oxygen project: 'aaa' project-name: 'aaa' - branch: 'master' + branch: 'stable/oxygen' mvn-settings: 'aaa-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' diff --git a/jjb/alto/alto-csit-setup.yaml b/jjb/alto/alto-csit-setup.yaml index 172f7506b..14fbfd8d8 100644 --- a/jjb/alto/alto-csit-setup.yaml +++ b/jjb/alto/alto-csit-setup.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/alto/alto.yaml b/jjb/alto/alto.yaml index d1085a28f..7145b02a7 100644 --- a/jjb/alto/alto.yaml +++ b/jjb/alto/alto.yaml @@ -1,4 +1,23 @@ --- +- project: + name: alto-fluorine + jobs: + - '{project-name}-distribution-check-{stream}' + - odl-maven-jobs + + stream: fluorine + project: 'alto' + project-name: 'alto' + branch: 'master' + build-node: centos7-builder-2c-8g + mvn-settings: 'alto-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: 'l2switch-merge-{stream}' + email-upstream: '[alto] [l2switch]' + + # Used by the release job + staging-profile-id: 931eabae9693c + - project: name: alto-oxygen jobs: @@ -8,7 +27,7 @@ stream: oxygen project: 'alto' project-name: 'alto' - branch: 'master' + branch: 'stable/oxygen' build-node: centos7-builder-2c-8g mvn-settings: 'alto-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/atrium/atrium.yaml b/jjb/atrium/atrium.yaml index 447d85160..34f659786 100644 --- a/jjb/atrium/atrium.yaml +++ b/jjb/atrium/atrium.yaml @@ -1,4 +1,22 @@ --- +- project: + name: atrium-fluorine + jobs: + - '{project-name}-distribution-check-{stream}' + - odl-maven-jobs + + stream: fluorine + project: 'atrium' + project-name: 'atrium' + branch: 'master' + mvn-settings: 'atrium-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: '' + email-upstream: '[atrium]' + + # Used by the release job + staging-profile-id: 9324f12310e6a + - project: name: atrium-oxygen jobs: @@ -8,7 +26,7 @@ stream: oxygen project: 'atrium' project-name: 'atrium' - branch: 'master' + branch: 'stable/oxygen' mvn-settings: 'atrium-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml index 9e6bc1e47..12f6f6004 100644 --- a/jjb/autorelease/autorelease-projects.yaml +++ b/jjb/autorelease/autorelease-projects.yaml @@ -14,9 +14,14 @@ # todo: After Carbon EOL remove next-release-tag and directy pass # '{stream}' to autorelease-release-tag parameter stream: - - oxygen: + - fluorine: next-release-tag: '{stream}' branch: 'master' + integration-test: fluorine + extra-mvn-opts: -Dsft.heap.max=4g + - oxygen: + next-release-tag: '{stream}' + branch: 'stable/oxygen' integration-test: oxygen extra-mvn-opts: -Dsft.heap.max=4g - nitrogen: diff --git a/jjb/autorelease/autorelease-version-management.yaml b/jjb/autorelease/autorelease-version-management.yaml index b80c1eeb1..88670afd9 100644 --- a/jjb/autorelease/autorelease-version-management.yaml +++ b/jjb/autorelease/autorelease-version-management.yaml @@ -11,9 +11,11 @@ build-node: centos7-builder-2c-8g stream: + - fluorine: + branch: 'master' - oxygen: - branch: master + branch: 'stable/oxygen' - nitrogen: - branch: stable/nitrogen + branch: 'stable/nitrogen' - carbon: - branch: stable/carbon + branch: 'stable/carbon' diff --git a/jjb/bgpcep/bgpcep-csit-bgp-gate-ingest-mixed.yaml b/jjb/bgpcep/bgpcep-csit-bgp-gate-ingest-mixed.yaml index c0441af51..763c5b6bf 100644 --- a/jjb/bgpcep/bgpcep-csit-bgp-gate-ingest-mixed.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgp-gate-ingest-mixed.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml index 37137285c..16976ff6a 100644 --- a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml index a078abb9f..b61c1b819 100644 --- a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml index 3f5f7270f..752100734 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml @@ -12,7 +12,7 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' install-features: > odl-restconf, @@ -21,7 +21,15 @@ odl-bgpcep-bmp, odl-bgpcep-bmp-config-example, odl-bgpcep-pcep - + - oxygen: + branch: 'stable/oxygen' + install-features: > + odl-restconf, + odl-bgpcep-bgp, + odl-bgpcep-bgp-config-example, + odl-bgpcep-bmp, + odl-bgpcep-bmp-config-example, + odl-bgpcep-pcep - nitrogen: branch: 'stable/nitrogen' install-features: > diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml index 3d7a48cba..ee8e9d37a 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml index 96ae34914..96f954631 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/bgpcep/bgpcep-csit-gate-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-gate-throughpcep.yaml index 326431132..3e7b71c86 100644 --- a/jjb/bgpcep/bgpcep-csit-gate-throughpcep.yaml +++ b/jjb/bgpcep/bgpcep-csit-gate-throughpcep.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml index c0fc3a7a8..0eca8dc68 100644 --- a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml +++ b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml index 384845689..a0316bfed 100644 --- a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml +++ b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml @@ -15,8 +15,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/bgpcep/bgpcep-patch-test.yaml b/jjb/bgpcep/bgpcep-patch-test.yaml index 3c1f84b94..f1e6f274a 100644 --- a/jjb/bgpcep/bgpcep-patch-test.yaml +++ b/jjb/bgpcep/bgpcep-patch-test.yaml @@ -9,8 +9,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml index 5c8ee1da2..a05817ddb 100644 --- a/jjb/bgpcep/bgpcep.yaml +++ b/jjb/bgpcep/bgpcep.yaml @@ -1,4 +1,30 @@ --- +- project: + name: bgpcep-fluorine + jobs: + - '{project-name}-distribution-check-{stream}' + - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs + + stream: fluorine + project: 'bgpcep' + project-name: 'bgpcep' + build-node: centos7-builder-8c-8g + build-timeout: 120 + branch: 'master' + mvn-settings: 'bgpcep-settings' + mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m' + dependencies: > + odlparent-merge-{stream}, + yangtools-merge-{stream}, + controller-merge-{stream}, + mdsal-merge-{stream}, + tcpmd5-merge-{stream} + email-upstream: '[bgpcep] [odlparent] [yangtools] [controller] [mdsal] [tcpmd5]' + + # Used by the release job + staging-profile-id: 9427a05049030 + - project: name: bgpcep-oxygen jobs: @@ -11,7 +37,7 @@ project-name: 'bgpcep' build-node: centos7-builder-8c-8g build-timeout: 120 - branch: 'master' + branch: 'stable/oxygen' mvn-settings: 'bgpcep-settings' mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m' dependencies: > diff --git a/jjb/bier/bier-csit-basic.yaml b/jjb/bier/bier-csit-basic.yaml index 94459efaf..afeed6b87 100644 --- a/jjb/bier/bier-csit-basic.yaml +++ b/jjb/bier/bier-csit-basic.yaml @@ -17,8 +17,10 @@ # incompatible changes in test suites for Nitrogen # TODO: Create test suites for specific release before # Nitrogen if needed. - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/bier/bier.yaml b/jjb/bier/bier.yaml index 3dd2638f4..be6163729 100644 --- a/jjb/bier/bier.yaml +++ b/jjb/bier/bier.yaml @@ -1,4 +1,24 @@ --- +- project: + name: bier-fluorine + jobs: + - '{project-name}-distribution-check-{stream}' + - odl-maven-jobs + + stream: fluorine + project: 'bier' + project-name: 'bier' + branch: 'master' + build-node: centos7-builder-2c-8g + build-timeout: 90 + mvn-settings: 'bier-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: '' + email-upstream: '[bier]' + + # Used by the release job + staging-profile-id: 942a8075b1f2a + - project: name: bier-oxygen jobs: @@ -8,7 +28,7 @@ stream: oxygen project: 'bier' project-name: 'bier' - branch: 'master' + branch: 'stable/oxygen' build-node: centos7-builder-2c-8g build-timeout: 90 mvn-settings: 'bier-settings' diff --git a/jjb/capwap/capwap-csit-ac.yaml b/jjb/capwap/capwap-csit-ac.yaml index 6a5975d5d..023718a5c 100644 --- a/jjb/capwap/capwap-csit-ac.yaml +++ b/jjb/capwap/capwap-csit-ac.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/capwap/capwap.yaml b/jjb/capwap/capwap.yaml index e6fdae199..6836282e6 100644 --- a/jjb/capwap/capwap.yaml +++ b/jjb/capwap/capwap.yaml @@ -1,4 +1,22 @@ --- +- project: + name: capwap-fluorine + jobs: + - '{project-name}-distribution-check-{stream}' + - odl-maven-jobs + + stream: fluorine + project: 'capwap' + project-name: 'capwap' + branch: 'master' + mvn-settings: 'capwap-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: '' + email-upstream: '[capwap]' + + # Used by the release job + staging-profile-id: 96bd6b5bf86e3 + - project: name: capwap-oxygen jobs: @@ -8,7 +26,7 @@ stream: oxygen project: 'capwap' project-name: 'capwap' - branch: 'master' + branch: 'stable/oxygen' mvn-settings: 'capwap-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' diff --git a/jjb/cardinal/cardinal.yaml b/jjb/cardinal/cardinal.yaml index 71b99503d..58b826da0 100644 --- a/jjb/cardinal/cardinal.yaml +++ b/jjb/cardinal/cardinal.yaml @@ -1,4 +1,22 @@ --- +- project: + name: cardinal-fluorine + jobs: + - '{project-name}-distribution-check-{stream}' + - odl-maven-jobs + + stream: fluorine + project: 'cardinal' + project-name: 'cardinal' + branch: 'master' + mvn-settings: 'cardinal-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: 'openflowplugin-merge-{stream},iotdm-merge-{stream},sfc-merge-{stream}' + email-upstream: '[cardinal] [openflowplugin] [iotdm] [sfc]' + + # Used by the release job + staging-profile-id: 96be20348f0f2 + - project: name: cardinal-oxygen jobs: @@ -8,7 +26,7 @@ stream: oxygen project: 'cardinal' project-name: 'cardinal' - branch: 'master' + branch: 'stable/oxygen' mvn-settings: 'cardinal-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'openflowplugin-merge-{stream},iotdm-merge-{stream},sfc-merge-{stream}' diff --git a/jjb/centinel/centinel-csit-basic.yaml b/jjb/centinel/centinel-csit-basic.yaml index 9e5489b6f..7a4a45f52 100644 --- a/jjb/centinel/centinel-csit-basic.yaml +++ b/jjb/centinel/centinel-csit-basic.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/centinel/centinel.yaml b/jjb/centinel/centinel.yaml index a9beae82d..e65f791a3 100644 --- a/jjb/centinel/centinel.yaml +++ b/jjb/centinel/centinel.yaml @@ -1,4 +1,22 @@ --- +- project: + name: centinel-fluorine + jobs: + - '{project-name}-distribution-check-{stream}' + - odl-maven-jobs + + stream: fluorine + project: 'centinel' + project-name: 'centinel' + branch: 'master' + mvn-settings: 'centinel-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: '' + email-upstream: '[centinel]' + + # Used by the release job + staging-profile-id: 96bf9b3fefd8a + - project: name: centinel-oxygen jobs: @@ -8,7 +26,7 @@ stream: oxygen project: 'centinel' project-name: 'centinel' - branch: 'master' + branch: 'stable/oxygen' mvn-settings: 'centinel-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' diff --git a/jjb/coe/coe.yaml b/jjb/coe/coe.yaml index 290f29cf8..0cf37a885 100644 --- a/jjb/coe/coe.yaml +++ b/jjb/coe/coe.yaml @@ -1,4 +1,22 @@ --- +- project: + name: coe-fluorine + jobs: + - '{project-name}-distribution-check-{stream}' + - odl-maven-jobs + + project: 'coe' + project-name: 'coe' + stream: fluorine + branch: 'master' + mvn-settings: 'coe-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' + email-upstream: '[coe] [odlparent] [yangtools] [controller]' + + # Used by the release job + staging-profile-id: 96c0be46aac33 + - project: name: coe-oxygen jobs: @@ -8,7 +26,7 @@ project: 'coe' project-name: 'coe' stream: oxygen - branch: 'master' + branch: 'stable/oxygen' mvn-settings: 'coe-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' diff --git a/jjb/controller/controller-csit-akka1.yaml b/jjb/controller/controller-csit-akka1.yaml index 32595905d..eb580fda5 100644 --- a/jjb/controller/controller-csit-akka1.yaml +++ b/jjb/controller/controller-csit-akka1.yaml @@ -11,8 +11,10 @@ functionality: 'akka1' stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/controller/controller-csit-clustering.yaml b/jjb/controller/controller-csit-clustering.yaml index 1e46d21c7..23ffa331c 100644 --- a/jjb/controller/controller-csit-clustering.yaml +++ b/jjb/controller/controller-csit-clustering.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/controller/controller-csit-cs-chasing-leader.yaml b/jjb/controller/controller-csit-cs-chasing-leader.yaml index 93735f152..a6bd7ac4d 100644 --- a/jjb/controller/controller-csit-cs-chasing-leader.yaml +++ b/jjb/controller/controller-csit-cs-chasing-leader.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/controller/controller-csit-cs-partnheal.yaml b/jjb/controller/controller-csit-cs-partnheal.yaml index 7ff4b538b..a5130abf9 100644 --- a/jjb/controller/controller-csit-cs-partnheal.yaml +++ b/jjb/controller/controller-csit-cs-partnheal.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml b/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml index be7345a97..88a8e0c12 100644 --- a/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml +++ b/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/controller/controller-csit-dnb-noloss.yaml b/jjb/controller/controller-csit-dnb-noloss.yaml index 62e5e42b6..a95fdb06c 100644 --- a/jjb/controller/controller-csit-dnb-noloss.yaml +++ b/jjb/controller/controller-csit-dnb-noloss.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/controller/controller-csit-drb-partnheal.yaml b/jjb/controller/controller-csit-drb-partnheal.yaml index 891294cc8..1743f1b1a 100644 --- a/jjb/controller/controller-csit-drb-partnheal.yaml +++ b/jjb/controller/controller-csit-drb-partnheal.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/controller/controller-csit-drb-precedence.yaml b/jjb/controller/controller-csit-drb-precedence.yaml index 8bd1f5a32..e79ebef99 100644 --- a/jjb/controller/controller-csit-drb-precedence.yaml +++ b/jjb/controller/controller-csit-drb-precedence.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml b/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml index 2d4b62a8e..43a9f55b8 100644 --- a/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml +++ b/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/controller/controller-csit-periodic-dsbenchmark.yaml b/jjb/controller/controller-csit-periodic-dsbenchmark.yaml index eebe58a38..25f583679 100644 --- a/jjb/controller/controller-csit-periodic-dsbenchmark.yaml +++ b/jjb/controller/controller-csit-periodic-dsbenchmark.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/controller/controller-csit-rest-cars-perf.yaml b/jjb/controller/controller-csit-rest-cars-perf.yaml index 9b68e7d05..0c2b0fdfd 100644 --- a/jjb/controller/controller-csit-rest-cars-perf.yaml +++ b/jjb/controller/controller-csit-rest-cars-perf.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml index efd98b37b..6cf7ecfea 100644 --- a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml +++ b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml index 8683803c4..025a9e9a7 100644 --- a/jjb/controller/controller.yaml +++ b/jjb/controller/controller.yaml @@ -1,4 +1,26 @@ --- +- project: + name: controller-fluorine + jobs: + - '{project-name}-distribution-check-{stream}' + - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs + + stream: fluorine + project: 'controller' + project-name: 'controller' + branch: 'master' + mvn-settings: 'controller-settings' + mvn-goals: 'clean deploy -Pintegrationtests,docs' + mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' + build-node: centos7-builder-8c-8g + build-timeout: 90 + dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}' + email-upstream: '[controller] [odlparent] [yangtools] [aaa]' + + # Used by the release job + staging-profile-id: 96c1c9177efdd + - project: name: controller-oxygen jobs: @@ -9,7 +31,7 @@ stream: oxygen project: 'controller' project-name: 'controller' - branch: 'master' + branch: 'stable/oxygen' mvn-settings: 'controller-settings' mvn-goals: 'clean deploy -Pintegrationtests,docs' mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' diff --git a/jjb/coretutorials/coretutorials.yaml b/jjb/coretutorials/coretutorials.yaml index 8ffa7a99d..67d5754d2 100644 --- a/jjb/coretutorials/coretutorials.yaml +++ b/jjb/coretutorials/coretutorials.yaml @@ -1,4 +1,22 @@ --- +- project: + name: coretutorials-fluorine + jobs: + - odl-maven-jobs + + stream: fluorine + project: 'coretutorials' + project-name: 'coretutorials' + branch: 'master' + mvn-settings: 'coretutorials-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: '' + email-upstream: '[coretutorials]' + build-timeout: 120 + + # Used by the release job + staging-profile-id: 96cd299563ec6 + - project: name: coretutorials-oxygen jobs: @@ -7,7 +25,7 @@ stream: oxygen project: 'coretutorials' project-name: 'coretutorials' - branch: 'master' + branch: 'stable/oxygen' mvn-settings: 'coretutorials-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' diff --git a/jjb/daexim/daexim-csit-basic.yaml b/jjb/daexim/daexim-csit-basic.yaml index 9bcd46fdc..083be0a88 100644 --- a/jjb/daexim/daexim-csit-basic.yaml +++ b/jjb/daexim/daexim-csit-basic.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' diff --git a/jjb/daexim/daexim-csit-clustering-basic.yaml b/jjb/daexim/daexim-csit-clustering-basic.yaml index d90ccbb85..08da6af2c 100644 --- a/jjb/daexim/daexim-csit-clustering-basic.yaml +++ b/jjb/daexim/daexim-csit-clustering-basic.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' diff --git a/jjb/daexim/daexim.yaml b/jjb/daexim/daexim.yaml index 25f05ee88..5fb3dd0d2 100644 --- a/jjb/daexim/daexim.yaml +++ b/jjb/daexim/daexim.yaml @@ -1,4 +1,22 @@ --- +- project: + name: daexim-fluorine + jobs: + - '{project-name}-distribution-check-{stream}' + - odl-maven-jobs + + project: 'daexim' + project-name: 'daexim' + stream: fluorine + branch: 'master' + mvn-settings: 'daexim-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' + email-upstream: '[daexim] [odlparent] [yangtools] [controller]' + + # Used by the release job + staging-profile-id: 96e4dade34bd7 + - project: name: daexim-oxygen jobs: @@ -8,7 +26,7 @@ project: 'daexim' project-name: 'daexim' stream: oxygen - branch: 'master' + branch: 'stable/oxygen' mvn-settings: 'daexim-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' diff --git a/jjb/didm/didm-csit-discovery.yaml b/jjb/didm/didm-csit-discovery.yaml index 93c30b923..4732b9b1c 100644 --- a/jjb/didm/didm-csit-discovery.yaml +++ b/jjb/didm/didm-csit-discovery.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/didm/didm.yaml b/jjb/didm/didm.yaml index 037ebc6be..a9a6be7d4 100644 --- a/jjb/didm/didm.yaml +++ b/jjb/didm/didm.yaml @@ -1,4 +1,22 @@ --- +- project: + name: didm-fluorine + jobs: + - '{project-name}-distribution-check-{stream}' + - odl-maven-jobs + + stream: fluorine + project: 'didm' + project-name: 'didm' + branch: 'master' + mvn-settings: 'didm-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: '' + email-upstream: '[didm]' + + # Used by the release job + staging-profile-id: 96e6338c870f5 + - project: name: didm-oxygen jobs: @@ -8,7 +26,7 @@ stream: oxygen project: 'didm' project-name: 'didm' - branch: 'master' + branch: 'stable/oxygen' mvn-settings: 'didm-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' diff --git a/jjb/dlux/dlux.yaml b/jjb/dlux/dlux.yaml index d090eebea..7f52f5c62 100644 --- a/jjb/dlux/dlux.yaml +++ b/jjb/dlux/dlux.yaml @@ -1,4 +1,22 @@ --- +- project: + name: dlux-fluorine + jobs: + - '{project-name}-distribution-check-{stream}' + - odl-maven-jobs + + stream: fluorine + project: 'dlux' + project-name: 'dlux' + branch: 'master' + mvn-settings: 'dlux-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: 'odlparent-merge-{stream}' + email-upstream: '[dlux] [odlparent]' + + # Used by the release job + staging-profile-id: 96e6a0327484f + - project: name: dlux-oxygen jobs: @@ -8,7 +26,7 @@ stream: oxygen project: 'dlux' project-name: 'dlux' - branch: 'master' + branch: 'stable/oxygen' mvn-settings: 'dlux-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream}' diff --git a/jjb/dluxapps/dluxapps-csit-yangman.yaml b/jjb/dluxapps/dluxapps-csit-yangman.yaml index c1c82c6fe..b0c568b21 100644 --- a/jjb/dluxapps/dluxapps-csit-yangman.yaml +++ b/jjb/dluxapps/dluxapps-csit-yangman.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/dluxapps/dluxapps.yaml b/jjb/dluxapps/dluxapps.yaml index d87fdb4c7..6cd7760b2 100644 --- a/jjb/dluxapps/dluxapps.yaml +++ b/jjb/dluxapps/dluxapps.yaml @@ -1,4 +1,23 @@ --- +- project: + name: dluxapps-fluorine + jobs: + - '{project-name}-distribution-check-{stream}' + - odl-maven-jobs + + project: 'dluxapps' + project-name: 'dluxapps' + stream: fluorine + branch: 'master' + build-node: centos7-builder-2c-8g + mvn-settings: 'dluxapps-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' + email-upstream: '[dluxapps] [odlparent] [yangtools] [controller]' + + # Used by the release job + staging-profile-id: 96e6fb1e65bf9 + - project: name: dluxapps-oxygen jobs: @@ -8,7 +27,7 @@ project: 'dluxapps' project-name: 'dluxapps' stream: oxygen - branch: 'master' + branch: 'stable/oxygen' build-node: centos7-builder-2c-8g mvn-settings: 'dluxapps-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/docs/docs-rtd.yaml b/jjb/docs/docs-rtd.yaml index e6461e14c..b2d770961 100644 --- a/jjb/docs/docs-rtd.yaml +++ b/jjb/docs/docs-rtd.yaml @@ -6,12 +6,14 @@ - gerrit-tox-verify stream: + - fluorine: + branch: 'master' - oxygen: - branch: master + branch: 'stable/oxygen' - nitrogen: - branch: stable/nitrogen + branch: 'stable/nitrogen' - carbon: - branch: stable/carbon + branch: 'stable/carbon' project: docs project-name: docs diff --git a/jjb/eman/eman.yaml b/jjb/eman/eman.yaml index d36e97ec2..36e06e98a 100644 --- a/jjb/eman/eman.yaml +++ b/jjb/eman/eman.yaml @@ -1,4 +1,24 @@ --- +- project: + name: eman-fluorine + jobs: + - '{project-name}-distribution-check-{stream}' + - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs + + stream: fluorine + project: 'eman' + project-name: 'eman' + branch: 'master' + mvn-settings: 'eman-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: '' + email-upstream: '[eman]' + build-node: centos7-builder-4c-16g + + # Used by the release job + staging-profile-id: 96e9352979521 + - project: name: eman-oxygen jobs: @@ -9,7 +29,7 @@ stream: oxygen project: 'eman' project-name: 'eman' - branch: 'master' + branch: 'stable/oxygen' mvn-settings: 'eman-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' diff --git a/jjb/faas/faas.yaml b/jjb/faas/faas.yaml index c3e95b813..08ec7ea29 100644 --- a/jjb/faas/faas.yaml +++ b/jjb/faas/faas.yaml @@ -1,4 +1,22 @@ --- +- project: + name: faas-fluorine + jobs: + - '{project-name}-distribution-check-{stream}' + - odl-maven-jobs + + stream: fluorine + project: 'faas' + project-name: 'faas' + branch: 'master' + mvn-settings: 'faas-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: '' + email-upstream: '[faas]' + + # Used by the release job + staging-profile-id: 96f5ac591d858 + - project: name: faas-oxygen jobs: @@ -8,7 +26,7 @@ stream: oxygen project: 'faas' project-name: 'faas' - branch: 'master' + branch: 'stable/oxygen' mvn-settings: 'faas-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' diff --git a/jjb/federation/federation.yaml b/jjb/federation/federation.yaml index 37d11172b..428f14b0d 100644 --- a/jjb/federation/federation.yaml +++ b/jjb/federation/federation.yaml @@ -1,4 +1,23 @@ --- +- project: + name: federation-fluorine + jobs: + - '{project-name}-distribution-check-{stream}' + - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs + + project: 'federation' + project-name: 'federation' + stream: fluorine + branch: 'master' + mvn-settings: 'federation-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' + email-upstream: '[federation] [odlparent] [yangtools] [controller]' + + # Used by the release job + staging-profile-id: 96f78c7a40a24 + - project: name: federation-oxygen jobs: @@ -9,7 +28,7 @@ project: 'federation' project-name: 'federation' stream: oxygen - branch: 'master' + branch: 'stable/oxygen' mvn-settings: 'federation-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' diff --git a/jjb/genius/genius-csit-genius.yaml b/jjb/genius/genius-csit-genius.yaml index 1d64f2e5d..fa777e611 100644 --- a/jjb/genius/genius-csit-genius.yaml +++ b/jjb/genius/genius-csit-genius.yaml @@ -18,8 +18,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' install: - all: scope: 'all' diff --git a/jjb/genius/genius-patch-test.yaml b/jjb/genius/genius-patch-test.yaml index e0fdf3c45..92477acd0 100644 --- a/jjb/genius/genius-patch-test.yaml +++ b/jjb/genius/genius-patch-test.yaml @@ -9,9 +9,12 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' os-branch: 'ocata' + - oxygen: + branch: 'stable/oxygen' + os-branch: 'ocata' - nitrogen: branch: 'stable/nitrogen' os-branch: 'ocata' diff --git a/jjb/genius/genius.yaml b/jjb/genius/genius.yaml index 2bd0758bf..73bbbf8d5 100644 --- a/jjb/genius/genius.yaml +++ b/jjb/genius/genius.yaml @@ -1,4 +1,30 @@ --- +- project: + name: genius-fluorine + jobs: + - '{project-name}-distribution-check-{stream}' + - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs + + stream: fluorine + project: 'genius' + project-name: 'genius' + branch: 'master' + build-node: centos7-builder-2c-8g + mvn-settings: 'genius-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + build-timeout: 90 + dependencies: > + controller-merge-{stream}, + yangtools-merge-{stream}, + odlparent-merge-{stream}, + openflowplugin-merge-{stream}, + neutron-merge-{stream} + email-upstream: '[genius] [controller] [yangtools] [odlparent] [openflowplugin] [neutron]' + + # Used by the release job + staging-profile-id: 96fb4b6d9d1ee + - project: name: genius-oxygen jobs: @@ -9,7 +35,7 @@ stream: oxygen project: 'genius' project-name: 'genius' - branch: 'master' + branch: 'stable/oxygen' build-node: centos7-builder-2c-8g mvn-settings: 'genius-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml index 208341cb8..1243ce187 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml @@ -19,9 +19,12 @@ functionality: 'openstack' stream: - - oxygen: + - fluorine: branch: 'master' install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf' + - oxygen: + branch: 'stable/oxygen' + install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf' - nitrogen: branch: 'stable/nitrogen' install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf' diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml index 73e46e8af..53b6f7578 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml index 8e5af5eac..1444524aa 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml index 90800ffea..675fdf0c2 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml index 9116b0307..be355c2fc 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml @@ -11,8 +11,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.yaml b/jjb/groupbasedpolicy/groupbasedpolicy.yaml index 70c32643c..6792b6307 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy.yaml @@ -1,4 +1,30 @@ --- +- project: + name: groupbasedpolicy-fluorine + jobs: + - '{project-name}-distribution-check-{stream}' + - odl-maven-jobs + + stream: fluorine + project: 'groupbasedpolicy' + project-name: 'groupbasedpolicy' + branch: 'master' + build-node: centos7-builder-2c-8g + mvn-settings: 'groupbasedpolicy-settings' + mvn-goals: '-U clean deploy findbugs:findbugs' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + build-timeout: 90 + dependencies: > + openflowjava-merge-{stream}, + openflowplugin-merge-{stream}, + neutron-merge-{stream}, + sfc-merge-{stream}, + ovsdb-merge-{stream} + email-upstream: '[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron] [sfc] [ovsdb]' + + # Used by the release job + staging-profile-id: 96fbb93f95a76 + - project: name: groupbasedpolicy-oxygen jobs: @@ -8,7 +34,7 @@ stream: oxygen project: 'groupbasedpolicy' project-name: 'groupbasedpolicy' - branch: 'master' + branch: 'stable/oxygen' build-node: centos7-builder-2c-8g mvn-settings: 'groupbasedpolicy-settings' mvn-goals: '-U clean deploy findbugs:findbugs' diff --git a/jjb/honeycomb/vbd/vbd.yaml b/jjb/honeycomb/vbd/vbd.yaml index f2e35f98a..f4829d180 100644 --- a/jjb/honeycomb/vbd/vbd.yaml +++ b/jjb/honeycomb/vbd/vbd.yaml @@ -1,4 +1,22 @@ --- +- project: + name: vbd-fluorine + jobs: + - '{project-name}-distribution-check-{stream}' + - odl-maven-jobs + + stream: fluorine + project: 'honeycomb/vbd' + project-name: 'vbd' + branch: 'master' + mvn-settings: 'honeycomb-vbd-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: '' + email-upstream: '[vbd]' + + # Used by the release job + staging-profile-id: 96fc362c36862 + - project: name: vbd-oxygen jobs: @@ -8,7 +26,7 @@ stream: oxygen project: 'honeycomb/vbd' project-name: 'vbd' - branch: 'master' + branch: 'stable/oxygen' mvn-settings: 'honeycomb-vbd-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' diff --git a/jjb/infrautils/infrautils-patch-test.yaml b/jjb/infrautils/infrautils-patch-test.yaml index 69eda5471..b204cf6fb 100644 --- a/jjb/infrautils/infrautils-patch-test.yaml +++ b/jjb/infrautils/infrautils-patch-test.yaml @@ -7,9 +7,12 @@ project: 'infrautils' stream: - - oxygen: + - fluorine: branch: 'master' os-branch: 'ocata' + - oxygen: + branch: 'stable/oxygen' + os-branch: 'ocata' - nitrogen: branch: 'stable/nitrogen' os-branch: 'ocata' diff --git a/jjb/infrautils/infrautils.yaml b/jjb/infrautils/infrautils.yaml index 8ebb62990..bfec7c881 100644 --- a/jjb/infrautils/infrautils.yaml +++ b/jjb/infrautils/infrautils.yaml @@ -1,4 +1,23 @@ --- +- project: + name: infrautils-fluorine + jobs: + - '{project-name}-distribution-check-{stream}' + - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs + + stream: fluorine + project: 'infrautils' + project-name: 'infrautils' + branch: 'master' + mvn-settings: 'infrautils-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: 'odlparent-merge-{stream}' + email-upstream: '[infrautils] [odlparent]' + + # Used by the release job + staging-profile-id: 96fca0367756c + - project: name: infrautils-oxygen jobs: @@ -9,7 +28,7 @@ stream: oxygen project: 'infrautils' project-name: 'infrautils' - branch: 'master' + branch: 'stable/oxygen' mvn-settings: 'infrautils-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream}' diff --git a/jjb/integration/csit-jobs-fluorine.lst b/jjb/integration/csit-jobs-fluorine.lst new file mode 100644 index 000000000..452da084f --- /dev/null +++ b/jjb/integration/csit-jobs-fluorine.lst @@ -0,0 +1,105 @@ +aaa-csit-1node-authn-all-fluorine, +aaa-csit-1node-keystone-all-fluorine, +aaa-csit-1node-tls-only-fluorine, +alto-csit-1node-setup-all-fluorine, +bgpcep-csit-1node-periodic-bgp-ingest-all-fluorine, +bgpcep-csit-1node-periodic-bgp-ingest-mixed-all-fluorine, +bgpcep-csit-1node-periodic-throughpcep-all-fluorine, +bgpcep-csit-1node-userfeatures-all-fluorine, +bgpcep-csit-3node-periodic-bgpclustering-all-fluorine, +bgpcep-csit-3node-periodic-bgpclustering-ha-only-fluorine, +bier-csit-1node-basic-all-fluorine, +controller-csit-1node-akka1-all-fluorine, +controller-csit-1node-periodic-benchmark-all-fluorine, +controller-csit-1node-rest-cars-perf-all-fluorine, +controller-csit-3node-clustering-all-fluorine, +controller-csit-3node-periodic-benchmark-all-fluorine, +controller-csit-3node-rest-clust-cars-perf-only-fluorine, +daexim-csit-1node-basic-only-fluorine, +daexim-csit-3node-clustering-basic-only-fluorine, +distribution-csit-1node-userfeatures-all-fluorine, +dluxapps-csit-1node-yangman-all-fluorine, +genius-csit-1node-upstream-all-fluorine, +genius-csit-3node-upstream-all-fluorine, +groupbasedpolicy-csit-1node-3-node-all-fluorine, +groupbasedpolicy-csit-1node-6node-all-fluorine, +groupbasedpolicy-csit-1node-openstack-newton-openstack-fluorine, +groupbasedpolicy-csit-1node-sxp-only-fluorine, +groupbasedpolicy-csit-3node-clustering-all-fluorine, +l2switch-csit-1node-periodic-host-scalability-daily-only-fluorine, +l2switch-csit-1node-scalability-all-fluorine, +l2switch-csit-1node-switch-all-fluorine, +lispflowmapping-csit-1node-msmr-all-fluorine, +lispflowmapping-csit-1node-performance-only-fluorine, +lispflowmapping-csit-3node-msmr-all-fluorine, +mdsal-csit-1node-periodic-bindingv1-only-fluorine, +messaging4transport-csit-1node-basic-all-fluorine, +natapp-csit-1node-basic-all-fluorine, +nemo-csit-1node-engine-all-fluorine, +netconf-csit-1node-callhome-only-fluorine, +netconf-csit-1node-periodic-scale-all-fluorine, +netconf-csit-1node-userfeatures-all-fluorine, +netconf-csit-3node-cluster-stress-all-fluorine, +netconf-csit-3node-clustering-all-fluorine, +netconf-csit-3node-periodic-clustering-scale-all-fluorine, +netvirt-csit-1node-openstack-ocata-upstream-stateful-fluorine, +netvirt-csit-1node-openstack-ocata-upstream-stateful-snat-conntrack-fluorine, +netvirt-csit-1node-openstack-pike-sfc-fluorine, +netvirt-csit-1node-openstack-pike-upstream-stateful-fluorine, +netvirt-csit-1node-openstack-pike-upstream-stateful-snat-conntrack-fluorine, +netvirt-csit-1node-openstack-queens-upstream-stateful-fluorine, +netvirt-csit-1node-openstack-queens-upstream-stateful-snat-conntrack-fluorine, +netvirt-csit-3node-openstack-ocata-upstream-stateful-fluorine, +netvirt-csit-3node-openstack-ocata-upstream-stateful-snat-conntrack-fluorine, +netvirt-csit-3node-openstack-pike-upstream-stateful-fluorine, +netvirt-csit-3node-openstack-pike-upstream-stateful-snat-conntrack-fluorine, +netvirt-csit-3node-openstack-queens-upstream-stateful-fluorine, +netvirt-csit-3node-openstack-queens-upstream-stateful-snat-conntrack-fluorine, +netvirt-csit-hwvtep-1node-openstack-ocata-upstream-stateful-fluorine, +netvirt-csit-hwvtep-1node-openstack-pike-upstream-stateful-fluorine, +netvirt-csit-hwvtep-1node-openstack-queens-upstream-stateful-fluorine, +netvirt-csit-hwvtep-3node-openstack-ocata-upstream-stateful-fluorine, +netvirt-csit-hwvtep-3node-openstack-pike-upstream-stateful-fluorine, +netvirt-csit-hwvtep-3node-openstack-queens-upstream-stateful-fluorine, +nic-csit-1node-basic-all-fluorine, +ocpplugin-csit-1node-get-all-fluorine, +ocpplugin-csit-1node-scalability-all-fluorine, +of-config-csit-1node-basic-all-fluorine, +openflowplugin-csit-1node-cbench-only-fluorine, +openflowplugin-csit-1node-flow-services-all-fluorine, +openflowplugin-csit-1node-perf-bulkomatic-only-fluorine, +openflowplugin-csit-1node-perf-stats-collection-only-fluorine, +openflowplugin-csit-1node-scale-link-only-fluorine, +openflowplugin-csit-1node-scale-only-fluorine, +openflowplugin-csit-1node-scale-switch-only-fluorine, +openflowplugin-csit-3node-clustering-bulkomatic-only-fluorine, +openflowplugin-csit-3node-clustering-only-fluorine, +openflowplugin-csit-3node-clustering-perf-bulkomatic-only-fluorine, +ovsdb-csit-1node-upstream-southbound-all-fluorine, +ovsdb-csit-3node-upstream-clustering-only-fluorine, +p4plugin-csit-1node-basic-all-fluorine, +packetcable-csit-1node-pcmm-all-fluorine, +sdninterfaceapp-csit-1node-basic-only-fluorine, +sfc-csit-3node-docker-full-deploy-all-fluorine, +sfc-csit-3node-rest-basic-all-fluorine, +sxp-csit-1node-basic-all-fluorine, +sxp-csit-1node-filtering-all-fluorine, +sxp-csit-1node-periodic-performance-all-fluorine, +sxp-csit-1node-topology-all-fluorine, +sxp-csit-3node-periodic-clustering-all-fluorine, +sxp-csit-3node-periodic-routing-all-fluorine, +topoprocessing-csit-1node-topology-operations-all-fluorine, +tsdr-csit-1node-cassandra-datastore-only-fluorine, +tsdr-csit-1node-elasticsearch-datastore-only-fluorine, +tsdr-csit-1node-hbase-datastore-all-fluorine, +tsdr-csit-1node-hsqldb-datastore-all-fluorine, +unimgr-csit-1node-basic-all-fluorine, +unimgr-csit-1node-legato-all-fluorine, +usc-csit-1node-channel-all-fluorine, +usc-csit-1node-tcp-all-fluorine, +usecplugin-csit-1node-basic-all-fluorine, +vtn-csit-1node-coordinator-only-fluorine, +vtn-csit-1node-manager-all-fluorine, +vtn-csit-1node-openstack-pike-neutron-fluorine, +vtn-csit-3node-manager-all-fluorine, +yangtools-csit-1node-periodic-system-only-fluorine, diff --git a/jjb/integration/distribution/distribution-csit-userfeatures.yaml b/jjb/integration/distribution/distribution-csit-userfeatures.yaml index 54d9b5ccb..0d016eb58 100644 --- a/jjb/integration/distribution/distribution-csit-userfeatures.yaml +++ b/jjb/integration/distribution/distribution-csit-userfeatures.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/integration/distribution/distribution.yaml b/jjb/integration/distribution/distribution.yaml index b5e48fd91..c737d8d70 100644 --- a/jjb/integration/distribution/distribution.yaml +++ b/jjb/integration/distribution/distribution.yaml @@ -1,5 +1,4 @@ --- -# ODL Releng build templates - project: name: distribution jobs: @@ -22,12 +21,14 @@ email-upstream: '[int/dist]' stream: + - fluorine: + branch: 'master' - oxygen: - branch: master + branch: 'stable/oxygen' - nitrogen: - branch: stable/nitrogen + branch: 'stable/nitrogen' - carbon: - branch: stable/carbon + branch: 'stable/carbon' karaf-version: karaf3 - project: diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml index b5c23f5ae..bdc95e07e 100644 --- a/jjb/integration/integration-test-jobs.yaml +++ b/jjb/integration/integration-test-jobs.yaml @@ -18,9 +18,17 @@ # CSIT Lists in releng-defaults.yaml stream: - - oxygen: + - fluorine: branch: 'master' csit-blacklist: longevity gate sanity capwap centinel coe didm iotdm jsonrpc lacp netide tdd wip + csit-list: !include: csit-jobs-fluorine.lst + csit-sanity-list: '{csit-sanity-list-fluorine}' + csit-weekly-list: '{csit-weekly-list-fluorine}' + csit-high-frequency-list: '{csit-high-frequency-list-fluorine}' + mvn-version: 'mvn33' + - oxygen: + branch: 'stable/oxygen' + csit-blacklist: longevity gate sanity capwap centinel coe didm iotdm jsonrpc lacp netide tdd wip csit-list: !include: csit-jobs-oxygen.lst csit-sanity-list: '{csit-sanity-list-oxygen}' csit-weekly-list: '{csit-weekly-list-oxygen}' diff --git a/jjb/iotdm/iotdm-csit-basic.yaml b/jjb/iotdm/iotdm-csit-basic.yaml index 6c53fd802..fcbaa7eef 100644 --- a/jjb/iotdm/iotdm-csit-basic.yaml +++ b/jjb/iotdm/iotdm-csit-basic.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/iotdm/iotdm.yaml b/jjb/iotdm/iotdm.yaml index ed5b2d0aa..7ebc16da4 100644 --- a/jjb/iotdm/iotdm.yaml +++ b/jjb/iotdm/iotdm.yaml @@ -1,4 +1,23 @@ --- +- project: + name: iotdm-fluorine + jobs: + - '{project-name}-distribution-check-{stream}' + - odl-maven-jobs + + stream: fluorine + project: 'iotdm' + project-name: 'iotdm' + branch: 'master' + build-node: centos7-builder-2c-8g + mvn-settings: 'iotdm-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: 'aaa-merge-{stream}' + email-upstream: '[iotdm] [aaa]' + + # Used by the release job + staging-profile-id: 96fd6e9453970 + - project: name: iotdm-oxygen jobs: @@ -8,7 +27,7 @@ stream: oxygen project: 'iotdm' project-name: 'iotdm' - branch: 'master' + branch: 'stable/oxygen' build-node: centos7-builder-2c-8g mvn-settings: 'iotdm-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/jsonrpc/jsonrpc.yaml b/jjb/jsonrpc/jsonrpc.yaml index 033d8978d..1eaa52fb6 100644 --- a/jjb/jsonrpc/jsonrpc.yaml +++ b/jjb/jsonrpc/jsonrpc.yaml @@ -25,7 +25,7 @@ project: 'jsonrpc' project-name: 'jsonrpc' stream: oxygen - branch: 'master' + branch: 'stable/oxygen' mvn-settings: 'jsonrpc-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}' diff --git a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml index 6ef4b908c..fc55dafa0 100644 --- a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml +++ b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/l2switch/l2switch-csit-scalability.yaml b/jjb/l2switch/l2switch-csit-scalability.yaml index 3c1929909..f56573369 100644 --- a/jjb/l2switch/l2switch-csit-scalability.yaml +++ b/jjb/l2switch/l2switch-csit-scalability.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/l2switch/l2switch-csit-switch.yaml b/jjb/l2switch/l2switch-csit-switch.yaml index 8a07d07f7..54fb5958c 100644 --- a/jjb/l2switch/l2switch-csit-switch.yaml +++ b/jjb/l2switch/l2switch-csit-switch.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/l2switch/l2switch-patch-test.yaml b/jjb/l2switch/l2switch-patch-test.yaml index 70beefc48..472071b54 100644 --- a/jjb/l2switch/l2switch-patch-test.yaml +++ b/jjb/l2switch/l2switch-patch-test.yaml @@ -9,8 +9,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/l2switch/l2switch.yaml b/jjb/l2switch/l2switch.yaml index 6e1af41fb..e2955c101 100644 --- a/jjb/l2switch/l2switch.yaml +++ b/jjb/l2switch/l2switch.yaml @@ -1,4 +1,27 @@ --- +- project: + name: l2switch-fluorine + jobs: + - '{project-name}-distribution-check-{stream}' + - odl-maven-jobs + + stream: fluorine + project: 'l2switch' + project-name: 'l2switch' + branch: 'master' + mvn-settings: 'l2switch-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' + dependencies: > + odlparent-merge-{stream}, + yangtools-merge-{stream}, + controller-merge-{stream}, + openflowjava-merge-{stream}, + openflowplugin-merge-{stream} + email-upstream: '[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]' + + # Used by the release job + staging-profile-id: 96fee85953ca0 + - project: name: l2switch-oxygen jobs: @@ -8,7 +31,7 @@ stream: oxygen project: 'l2switch' project-name: 'l2switch' - branch: 'master' + branch: 'stable/oxygen' mvn-settings: 'l2switch-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' dependencies: > diff --git a/jjb/lacp/lacp-csit-lacp.yaml b/jjb/lacp/lacp-csit-lacp.yaml index de7b79f6e..1cf3cabbd 100644 --- a/jjb/lacp/lacp-csit-lacp.yaml +++ b/jjb/lacp/lacp-csit-lacp.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/lacp/lacp.yaml b/jjb/lacp/lacp.yaml index 49d043cb7..c089d6123 100644 --- a/jjb/lacp/lacp.yaml +++ b/jjb/lacp/lacp.yaml @@ -1,4 +1,22 @@ --- +- project: + name: lacp-fluorine + jobs: + - '{project-name}-distribution-check-{stream}' + - odl-maven-jobs + + stream: fluorine + project: 'lacp' + project-name: 'lacp' + branch: 'master' + mvn-settings: 'lacp-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: 'openflowjava-merge-{stream},openflowplugin-merge-{stream}' + email-upstream: '[lacp] [openflowjava] [openflowplugin]' + + # Used by the release job + staging-profile-id: 96ff6c0ff6ab1 + - project: name: lacp-oxygen jobs: @@ -8,7 +26,7 @@ stream: oxygen project: 'lacp' project-name: 'lacp' - branch: 'master' + branch: 'stable/oxygen' mvn-settings: 'lacp-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'openflowjava-merge-{stream},openflowplugin-merge-{stream}' diff --git a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml index d00618879..fb0a4f21b 100644 --- a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml +++ b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml @@ -14,8 +14,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml b/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml index 5f3b6cdb9..01b9e23ba 100644 --- a/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml +++ b/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml index 4e7518c27..d3fc860f9 100644 --- a/jjb/lispflowmapping/lispflowmapping.yaml +++ b/jjb/lispflowmapping/lispflowmapping.yaml @@ -1,4 +1,29 @@ --- +- project: + name: lispflowmapping-fluorine + jobs: + - '{project-name}-distribution-check-{stream}' + - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs + + stream: fluorine + project: 'lispflowmapping' + project-name: 'lispflowmapping' + branch: 'master' + mvn-settings: 'lispflowmapping-settings' + mvn-goals: 'clean deploy findbugs:findbugs javadoc:aggregate -DrepoBuild' + mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m -Dmaven.compile.fork=true' + dependencies: 'controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream},neutron-merge-{stream}' + email-upstream: '[lispflowmapping] [controller] [odlparent] [yangtools] [neutron]' + archive-artifacts: > + **/*.log + **/target/surefire-reports/*-output.txt + + build-node: centos7-builder-8c-8g + + # Used by the release job + staging-profile-id: 96fff2503b766 + - project: name: lispflowmapping-oxygen jobs: @@ -9,7 +34,7 @@ stream: oxygen project: 'lispflowmapping' project-name: 'lispflowmapping' - branch: 'master' + branch: 'stable/oxygen' mvn-settings: 'lispflowmapping-settings' mvn-goals: 'clean deploy findbugs:findbugs javadoc:aggregate -DrepoBuild' mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m -Dmaven.compile.fork=true' diff --git a/jjb/mdsal/mdsal-csit-bindingv1.yaml b/jjb/mdsal/mdsal-csit-bindingv1.yaml index e52cdb70b..6e6075725 100644 --- a/jjb/mdsal/mdsal-csit-bindingv1.yaml +++ b/jjb/mdsal/mdsal-csit-bindingv1.yaml @@ -11,8 +11,10 @@ functionality: 'bindingv1' stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml index 7490dd565..dd0a04631 100644 --- a/jjb/mdsal/mdsal.yaml +++ b/jjb/mdsal/mdsal.yaml @@ -1,4 +1,27 @@ --- +- project: + name: mdsal-fluorine + jobs: + - '{project-name}-distribution-check-{stream}': + mvn-version: 'mvn35' + - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs + + stream: fluorine + project: 'mdsal' + project-name: 'mdsal' + branch: 'master' + mvn-settings: 'mdsal-settings' + mvn-goals: '-Dmaven.compile.fork=true clean deploy -Dintegrationtests' + mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m' + build-node: centos7-builder-8c-8g + build-timeout: 90 + dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}' + email-upstream: '[mdsal] [odlparent] [yangtools]' + + # Used by the release job + staging-profile-id: a674173c7b29d + - project: name: mdsal-oxygen jobs: @@ -10,7 +33,7 @@ stream: oxygen project: 'mdsal' project-name: 'mdsal' - branch: 'master' + branch: 'stable/oxygen' mvn-settings: 'mdsal-settings' mvn-goals: '-Dmaven.compile.fork=true clean deploy -Dintegrationtests' mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m' diff --git a/jjb/messaging4transport/messaging4transport-csit-basic.yaml b/jjb/messaging4transport/messaging4transport-csit-basic.yaml index d59e37040..c6afc49a0 100644 --- a/jjb/messaging4transport/messaging4transport-csit-basic.yaml +++ b/jjb/messaging4transport/messaging4transport-csit-basic.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/messaging4transport/messaging4transport.yaml b/jjb/messaging4transport/messaging4transport.yaml index 14c273883..b27a82795 100644 --- a/jjb/messaging4transport/messaging4transport.yaml +++ b/jjb/messaging4transport/messaging4transport.yaml @@ -1,4 +1,23 @@ --- +- project: + name: messaging4transport-fluorine + jobs: + - '{project-name}-distribution-check-{stream}' + - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs + + stream: fluorine + project: 'messaging4transport' + project-name: 'messaging4transport' + branch: 'master' + mvn-settings: 'messaging4transport-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: '' + email-upstream: '[messaging4transport]' + + # Used by the release job + staging-profile-id: a677283157db4 + - project: name: messaging4transport-oxygen jobs: @@ -9,7 +28,7 @@ stream: oxygen project: 'messaging4transport' project-name: 'messaging4transport' - branch: 'master' + branch: 'stable/oxygen' mvn-settings: 'messaging4transport-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' diff --git a/jjb/natapp/natapp-csit-basic.yaml b/jjb/natapp/natapp-csit-basic.yaml index da7bfc6bc..e84130304 100644 --- a/jjb/natapp/natapp-csit-basic.yaml +++ b/jjb/natapp/natapp-csit-basic.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/natapp/natapp.yaml b/jjb/natapp/natapp.yaml index 3b948fca6..5bffab748 100644 --- a/jjb/natapp/natapp.yaml +++ b/jjb/natapp/natapp.yaml @@ -1,4 +1,23 @@ --- +- project: + name: natapp-fluorine + jobs: + - '{project-name}-distribution-check-{stream}' + - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs + + stream: fluorine + project: 'natapp' + project-name: 'natapp' + branch: 'master' + mvn-settings: 'natapp-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: 'openflowplugin-merge-{stream}' + email-upstream: '[natapp] [openflowplugin]' + + # Used by the release job + staging-profile-id: a679c0f4f08a8 + - project: name: natapp-oxygen jobs: @@ -9,7 +28,7 @@ stream: oxygen project: 'natapp' project-name: 'natapp' - branch: 'master' + branch: 'stable/oxygen' mvn-settings: 'natapp-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'openflowplugin-merge-{stream}' diff --git a/jjb/nemo/nemo-csit-engine.yaml b/jjb/nemo/nemo-csit-engine.yaml index f2c8cbd75..8ffa8fd78 100644 --- a/jjb/nemo/nemo-csit-engine.yaml +++ b/jjb/nemo/nemo-csit-engine.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/nemo/nemo.yaml b/jjb/nemo/nemo.yaml index af23ab6fd..49d944258 100644 --- a/jjb/nemo/nemo.yaml +++ b/jjb/nemo/nemo.yaml @@ -1,4 +1,22 @@ --- +- project: + name: nemo-fluorine + jobs: + - '{project-name}-distribution-check-{stream}' + - odl-maven-jobs + + stream: fluorine + project: 'nemo' + project-name: 'nemo' + branch: 'master' + mvn-settings: 'nemo-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: '' + email-upstream: '[nemo]' + + # Used by the release job + staging-profile-id: a67a9890f6202 + - project: name: nemo-oxygen jobs: @@ -8,7 +26,7 @@ stream: oxygen project: 'nemo' project-name: 'nemo' - branch: 'master' + branch: 'stable/oxygen' mvn-settings: 'nemo-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' diff --git a/jjb/netconf/netconf-cluster-stress.yaml b/jjb/netconf/netconf-cluster-stress.yaml index b4a1caa77..122759990 100644 --- a/jjb/netconf/netconf-cluster-stress.yaml +++ b/jjb/netconf/netconf-cluster-stress.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/netconf/netconf-clustering-scale.yaml b/jjb/netconf/netconf-clustering-scale.yaml index 1b0645bbb..46ad660fc 100644 --- a/jjb/netconf/netconf-clustering-scale.yaml +++ b/jjb/netconf/netconf-clustering-scale.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/netconf/netconf-clustering.yaml b/jjb/netconf/netconf-clustering.yaml index 8131b7613..1cc6053f4 100644 --- a/jjb/netconf/netconf-clustering.yaml +++ b/jjb/netconf/netconf-clustering.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/netconf/netconf-csit-callhome.yaml b/jjb/netconf/netconf-csit-callhome.yaml index 8f407370d..9579718bc 100644 --- a/jjb/netconf/netconf-csit-callhome.yaml +++ b/jjb/netconf/netconf-csit-callhome.yaml @@ -14,8 +14,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/netconf/netconf-patch-test.yaml b/jjb/netconf/netconf-patch-test.yaml index bd4263fe9..c64b959d0 100644 --- a/jjb/netconf/netconf-patch-test.yaml +++ b/jjb/netconf/netconf-patch-test.yaml @@ -9,8 +9,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/netconf/netconf-scale.yaml b/jjb/netconf/netconf-scale.yaml index a35cda998..0b5bc974e 100644 --- a/jjb/netconf/netconf-scale.yaml +++ b/jjb/netconf/netconf-scale.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/netconf/netconf-userfeatures.yaml b/jjb/netconf/netconf-userfeatures.yaml index 1fe61a753..90f876065 100644 --- a/jjb/netconf/netconf-userfeatures.yaml +++ b/jjb/netconf/netconf-userfeatures.yaml @@ -15,8 +15,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml index e12d7bb25..5e5054050 100644 --- a/jjb/netconf/netconf.yaml +++ b/jjb/netconf/netconf.yaml @@ -1,4 +1,25 @@ --- +- project: + name: netconf-fluorine + jobs: + - '{project-name}-distribution-check-{stream}' + - odl-maven-jobs + + stream: fluorine + project: 'netconf' + project-name: 'netconf' + branch: 'master' + build-node: centos7-builder-2c-8g + mvn-settings: 'netconf-settings' + mvn-goals: 'clean deploy -Pintegrationtests' + mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' + build-timeout: 90 + dependencies: 'aaa-merge-{stream},controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream}' + email-upstream: '[netconf] [aaa] [controller] [odlparent] [yangtools]' + + # Used by the release job + staging-profile-id: a67b22fc3663f + - project: name: netconf-oxygen jobs: @@ -8,7 +29,7 @@ stream: oxygen project: 'netconf' project-name: 'netconf' - branch: 'master' + branch: 'stable/oxygen' build-node: centos7-builder-2c-8g mvn-settings: 'netconf-settings' mvn-goals: 'clean deploy -Pintegrationtests' diff --git a/jjb/netide/netide-csit-basic.yaml b/jjb/netide/netide-csit-basic.yaml index 9e1756f66..c45a2ca2a 100644 --- a/jjb/netide/netide-csit-basic.yaml +++ b/jjb/netide/netide-csit-basic.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/netide/netide.yaml b/jjb/netide/netide.yaml index abc54479c..732afd3c1 100644 --- a/jjb/netide/netide.yaml +++ b/jjb/netide/netide.yaml @@ -1,4 +1,22 @@ --- +- project: + name: netide-fluorine + jobs: + - '{project-name}-distribution-check-{stream}' + - odl-maven-jobs + + stream: fluorine + project: 'netide' + project-name: 'netide' + branch: 'master' + mvn-settings: 'netide-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: 'openflowjava-merge-{stream}' + email-upstream: '[netide] [openflowjava]' + + # Used by the release job + staging-profile-id: a67bab3755815 + - project: name: netide-oxygen jobs: @@ -8,7 +26,7 @@ stream: oxygen project: 'netide' project-name: 'netide' - branch: 'master' + branch: 'stable/oxygen' mvn-settings: 'netide-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'openflowjava-merge-{stream}' diff --git a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml index 88d6a4a42..e14a49090 100644 --- a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml +++ b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml @@ -1,4 +1,63 @@ --- +- project: + name: netvirt-csit-hwvtep-openstack-integration-fluorine + jobs: + - inttest-csit-hwvtep-openstack + + project: 'netvirt' + stream: 'fluorine' + branch: 'master' + testplan: '{project}-{topology}-l2gw-openstack.txt' + odl-ml2-driver-version: 'v2' + enable-openstack-services: 'placement-api,l2gw-plugin' + enable-openstack-compute-services: 'placement-client' + security-group-mode: 'stateful' + odl_system_flavor: v2-standard-8 + openstack_system_flavor: v2-standard-8 + openstack_system2_flavor: v2-standard-4 + tools_system_count: 2 + tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847 + + # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled + enable-networking-l2gw: 'yes' + + topology: + - 1node: + openstack_system2_count: 1 + odl_system_count: 1 + enable-haproxy: 'no' + install-features: 'odl-netvirt-openstack' + - 3node: + openstack_system2_count: 1 + odl_system_count: 3 + enable-haproxy: 'yes' + install-features: 'odl-jolokia,odl-netvirt-openstack' + + functionality: + - upstream-stateful + - gate-stateful + + openstack: + - ocata: + openstack-branch: 'stable/ocata' + odl-ml2-branch: 'stable/ocata' + openstack_system_image: '{openstack_system_image_ocata}' + openstack_system2_image: '{openstack_system_image_ocata}' + enable-openstack-network-services: '{openstack_legacy_default_network_services}' + - pike: + openstack-branch: 'stable/pike' + odl-ml2-branch: 'stable/pike' + odl-ml2-port-binding: 'pseudo-agentdb-binding' + openstack_system_image: '{openstack_system_image_pike}' + openstack_system2_image: '{openstack_system_image_pike}' + enable-openstack-network-services: '{openstack_legacy_default_network_services}' + - queens: + openstack-branch: 'master' + odl-ml2-branch: 'master' + odl-ml2-port-binding: 'pseudo-agentdb-binding' + openstack_system_image: '{openstack_system_image_pike}' + openstack_system2_image: '{openstack_system_image_pike}' + - project: name: netvirt-csit-hwvtep-openstack-integration-oxygen jobs: @@ -6,7 +65,7 @@ project: 'netvirt' stream: 'oxygen' - branch: 'master' + branch: 'stable/oxygen' testplan: '{project}-{topology}-l2gw-openstack.txt' odl-ml2-driver-version: 'v2' enable-openstack-services: 'placement-api,l2gw-plugin' diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml index 61b562eb0..c36881900 100644 --- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml +++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml @@ -1,4 +1,68 @@ --- +- project: + name: netvirt-csit-openstack-integration-fluorine + jobs: + - inttest-csit-openstack + + project: 'netvirt' + stream: 'fluorine' + branch: 'master' + testplan: '{project}-{topology}-openstack.txt' + odl-ml2-driver-version: 'v2' + enable-openstack-services: 'placement-api,tempest' + enable-openstack-compute-services: 'placement-client' + security-group-mode: 'stateful' + odl_system_flavor: v2-standard-8 + openstack_system_flavor: v2-standard-8 + openstack_system2_flavor: v2-standard-4 + + topology: + - 1node: + openstack_system2_count: 2 + odl_system_count: 1 + enable-haproxy: 'no' + install-features: 'odl-netvirt-openstack' + - 3node: + openstack_system2_count: 3 + odl_system_count: 3 + enable-haproxy: 'yes' + install-features: 'odl-jolokia,odl-netvirt-openstack' + + functionality: + - upstream-stateful + - upstream-stateful-snat-conntrack: + odl-snat-mode: 'conntrack' + - gate-stateful + - gate-stateful-snat-conntrack: + odl-snat-mode: 'conntrack' + - gate-minimal-cluster: + testplan: '{project}-{topology}-minimal-openstack.txt' + # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually. + - gate-tdd-wip: + testplan: '{project}-{topology}-tdd-wip-openstack.txt' + schedule: '' + + openstack: + - ocata: + openstack-branch: 'stable/ocata' + odl-ml2-branch: 'stable/ocata' + openstack_system_image: '{openstack_system_image_ocata}' + openstack_system2_image: '{openstack_system_image_ocata}' + enable-openstack-network-services: '{openstack_legacy_default_network_services}' + - pike: + openstack-branch: 'stable/pike' + odl-ml2-branch: 'stable/pike' + odl-ml2-port-binding: 'pseudo-agentdb-binding' + openstack_system_image: '{openstack_system_image_pike}' + openstack_system2_image: '{openstack_system_image_pike}' + enable-openstack-network-services: '{openstack_legacy_default_network_services}' + - queens: + openstack-branch: 'master' + odl-ml2-branch: 'master' + odl-ml2-port-binding: 'pseudo-agentdb-binding' + openstack_system_image: '{openstack_system_image_pike}' + openstack_system2_image: '{openstack_system_image_pike}' + - project: name: netvirt-csit-openstack-integration-oxygen jobs: @@ -6,7 +70,7 @@ project: 'netvirt' stream: 'oxygen' - branch: 'master' + branch: 'stable/oxygen' testplan: '{project}-{topology}-openstack.txt' odl-ml2-driver-version: 'v2' enable-openstack-services: 'placement-api,tempest' diff --git a/jjb/netvirt/netvirt-full-integration.yaml b/jjb/netvirt/netvirt-full-integration.yaml index 74bd6b25c..bb4852f00 100644 --- a/jjb/netvirt/netvirt-full-integration.yaml +++ b/jjb/netvirt/netvirt-full-integration.yaml @@ -5,8 +5,10 @@ - 'netvirt-daily-full-integration-{stream}' stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/netvirt/netvirt-patch-test.yaml b/jjb/netvirt/netvirt-patch-test.yaml index dd876aed2..a7a896beb 100644 --- a/jjb/netvirt/netvirt-patch-test.yaml +++ b/jjb/netvirt/netvirt-patch-test.yaml @@ -9,12 +9,18 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' # ideally, master (oxygen) would gate against Queens (current master) or 'R' release # bug even the pike devstack environment is still unreliable. so sticking with Ocata # for now os-branch: 'ocata' + - oxygen: + branch: 'stable/oxygen' + # ideally, master (oxygen) would gate against Queens (current master) or 'R' release + # bug even the pike devstack environment is still unreliable. so sticking with Ocata + # for now + os-branch: 'ocata' - nitrogen: branch: 'stable/nitrogen' # ideally, master (oxygen) would gate against Queens (current master) diff --git a/jjb/netvirt/netvirt.yaml b/jjb/netvirt/netvirt.yaml index f172ba17f..1f5a0ffaf 100644 --- a/jjb/netvirt/netvirt.yaml +++ b/jjb/netvirt/netvirt.yaml @@ -8,8 +8,10 @@ - odl-maven-jobs stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml index 9c1c89196..766bd81c7 100644 --- a/jjb/neutron/neutron.yaml +++ b/jjb/neutron/neutron.yaml @@ -1,4 +1,24 @@ --- +- project: + name: neutron-fluorine + jobs: + - '{project-name}-distribution-check-{stream}' + - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs + + stream: fluorine + project: 'neutron' + project-name: 'neutron' + build-timeout: 90 + branch: 'master' + mvn-settings: 'neutron-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}' + email-upstream: '[neutron] [odlparent] [aaa]' + + # Used by the release job + staging-profile-id: a67e1b40d7419 + - project: name: neutron-oxygen jobs: @@ -10,7 +30,7 @@ project: 'neutron' project-name: 'neutron' build-timeout: 90 - branch: 'master' + branch: 'stable/oxygen' mvn-settings: 'neutron-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}' diff --git a/jjb/next/next.yaml b/jjb/next/next.yaml index e4c4a495a..b160dc6d3 100644 --- a/jjb/next/next.yaml +++ b/jjb/next/next.yaml @@ -1,4 +1,22 @@ --- +- project: + name: next-fluorine + jobs: + - '{project-name}-distribution-check-{stream}' + - odl-maven-jobs + + stream: fluorine + project: 'next' + project-name: 'next' + branch: 'master' + mvn-settings: 'next-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: '' + email-upstream: '[next]' + + # Used by the release job + staging-profile-id: a67e7c516f385 + - project: name: next-oxygen jobs: @@ -8,7 +26,7 @@ stream: oxygen project: 'next' project-name: 'next' - branch: 'master' + branch: 'stable/oxygen' mvn-settings: 'next-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' diff --git a/jjb/nic/nic-csit-basic.yaml b/jjb/nic/nic-csit-basic.yaml index 828a0caf7..b777acef9 100644 --- a/jjb/nic/nic-csit-basic.yaml +++ b/jjb/nic/nic-csit-basic.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/nic/nic.yaml b/jjb/nic/nic.yaml index 5d0dd476f..bf200779b 100644 --- a/jjb/nic/nic.yaml +++ b/jjb/nic/nic.yaml @@ -1,4 +1,23 @@ --- +- project: + name: nic-fluorine + jobs: + - '{project-name}-distribution-check-{stream}' + - odl-maven-jobs + + stream: fluorine + project: 'nic' + project-name: 'nic' + branch: 'master' + build-node: centos7-builder-2c-8g + mvn-settings: 'nic-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: 'vtn-merge-{stream},groupbasedpolicy-merge-{stream}' + email-upstream: '[nic] [vtn] [groupbasedpolicy]' + + # Used by the release job + staging-profile-id: a67ef386204aa + - project: name: nic-oxygen jobs: @@ -8,7 +27,7 @@ stream: oxygen project: 'nic' project-name: 'nic' - branch: 'master' + branch: 'stable/oxygen' build-node: centos7-builder-2c-8g mvn-settings: 'nic-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/ocpplugin/ocpplugin-csit-basic.yaml b/jjb/ocpplugin/ocpplugin-csit-basic.yaml index 8cc76c6e8..55f49aaad 100644 --- a/jjb/ocpplugin/ocpplugin-csit-basic.yaml +++ b/jjb/ocpplugin/ocpplugin-csit-basic.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/ocpplugin/ocpplugin-csit-scalability.yaml b/jjb/ocpplugin/ocpplugin-csit-scalability.yaml index 2287da9f4..b4d9ed4f6 100644 --- a/jjb/ocpplugin/ocpplugin-csit-scalability.yaml +++ b/jjb/ocpplugin/ocpplugin-csit-scalability.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/ocpplugin/ocpplugin.yaml b/jjb/ocpplugin/ocpplugin.yaml index eb99c400c..f9e55c810 100644 --- a/jjb/ocpplugin/ocpplugin.yaml +++ b/jjb/ocpplugin/ocpplugin.yaml @@ -1,4 +1,22 @@ --- +- project: + name: ocpplugin-fluorine + jobs: + - '{project-name}-distribution-check-{stream}' + - odl-maven-jobs + + stream: fluorine + project: 'ocpplugin' + project-name: 'ocpplugin' + branch: 'master' + mvn-settings: 'ocpplugin-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' + email-upstream: '[ocpplugin] [odlparent] [yangtools] [controller]' + + # Used by the release job + staging-profile-id: a687673279f9c + - project: name: ocpplugin-oxygen jobs: @@ -8,7 +26,7 @@ stream: oxygen project: 'ocpplugin' project-name: 'ocpplugin' - branch: 'master' + branch: 'stable/oxygen' mvn-settings: 'ocpplugin-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' diff --git a/jjb/of-config/of-config-csit-basic.yaml b/jjb/of-config/of-config-csit-basic.yaml index 1f2b7dce7..a614b7968 100644 --- a/jjb/of-config/of-config-csit-basic.yaml +++ b/jjb/of-config/of-config-csit-basic.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/of-config/of-config.yaml b/jjb/of-config/of-config.yaml index 5892334b0..c7a309ad8 100644 --- a/jjb/of-config/of-config.yaml +++ b/jjb/of-config/of-config.yaml @@ -1,4 +1,22 @@ --- +- project: + name: of-config-fluorine + jobs: + - '{project-name}-distribution-check-{stream}' + - odl-maven-jobs + + stream: fluorine + project: 'of-config' + project-name: 'of-config' + branch: 'master' + mvn-settings: 'of-config-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: netconf-merge-{stream}' + email-upstream: '[of-config] [netconf]' + + # Used by the release job + staging-profile-id: a6880455efe67 + - project: name: of-config-oxygen jobs: @@ -8,7 +26,7 @@ stream: oxygen project: 'of-config' project-name: 'of-config' - branch: 'master' + branch: 'stable/oxygen' mvn-settings: 'of-config-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: netconf-merge-{stream}' diff --git a/jjb/ofextensions/circuitsw/circuitsw.yaml b/jjb/ofextensions/circuitsw/circuitsw.yaml index 0d55c6745..2cdba4046 100644 --- a/jjb/ofextensions/circuitsw/circuitsw.yaml +++ b/jjb/ofextensions/circuitsw/circuitsw.yaml @@ -1,4 +1,21 @@ --- +- project: + name: circuitsw-fluorine + jobs: + - odl-maven-jobs + + stream: fluorine + project: 'ofextensions/circuitsw' + project-name: 'circuitsw' + branch: 'master' + mvn-settings: 'ofextensions-circuitsw-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: '' + email-upstream: '[circuitsw]' + + # Used by the release job + staging-profile-id: a68970cf5b25c + - project: name: circuitsw-oxygen jobs: @@ -7,7 +24,7 @@ stream: oxygen project: 'ofextensions/circuitsw' project-name: 'circuitsw' - branch: 'master' + branch: 'stable/oxygen' mvn-settings: 'ofextensions-circuitsw-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml index e7b25e8d0..138541bb2 100644 --- a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml index 387126dc3..dc05f7ade 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml @@ -14,8 +14,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml index 7513bf713..78ba1366d 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml @@ -14,8 +14,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml index ec0df076c..5b564592c 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml @@ -14,8 +14,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml index 8130af298..a4e70c584 100644 --- a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml @@ -14,8 +14,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml index e94a8efcc..795e0365a 100644 --- a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml index 339ffa6a2..bba9cdabe 100644 --- a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml @@ -14,8 +14,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml index 9445d68e6..87a5ece01 100644 --- a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml @@ -14,8 +14,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml index 898c7476b..7cb70f9ea 100644 --- a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml index 2e49e9d08..381a28052 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml index c8fa21328..d5caa6758 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/openflowplugin/openflowplugin-csit-scale.yaml b/jjb/openflowplugin/openflowplugin-csit-scale.yaml index 27724beb2..e138893a5 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale.yaml @@ -14,8 +14,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/openflowplugin/openflowplugin-patch-test.yaml b/jjb/openflowplugin/openflowplugin-patch-test.yaml index bbf752fb8..e52dc48d9 100644 --- a/jjb/openflowplugin/openflowplugin-patch-test.yaml +++ b/jjb/openflowplugin/openflowplugin-patch-test.yaml @@ -9,9 +9,12 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' os-branch: 'ocata' + - oxygen: + branch: 'stable/oxygen' + os-branch: 'ocata' - nitrogen: branch: 'stable/nitrogen' os-branch: 'ocata' diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml index 5e1531903..4bc720acb 100644 --- a/jjb/openflowplugin/openflowplugin.yaml +++ b/jjb/openflowplugin/openflowplugin.yaml @@ -1,4 +1,31 @@ --- +- project: + name: openflowplugin-fluorine + jobs: + - '{project-name}-distribution-check-{stream}' + - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs + + stream: fluorine + project: 'openflowplugin' + project-name: 'openflowplugin' + branch: 'master' + build-node: centos7-builder-2c-8g + build-timeout: 90 + mvn-settings: 'openflowplugin-settings' + mvn-goals: 'clean deploy javadoc:aggregate' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: > + odlparent-merge-{stream}, + yangtools-merge-{stream}, + controller-merge-{stream}, + openflowjava-merge-{stream} + email-upstream: '[openflowplugin] [odlparent] [yangtools] [controller] [openflowjava]' + archive-artifacts: 'model/*/target/site/**' + + # Used by the release job + staging-profile-id: a68a76dc1b44c + - project: name: openflowplugin-oxygen jobs: @@ -9,7 +36,7 @@ stream: oxygen project: 'openflowplugin' project-name: 'openflowplugin' - branch: 'master' + branch: 'stable/oxygen' build-node: centos7-builder-2c-8g build-timeout: 90 mvn-settings: 'openflowplugin-settings' diff --git a/jjb/opflex/opflex-custom.yaml b/jjb/opflex/opflex-custom.yaml index 68b7292da..2ace6c4ad 100644 --- a/jjb/opflex/opflex-custom.yaml +++ b/jjb/opflex/opflex-custom.yaml @@ -6,11 +6,16 @@ - 'opflex-merge-{stream}' stream: - - oxygen: + - fluorine: branch: 'master' libuv-version: '1.8.0' rapidjson-version: '1.0.2' openvswitch-version: '2.6.0' + - oxygen: + branch: 'stable/oxygen' + libuv-version: '1.8.0' + rapidjson-version: '1.0.2' + openvswitch-version: '2.6.0' - nitrogen: branch: 'stable/nitrogen' libuv-version: '1.8.0' diff --git a/jjb/opflex/opflex.yaml b/jjb/opflex/opflex.yaml index 3f85b0824..3d38119e4 100644 --- a/jjb/opflex/opflex.yaml +++ b/jjb/opflex/opflex.yaml @@ -5,11 +5,16 @@ - 'opflex-release-{stream}' stream: - - oxygen: + - fluorine: branch: 'master' libuv-version: '1.8.0' rapidjson-version: '1.0.2' openvswitch-version: '2.6.0' + - oxygen: + branch: 'stable/oxygen' + libuv-version: '1.8.0' + rapidjson-version: '1.0.2' + openvswitch-version: '2.6.0' - nitrogen: branch: 'stable/nitrogen' libuv-version: '1.8.0' diff --git a/jjb/ovil/ovil.yaml b/jjb/ovil/ovil.yaml index 66790de44..6e96ffac5 100644 --- a/jjb/ovil/ovil.yaml +++ b/jjb/ovil/ovil.yaml @@ -1,15 +1,33 @@ --- - project: - name: ovil + name: ovil-fluorine jobs: - odl-maven-jobs - gerrit-tox-verify + stream: fluorine project: ovil project-name: ovil - stream: - - oxygen: - branch: master + branch: 'master' + mvn-settings: ovil-settings + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + + dependencies: '' + email-upstream: '[ovil]' + + # Used by the release job + staging-profile-id: 7b48866c207d8 + +- project: + name: ovil-oxygen + jobs: + - odl-maven-jobs + - gerrit-tox-verify + + stream: oxygen + project: ovil + project-name: ovil + branch: 'stable/oxygen' mvn-settings: ovil-settings mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/ovsdb/ovsdb-csit-clustering.yaml b/jjb/ovsdb/ovsdb-csit-clustering.yaml index 4f4850703..e0e4969a0 100644 --- a/jjb/ovsdb/ovsdb-csit-clustering.yaml +++ b/jjb/ovsdb/ovsdb-csit-clustering.yaml @@ -14,8 +14,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/ovsdb/ovsdb-csit-southbound.yaml b/jjb/ovsdb/ovsdb-csit-southbound.yaml index 29eea50d3..b88d63f46 100644 --- a/jjb/ovsdb/ovsdb-csit-southbound.yaml +++ b/jjb/ovsdb/ovsdb-csit-southbound.yaml @@ -14,8 +14,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml index 7b86adad7..0e24962d8 100644 --- a/jjb/ovsdb/ovsdb-full-integration.yaml +++ b/jjb/ovsdb/ovsdb-full-integration.yaml @@ -5,8 +5,10 @@ - 'ovsdb-daily-full-integration-{stream}' stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/ovsdb/ovsdb-patch-test.yaml b/jjb/ovsdb/ovsdb-patch-test.yaml index 247ec8c2c..852e0a5b9 100644 --- a/jjb/ovsdb/ovsdb-patch-test.yaml +++ b/jjb/ovsdb/ovsdb-patch-test.yaml @@ -8,11 +8,16 @@ project: 'ovsdb' stream: - - oxygen: + - fluorine: branch: 'master' # os-branch: 'pike' # issues with pike right now (esp l2gw), lets stick with ocata os-branch: 'ocata' + - oxygen: + branch: 'stable/oxygen' + # os-branch: 'pike' + # issues with pike right now (esp l2gw), lets stick with ocata + os-branch: 'ocata' - nitrogen: branch: 'stable/nitrogen' os-branch: 'ocata' diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml index 652820f26..60064bd31 100644 --- a/jjb/ovsdb/ovsdb.yaml +++ b/jjb/ovsdb/ovsdb.yaml @@ -1,4 +1,24 @@ --- +- project: + name: ovsdb-fluorine + jobs: + - '{project-name}-distribution-check-{stream}' + - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs + + stream: fluorine + project: 'ovsdb' + project-name: 'ovsdb' + branch: 'master' + build-node: centos7-builder-2c-8g + mvn-settings: 'ovsdb-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' + email-upstream: '[ovsdb] [odlparent] [controller] [yangtools]' + + # Used by the release job + staging-profile-id: a68b188166958 + - project: name: ovsdb-oxygen jobs: @@ -9,7 +29,7 @@ stream: oxygen project: 'ovsdb' project-name: 'ovsdb' - branch: 'master' + branch: 'stable/oxygen' build-node: centos7-builder-2c-8g mvn-settings: 'ovsdb-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/p4plugin/p4plugin-csit-basic.yaml b/jjb/p4plugin/p4plugin-csit-basic.yaml index e9f6d10c3..0b892c04d 100644 --- a/jjb/p4plugin/p4plugin-csit-basic.yaml +++ b/jjb/p4plugin/p4plugin-csit-basic.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' install: - all: diff --git a/jjb/p4plugin/p4plugin.yaml b/jjb/p4plugin/p4plugin.yaml index 7ead8dd89..90802ab73 100644 --- a/jjb/p4plugin/p4plugin.yaml +++ b/jjb/p4plugin/p4plugin.yaml @@ -1,4 +1,23 @@ --- +- project: + name: p4plugin-fluorine + jobs: + - '{project-name}-distribution-check-{stream}' + - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs + + stream: fluorine + project: 'p4plugin' + project-name: 'p4plugin' + branch: 'master' + mvn-settings: 'p4plugin-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: '' + email-upstream: '[p4plugin]' + + # Used by the release job + staging-profile-id: a68bf26e208d4 + - project: name: p4plugin-oxygen jobs: @@ -9,7 +28,7 @@ stream: oxygen project: 'p4plugin' project-name: 'p4plugin' - branch: 'master' + branch: 'stable/oxygen' mvn-settings: 'p4plugin-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' diff --git a/jjb/packaging/packaging.yaml b/jjb/packaging/packaging.yaml index 23b542856..afe5d1524 100644 --- a/jjb/packaging/packaging.yaml +++ b/jjb/packaging/packaging.yaml @@ -19,6 +19,7 @@ project: 'integration/packaging' stream: + - fluorine - carbon - nitrogen - oxygen diff --git a/jjb/packetcable/packetcable-csit-pcmm.yaml b/jjb/packetcable/packetcable-csit-pcmm.yaml index 5d642d1ee..13eb0eb1f 100644 --- a/jjb/packetcable/packetcable-csit-pcmm.yaml +++ b/jjb/packetcable/packetcable-csit-pcmm.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/packetcable/packetcable.yaml b/jjb/packetcable/packetcable.yaml index 2fe013e80..14a83cd22 100644 --- a/jjb/packetcable/packetcable.yaml +++ b/jjb/packetcable/packetcable.yaml @@ -1,4 +1,22 @@ --- +- project: + name: packetcable-fluorine + jobs: + - '{project-name}-distribution-check-{stream}' + - odl-maven-jobs + + stream: fluorine + project: 'packetcable' + project-name: 'packetcable' + branch: 'master' + mvn-settings: 'packetcable-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: '' + email-upstream: '[packetcable]' + + # Used by the release job + staging-profile-id: a68ca4a24655c + - project: name: packetcable-oxygen jobs: @@ -8,7 +26,7 @@ stream: oxygen project: 'packetcable' project-name: 'packetcable' - branch: 'master' + branch: 'stable/oxygen' mvn-settings: 'packetcable-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' diff --git a/jjb/persistence/persistence.yaml b/jjb/persistence/persistence.yaml index 8d00a247d..c745e2178 100644 --- a/jjb/persistence/persistence.yaml +++ b/jjb/persistence/persistence.yaml @@ -1,4 +1,22 @@ --- +- project: + name: persistence-fluorine + jobs: + - odl-maven-jobs + + stream: fluorine + project: 'persistence' + project-name: 'persistence' + branch: 'master' + jdk: openjdk7 + mvn-settings: 'persistence-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: '' + email-upstream: '[persistence]' + + # Used by the release job + staging-profile-id: a68d3c2bb44d1 + - project: name: persistence-oxygen jobs: @@ -7,7 +25,7 @@ stream: oxygen project: 'persistence' project-name: 'persistence' - branch: 'master' + branch: 'stable/oxygen' jdk: openjdk7 mvn-settings: 'persistence-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml index 839171392..d362e69fa 100644 --- a/jjb/releng-defaults.yaml +++ b/jjb/releng-defaults.yaml @@ -182,18 +182,31 @@ 10-exclude-value: '' # Manual CSIT job lists used by sanity or periodic in nature. + csit-high-frequency-list-fluorine: > + netvirt-csit-1node-openstack-ocata-upstream-stateful-fluorine csit-high-frequency-list-oxygen: > netvirt-csit-1node-openstack-ocata-upstream-stateful-oxygen csit-high-frequency-list-nitrogen: > netvirt-csit-1node-openstack-ocata-upstream-stateful-nitrogen csit-high-frequency-list-carbon: > netvirt-csit-1node-openstack-newton-nodl-v2-upstream-stateful-carbon + csit-sanity-list-fluorine: > + openflowplugin-csit-1node-sanity-only-fluorine csit-sanity-list-oxygen: > openflowplugin-csit-1node-sanity-only-oxygen csit-sanity-list-nitrogen: > openflowplugin-csit-1node-sanity-only-nitrogen csit-sanity-list-carbon: > openflowplugin-csit-1node-sanity-only-carbon + csit-weekly-list-fluorine: > + controller-csit-1node-notifications-longevity-only-fluorine, + controller-csit-3node-drb-partnheal-longevity-only-fluorine, + controller-csit-3node-drb-precedence-longevity-only-fluorine, + controller-csit-3node-ddb-expl-lead-movement-longevity-only-fluorine, + bgpcep-csit-3node-bgpclustering-longevity-only-fluorine, + distribution-deploy-fluorine, + distribution-offline-fluorine, + openflowplugin-csit-1node-longevity-only-fluorine csit-weekly-list-oxygen: > controller-csit-1node-notifications-longevity-only-oxygen, controller-csit-3node-drb-partnheal-longevity-only-oxygen, diff --git a/jjb/reservation/reservation.yaml b/jjb/reservation/reservation.yaml index 9af582ca7..47b06b04e 100644 --- a/jjb/reservation/reservation.yaml +++ b/jjb/reservation/reservation.yaml @@ -1,4 +1,21 @@ --- +- project: + name: reservation-fluorine + jobs: + - odl-maven-jobs + + stream: fluorine + project: 'reservation' + project-name: 'reservation' + branch: 'master' + mvn-settings: 'reservation-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: '' + email-upstream: '[reservation]' + + # Used by the release job + staging-profile-id: a68d9bc504037 + - project: name: reservation-oxygen jobs: @@ -7,7 +24,7 @@ stream: oxygen project: 'reservation' project-name: 'reservation' - branch: 'master' + branch: 'stable/oxygen' mvn-settings: 'reservation-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' diff --git a/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml b/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml index 834ff2b81..da2df481e 100644 --- a/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml +++ b/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/sdninterfaceapp/sdninterfaceapp.yaml b/jjb/sdninterfaceapp/sdninterfaceapp.yaml index 99c856bf9..d14de6265 100644 --- a/jjb/sdninterfaceapp/sdninterfaceapp.yaml +++ b/jjb/sdninterfaceapp/sdninterfaceapp.yaml @@ -1,4 +1,23 @@ --- +- project: + name: sdninterfaceapp-fluorine + jobs: + - '{project-name}-distribution-check-{stream}' + - odl-maven-jobs + + stream: fluorine + project: 'sdninterfaceapp' + project-name: 'sdninterfaceapp' + branch: 'master' + build-node: centos7-builder-2c-8g + mvn-settings: 'sdninterfaceapp-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: 'bgpcep-merge-{stream}' + email-upstream: '[sdninterfaceapp] [bgpcep]' + + # Used by the release job + staging-profile-id: a68e3d1ff55e3 + - project: name: sdninterfaceapp-oxygen jobs: @@ -8,7 +27,7 @@ stream: oxygen project: 'sdninterfaceapp' project-name: 'sdninterfaceapp' - branch: 'master' + branch: 'stable/oxygen' build-node: centos7-builder-2c-8g mvn-settings: 'sdninterfaceapp-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/sfc/sfc-csit-full-deploy.yaml b/jjb/sfc/sfc-csit-full-deploy.yaml index bfbc9066d..c050efa8c 100644 --- a/jjb/sfc/sfc-csit-full-deploy.yaml +++ b/jjb/sfc/sfc-csit-full-deploy.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/sfc/sfc-csit-rest-basic.yaml b/jjb/sfc/sfc-csit-rest-basic.yaml index 5f15d879b..a0dc38318 100644 --- a/jjb/sfc/sfc-csit-rest-basic.yaml +++ b/jjb/sfc/sfc-csit-rest-basic.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/sfc/sfc-patch-test.yaml b/jjb/sfc/sfc-patch-test.yaml index dc9cf856a..d3da13233 100644 --- a/jjb/sfc/sfc-patch-test.yaml +++ b/jjb/sfc/sfc-patch-test.yaml @@ -9,8 +9,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/sfc/sfc-python.yaml b/jjb/sfc/sfc-python.yaml index 9b226d93b..bfe6ef9e0 100644 --- a/jjb/sfc/sfc-python.yaml +++ b/jjb/sfc/sfc-python.yaml @@ -5,8 +5,10 @@ - 'sfc-verify-python-{stream}' stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/sfc/sfc.yaml b/jjb/sfc/sfc.yaml index a38ec9b22..ab58e449b 100644 --- a/jjb/sfc/sfc.yaml +++ b/jjb/sfc/sfc.yaml @@ -1,4 +1,24 @@ --- +- project: + name: sfc-fluorine + jobs: + - '{project-name}-distribution-check-{stream}' + - odl-maven-jobs + + stream: fluorine + project: 'sfc' + project-name: 'sfc' + branch: 'master' + mvn-settings: 'sfc-settings' + mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' + build-timeout: 120 + dependencies: 'openflowplugin-merge-{stream},ovsdb-merge-{stream},lispflowmapping-merge-{stream}' + email-upstream: '[sfc] [openflowplugin] [ovsdb] [lispflowmapping]' + build-node: centos7-builder-8c-8g + + # Used by the release job + staging-profile-id: a68eb361ca48a + - project: name: sfc-oxygen jobs: @@ -8,7 +28,7 @@ stream: oxygen project: 'sfc' project-name: 'sfc' - branch: 'master' + branch: 'stable/oxygen' mvn-settings: 'sfc-settings' mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' build-timeout: 120 diff --git a/jjb/snbi/snbi.yaml b/jjb/snbi/snbi.yaml index 53a61ecd0..f9ecd01f6 100644 --- a/jjb/snbi/snbi.yaml +++ b/jjb/snbi/snbi.yaml @@ -1,4 +1,22 @@ --- +- project: + name: snbi-fluorine + jobs: + - '{project-name}-distribution-check-{stream}' + - odl-maven-jobs + + stream: fluorine + project: 'snbi' + project-name: 'snbi' + branch: 'master' + mvn-settings: 'snbi-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: '' + email-upstream: '[snbi]' + + # Used by the release job + staging-profile-id: a68f328cefed6 + - project: name: snbi-oxygen jobs: @@ -8,7 +26,7 @@ stream: oxygen project: 'snbi' project-name: 'snbi' - branch: 'master' + branch: 'stable/oxygen' mvn-settings: 'snbi-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' diff --git a/jjb/snmp/snmp.yaml b/jjb/snmp/snmp.yaml index 55ee92233..4a5c47d15 100644 --- a/jjb/snmp/snmp.yaml +++ b/jjb/snmp/snmp.yaml @@ -1,4 +1,22 @@ --- +- project: + name: snmp-fluorine + jobs: + - '{project-name}-distribution-check-{stream}' + - odl-maven-jobs + + stream: fluorine + project: 'snmp' + project-name: 'snmp' + branch: 'master' + mvn-settings: 'snmp-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: 'odlparent-merge-{stream}' + email-upstream: '[snmp] [odlparent]' + + # Used by the release job + staging-profile-id: a68fb236b93a6 + - project: name: snmp-oxygen jobs: @@ -8,7 +26,7 @@ stream: oxygen project: 'snmp' project-name: 'snmp' - branch: 'master' + branch: 'stable/oxygen' mvn-settings: 'snmp-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream}' diff --git a/jjb/snmp4sdn/snmp4sdn.yaml b/jjb/snmp4sdn/snmp4sdn.yaml index ecb20af33..1ad2b6a86 100644 --- a/jjb/snmp4sdn/snmp4sdn.yaml +++ b/jjb/snmp4sdn/snmp4sdn.yaml @@ -1,4 +1,22 @@ --- +- project: + name: snmp4sdn-fluorine + jobs: + - '{project-name}-distribution-check-{stream}' + - odl-maven-jobs + + stream: fluorine + project: 'snmp4sdn' + project-name: 'snmp4sdn' + branch: 'master' + mvn-settings: 'snmp4sdn-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' + email-upstream: '[snmp4sdn] [odlparent] [controller] [yangtools]' + + # Used by the release job + staging-profile-id: a69034a4b6ef5 + - project: name: snmp4sdn-oxygen jobs: @@ -8,7 +26,7 @@ stream: oxygen project: 'snmp4sdn' project-name: 'snmp4sdn' - branch: 'master' + branch: 'stable/oxygen' mvn-settings: 'snmp4sdn-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' diff --git a/jjb/sxp/sxp-csit-basic.yaml b/jjb/sxp/sxp-csit-basic.yaml index 5c91055cb..144a8f4e5 100644 --- a/jjb/sxp/sxp-csit-basic.yaml +++ b/jjb/sxp/sxp-csit-basic.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/sxp/sxp-csit-cluster-routing.yaml b/jjb/sxp/sxp-csit-cluster-routing.yaml index 9474a4097..8f6aec788 100644 --- a/jjb/sxp/sxp-csit-cluster-routing.yaml +++ b/jjb/sxp/sxp-csit-cluster-routing.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/sxp/sxp-csit-clustering.yaml b/jjb/sxp/sxp-csit-clustering.yaml index 0b5e3adac..b724bd0d1 100644 --- a/jjb/sxp/sxp-csit-clustering.yaml +++ b/jjb/sxp/sxp-csit-clustering.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/sxp/sxp-csit-filtering.yaml b/jjb/sxp/sxp-csit-filtering.yaml index 410c409b6..be42360bc 100644 --- a/jjb/sxp/sxp-csit-filtering.yaml +++ b/jjb/sxp/sxp-csit-filtering.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/sxp/sxp-csit-performance.yaml b/jjb/sxp/sxp-csit-performance.yaml index 7b909d0ef..b78f1f4a7 100644 --- a/jjb/sxp/sxp-csit-performance.yaml +++ b/jjb/sxp/sxp-csit-performance.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/sxp/sxp-csit-topology.yaml b/jjb/sxp/sxp-csit-topology.yaml index 16e672552..00950eff3 100644 --- a/jjb/sxp/sxp-csit-topology.yaml +++ b/jjb/sxp/sxp-csit-topology.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml index 351fb8881..08b5b7556 100644 --- a/jjb/sxp/sxp.yaml +++ b/jjb/sxp/sxp.yaml @@ -1,4 +1,22 @@ --- +- project: + name: sxp-fluorine + jobs: + - '{project-name}-distribution-check-{stream}' + - odl-maven-jobs + + stream: fluorine + project: 'sxp' + project-name: 'sxp' + branch: 'master' + mvn-settings: 'sxp-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' + email-upstream: '[sxp] [odlparent] [controller] [yangtools]' + + # Used by the release job + staging-profile-id: a6909c75719b7 + - project: name: sxp-oxygen jobs: @@ -8,7 +26,7 @@ stream: oxygen project: 'sxp' project-name: 'sxp' - branch: 'master' + branch: 'stable/oxygen' mvn-settings: 'sxp-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' diff --git a/jjb/systemmetrics/systemmetrics.yaml b/jjb/systemmetrics/systemmetrics.yaml index e75892ea7..f6b280bb9 100644 --- a/jjb/systemmetrics/systemmetrics.yaml +++ b/jjb/systemmetrics/systemmetrics.yaml @@ -1,4 +1,21 @@ --- +- project: + name: systemmetrics-fluorine + jobs: + - odl-maven-jobs + + project: 'systemmetrics' + project-name: 'systemmetrics' + stream: fluorine + branch: 'master' + mvn-settings: 'systemmetrics-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' + email-upstream: '[systemmetrics] [odlparent] [yangtools] [controller]' + + # Used by the release job + staging-profile-id: a69113575458e + - project: name: systemmetrics-oxygen jobs: @@ -7,7 +24,7 @@ project: 'systemmetrics' project-name: 'systemmetrics' stream: oxygen - branch: 'master' + branch: 'stable/oxygen' mvn-settings: 'systemmetrics-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' diff --git a/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml b/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml index 5ebd9e0d8..3236e6e42 100644 --- a/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml +++ b/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/topoprocessing/topoprocessing.yaml b/jjb/topoprocessing/topoprocessing.yaml index c8147cf11..8aacb5041 100644 --- a/jjb/topoprocessing/topoprocessing.yaml +++ b/jjb/topoprocessing/topoprocessing.yaml @@ -1,4 +1,22 @@ --- +- project: + name: topoprocessing-fluorine + jobs: + - '{project-name}-distribution-check-{stream}' + - odl-maven-jobs + + stream: fluorine + project: 'topoprocessing' + project-name: 'topoprocessing' + branch: 'master' + mvn-settings: 'topoprocessing-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' + email-upstream: '[topoprocessing] [odlparent] [controller] [yangtools]' + + # Used by the release job + staging-profile-id: a691bbe2328cb + - project: name: topoprocessing-oxygen jobs: @@ -8,7 +26,7 @@ stream: oxygen project: 'topoprocessing' project-name: 'topoprocessing' - branch: 'master' + branch: 'stable/oxygen' mvn-settings: 'topoprocessing-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' diff --git a/jjb/transportpce/transportpce.yaml b/jjb/transportpce/transportpce.yaml index 3f5c8fa12..30ab98e93 100644 --- a/jjb/transportpce/transportpce.yaml +++ b/jjb/transportpce/transportpce.yaml @@ -1,4 +1,21 @@ --- +- project: + name: transportpce-fluorine + jobs: + - odl-maven-jobs + + project: 'transportpce' + project-name: 'transportpce' + stream: fluorine + branch: 'master' + mvn-settings: 'transportpce-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' + email-upstream: '[transportpce] [odlparent] [yangtools] [controller]' + + # Used by the release job + staging-profile-id: a6927323fa3d4 + - project: name: transportpce-oxygen jobs: @@ -7,7 +24,7 @@ project: 'transportpce' project-name: 'transportpce' stream: oxygen - branch: 'master' + branch: 'stable/oxygen' mvn-settings: 'transportpce-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' diff --git a/jjb/tsdr/tsdr-csit-cassandra.yaml b/jjb/tsdr/tsdr-csit-cassandra.yaml index 5a712c665..0abf934ed 100644 --- a/jjb/tsdr/tsdr-csit-cassandra.yaml +++ b/jjb/tsdr/tsdr-csit-cassandra.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/tsdr/tsdr-csit-elasticsearch.yaml b/jjb/tsdr/tsdr-csit-elasticsearch.yaml index c67e3101a..02e9df3cd 100644 --- a/jjb/tsdr/tsdr-csit-elasticsearch.yaml +++ b/jjb/tsdr/tsdr-csit-elasticsearch.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/tsdr/tsdr-csit-hbase.yaml b/jjb/tsdr/tsdr-csit-hbase.yaml index 37840bb3b..c574684ae 100644 --- a/jjb/tsdr/tsdr-csit-hbase.yaml +++ b/jjb/tsdr/tsdr-csit-hbase.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/tsdr/tsdr-csit-hsqldb.yaml b/jjb/tsdr/tsdr-csit-hsqldb.yaml index 6d4e1cbcd..8c251df84 100644 --- a/jjb/tsdr/tsdr-csit-hsqldb.yaml +++ b/jjb/tsdr/tsdr-csit-hsqldb.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/tsdr/tsdr.yaml b/jjb/tsdr/tsdr.yaml index 830ddc77a..04bd66db3 100644 --- a/jjb/tsdr/tsdr.yaml +++ b/jjb/tsdr/tsdr.yaml @@ -1,4 +1,22 @@ --- +- project: + name: tsdr-fluorine + jobs: + - '{project-name}-distribution-check-{stream}' + - odl-maven-jobs + + stream: fluorine + project: 'tsdr' + project-name: 'tsdr' + branch: 'master' + mvn-settings: 'tsdr-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: '' + email-upstream: '[tsdr]' + + # Used by the release job + staging-profile-id: a69373036303c + - project: name: tsdr-oxygen jobs: @@ -8,7 +26,7 @@ stream: oxygen project: 'tsdr' project-name: 'tsdr' - branch: 'master' + branch: 'stable/oxygen' mvn-settings: 'tsdr-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' diff --git a/jjb/ttp/ttp.yaml b/jjb/ttp/ttp.yaml index b92ebd1c7..323a75b8a 100644 --- a/jjb/ttp/ttp.yaml +++ b/jjb/ttp/ttp.yaml @@ -1,4 +1,22 @@ --- +- project: + name: ttp-fluorine + jobs: + - '{project-name}-distribution-check-{stream}' + - odl-maven-jobs + + stream: fluorine + project: 'ttp' + project-name: 'ttp' + branch: 'master' + mvn-settings: 'ttp-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: 'odlparent-merge-{stream}' + email-upstream: '[ttp] [odlparent]' + + # Used by the release job + staging-profile-id: a693f948563d5 + - project: name: ttp-oxygen jobs: @@ -8,7 +26,7 @@ stream: oxygen project: 'ttp' project-name: 'ttp' - branch: 'master' + branch: 'stable/oxygen' mvn-settings: 'ttp-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream}' diff --git a/jjb/unimgr/unimgr-csit-basic.yaml b/jjb/unimgr/unimgr-csit-basic.yaml index 91835fbbb..985b58e05 100644 --- a/jjb/unimgr/unimgr-csit-basic.yaml +++ b/jjb/unimgr/unimgr-csit-basic.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/unimgr/unimgr-csit-legato.yaml b/jjb/unimgr/unimgr-csit-legato.yaml index b575e274f..1312aec28 100644 --- a/jjb/unimgr/unimgr-csit-legato.yaml +++ b/jjb/unimgr/unimgr-csit-legato.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/unimgr/unimgr.yaml b/jjb/unimgr/unimgr.yaml index 65e659cbc..e53712d93 100644 --- a/jjb/unimgr/unimgr.yaml +++ b/jjb/unimgr/unimgr.yaml @@ -1,4 +1,23 @@ --- +- project: + name: unimgr-fluorine + jobs: + - '{project-name}-distribution-check-{stream}' + - odl-maven-jobs + + stream: fluorine + project: 'unimgr' + project-name: 'unimgr' + branch: 'master' + mvn-settings: 'unimgr-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: 'ovsdb-merge-{stream}' + email-upstream: '[unimgr] [ovsdb]' + build-node: centos7-builder-4c-16g + + # Used by the release job + staging-profile-id: a695d0a0b8d51 + - project: name: unimgr-oxygen jobs: @@ -8,7 +27,7 @@ stream: oxygen project: 'unimgr' project-name: 'unimgr' - branch: 'master' + branch: 'stable/oxygen' mvn-settings: 'unimgr-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'ovsdb-merge-{stream}' diff --git a/jjb/usc/usc-csit-channel.yaml b/jjb/usc/usc-csit-channel.yaml index 1e85d7bd5..9176ec0c2 100644 --- a/jjb/usc/usc-csit-channel.yaml +++ b/jjb/usc/usc-csit-channel.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/usc/usc-csit-tcp.yaml b/jjb/usc/usc-csit-tcp.yaml index 0c409bc80..46781e36c 100644 --- a/jjb/usc/usc-csit-tcp.yaml +++ b/jjb/usc/usc-csit-tcp.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/usc/usc.yaml b/jjb/usc/usc.yaml index fab6c6277..772a8d932 100644 --- a/jjb/usc/usc.yaml +++ b/jjb/usc/usc.yaml @@ -1,4 +1,23 @@ --- +- project: + name: usc-fluorine + jobs: + - '{project-name}-distribution-check-{stream}' + - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs + + stream: fluorine + project: 'usc' + project-name: 'usc' + branch: 'master' + mvn-settings: 'usc-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}' + email-upstream: '[usc] [controller] [yangtools] [odlparent]' + + # Used by the release job + staging-profile-id: a697b633b3ffe + - project: name: usc-oxygen jobs: @@ -9,7 +28,7 @@ stream: oxygen project: 'usc' project-name: 'usc' - branch: 'master' + branch: 'stable/oxygen' mvn-settings: 'usc-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}' diff --git a/jjb/usecplugin/usecplugin-csit-basic.yaml b/jjb/usecplugin/usecplugin-csit-basic.yaml index 380414925..ff278048d 100644 --- a/jjb/usecplugin/usecplugin-csit-basic.yaml +++ b/jjb/usecplugin/usecplugin-csit-basic.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/usecplugin/usecplugin.yaml b/jjb/usecplugin/usecplugin.yaml index f4fd0fa48..459dccd32 100644 --- a/jjb/usecplugin/usecplugin.yaml +++ b/jjb/usecplugin/usecplugin.yaml @@ -1,4 +1,22 @@ --- +- project: + name: usecplugin-fluorine + jobs: + - '{project-name}-distribution-check-{stream}' + - odl-maven-jobs + + stream: fluorine + project: 'usecplugin' + project-name: 'usecplugin' + branch: 'master' + mvn-settings: 'usecplugin-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: 'openflowplugin-merge-{stream}' + email-upstream: '[usecplugin] [openflowplugin]' + + # Used by the release job + staging-profile-id: a69902281e037 + - project: name: usecplugin-oxygen jobs: @@ -8,7 +26,7 @@ stream: oxygen project: 'usecplugin' project-name: 'usecplugin' - branch: 'master' + branch: 'stable/oxygen' mvn-settings: 'usecplugin-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'openflowplugin-merge-{stream}' diff --git a/jjb/vtn/vtn-csit-3node-manager.yaml b/jjb/vtn/vtn-csit-3node-manager.yaml index 9c3efd140..21ec6ea79 100644 --- a/jjb/vtn/vtn-csit-3node-manager.yaml +++ b/jjb/vtn/vtn-csit-3node-manager.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/vtn/vtn-csit-coordinator.yaml b/jjb/vtn/vtn-csit-coordinator.yaml index 92bdeab82..e1acbb2de 100644 --- a/jjb/vtn/vtn-csit-coordinator.yaml +++ b/jjb/vtn/vtn-csit-coordinator.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/vtn/vtn-csit-manager.yaml b/jjb/vtn/vtn-csit-manager.yaml index e9efdf10f..fd04de777 100644 --- a/jjb/vtn/vtn-csit-manager.yaml +++ b/jjb/vtn/vtn-csit-manager.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/vtn/vtn-manager-csit-1node-openstack.yaml b/jjb/vtn/vtn-manager-csit-1node-openstack.yaml index 512ac50c2..6fd69d820 100644 --- a/jjb/vtn/vtn-manager-csit-1node-openstack.yaml +++ b/jjb/vtn/vtn-manager-csit-1node-openstack.yaml @@ -20,8 +20,10 @@ functionality: 'neutron' stream: - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/vtn/vtn-patch-test.yaml b/jjb/vtn/vtn-patch-test.yaml index f1719f93b..eceaf80aa 100644 --- a/jjb/vtn/vtn-patch-test.yaml +++ b/jjb/vtn/vtn-patch-test.yaml @@ -11,11 +11,16 @@ # Project branches stream: - - oxygen: + - fluorine: branch: 'master' csit-list: > vtn-csit-1node-manager-all-{stream}, vtn-csit-3node-manager-all-{stream} + - oxygen: + branch: 'stable/oxygen' + csit-list: > + vtn-csit-1node-manager-all-{stream}, + vtn-csit-3node-manager-all-{stream} - nitrogen: branch: 'stable/nitrogen' csit-list: > diff --git a/jjb/vtn/vtn.yaml b/jjb/vtn/vtn.yaml index d5a7386eb..9d47eaf4c 100644 --- a/jjb/vtn/vtn.yaml +++ b/jjb/vtn/vtn.yaml @@ -1,4 +1,29 @@ --- +- project: + name: vtn-fluorine + jobs: + - '{project-name}-distribution-check-{stream}' + - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs + + stream: fluorine + project: 'vtn' + project-name: 'vtn' + branch: 'master' + mvn-settings: 'vtn-settings' + mvn-goals: 'clean deploy -V -Pintegrationtests,strictcheck,docs -Dvtn.build.jobs=2' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: 'neutron-merge-{stream},openflowplugin-merge-{stream},ovsdb-merge-{stream}' + email-upstream: '[vtn] [neutron] [openflowplugin] [ovsdb]' + + # Please do not archive maven sites!!! + # Maven sites are published to Nexus at: + # https://nexus.opendaylight.org/content/sites/site/ + archive-artifacts: 'manager/dist/*/target/*.zip coordinator/dist/target/*.bz2' + + # Used by the release job + staging-profile-id: a699799dd6fc9 + - project: name: vtn-oxygen jobs: @@ -9,7 +34,7 @@ stream: oxygen project: 'vtn' project-name: 'vtn' - branch: 'master' + branch: 'stable/oxygen' mvn-settings: 'vtn-settings' mvn-goals: 'clean deploy -V -Pintegrationtests,strictcheck,docs -Dvtn.build.jobs=2' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/yang-push/yang-push.yaml b/jjb/yang-push/yang-push.yaml index c533c444c..da08c4bdd 100644 --- a/jjb/yang-push/yang-push.yaml +++ b/jjb/yang-push/yang-push.yaml @@ -1,4 +1,22 @@ --- +- project: + name: yang-push-fluorine + jobs: + - '{project-name}-distribution-check-{stream}' + - odl-maven-jobs + + stream: fluorine + project: 'yang-push' + project-name: 'yang-push' + branch: 'master' + mvn-settings: 'yang-push-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: '' + email-upstream: '[yang-push]' + + # Used by the release job + staging-profile-id: a69aae2832869 + - project: name: yang-push-oxygen jobs: @@ -8,7 +26,7 @@ stream: oxygen project: 'yang-push' project-name: 'yang-push' - branch: 'master' + branch: 'stable/oxygen' mvn-settings: 'yang-push-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' diff --git a/jjb/yangide/yangide.yaml b/jjb/yangide/yangide.yaml index 1358a5e88..2e8ec0ae2 100644 --- a/jjb/yangide/yangide.yaml +++ b/jjb/yangide/yangide.yaml @@ -1,4 +1,21 @@ --- +- project: + name: yangide-fluorine + jobs: + - odl-maven-jobs + + stream: fluorine + project: 'yangide' + project-name: 'yangide' + branch: 'master' + mvn-settings: 'yangide-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}' + email-upstream: '[yangide] [odlparent] [yangtools]' + + # Used by the release job + staging-profile-id: fba306956f98 + - project: name: yangide-oxygen jobs: @@ -7,7 +24,7 @@ stream: oxygen project: 'yangide' project-name: 'yangide' - branch: 'master' + branch: 'stable/oxygen' mvn-settings: 'yangide-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}' diff --git a/jjb/yangtools/yangtools-csit-system.yaml b/jjb/yangtools/yangtools-csit-system.yaml index 19644cfc4..f27bc5f50 100644 --- a/jjb/yangtools/yangtools-csit-system.yaml +++ b/jjb/yangtools/yangtools-csit-system.yaml @@ -13,8 +13,10 @@ # Project branches. stream: # The tested component was only introduced in Carbon. - - oxygen: + - fluorine: branch: 'master' + - oxygen: + branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - carbon: