From: Anil Belur Date: Sat, 2 Feb 2019 12:45:31 +0000 (+1000) Subject: Create stable/neon branch bump master to sodium X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F25%2F80125%2F1;p=releng%2Fbuilder.git Create stable/neon branch bump master to sodium Neon branch cutting to reflect new stable/neon branches and move master to Sodium. Change-Id: Ia7683219d65f81621553d491cf44880f0dccc2cf Signed-off-by: Anil Belur --- diff --git a/jjb/aaa/aaa-csit-authn.yaml b/jjb/aaa/aaa-csit-authn.yaml index 8d328842c..f50680dea 100644 --- a/jjb/aaa/aaa-csit-authn.yaml +++ b/jjb/aaa/aaa-csit-authn.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - oxygen: diff --git a/jjb/aaa/aaa-csit-keystone.yaml b/jjb/aaa/aaa-csit-keystone.yaml index 614ef0465..05aa6150d 100644 --- a/jjb/aaa/aaa-csit-keystone.yaml +++ b/jjb/aaa/aaa-csit-keystone.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - oxygen: diff --git a/jjb/aaa/aaa-csit-tls.yaml b/jjb/aaa/aaa-csit-tls.yaml index fc0c7a97b..906e9601a 100644 --- a/jjb/aaa/aaa-csit-tls.yaml +++ b/jjb/aaa/aaa-csit-tls.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - oxygen: diff --git a/jjb/aaa/aaa-patch-test.yaml b/jjb/aaa/aaa-patch-test.yaml index 06f0b3224..d3c9d0344 100644 --- a/jjb/aaa/aaa-patch-test.yaml +++ b/jjb/aaa/aaa-patch-test.yaml @@ -7,9 +7,12 @@ project: 'aaa' stream: - - neon: + - sodium: branch: 'master' os-branch: 'queens' + - neon: + branch: 'stable/neon' + os-branch: 'queens' - fluorine: branch: 'stable/fluorine' os-branch: 'queens' diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml index 7284ed198..e656fd486 100644 --- a/jjb/aaa/aaa.yaml +++ b/jjb/aaa/aaa.yaml @@ -1,4 +1,27 @@ --- +- project: + name: aaa-sodium + jobs: + - '{project-name}-distribution-check-{stream}' + - '{project-name}-rtd-jobs': + build-node: centos7-builder-2c-2g + project-pattern: aaa + rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-aaa/47615/ + rtd-token: 621132230e1307d38f4aaf27e669d7dfdf98532f + - odl-maven-jobs + + stream: sodium + 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-neon jobs: @@ -13,7 +36,7 @@ stream: neon project: 'aaa' project-name: 'aaa' - branch: 'master' + branch: 'stable/neon' 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 ef5c322ac..f6551354f 100644 --- a/jjb/alto/alto-csit-setup.yaml +++ b/jjb/alto/alto-csit-setup.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - oxygen: diff --git a/jjb/alto/alto.yaml b/jjb/alto/alto.yaml index bde653749..0c52a87cd 100644 --- a/jjb/alto/alto.yaml +++ b/jjb/alto/alto.yaml @@ -1,4 +1,22 @@ --- +- project: + name: alto-sodium + jobs: + - odl-maven-jobs + + stream: sodium + 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-neon jobs: @@ -7,7 +25,7 @@ stream: neon project: 'alto' project-name: 'alto' - branch: 'master' + branch: 'stable/neon' build-node: centos7-builder-2c-8g mvn-settings: 'alto-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/ansible/ansible.yaml b/jjb/ansible/ansible.yaml index 0295d49eb..157305b8b 100644 --- a/jjb/ansible/ansible.yaml +++ b/jjb/ansible/ansible.yaml @@ -8,8 +8,10 @@ - odl-maven-jobs stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' diff --git a/jjb/archetypes/archetypes.yaml b/jjb/archetypes/archetypes.yaml index b9a976121..0dd66f825 100644 --- a/jjb/archetypes/archetypes.yaml +++ b/jjb/archetypes/archetypes.yaml @@ -1,4 +1,28 @@ --- +- project: + name: archetypes-sodium + jobs: + - gerrit-maven-clm + - '{project-name}-merge-{stream}': + build-timeout: 180 + cron: '@daily' + mvn-goals: clean install -V -Dmaven.compile.fork=true + - gerrit-maven-stage + - gerrit-maven-verify + - gerrit-maven-verify-dependencies: + build-timeout: 180 + + stream: sodium + project: 'archetypes' + project-name: 'archetypes' + branch: 'master' + mvn-settings: 'archetypes-settings' + dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}' + email-upstream: '[archetypes] [odlparent] [yangtools] [controller] [mdsal]' + + # Used by the release job + staging-profile-id: d88dcfe6ce48d + - project: name: archetypes-neon jobs: @@ -15,7 +39,7 @@ stream: neon project: 'archetypes' project-name: 'archetypes' - branch: 'master' + branch: 'stable/neon' mvn-settings: 'archetypes-settings' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}' email-upstream: '[archetypes] [odlparent] [yangtools] [controller] [mdsal]' diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml index 7860abfec..896d5aabe 100644 --- a/jjb/autorelease/autorelease-projects.yaml +++ b/jjb/autorelease/autorelease-projects.yaml @@ -14,8 +14,13 @@ - gerrit-tox-verify stream: - - neon: + - sodium: branch: 'master' + integration-test: sodium + extra-mvn-opts: -P!karaf -Pignore-lispflowmapping-integrationtest -Dsft.heap.max=4g + -Dskip.karaf.featureTest=true + - neon: + branch: 'stable/neon' integration-test: neon extra-mvn-opts: -P!karaf -Pignore-lispflowmapping-integrationtest -Dsft.heap.max=4g -Dskip.karaf.featureTest=true diff --git a/jjb/autorelease/autorelease-version-management.yaml b/jjb/autorelease/autorelease-version-management.yaml index 20b96a434..4427eacf1 100644 --- a/jjb/autorelease/autorelease-version-management.yaml +++ b/jjb/autorelease/autorelease-version-management.yaml @@ -11,8 +11,10 @@ build-node: centos7-builder-2c-8g stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - oxygen: diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml index 7347ea018..793c33783 100644 --- a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml @@ -14,8 +14,10 @@ # Project branches stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - oxygen: diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml index 31794be64..ce2cd23c8 100644 --- a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - oxygen: diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml index b6f0ca61d..f416cc881 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - oxygen: diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml index 84e5bb2a6..a13904274 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - oxygen: diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml index c8902b46b..3866469df 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - oxygen: diff --git a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml index 534b08f25..3e01dd93f 100644 --- a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml +++ b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml @@ -14,8 +14,10 @@ # Project branches stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - oxygen: diff --git a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml index 40e58d612..7045ad2e3 100644 --- a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml +++ b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml @@ -15,8 +15,10 @@ # Project branches stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - oxygen: diff --git a/jjb/bgpcep/bgpcep-patch-test.yaml b/jjb/bgpcep/bgpcep-patch-test.yaml index 2405fe4bd..2f2fbc6e7 100644 --- a/jjb/bgpcep/bgpcep-patch-test.yaml +++ b/jjb/bgpcep/bgpcep-patch-test.yaml @@ -9,8 +9,10 @@ # Project branches stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - oxygen: diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml index 82b640e10..65641f9d7 100644 --- a/jjb/bgpcep/bgpcep.yaml +++ b/jjb/bgpcep/bgpcep.yaml @@ -1,4 +1,34 @@ --- +- project: + name: bgpcep-sodium + jobs: + - '{project-name}-distribution-check-{stream}' + - '{project-name}-maven-javadoc-jobs' + - '{project-name}-rtd-jobs': + build-node: centos7-builder-2c-2g + project-pattern: bgpcep + rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-bgpcep/47576/ + rtd-token: dbe9d1aabbe8812a26b428908f6613c28e3191fc + - odl-maven-jobs + + stream: sodium + 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} + email-upstream: '[bgpcep] [odlparent] [yangtools] [controller] [mdsal]' + + # Used by the release job + staging-profile-id: 9427a05049030 + - project: name: bgpcep-neon jobs: @@ -16,7 +46,7 @@ project-name: 'bgpcep' build-node: centos7-builder-8c-8g build-timeout: 120 - branch: 'master' + branch: 'stable/neon' 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 dc3860669..5c785e7ca 100644 --- a/jjb/bier/bier-csit-basic.yaml +++ b/jjb/bier/bier-csit-basic.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - oxygen: diff --git a/jjb/bier/bier.yaml b/jjb/bier/bier.yaml index bbebe4c86..e7c0c897b 100644 --- a/jjb/bier/bier.yaml +++ b/jjb/bier/bier.yaml @@ -1,4 +1,23 @@ --- +- project: + name: bier-sodium + jobs: + - odl-maven-jobs + + stream: sodium + 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-neon jobs: @@ -7,7 +26,7 @@ stream: neon project: 'bier' project-name: 'bier' - branch: 'master' + branch: 'stable/neon' 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 1e2c783a5..551603f71 100644 --- a/jjb/capwap/capwap-csit-ac.yaml +++ b/jjb/capwap/capwap-csit-ac.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - oxygen: diff --git a/jjb/capwap/capwap.yaml b/jjb/capwap/capwap.yaml index 55af0a842..f9c38ad78 100644 --- a/jjb/capwap/capwap.yaml +++ b/jjb/capwap/capwap.yaml @@ -1,4 +1,21 @@ --- +- project: + name: capwap-sodium + jobs: + - odl-maven-jobs + + stream: sodium + 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-neon jobs: @@ -7,7 +24,7 @@ stream: neon project: 'capwap' project-name: 'capwap' - branch: 'master' + branch: 'stable/neon' mvn-settings: 'capwap-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' diff --git a/jjb/cardinal/cardinal.yaml b/jjb/cardinal/cardinal.yaml index 24fad7f9a..420f2af24 100644 --- a/jjb/cardinal/cardinal.yaml +++ b/jjb/cardinal/cardinal.yaml @@ -1,4 +1,21 @@ --- +- project: + name: cardinal-sodium + jobs: + - odl-maven-jobs + + stream: sodium + 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-neon jobs: @@ -7,7 +24,7 @@ stream: neon project: 'cardinal' project-name: 'cardinal' - branch: 'master' + branch: 'stable/neon' 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 71988d3ae..7cb7518cf 100644 --- a/jjb/centinel/centinel-csit-basic.yaml +++ b/jjb/centinel/centinel-csit-basic.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - oxygen: diff --git a/jjb/centinel/centinel.yaml b/jjb/centinel/centinel.yaml index fc12a575b..8806d681d 100644 --- a/jjb/centinel/centinel.yaml +++ b/jjb/centinel/centinel.yaml @@ -1,4 +1,21 @@ --- +- project: + name: centinel-sodium + jobs: + - odl-maven-jobs + + stream: sodium + 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-neon jobs: @@ -7,7 +24,7 @@ stream: neon project: 'centinel' project-name: 'centinel' - branch: 'master' + branch: 'stable/neon' mvn-settings: 'centinel-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' diff --git a/jjb/coe/coe-csit.yaml b/jjb/coe/coe-csit.yaml index 7f6b1205e..74e57ec1b 100644 --- a/jjb/coe/coe-csit.yaml +++ b/jjb/coe/coe-csit.yaml @@ -11,8 +11,10 @@ tools_system_image: ZZCI - Ubuntu 16.04 - kubernetes - 20180723-235526.580 stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - oxygen: diff --git a/jjb/coe/coe-patch-test.yaml b/jjb/coe/coe-patch-test.yaml index c22ec726c..3a85ed346 100644 --- a/jjb/coe/coe-patch-test.yaml +++ b/jjb/coe/coe-patch-test.yaml @@ -7,8 +7,10 @@ project: 'coe' stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - oxygen: diff --git a/jjb/coe/coe.yaml b/jjb/coe/coe.yaml index 8b01c9e56..ae6e8c6fd 100644 --- a/jjb/coe/coe.yaml +++ b/jjb/coe/coe.yaml @@ -1,4 +1,28 @@ --- +- project: + name: coe-sodium + jobs: + - '{project-name}-distribution-check-{stream}' + - '{project-name}-rtd-jobs': + build-node: centos7-builder-2c-2g + project-pattern: coe + rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-coe/34924/ + rtd-token: 95a5a8fed43b75c6be8432a2643f20a344ba5155 + - odl-maven-jobs + + project: 'coe' + project-name: 'coe' + stream: sodium + 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]' + build-node: centos7-docker-2c-8g + + # Used by the release job + staging-profile-id: 96c0be46aac33 + - project: name: coe-neon jobs: @@ -13,7 +37,7 @@ project: 'coe' project-name: 'coe' stream: neon - branch: 'master' + branch: 'stable/neon' 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 2b655baa6..6dfdeb468 100644 --- a/jjb/controller/controller-csit-akka1.yaml +++ b/jjb/controller/controller-csit-akka1.yaml @@ -11,8 +11,10 @@ functionality: 'akka1' stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - oxygen: diff --git a/jjb/controller/controller-csit-clustering.yaml b/jjb/controller/controller-csit-clustering.yaml index e0c41376e..775be1131 100644 --- a/jjb/controller/controller-csit-clustering.yaml +++ b/jjb/controller/controller-csit-clustering.yaml @@ -11,8 +11,10 @@ - 'clustering-tell' stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - oxygen: diff --git a/jjb/controller/controller-csit-cs-chasing-leader.yaml b/jjb/controller/controller-csit-cs-chasing-leader.yaml index 7397512ac..c35ccb77c 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: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - oxygen: diff --git a/jjb/controller/controller-csit-cs-partnheal.yaml b/jjb/controller/controller-csit-cs-partnheal.yaml index db10859a7..c415e70d6 100644 --- a/jjb/controller/controller-csit-cs-partnheal.yaml +++ b/jjb/controller/controller-csit-cs-partnheal.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - oxygen: diff --git a/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml b/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml index 250ce7da1..5a9d876eb 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: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - oxygen: diff --git a/jjb/controller/controller-csit-dnb-noloss.yaml b/jjb/controller/controller-csit-dnb-noloss.yaml index 0aefef94d..c51db91a9 100644 --- a/jjb/controller/controller-csit-dnb-noloss.yaml +++ b/jjb/controller/controller-csit-dnb-noloss.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - oxygen: diff --git a/jjb/controller/controller-csit-drb-partnheal.yaml b/jjb/controller/controller-csit-drb-partnheal.yaml index 1239d74f6..c4d563788 100644 --- a/jjb/controller/controller-csit-drb-partnheal.yaml +++ b/jjb/controller/controller-csit-drb-partnheal.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - oxygen: diff --git a/jjb/controller/controller-csit-drb-precedence.yaml b/jjb/controller/controller-csit-drb-precedence.yaml index 6f95f90c4..a7964a3a0 100644 --- a/jjb/controller/controller-csit-drb-precedence.yaml +++ b/jjb/controller/controller-csit-drb-precedence.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - oxygen: diff --git a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml index 9f14470e8..20da46c3b 100644 --- a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml +++ b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - oxygen: diff --git a/jjb/controller/controller-csit-dsbenchmark.yaml b/jjb/controller/controller-csit-dsbenchmark.yaml index b54e60c4a..b012d01e8 100644 --- a/jjb/controller/controller-csit-dsbenchmark.yaml +++ b/jjb/controller/controller-csit-dsbenchmark.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - oxygen: diff --git a/jjb/controller/controller-csit-rest-cars-perf.yaml b/jjb/controller/controller-csit-rest-cars-perf.yaml index a631e6282..24de0ac2b 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: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - oxygen: diff --git a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml index a1546a218..5b38236a6 100644 --- a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml +++ b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml @@ -14,8 +14,10 @@ # Project branches stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - oxygen: diff --git a/jjb/controller/controller-patch-test.yaml b/jjb/controller/controller-patch-test.yaml index a0890e130..c36e730af 100644 --- a/jjb/controller/controller-patch-test.yaml +++ b/jjb/controller/controller-patch-test.yaml @@ -7,9 +7,12 @@ project: 'controller' stream: - - neon: + - sodium: branch: 'master' os-branch: 'queens' + - neon: + branch: 'stable/neon' + os-branch: 'queens' - fluorine: branch: 'stable/fluorine' os-branch: 'queens' diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml index 0a16ec99a..a4ae7d016 100644 --- a/jjb/controller/controller.yaml +++ b/jjb/controller/controller.yaml @@ -1,4 +1,31 @@ --- +- project: + name: controller-sodium + jobs: + - '{project-name}-distribution-check-{stream}' + - '{project-name}-maven-javadoc-jobs' + - '{project-name}-rtd-jobs': + build-node: centos7-builder-2c-2g + project-pattern: controller + rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-controller/48288/ + rtd-token: b8440116c823a80c0fb0479eb7448a9196e6932f + - odl-maven-jobs + + stream: sodium + 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-neon jobs: @@ -14,7 +41,7 @@ stream: neon project: 'controller' project-name: 'controller' - branch: 'master' + branch: 'stable/neon' 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 98897a155..1ce641b53 100644 --- a/jjb/coretutorials/coretutorials.yaml +++ b/jjb/coretutorials/coretutorials.yaml @@ -1,4 +1,22 @@ --- +- project: + name: coretutorials-sodium + jobs: + - odl-maven-jobs + + stream: sodium + 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-neon jobs: @@ -7,7 +25,7 @@ stream: neon project: 'coretutorials' project-name: 'coretutorials' - branch: 'master' + branch: 'stable/neon' 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 731844dea..c1a6ba502 100644 --- a/jjb/daexim/daexim-csit-basic.yaml +++ b/jjb/daexim/daexim-csit-basic.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - oxygen: diff --git a/jjb/daexim/daexim-csit-clustering-basic.yaml b/jjb/daexim/daexim-csit-clustering-basic.yaml index bf041892c..dfed23ea7 100644 --- a/jjb/daexim/daexim-csit-clustering-basic.yaml +++ b/jjb/daexim/daexim-csit-clustering-basic.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - oxygen: diff --git a/jjb/daexim/daexim.yaml b/jjb/daexim/daexim.yaml index 99057ec6f..cee7acfaf 100644 --- a/jjb/daexim/daexim.yaml +++ b/jjb/daexim/daexim.yaml @@ -1,4 +1,27 @@ --- +- project: + name: daexim-sodium + jobs: + - '{project-name}-distribution-check-{stream}' + - '{project-name}-rtd-jobs': + build-node: centos7-builder-2c-2g + project-pattern: daexim + rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-daexim/47611/ + rtd-token: 76284f12638574f131cdccdf257d852d07c195fc + - odl-maven-jobs + + project: 'daexim' + project-name: 'daexim' + stream: sodium + 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-neon jobs: @@ -13,7 +36,7 @@ project: 'daexim' project-name: 'daexim' stream: neon - branch: 'master' + branch: 'stable/neon' 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 2c630ac72..ce312defd 100644 --- a/jjb/didm/didm-csit-discovery.yaml +++ b/jjb/didm/didm-csit-discovery.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - oxygen: diff --git a/jjb/didm/didm.yaml b/jjb/didm/didm.yaml index baf62c47e..b8e7e7399 100644 --- a/jjb/didm/didm.yaml +++ b/jjb/didm/didm.yaml @@ -1,4 +1,21 @@ --- +- project: + name: didm-sodium + jobs: + - odl-maven-jobs + + stream: sodium + 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-neon jobs: @@ -7,7 +24,7 @@ stream: neon project: 'didm' project-name: 'didm' - branch: 'master' + branch: 'stable/neon' mvn-settings: 'didm-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' diff --git a/jjb/dlux/dlux.yaml b/jjb/dlux/dlux.yaml index d3aa75ecf..f342bf494 100644 --- a/jjb/dlux/dlux.yaml +++ b/jjb/dlux/dlux.yaml @@ -1,4 +1,21 @@ --- +- project: + name: dlux-sodium + jobs: + - odl-maven-jobs + + stream: sodium + 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-neon jobs: @@ -7,7 +24,7 @@ stream: neon project: 'dlux' project-name: 'dlux' - branch: 'master' + branch: 'stable/neon' 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 65f5c6f85..2afc8ff05 100644 --- a/jjb/dluxapps/dluxapps-csit-yangman.yaml +++ b/jjb/dluxapps/dluxapps-csit-yangman.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - oxygen: diff --git a/jjb/dluxapps/dluxapps.yaml b/jjb/dluxapps/dluxapps.yaml index 14e23e2df..11a03a780 100644 --- a/jjb/dluxapps/dluxapps.yaml +++ b/jjb/dluxapps/dluxapps.yaml @@ -1,4 +1,22 @@ --- +- project: + name: dluxapps-sodium + jobs: + - odl-maven-jobs + + project: 'dluxapps' + project-name: 'dluxapps' + stream: sodium + 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-neon jobs: @@ -7,7 +25,7 @@ project: 'dluxapps' project-name: 'dluxapps' stream: neon - branch: 'master' + branch: 'stable/neon' 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 53ed32f95..b624019bf 100644 --- a/jjb/docs/docs-rtd.yaml +++ b/jjb/docs/docs-rtd.yaml @@ -6,8 +6,10 @@ - gerrit-tox-verify stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - oxygen: diff --git a/jjb/eman/eman.yaml b/jjb/eman/eman.yaml index be113bbe2..c9896ae49 100644 --- a/jjb/eman/eman.yaml +++ b/jjb/eman/eman.yaml @@ -1,4 +1,23 @@ --- +- project: + name: eman-sodium + jobs: + - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs + + stream: sodium + 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-neon jobs: @@ -8,7 +27,7 @@ stream: neon project: 'eman' project-name: 'eman' - branch: 'master' + branch: 'stable/neon' mvn-settings: 'eman-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' diff --git a/jjb/faas/faas.yaml b/jjb/faas/faas.yaml index 1cc73c323..3f99f83c0 100644 --- a/jjb/faas/faas.yaml +++ b/jjb/faas/faas.yaml @@ -1,4 +1,21 @@ --- +- project: + name: faas-sodium + jobs: + - odl-maven-jobs + + stream: sodium + 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-neon jobs: @@ -7,7 +24,7 @@ stream: neon project: 'faas' project-name: 'faas' - branch: 'master' + branch: 'stable/neon' mvn-settings: 'faas-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' diff --git a/jjb/federation/federation.yaml b/jjb/federation/federation.yaml index 1769fe85d..764a9f677 100644 --- a/jjb/federation/federation.yaml +++ b/jjb/federation/federation.yaml @@ -1,4 +1,22 @@ --- +- project: + name: federation-sodium + jobs: + - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs + + project: 'federation' + project-name: 'federation' + stream: sodium + 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-neon jobs: @@ -8,7 +26,7 @@ project: 'federation' project-name: 'federation' stream: neon - branch: 'master' + branch: 'stable/neon' 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 46315bb4b..184d1d07c 100644 --- a/jjb/genius/genius-csit-genius.yaml +++ b/jjb/genius/genius-csit-genius.yaml @@ -16,8 +16,10 @@ testplan: '{project}-{functionality}.txt' stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - oxygen: diff --git a/jjb/genius/genius-patch-test.yaml b/jjb/genius/genius-patch-test.yaml index 77067e5cb..6d95705bd 100644 --- a/jjb/genius/genius-patch-test.yaml +++ b/jjb/genius/genius-patch-test.yaml @@ -7,9 +7,12 @@ project: 'genius' stream: - - neon: + - sodium: branch: 'master' os-branch: 'queens' + - neon: + branch: 'stable/neon' + os-branch: 'queens' - fluorine: branch: 'stable/fluorine' os-branch: 'queens' diff --git a/jjb/genius/genius.yaml b/jjb/genius/genius.yaml index 6aad10ae9..fb3452d81 100644 --- a/jjb/genius/genius.yaml +++ b/jjb/genius/genius.yaml @@ -1,4 +1,38 @@ --- +- project: + name: genius-sodium + jobs: + - '{project-name}-distribution-check-{stream}' + - '{project-name}-maven-javadoc-jobs' + - '{project-name}-rtd-jobs': + build-node: centos7-builder-2c-2g + project-pattern: genius + rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-genius/34944/ + rtd-token: 7ba691afb89bd53d19fd7d8585fdd8bd6620de7f + - odl-maven-jobs + + csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}' + block_on_csit: false + + stream: sodium + 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-neon jobs: @@ -17,7 +51,7 @@ stream: neon project: 'genius' project-name: 'genius' - branch: 'master' + branch: 'stable/neon' 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 732faf41e..48e130981 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml @@ -19,8 +19,10 @@ functionality: 'openstack' stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf' - fluorine: branch: 'stable/fluorine' diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml index 5589adb53..f929bfcb5 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - oxygen: diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml index 5779e1a1d..896762a32 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - oxygen: diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml index 10dbc33ad..868757e38 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - oxygen: diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml index 6a826d474..c86eeb22f 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml @@ -11,8 +11,10 @@ # Project branches stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - oxygen: diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.yaml b/jjb/groupbasedpolicy/groupbasedpolicy.yaml index 25cbca1dc..5e1efac09 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy.yaml @@ -1,4 +1,29 @@ --- +- project: + name: groupbasedpolicy-sodium + jobs: + - odl-maven-jobs + + stream: sodium + 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-neon jobs: @@ -7,7 +32,7 @@ stream: neon project: 'groupbasedpolicy' project-name: 'groupbasedpolicy' - branch: 'master' + branch: 'stable/neon' 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 659a57655..eb8ef932b 100644 --- a/jjb/honeycomb/vbd/vbd.yaml +++ b/jjb/honeycomb/vbd/vbd.yaml @@ -1,4 +1,21 @@ --- +- project: + name: vbd-sodium + jobs: + - odl-maven-jobs + + stream: sodium + 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-neon jobs: @@ -7,7 +24,7 @@ stream: neon project: 'honeycomb/vbd' project-name: 'vbd' - branch: 'master' + branch: 'stable/neon' 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 b584fff79..7a9233626 100644 --- a/jjb/infrautils/infrautils-patch-test.yaml +++ b/jjb/infrautils/infrautils-patch-test.yaml @@ -7,9 +7,12 @@ project: 'infrautils' stream: - - neon: + - sodium: branch: 'master' os-branch: 'queens' + - neon: + branch: 'stable/neon' + os-branch: 'queens' - fluorine: branch: 'stable/fluorine' os-branch: 'queens' diff --git a/jjb/infrautils/infrautils.yaml b/jjb/infrautils/infrautils.yaml index 563eb54f6..ccf4124da 100644 --- a/jjb/infrautils/infrautils.yaml +++ b/jjb/infrautils/infrautils.yaml @@ -1,4 +1,29 @@ --- +- project: + name: infrautils-sodium + jobs: + - '{project-name}-distribution-check-{stream}' + - '{project-name}-maven-javadoc-jobs' + - '{project-name}-rtd-jobs': + build-node: centos7-builder-2c-2g + doc-dir: .tox/docs/tmp/html + project-pattern: infrautils + rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-infrautils/38993/ + rtd-token: 294c76173237e3a088365c31012cf4ddaa767dc9 + - odl-maven-jobs + + stream: sodium + 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-neon jobs: @@ -15,7 +40,7 @@ stream: neon project: 'infrautils' project-name: 'infrautils' - branch: 'master' + branch: 'stable/neon' mvn-settings: 'infrautils-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream}' diff --git a/jjb/integration/distribution/distribution-csit-userfeatures.yaml b/jjb/integration/distribution/distribution-csit-userfeatures.yaml index 1381e246b..f8eaf14f4 100644 --- a/jjb/integration/distribution/distribution-csit-userfeatures.yaml +++ b/jjb/integration/distribution/distribution-csit-userfeatures.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - oxygen: diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml index 004b1e796..fe292d19a 100644 --- a/jjb/integration/distribution/distribution-jobs.yaml +++ b/jjb/integration/distribution/distribution-jobs.yaml @@ -19,7 +19,7 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' email-upstream: '[int/dist]' stream: - - neon: + - sodium: branch: 'master' karaf-version: odl # Self-Managed projects repos and features: @@ -31,6 +31,18 @@ odl-telemetry-collector, odl-telemetry-configurator, odl-telemetry-all + - neon: + branch: 'stable/neon' + karaf-version: odl + # Self-Managed projects repos and features: + sm-repos: > + mvn:org.opendaylight.sxp/features-sxp//xml/features, + mvn:org.opendaylight.telemetry/features-telemetry//xml/features + sm-features: > + odl-sxp-routing, + odl-telemetry-collector, + odl-telemetry-configurator, + odl-telemetry-all - fluorine: branch: 'stable/fluorine' karaf-version: odl @@ -71,7 +83,7 @@ dist-pom: 'distribution/pom.xml' stream: - - neon: + - sodium: branch: 'master' dependencies: > aaa-merge-{stream}, @@ -90,6 +102,25 @@ ovsdb-merge-{stream}, serviceutils-merge-{stream}, sfc-merge-{stream} + - neon: + branch: 'stable/neon' + dependencies: > + aaa-merge-{stream}, + bgpcep-merge-{stream}, + coe-merge-{stream}, + controller-merge-{stream}, + daexim-merge-{stream}, + genius-merge-{stream}, + infrautils-merge-{stream}, + lispflowmapping-merge-{stream}, + mdsal-merge-{stream}, + netconf-merge-{stream}, + netvirt-merge-{stream} + neutron-merge-{stream}, + openflowplugin-merge-{stream}, + ovsdb-merge-{stream}, + serviceutils-merge-{stream}, + sfc-merge-{stream} - fluorine: branch: 'stable/fluorine' dependencies: > @@ -169,7 +200,7 @@ dist-pom: 'distribution/opendaylight/pom.xml' stream: - - neon: + - sodium: branch: 'master' karaf-version: odl dependencies: > @@ -178,6 +209,15 @@ telemetry-merge-{stream}, tsdr-merge-{stream}, unimgr-merge-{stream} + - neon: + branch: 'stable/neon' + karaf-version: odl + dependencies: > + distribution-merge-managed-{stream}, + sxp-merge-{stream}, + telemetry-merge-{stream}, + tsdr-merge-{stream}, + unimgr-merge-{stream} - fluorine: branch: 'stable/fluorine' karaf-version: odl @@ -208,9 +248,12 @@ staging-profile-id: 2af042ed81d5e2 stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' + - fluorine: branch: 'stable/fluorine' diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml index b1b6c24d7..3b73465a4 100644 --- a/jjb/integration/integration-test-jobs.yaml +++ b/jjb/integration/integration-test-jobs.yaml @@ -18,7 +18,7 @@ # CSIT Lists in defaults.yaml stream: - - neon: + - sodium: branch: 'master' mvn-version: 'mvn35' csit-list: !include: csit-jobs-neon.lst @@ -27,6 +27,15 @@ daexim ovsdb neutron openflowplugin coe genius lispflowmapping sfc netvirt bgpcep integration/distribution + - neon: + branch: 'stable/neon' + mvn-version: 'mvn35' + csit-list: !include: csit-jobs-neon.lst + build-order: > + odlparent yangtools infrautils mdsal controller serviceutils aaa netconf + daexim ovsdb neutron openflowplugin coe genius lispflowmapping sfc netvirt + bgpcep integration/distribution + - fluorine: branch: 'stable/fluorine' mvn-version: 'mvn35' diff --git a/jjb/iotdm/iotdm-csit-basic.yaml b/jjb/iotdm/iotdm-csit-basic.yaml index df7ec1e49..6d3c7e2e0 100644 --- a/jjb/iotdm/iotdm-csit-basic.yaml +++ b/jjb/iotdm/iotdm-csit-basic.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - oxygen: diff --git a/jjb/iotdm/iotdm.yaml b/jjb/iotdm/iotdm.yaml index 784e75ccd..cbc1aa355 100644 --- a/jjb/iotdm/iotdm.yaml +++ b/jjb/iotdm/iotdm.yaml @@ -1,4 +1,22 @@ --- +- project: + name: iotdm-sodium + jobs: + - odl-maven-jobs + + stream: sodium + 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-neon jobs: @@ -7,7 +25,7 @@ stream: neon project: 'iotdm' project-name: 'iotdm' - branch: 'master' + branch: 'stable/neon' build-node: centos7-builder-2c-8g mvn-settings: 'iotdm-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/jsonrpc/jsonrpc-csit-basic.yaml b/jjb/jsonrpc/jsonrpc-csit-basic.yaml index c6a0cb8fe..d91bb5769 100644 --- a/jjb/jsonrpc/jsonrpc-csit-basic.yaml +++ b/jjb/jsonrpc/jsonrpc-csit-basic.yaml @@ -15,8 +15,10 @@ # Project branches stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - oxygen: diff --git a/jjb/jsonrpc/jsonrpc.yaml b/jjb/jsonrpc/jsonrpc.yaml index 5059f3172..2900923fb 100644 --- a/jjb/jsonrpc/jsonrpc.yaml +++ b/jjb/jsonrpc/jsonrpc.yaml @@ -1,4 +1,21 @@ --- +- project: + name: jsonrpc-sodium + jobs: + - odl-maven-jobs + + project: 'jsonrpc' + project-name: 'jsonrpc' + stream: sodium + branch: 'master' + mvn-settings: 'jsonrpc-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}' + email-upstream: '[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]' + + # Used by the release job + staging-profile-id: 96fdf4408765d + - project: name: jsonrpc-neon jobs: @@ -7,7 +24,7 @@ project: 'jsonrpc' project-name: 'jsonrpc' stream: neon - branch: 'master' + branch: 'stable/neon' 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 332eddb34..864ac008d 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: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - oxygen: diff --git a/jjb/l2switch/l2switch-csit-scalability.yaml b/jjb/l2switch/l2switch-csit-scalability.yaml index 2366e31e0..c056515c3 100644 --- a/jjb/l2switch/l2switch-csit-scalability.yaml +++ b/jjb/l2switch/l2switch-csit-scalability.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - oxygen: diff --git a/jjb/l2switch/l2switch-csit-switch.yaml b/jjb/l2switch/l2switch-csit-switch.yaml index 3c7fd0e81..816c2a609 100644 --- a/jjb/l2switch/l2switch-csit-switch.yaml +++ b/jjb/l2switch/l2switch-csit-switch.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - oxygen: diff --git a/jjb/l2switch/l2switch-patch-test.yaml b/jjb/l2switch/l2switch-patch-test.yaml index 8634fd449..6b00d9eb2 100644 --- a/jjb/l2switch/l2switch-patch-test.yaml +++ b/jjb/l2switch/l2switch-patch-test.yaml @@ -9,8 +9,11 @@ # Project branches stream: - - neon: + - sodium: branch: 'master' + os-branch: 'queens' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - oxygen: diff --git a/jjb/l2switch/l2switch.yaml b/jjb/l2switch/l2switch.yaml index 176de3580..60277c150 100644 --- a/jjb/l2switch/l2switch.yaml +++ b/jjb/l2switch/l2switch.yaml @@ -1,4 +1,26 @@ --- +- project: + name: l2switch-sodium + jobs: + - odl-maven-jobs + + stream: sodium + 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-neon jobs: @@ -7,7 +29,7 @@ stream: neon project: 'l2switch' project-name: 'l2switch' - branch: 'master' + branch: 'stable/neon' 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 1cc1b232f..1195292a9 100644 --- a/jjb/lacp/lacp-csit-lacp.yaml +++ b/jjb/lacp/lacp-csit-lacp.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - oxygen: diff --git a/jjb/lacp/lacp.yaml b/jjb/lacp/lacp.yaml index 67ac76291..322f27baa 100644 --- a/jjb/lacp/lacp.yaml +++ b/jjb/lacp/lacp.yaml @@ -1,4 +1,21 @@ --- +- project: + name: lacp-sodium + jobs: + - odl-maven-jobs + + stream: sodium + 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-neon jobs: @@ -7,7 +24,7 @@ stream: neon project: 'lacp' project-name: 'lacp' - branch: 'master' + branch: 'stable/neon' 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 a08c79e5a..cfdc281d6 100644 --- a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml +++ b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml @@ -14,8 +14,10 @@ # Project branches stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - oxygen: diff --git a/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml b/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml index 9017bc067..88f17c38f 100644 --- a/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml +++ b/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - oxygen: diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml index 4d5492db0..957bc14dd 100644 --- a/jjb/lispflowmapping/lispflowmapping.yaml +++ b/jjb/lispflowmapping/lispflowmapping.yaml @@ -1,4 +1,37 @@ --- +- project: + name: lispflowmapping-sodium + jobs: + - '{project-name}-distribution-check-{stream}' + - '{project-name}-maven-javadoc-jobs' + - '{project-name}-rtd-jobs': + build-node: centos7-builder-2c-2g + project-pattern: lispflowmapping + rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-lispflowmapping/47783/ + rtd-token: 181be9dd804e4969b9f318a6f1988e3cbee9d9a8 + - odl-maven-jobs + + java-version: + - openjdk8 + - openjdk11 + stream: sodium + 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-neon jobs: @@ -17,7 +50,7 @@ stream: neon project: 'lispflowmapping' project-name: 'lispflowmapping' - branch: 'master' + branch: 'stable/neon' 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 0f36f54fe..7b9e2ad0c 100644 --- a/jjb/mdsal/mdsal-csit-bindingv1.yaml +++ b/jjb/mdsal/mdsal-csit-bindingv1.yaml @@ -12,8 +12,10 @@ functionality: 'bindingv1' stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - oxygen: diff --git a/jjb/mdsal/mdsal-patch-test.yaml b/jjb/mdsal/mdsal-patch-test.yaml index ffafa87c3..720d0d6a4 100644 --- a/jjb/mdsal/mdsal-patch-test.yaml +++ b/jjb/mdsal/mdsal-patch-test.yaml @@ -7,9 +7,12 @@ project: 'mdsal' stream: - - neon: + - sodium: branch: 'master' os-branch: 'queens' + - neon: + branch: 'stable/neon' + os-branch: 'queens' - fluorine: branch: 'stable/fluorine' os-branch: 'queens' diff --git a/jjb/natapp/natapp.yaml b/jjb/natapp/natapp.yaml index 26098a6fa..073a5c03a 100644 --- a/jjb/natapp/natapp.yaml +++ b/jjb/natapp/natapp.yaml @@ -1,4 +1,22 @@ --- +- project: + name: natapp-sodium + jobs: + - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs + + stream: sodium + 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-neon jobs: @@ -8,7 +26,7 @@ stream: neon project: 'natapp' project-name: 'natapp' - branch: 'master' + branch: 'stable/neon' 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 d56aeb22e..74e979bc2 100644 --- a/jjb/nemo/nemo-csit-engine.yaml +++ b/jjb/nemo/nemo-csit-engine.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - oxygen: diff --git a/jjb/nemo/nemo.yaml b/jjb/nemo/nemo.yaml index dc24a888f..b66975f18 100644 --- a/jjb/nemo/nemo.yaml +++ b/jjb/nemo/nemo.yaml @@ -1,4 +1,21 @@ --- +- project: + name: nemo-sodium + jobs: + - odl-maven-jobs + + stream: sodium + 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-neon jobs: @@ -7,7 +24,7 @@ stream: neon project: 'nemo' project-name: 'nemo' - branch: 'master' + branch: 'stable/neon' mvn-settings: 'nemo-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' diff --git a/jjb/netconf/netconf-clustering-scale.yaml b/jjb/netconf/netconf-clustering-scale.yaml index 7652b068f..99e7ca44b 100644 --- a/jjb/netconf/netconf-clustering-scale.yaml +++ b/jjb/netconf/netconf-clustering-scale.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - oxygen: diff --git a/jjb/netconf/netconf-clustering.yaml b/jjb/netconf/netconf-clustering.yaml index 85766f77d..b4dc4b993 100644 --- a/jjb/netconf/netconf-clustering.yaml +++ b/jjb/netconf/netconf-clustering.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - oxygen: diff --git a/jjb/netconf/netconf-csit-callhome.yaml b/jjb/netconf/netconf-csit-callhome.yaml index 7e85868e0..9fefcbb30 100644 --- a/jjb/netconf/netconf-csit-callhome.yaml +++ b/jjb/netconf/netconf-csit-callhome.yaml @@ -14,8 +14,10 @@ # Project branches stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - oxygen: diff --git a/jjb/netconf/netconf-patch-test.yaml b/jjb/netconf/netconf-patch-test.yaml index 8c2119f2c..5af1fa1ee 100644 --- a/jjb/netconf/netconf-patch-test.yaml +++ b/jjb/netconf/netconf-patch-test.yaml @@ -7,9 +7,12 @@ project: 'netconf' stream: - - neon: + - sodium: branch: 'master' os-branch: 'queens' + - neon: + branch: 'stable/neon' + os-branch: 'queens' - fluorine: branch: 'stable/fluorine' os-branch: 'queens' diff --git a/jjb/netconf/netconf-scale.yaml b/jjb/netconf/netconf-scale.yaml index 6070964f4..ccef35413 100644 --- a/jjb/netconf/netconf-scale.yaml +++ b/jjb/netconf/netconf-scale.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - oxygen: diff --git a/jjb/netconf/netconf-userfeatures.yaml b/jjb/netconf/netconf-userfeatures.yaml index fdbd77aaa..f38af32c1 100644 --- a/jjb/netconf/netconf-userfeatures.yaml +++ b/jjb/netconf/netconf-userfeatures.yaml @@ -15,8 +15,10 @@ # Project branches stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - oxygen: diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml index e3f6be7f6..2e6339906 100644 --- a/jjb/netconf/netconf.yaml +++ b/jjb/netconf/netconf.yaml @@ -1,4 +1,30 @@ --- +- project: + name: netconf-sodium + jobs: + - '{project-name}-distribution-check-{stream}' + - '{project-name}-rtd-jobs': + build-node: centos7-builder-2c-2g + project-pattern: netconf + rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-netconf/48397/ + rtd-token: aee2df909686ab7ba36f2ed08d90bdcf81f7b8dc + - odl-maven-jobs + + stream: sodium + 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-neon jobs: @@ -13,7 +39,7 @@ stream: neon project: 'netconf' project-name: 'netconf' - branch: 'master' + branch: 'stable/neon' build-node: centos7-builder-2c-8g mvn-settings: 'netconf-settings' mvn-goals: 'clean deploy -Pintegrationtests' diff --git a/jjb/netide/netide.yaml b/jjb/netide/netide.yaml index 4a6e1609b..206a3ce2e 100644 --- a/jjb/netide/netide.yaml +++ b/jjb/netide/netide.yaml @@ -1,4 +1,21 @@ --- +- project: + name: netide-sodium + jobs: + - odl-maven-jobs + + stream: sodium + 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-neon jobs: @@ -7,7 +24,7 @@ stream: neon project: 'netide' project-name: 'netide' - branch: 'master' + branch: 'stable/neon' mvn-settings: 'netide-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'openflowjava-merge-{stream}' diff --git a/jjb/netvirt/netvirt-csit-multi-apex.yaml b/jjb/netvirt/netvirt-csit-multi-apex.yaml index 005558ef5..72c21f8e2 100644 --- a/jjb/netvirt/netvirt-csit-multi-apex.yaml +++ b/jjb/netvirt/netvirt-csit-multi-apex.yaml @@ -6,8 +6,10 @@ project: 'netvirt' stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - oxygen: diff --git a/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml b/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml index d4a244d31..de87d8961 100644 --- a/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml +++ b/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml @@ -7,8 +7,10 @@ project: 'netvirt' stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' diff --git a/jjb/netvirt/netvirt-patch-test.yaml b/jjb/netvirt/netvirt-patch-test.yaml index 1827b8072..3fd404a38 100644 --- a/jjb/netvirt/netvirt-patch-test.yaml +++ b/jjb/netvirt/netvirt-patch-test.yaml @@ -7,9 +7,12 @@ project: 'netvirt' stream: - - neon: + - sodium: branch: 'master' os-branch: 'queens' + - neon: + branch: 'stable/neon' + os-branch: 'queens' - fluorine: branch: 'stable/fluorine' os-branch: 'queens' diff --git a/jjb/netvirt/netvirt.yaml b/jjb/netvirt/netvirt.yaml index 02039887a..aa10596e5 100644 --- a/jjb/netvirt/netvirt.yaml +++ b/jjb/netvirt/netvirt.yaml @@ -17,8 +17,10 @@ block_on_csit: false stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - oxygen: diff --git a/jjb/neutron/neutron-patch-test.yaml b/jjb/neutron/neutron-patch-test.yaml index 2453f9812..35d51233e 100644 --- a/jjb/neutron/neutron-patch-test.yaml +++ b/jjb/neutron/neutron-patch-test.yaml @@ -7,9 +7,12 @@ project: 'neutron' stream: - - neon: + - sodium: branch: 'master' os-branch: 'queens' + - neon: + branch: 'stable/neon' + os-branch: 'queens' - fluorine: branch: 'stable/fluorine' os-branch: 'queens' diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml index 20e835ed5..a1260d178 100644 --- a/jjb/neutron/neutron.yaml +++ b/jjb/neutron/neutron.yaml @@ -1,4 +1,24 @@ --- +- project: + name: neutron-sodium + jobs: + - '{project-name}-distribution-check-{stream}' + - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs + + stream: sodium + 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-neon jobs: @@ -10,7 +30,7 @@ project: 'neutron' project-name: 'neutron' build-timeout: 90 - branch: 'master' + branch: 'stable/neon' 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 ed3e16aed..a984e31e6 100644 --- a/jjb/next/next.yaml +++ b/jjb/next/next.yaml @@ -1,4 +1,21 @@ --- +- project: + name: next-sodium + jobs: + - odl-maven-jobs + + stream: sodium + 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-neon jobs: @@ -7,7 +24,7 @@ stream: neon project: 'next' project-name: 'next' - branch: 'master' + branch: 'stable/neon' mvn-settings: 'next-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' diff --git a/jjb/nic/nic.yaml b/jjb/nic/nic.yaml index c8421b900..6f5b8722e 100644 --- a/jjb/nic/nic.yaml +++ b/jjb/nic/nic.yaml @@ -1,4 +1,22 @@ --- +- project: + name: nic-sodium + jobs: + - odl-maven-jobs + + stream: sodium + 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-neon jobs: @@ -7,7 +25,7 @@ stream: neon project: 'nic' project-name: 'nic' - branch: 'master' + branch: 'stable/neon' build-node: centos7-builder-2c-8g mvn-settings: 'nic-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/ocpplugin/ocpplugin.yaml b/jjb/ocpplugin/ocpplugin.yaml index c07b59a65..9ecbf5106 100644 --- a/jjb/ocpplugin/ocpplugin.yaml +++ b/jjb/ocpplugin/ocpplugin.yaml @@ -1,4 +1,21 @@ --- +- project: + name: ocpplugin-sodium + jobs: + - odl-maven-jobs + + stream: sodium + 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-neon jobs: @@ -7,7 +24,7 @@ stream: neon project: 'ocpplugin' project-name: 'ocpplugin' - branch: 'master' + branch: 'stable/neon' mvn-settings: 'ocpplugin-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' diff --git a/jjb/odlparent/odlparent-patch-test.yaml b/jjb/odlparent/odlparent-patch-test.yaml index 1ba9d383b..ad6d163ce 100644 --- a/jjb/odlparent/odlparent-patch-test.yaml +++ b/jjb/odlparent/odlparent-patch-test.yaml @@ -7,9 +7,12 @@ project: 'odlparent' stream: - - neon: + - sodium: branch: 'master' os-branch: 'queens' + - neon: + branch: 'stable/neon' + os-branch: 'queens' - fluorine: branch: 'stable/fluorine' os-branch: 'queens' diff --git a/jjb/odltools/odltools-csit.yaml b/jjb/odltools/odltools-csit.yaml index 4c848fa58..944eb6100 100644 --- a/jjb/odltools/odltools-csit.yaml +++ b/jjb/odltools/odltools-csit.yaml @@ -10,8 +10,10 @@ testplan: '{project}-basic.txt' stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' diff --git a/jjb/odltools/odltools-patch-test.yaml b/jjb/odltools/odltools-patch-test.yaml index 6104f4fd5..89d1baae8 100644 --- a/jjb/odltools/odltools-patch-test.yaml +++ b/jjb/odltools/odltools-patch-test.yaml @@ -8,8 +8,10 @@ jdk: openjdk8 stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' diff --git a/jjb/odltools/odltools.yaml b/jjb/odltools/odltools.yaml index 60055fe10..c323c7cf4 100644 --- a/jjb/odltools/odltools.yaml +++ b/jjb/odltools/odltools.yaml @@ -11,8 +11,10 @@ rtd-token: 225d4ef64e1efce4fe3ba4c9c4fe772355d3c8b2 stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' diff --git a/jjb/of-config/of-config.yaml b/jjb/of-config/of-config.yaml index c4baf3664..d58d47275 100644 --- a/jjb/of-config/of-config.yaml +++ b/jjb/of-config/of-config.yaml @@ -1,4 +1,21 @@ --- +- project: + name: of-config-sodium + jobs: + - odl-maven-jobs + + stream: sodium + 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-neon jobs: @@ -7,7 +24,7 @@ stream: neon project: 'of-config' project-name: 'of-config' - branch: 'master' + branch: 'stable/neon' mvn-settings: 'of-config-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: netconf-merge-{stream}' diff --git a/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml b/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml index 4cda23afc..7e42629e1 100644 --- a/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml @@ -10,8 +10,10 @@ # Project branches stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - oxygen: diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml index b404b273f..cc0769a33 100644 --- a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - oxygen: diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml index 04b07adb1..ea16ddbf7 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml @@ -14,8 +14,10 @@ # Project branches stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - oxygen: diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml index 6cf7e904e..eaa1bed6d 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: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - oxygen: diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml index 9bbc4cf69..7c93f5161 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml @@ -14,8 +14,10 @@ # Project branches stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - oxygen: diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml index 36c42a253..bd26c91cb 100644 --- a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml @@ -14,8 +14,10 @@ # Project branches stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - oxygen: diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml index ca0d53dbe..115eb1425 100644 --- a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - oxygen: diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml index 540f34830..723c44bd1 100644 --- a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml @@ -14,8 +14,10 @@ # Project branches stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - oxygen: diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml index 1232f7ff9..d85f6e9b4 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: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - oxygen: diff --git a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml index aa2a4db56..f3a37540e 100644 --- a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - oxygen: diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml index f5287d8b9..d3a3b5fdb 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - oxygen: diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml index 7bd8ad239..0b07f9c9f 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - oxygen: diff --git a/jjb/openflowplugin/openflowplugin-csit-scale.yaml b/jjb/openflowplugin/openflowplugin-csit-scale.yaml index 7d0a84343..f0d78b2dc 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale.yaml @@ -14,8 +14,10 @@ # Project branches stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - oxygen: diff --git a/jjb/openflowplugin/openflowplugin-patch-test.yaml b/jjb/openflowplugin/openflowplugin-patch-test.yaml index bcfd5647e..c261be8bf 100644 --- a/jjb/openflowplugin/openflowplugin-patch-test.yaml +++ b/jjb/openflowplugin/openflowplugin-patch-test.yaml @@ -9,9 +9,12 @@ # Project branches stream: - - neon: + - sodium: branch: 'master' os-branch: 'queens' + - neon: + branch: 'stable/neon' + os-branch: 'queens' - fluorine: branch: 'stable/fluorine' os-branch: 'queens' diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml index 7805f8dbc..1d730cd27 100644 --- a/jjb/openflowplugin/openflowplugin.yaml +++ b/jjb/openflowplugin/openflowplugin.yaml @@ -1,4 +1,39 @@ --- +- project: + name: openflowplugin-sodium + jobs: + - '{project-name}-distribution-check-{stream}' + - '{project-name}-maven-javadoc-jobs' + - '{project-name}-rtd-jobs': + build-node: centos7-builder-2c-2g + doc-dir: .tox/docs/tmp/html + project-pattern: openflowplugin + rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-openflowplugin/38994/ + rtd-token: 86ce095922558b890c61b1b05d682521d1d66d5f + - odl-maven-jobs + + csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}' + block_on_csit: false + + stream: sodium + 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]' + + # Used by the release job + staging-profile-id: a68a76dc1b44c + - project: name: openflowplugin-neon jobs: @@ -18,7 +53,7 @@ stream: neon project: 'openflowplugin' project-name: 'openflowplugin' - branch: 'master' + branch: 'stable/neon' 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 9702ce9c8..073a49077 100644 --- a/jjb/opflex/opflex-custom.yaml +++ b/jjb/opflex/opflex-custom.yaml @@ -6,11 +6,16 @@ - 'opflex-merge-{stream}' stream: - - neon: + - sodium: branch: 'master' libuv-version: '1.8.0' rapidjson-version: '1.0.2' openvswitch-version: '2.6.0' + - neon: + branch: 'stable/neon' + libuv-version: '1.8.0' + rapidjson-version: '1.0.2' + openvswitch-version: '2.6.0' - fluorine: branch: 'stable/fluorine' libuv-version: '1.8.0' diff --git a/jjb/opflex/opflex.yaml b/jjb/opflex/opflex.yaml index ff6acfc8a..92639892a 100644 --- a/jjb/opflex/opflex.yaml +++ b/jjb/opflex/opflex.yaml @@ -10,11 +10,16 @@ - 'opflex-release-{stream}' stream: - - neon: + - sodium: branch: 'master' libuv-version: '1.8.0' rapidjson-version: '1.0.2' openvswitch-version: '2.6.0' + - neon: + branch: 'stable/neon' + libuv-version: '1.8.0' + rapidjson-version: '1.0.2' + openvswitch-version: '2.6.0' - fluorine: branch: 'stable/fluorine' libuv-version: '1.8.0' diff --git a/jjb/ovil/ovil.yaml b/jjb/ovil/ovil.yaml index 6e7ef19a7..cdd864326 100644 --- a/jjb/ovil/ovil.yaml +++ b/jjb/ovil/ovil.yaml @@ -1,4 +1,23 @@ --- +- project: + name: ovil-sodium + jobs: + - odl-maven-jobs + - gerrit-tox-verify + + stream: sodium + project: ovil + project-name: ovil + 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-neon jobs: @@ -8,7 +27,7 @@ stream: neon project: ovil project-name: ovil - branch: 'master' + branch: 'stable/neon' 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 4eb6ee08b..4f8f8d0d2 100644 --- a/jjb/ovsdb/ovsdb-csit-clustering.yaml +++ b/jjb/ovsdb/ovsdb-csit-clustering.yaml @@ -14,8 +14,10 @@ # Project branches stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - oxygen: diff --git a/jjb/ovsdb/ovsdb-csit-southbound.yaml b/jjb/ovsdb/ovsdb-csit-southbound.yaml index 7453bddb9..cca79c0f9 100644 --- a/jjb/ovsdb/ovsdb-csit-southbound.yaml +++ b/jjb/ovsdb/ovsdb-csit-southbound.yaml @@ -14,8 +14,10 @@ # Project branches stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - oxygen: diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml index 8f02b5d3e..4936a4704 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: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - oxygen: diff --git a/jjb/ovsdb/ovsdb-patch-test.yaml b/jjb/ovsdb/ovsdb-patch-test.yaml index 560e8b127..1aed1eb66 100644 --- a/jjb/ovsdb/ovsdb-patch-test.yaml +++ b/jjb/ovsdb/ovsdb-patch-test.yaml @@ -8,9 +8,12 @@ project: 'ovsdb' stream: - - neon: + - sodium: branch: 'master' os-branch: 'queens' + - neon: + branch: 'stable/neon' + os-branch: 'queens' - fluorine: branch: 'stable/fluorine' os-branch: 'queens' diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml index c8c482541..0da62ad81 100644 --- a/jjb/ovsdb/ovsdb.yaml +++ b/jjb/ovsdb/ovsdb.yaml @@ -1,4 +1,32 @@ --- +- project: + name: ovsdb-sodium + jobs: + - '{project-name}-distribution-check-{stream}' + - '{project-name}-maven-javadoc-jobs' + - '{project-name}-rtd-jobs': + build-node: centos7-builder-2c-2g + project-pattern: ovsdb + rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-ovsdb/35667/ + rtd-token: 46030df8681cf7fc857aa80c1a7695f46ed252be + - odl-maven-jobs + + csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}' + block_on_csit: false + + stream: sodium + 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-neon jobs: @@ -17,7 +45,7 @@ stream: neon project: 'ovsdb' project-name: 'ovsdb' - branch: 'master' + branch: 'stable/neon' build-node: centos7-builder-2c-8g mvn-settings: 'ovsdb-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/p4plugin/p4plugin.yaml b/jjb/p4plugin/p4plugin.yaml index 6025be9a1..b9dad7012 100644 --- a/jjb/p4plugin/p4plugin.yaml +++ b/jjb/p4plugin/p4plugin.yaml @@ -1,4 +1,22 @@ --- +- project: + name: p4plugin-sodium + jobs: + - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs + + stream: sodium + 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-neon jobs: @@ -8,7 +26,7 @@ stream: neon project: 'p4plugin' project-name: 'p4plugin' - branch: 'master' + branch: 'stable/neon' mvn-settings: 'p4plugin-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' diff --git a/jjb/packetcable/packetcable-csit-pcmm.yaml b/jjb/packetcable/packetcable-csit-pcmm.yaml index 1c2b45632..27eaabf41 100644 --- a/jjb/packetcable/packetcable-csit-pcmm.yaml +++ b/jjb/packetcable/packetcable-csit-pcmm.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - oxygen: diff --git a/jjb/packetcable/packetcable.yaml b/jjb/packetcable/packetcable.yaml index 7d500b4e9..3bf35a474 100644 --- a/jjb/packetcable/packetcable.yaml +++ b/jjb/packetcable/packetcable.yaml @@ -1,4 +1,21 @@ --- +- project: + name: packetcable-sodium + jobs: + - odl-maven-jobs + + stream: sodium + 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-neon jobs: @@ -7,7 +24,7 @@ stream: neon project: 'packetcable' project-name: 'packetcable' - branch: 'master' + branch: 'stable/neon' mvn-settings: 'packetcable-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' diff --git a/jjb/sdninterfaceapp/sdninterfaceapp.yaml b/jjb/sdninterfaceapp/sdninterfaceapp.yaml index 146c18893..eecc955a1 100644 --- a/jjb/sdninterfaceapp/sdninterfaceapp.yaml +++ b/jjb/sdninterfaceapp/sdninterfaceapp.yaml @@ -1,4 +1,22 @@ --- +- project: + name: sdninterfaceapp-sodium + jobs: + - odl-maven-jobs + + stream: sodium + 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-neon jobs: @@ -7,7 +25,7 @@ stream: neon project: 'sdninterfaceapp' project-name: 'sdninterfaceapp' - branch: 'master' + branch: 'stable/neon' build-node: centos7-builder-2c-8g mvn-settings: 'sdninterfaceapp-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/serviceutils/serviceutils-patch-test.yaml b/jjb/serviceutils/serviceutils-patch-test.yaml index da018f3a1..0512c6467 100644 --- a/jjb/serviceutils/serviceutils-patch-test.yaml +++ b/jjb/serviceutils/serviceutils-patch-test.yaml @@ -7,9 +7,12 @@ project: 'serviceutils' stream: - - neon: + - sodium: branch: 'master' os-branch: 'queens' + - neon: + branch: 'stable/neon' + os-branch: 'queens' - fluorine: branch: 'stable/fluorine' os-branch: 'queens' diff --git a/jjb/serviceutils/serviceutils.yaml b/jjb/serviceutils/serviceutils.yaml index 988017456..6f26e6c43 100644 --- a/jjb/serviceutils/serviceutils.yaml +++ b/jjb/serviceutils/serviceutils.yaml @@ -12,8 +12,10 @@ - odl-maven-jobs stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - oxygen: diff --git a/jjb/sfc/sfc-csit-full-deploy.yaml b/jjb/sfc/sfc-csit-full-deploy.yaml index 05b7fd2f8..3d69353d3 100644 --- a/jjb/sfc/sfc-csit-full-deploy.yaml +++ b/jjb/sfc/sfc-csit-full-deploy.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - oxygen: diff --git a/jjb/sfc/sfc-csit-rest-basic.yaml b/jjb/sfc/sfc-csit-rest-basic.yaml index d12157507..989b54314 100644 --- a/jjb/sfc/sfc-csit-rest-basic.yaml +++ b/jjb/sfc/sfc-csit-rest-basic.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - oxygen: diff --git a/jjb/sfc/sfc-patch-test.yaml b/jjb/sfc/sfc-patch-test.yaml index 1e4833e31..4f02422c1 100644 --- a/jjb/sfc/sfc-patch-test.yaml +++ b/jjb/sfc/sfc-patch-test.yaml @@ -9,9 +9,12 @@ # Project branches stream: - - neon: + - sodium: branch: 'master' os-branch: 'queens' + - neon: + branch: 'stable/neon' + os-branch: 'queens' - fluorine: branch: 'stable/fluorine' os-branch: 'queens' diff --git a/jjb/sfc/sfc-python.yaml b/jjb/sfc/sfc-python.yaml index 3dfecd935..084d292c6 100644 --- a/jjb/sfc/sfc-python.yaml +++ b/jjb/sfc/sfc-python.yaml @@ -5,8 +5,10 @@ - 'gerrit-tox-verify' stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - oxygen: diff --git a/jjb/sfc/sfc.yaml b/jjb/sfc/sfc.yaml index 4e659c575..5ae6d832b 100644 --- a/jjb/sfc/sfc.yaml +++ b/jjb/sfc/sfc.yaml @@ -1,4 +1,29 @@ --- +- project: + name: sfc-sodium + jobs: + - '{project-name}-distribution-check-{stream}' + - '{project-name}-rtd-jobs': + build-node: centos7-builder-2c-2g + project-pattern: sfc + rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-sfc/38996/ + rtd-token: 2fa6c2900bbe181b0427ad65df3dc494ac749edb + - odl-maven-jobs + + stream: sodium + 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-neon jobs: @@ -13,7 +38,7 @@ stream: neon project: 'sfc' project-name: 'sfc' - branch: 'master' + branch: 'stable/neon' 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 9d6ef95f5..98a5f8bc4 100644 --- a/jjb/snbi/snbi.yaml +++ b/jjb/snbi/snbi.yaml @@ -1,4 +1,21 @@ --- +- project: + name: snbi-sodium + jobs: + - odl-maven-jobs + + stream: sodium + 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-neon jobs: @@ -7,7 +24,7 @@ stream: neon project: 'snbi' project-name: 'snbi' - branch: 'master' + branch: 'stable/neon' mvn-settings: 'snbi-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' diff --git a/jjb/snmp/snmp.yaml b/jjb/snmp/snmp.yaml index 10a13ea79..edd4944c5 100644 --- a/jjb/snmp/snmp.yaml +++ b/jjb/snmp/snmp.yaml @@ -1,4 +1,21 @@ --- +- project: + name: snmp-sodium + jobs: + - odl-maven-jobs + + stream: sodium + 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-neon jobs: @@ -7,7 +24,7 @@ stream: neon project: 'snmp' project-name: 'snmp' - branch: 'master' + branch: 'stable/neon' 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 228b19f42..e4d6b0dc6 100644 --- a/jjb/snmp4sdn/snmp4sdn.yaml +++ b/jjb/snmp4sdn/snmp4sdn.yaml @@ -1,4 +1,21 @@ --- +- project: + name: snmp4sdn-sodium + jobs: + - odl-maven-jobs + + stream: sodium + 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-neon jobs: @@ -7,7 +24,7 @@ stream: neon project: 'snmp4sdn' project-name: 'snmp4sdn' - branch: 'master' + branch: 'stable/neon' 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 bbc6f40b4..69c15f615 100644 --- a/jjb/sxp/sxp-csit-basic.yaml +++ b/jjb/sxp/sxp-csit-basic.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' trigger-jobs: '{project}-merge-{stream}' karaf-version: 'odl' # yamllint disable-line rule:line-length diff --git a/jjb/sxp/sxp-csit-binding-origin.yaml b/jjb/sxp/sxp-csit-binding-origin.yaml index 422864f56..34683f847 100644 --- a/jjb/sxp/sxp-csit-binding-origin.yaml +++ b/jjb/sxp/sxp-csit-binding-origin.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' trigger-jobs: '{project}-merge-{stream}' karaf-version: 'odl' # yamllint disable-line rule:line-length diff --git a/jjb/sxp/sxp-csit-cluster-binding.yaml b/jjb/sxp/sxp-csit-cluster-binding.yaml index 89da503b9..1c67fec39 100644 --- a/jjb/sxp/sxp-csit-cluster-binding.yaml +++ b/jjb/sxp/sxp-csit-cluster-binding.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' trigger-jobs: '{project}-merge-{stream}' karaf-version: 'odl' # yamllint disable-line rule:line-length diff --git a/jjb/sxp/sxp-csit-clustering.yaml b/jjb/sxp/sxp-csit-clustering.yaml index 6a898e951..35549ffb4 100644 --- a/jjb/sxp/sxp-csit-clustering.yaml +++ b/jjb/sxp/sxp-csit-clustering.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' trigger-jobs: '{project}-merge-{stream}' karaf-version: 'odl' # yamllint disable-line rule:line-length diff --git a/jjb/sxp/sxp-csit-filtering.yaml b/jjb/sxp/sxp-csit-filtering.yaml index 706ffb44e..abe0b39e2 100644 --- a/jjb/sxp/sxp-csit-filtering.yaml +++ b/jjb/sxp/sxp-csit-filtering.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' trigger-jobs: '{project}-merge-{stream}' karaf-version: 'odl' # yamllint disable-line rule:line-length diff --git a/jjb/sxp/sxp-csit-performance.yaml b/jjb/sxp/sxp-csit-performance.yaml index 56417eafc..2a430e669 100644 --- a/jjb/sxp/sxp-csit-performance.yaml +++ b/jjb/sxp/sxp-csit-performance.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' trigger-jobs: '{project}-merge-{stream}' karaf-version: 'odl' # yamllint disable-line rule:line-length diff --git a/jjb/sxp/sxp-csit-topology.yaml b/jjb/sxp/sxp-csit-topology.yaml index 6d4882a3d..2a0508168 100644 --- a/jjb/sxp/sxp-csit-topology.yaml +++ b/jjb/sxp/sxp-csit-topology.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' trigger-jobs: '{project}-merge-{stream}' karaf-version: 'odl' # yamllint disable-line rule:line-length diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml index c84828118..7e94e7692 100644 --- a/jjb/sxp/sxp.yaml +++ b/jjb/sxp/sxp.yaml @@ -1,4 +1,32 @@ --- +- project: + name: sxp-sodium + jobs: + - '{project-name}-rtd-jobs': + build-node: centos7-builder-2c-2g + project-pattern: sxp + rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-sxp/47573/ + rtd-token: 4a78556e59ce3ef35e61e2fa19ebae049acf6d5d + - odl-maven-jobs + + java-version: + - openjdk8 + - openjdk11 + + stream: sodium + 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-neon jobs: @@ -16,7 +44,7 @@ stream: neon project: 'sxp' project-name: 'sxp' - branch: 'master' + branch: 'stable/neon' mvn-settings: 'sxp-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/systemmetrics/systemmetrics.yaml b/jjb/systemmetrics/systemmetrics.yaml index 87c311e3e..ddcaeb720 100644 --- a/jjb/systemmetrics/systemmetrics.yaml +++ b/jjb/systemmetrics/systemmetrics.yaml @@ -1,4 +1,21 @@ --- +- project: + name: systemmetrics-sodium + jobs: + - odl-maven-jobs + + project: 'systemmetrics' + project-name: 'systemmetrics' + stream: sodium + 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-neon jobs: @@ -7,7 +24,7 @@ project: 'systemmetrics' project-name: 'systemmetrics' stream: neon - branch: 'master' + branch: 'stable/neon' mvn-settings: 'systemmetrics-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' diff --git a/jjb/telemetry/telemetry-csit-basic.yaml b/jjb/telemetry/telemetry-csit-basic.yaml index b7f9829a6..61caadd4f 100644 --- a/jjb/telemetry/telemetry-csit-basic.yaml +++ b/jjb/telemetry/telemetry-csit-basic.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' install: - all: diff --git a/jjb/telemetry/telemetry.yaml b/jjb/telemetry/telemetry.yaml index c14d5a77c..914fec7d9 100644 --- a/jjb/telemetry/telemetry.yaml +++ b/jjb/telemetry/telemetry.yaml @@ -1,4 +1,34 @@ --- +- project: + name: telemetry-sodium + jobs: + - 'odl-maven-jobs' + - '{project-name}-integration-{stream}' + - '{project-name}-rtd-jobs': + build-node: centos7-builder-2c-2g + project-pattern: telemetry + rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-telemetry/57583/ + rtd-token: 694bcbf8e0b45b3c4e53174c6e5773ca351e1efb + + stream: sodium + project: 'telemetry' + project-name: 'telemetry' + branch: 'master' + jdks: + - openjdk8 + maven: + - mvn33: + mvn-version: 'mvn33' + mvn-settings: 'telemetry-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: '' + email-upstream: '[telemetry]' + archive-artifacts: '' + + # Used by the release job + staging-profile-id: 8ed9c52266504 + - project: name: telemetry-neon jobs: @@ -13,7 +43,7 @@ stream: neon project: 'telemetry' project-name: 'telemetry' - branch: 'master' + branch: 'stable/neon' jdks: - openjdk8 maven: diff --git a/jjb/transportpce/transportpce.yaml b/jjb/transportpce/transportpce.yaml index 508d53e69..e7e126992 100644 --- a/jjb/transportpce/transportpce.yaml +++ b/jjb/transportpce/transportpce.yaml @@ -1,4 +1,29 @@ --- +- project: + name: transportpce-sodium + jobs: + - '{project-name}-rtd-jobs': + build-node: centos7-builder-2c-2g + project-pattern: transportpce + rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-transportpce/47688/ + rtd-token: 6f37ba63226bdcc6c823ee455e62237cf68813fd + - gerrit-tox-verify: + build-timeout: 120 + build-node: centos7-builder-8c-8g + - odl-maven-jobs + + project: 'transportpce' + project-name: 'transportpce' + stream: sodium + 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-neon jobs: @@ -15,7 +40,7 @@ project: 'transportpce' project-name: 'transportpce' stream: neon - branch: 'master' + branch: 'stable/neon' 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 3af4a36af..e54162502 100644 --- a/jjb/tsdr/tsdr-csit-cassandra.yaml +++ b/jjb/tsdr/tsdr-csit-cassandra.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' trigger-jobs: '{project}-merge-{stream}' karaf-version: 'odl' # yamllint disable-line rule:line-length diff --git a/jjb/tsdr/tsdr-csit-elasticsearch.yaml b/jjb/tsdr/tsdr-csit-elasticsearch.yaml index f18d9c41f..541f105b1 100644 --- a/jjb/tsdr/tsdr-csit-elasticsearch.yaml +++ b/jjb/tsdr/tsdr-csit-elasticsearch.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' trigger-jobs: '{project}-merge-{stream}' karaf-version: 'odl' # yamllint disable-line rule:line-length diff --git a/jjb/tsdr/tsdr-csit-hbase.yaml b/jjb/tsdr/tsdr-csit-hbase.yaml index 219472b64..a01b684e8 100644 --- a/jjb/tsdr/tsdr-csit-hbase.yaml +++ b/jjb/tsdr/tsdr-csit-hbase.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' trigger-jobs: '{project}-merge-{stream}' karaf-version: 'odl' # yamllint disable-line rule:line-length diff --git a/jjb/tsdr/tsdr-csit-hsqldb.yaml b/jjb/tsdr/tsdr-csit-hsqldb.yaml index cf00cd886..97d4d76a3 100644 --- a/jjb/tsdr/tsdr-csit-hsqldb.yaml +++ b/jjb/tsdr/tsdr-csit-hsqldb.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' trigger-jobs: '{project}-merge-{stream}' karaf-version: 'odl' # yamllint disable-line rule:line-length diff --git a/jjb/tsdr/tsdr.yaml b/jjb/tsdr/tsdr.yaml index f16049f82..8327da28c 100644 --- a/jjb/tsdr/tsdr.yaml +++ b/jjb/tsdr/tsdr.yaml @@ -1,4 +1,26 @@ --- +- project: + name: tsdr-sodium + jobs: + - '{project-name}-rtd-jobs': + build-node: centos7-builder-2c-2g + project-pattern: tsdr + rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-tsdr/47532/ + rtd-token: 96c97641155132afcc5900bafc68af3364d91c99 + - odl-maven-jobs + + stream: sodium + 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-neon jobs: @@ -12,7 +34,7 @@ stream: neon project: 'tsdr' project-name: 'tsdr' - branch: 'master' + branch: 'stable/neon' mvn-settings: 'tsdr-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' diff --git a/jjb/ttp/ttp.yaml b/jjb/ttp/ttp.yaml index 59becd5b0..bdf20fb95 100644 --- a/jjb/ttp/ttp.yaml +++ b/jjb/ttp/ttp.yaml @@ -1,4 +1,21 @@ --- +- project: + name: ttp-sodium + jobs: + - odl-maven-jobs + + stream: sodium + 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-neon jobs: @@ -7,7 +24,7 @@ stream: neon project: 'ttp' project-name: 'ttp' - branch: 'master' + branch: 'stable/neon' mvn-settings: 'ttp-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream}' diff --git a/jjb/unimgr/unimgr.yaml b/jjb/unimgr/unimgr.yaml index cc769ff41..4ca410d15 100644 --- a/jjb/unimgr/unimgr.yaml +++ b/jjb/unimgr/unimgr.yaml @@ -1,4 +1,27 @@ --- +- project: + name: unimgr-sodium + jobs: + - '{project-name}-rtd-jobs': + build-node: centos7-builder-2c-2g + project-pattern: unimgr + rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-unimgr/49748/ + rtd-token: e12225e9b9ac67f5439c1619dcad342393b7ea31 + - odl-maven-jobs + + stream: sodium + 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-neon jobs: @@ -12,7 +35,7 @@ stream: neon project: 'unimgr' project-name: 'unimgr' - branch: 'master' + branch: 'stable/neon' mvn-settings: 'unimgr-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'ovsdb-merge-{stream}' diff --git a/jjb/usc/usc-csit-tcp.yaml b/jjb/usc/usc-csit-tcp.yaml index 0b71f0a2b..7f3615834 100644 --- a/jjb/usc/usc-csit-tcp.yaml +++ b/jjb/usc/usc-csit-tcp.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' # yamllint disable-line rule:line-length diff --git a/jjb/usc/usc.yaml b/jjb/usc/usc.yaml index a8fb8b199..878e8d3ff 100644 --- a/jjb/usc/usc.yaml +++ b/jjb/usc/usc.yaml @@ -1,4 +1,22 @@ --- +- project: + name: usc-sodium + jobs: + - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs + + stream: sodium + 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-neon jobs: @@ -8,7 +26,7 @@ stream: neon project: 'usc' project-name: 'usc' - branch: 'master' + branch: 'stable/neon' 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.yaml b/jjb/usecplugin/usecplugin.yaml index 8f51afc8a..8a6267617 100644 --- a/jjb/usecplugin/usecplugin.yaml +++ b/jjb/usecplugin/usecplugin.yaml @@ -1,4 +1,21 @@ --- +- project: + name: usecplugin-sodium + jobs: + - odl-maven-jobs + + stream: sodium + 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-neon jobs: @@ -7,7 +24,7 @@ stream: neon project: 'usecplugin' project-name: 'usecplugin' - branch: 'master' + branch: 'stable/neon' mvn-settings: 'usecplugin-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'openflowplugin-merge-{stream}' diff --git a/jjb/yangtools/yangtools-csit-system.yaml b/jjb/yangtools/yangtools-csit-system.yaml index a40bcf5ab..b21066fe9 100644 --- a/jjb/yangtools/yangtools-csit-system.yaml +++ b/jjb/yangtools/yangtools-csit-system.yaml @@ -12,8 +12,10 @@ # Project branches. stream: - - neon: + - sodium: branch: 'master' + - neon: + branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - oxygen: diff --git a/jjb/yangtools/yangtools-patch-test.yaml b/jjb/yangtools/yangtools-patch-test.yaml index e414787cd..cc89c7a66 100644 --- a/jjb/yangtools/yangtools-patch-test.yaml +++ b/jjb/yangtools/yangtools-patch-test.yaml @@ -7,9 +7,12 @@ project: 'yangtools' stream: - - neon: + - sodium: branch: 'master' os-branch: 'queens' + - neon: + branch: 'stable/neon' + os-branch: 'queens' - fluorine: branch: 'stable/fluorine' os-branch: 'queens'