From: Anil Belur Date: Tue, 13 Aug 2019 14:44:34 +0000 (+0530) Subject: Sodium branch cutting X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=releng%2Fbuilder.git;a=commitdiff_plain;h=7e4e61a16d62f5f8e34fdea2ce9ace0f9fe7b417;ds=sidebyside Sodium branch cutting Create jobs for 'stable/sodium', and move master to magnesium. Issue: https://jira.linuxfoundation.org/RELENG-1221 Change-Id: I82fcc6bdb4359b3be838c2482da36415f6be8a59 Signed-off-by: Anil Belur --- diff --git a/jjb/aaa/aaa-csit-authn.yaml b/jjb/aaa/aaa-csit-authn.yaml index 8404aec2b..03e6d8ae8 100644 --- a/jjb/aaa/aaa-csit-authn.yaml +++ b/jjb/aaa/aaa-csit-authn.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' - fluorine: diff --git a/jjb/aaa/aaa-patch-test.yaml b/jjb/aaa/aaa-patch-test.yaml index b87306907..9d55e968e 100644 --- a/jjb/aaa/aaa-patch-test.yaml +++ b/jjb/aaa/aaa-patch-test.yaml @@ -7,9 +7,12 @@ project: 'aaa' stream: - - sodium: + - magnesium: branch: 'master' os-branch: 'queens' + - sodium: + branch: 'stable/sodium' + os-branch: 'queens' - neon: branch: 'stable/neon' os-branch: 'queens' diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml index 5cd894b9a..29ec140cf 100644 --- a/jjb/aaa/aaa.yaml +++ b/jjb/aaa/aaa.yaml @@ -1,4 +1,27 @@ --- +- project: + name: aaa-magnesium + 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: magnesium + 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-sodium jobs: @@ -13,7 +36,7 @@ stream: sodium project: 'aaa' project-name: 'aaa' - branch: 'master' + branch: 'stable/sodium' mvn-settings: 'aaa-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' diff --git a/jjb/alt-datastores/alt-datastores.yaml b/jjb/alt-datastores/alt-datastores.yaml index 03dc74933..9b5c2d79e 100644 --- a/jjb/alt-datastores/alt-datastores.yaml +++ b/jjb/alt-datastores/alt-datastores.yaml @@ -1,4 +1,27 @@ --- +- project: + name: alt-datastores-magnesium + jobs: + - '{project-name}-rtd-jobs': + build-node: centos7-builder-2c-2g + project-pattern: alt-datastores + rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-alt-datastore/86481/ + rtd-token: dc412b0cc43fba4098173878f970e76380ce0084 + - odl-maven-jobs + + stream: magnesium + project: 'alt-datastores' + project-name: 'alt-datastores' + branch: 'master' + mvn-settings: 'alt-datastores-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' + email-upstream: '[alt-datastores] [odlparent] [yangtools] [controller]' + build-node: centos7-docker-2c-8g + + # Used by the release job + staging-profile-id: daa2b00117ed6 + - project: name: alt-datastores-sodium jobs: @@ -12,7 +35,7 @@ stream: sodium project: 'alt-datastores' project-name: 'alt-datastores' - branch: 'master' + branch: 'stable/sodium' mvn-settings: 'alt-datastores-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 ee913d8da..969ab4935 100644 --- a/jjb/alto/alto-csit-setup.yaml +++ b/jjb/alto/alto-csit-setup.yaml @@ -14,8 +14,10 @@ # Project branches stream: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' - fluorine: diff --git a/jjb/alto/alto.yaml b/jjb/alto/alto.yaml index bab58b8d0..4ec455d83 100644 --- a/jjb/alto/alto.yaml +++ b/jjb/alto/alto.yaml @@ -1,4 +1,23 @@ --- +- project: + name: alto-magnesium + jobs: + - odl-maven-jobs + + stream: magnesium + 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]' + disable-job: true + + # Used by the release job + staging-profile-id: 931eabae9693c + - project: name: alto-sodium jobs: @@ -7,7 +26,7 @@ stream: sodium project: 'alto' project-name: 'alto' - branch: 'master' + branch: 'stable/sodium' 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 157305b8b..e3f697c4b 100644 --- a/jjb/ansible/ansible.yaml +++ b/jjb/ansible/ansible.yaml @@ -8,8 +8,10 @@ - odl-maven-jobs stream: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' - fluorine: diff --git a/jjb/archetypes/archetypes.yaml b/jjb/archetypes/archetypes.yaml index 0e4d0fd72..2018a3491 100644 --- a/jjb/archetypes/archetypes.yaml +++ b/jjb/archetypes/archetypes.yaml @@ -1,4 +1,31 @@ --- +- project: + name: archetypes-magnesium + 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: + sign-artifacts: true + mvn-central: true + ossrh-profile-id: 6386ebbbf3a563 + - gerrit-maven-verify + - gerrit-maven-verify-dependencies: + build-timeout: 180 + + stream: magnesium + 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-sodium jobs: @@ -18,7 +45,7 @@ stream: sodium project: 'archetypes' project-name: 'archetypes' - branch: 'master' + branch: 'stable/sodium' 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 d60c8cbd7..1aaceb430 100644 --- a/jjb/autorelease/autorelease-projects.yaml +++ b/jjb/autorelease/autorelease-projects.yaml @@ -14,8 +14,11 @@ - gerrit-tox-verify stream: - - sodium: + - magnesium: branch: 'master' + integration-test: magnesium + - sodium: + branch: 'stable/sodium' integration-test: sodium - neon: branch: 'stable/neon' diff --git a/jjb/autorelease/autorelease-version-management.yaml b/jjb/autorelease/autorelease-version-management.yaml index 9b1203b71..863a9749f 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: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' - fluorine: diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml index 25f5e33aa..b8940a236 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: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' - fluorine: diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml index 01fa4f668..47a276034 100644 --- a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' - fluorine: diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml index bbfa54b55..d829e552c 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' - fluorine: diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml index 41bc854b9..768761b44 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' - fluorine: diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml index 222032dff..6c6253997 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' - fluorine: diff --git a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml index cb07e4a3d..88c449b8f 100644 --- a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml +++ b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml @@ -14,8 +14,10 @@ # Project branches stream: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' - fluorine: diff --git a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml index ed80862a4..0f1f80213 100644 --- a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml +++ b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml @@ -15,8 +15,10 @@ # Project branches stream: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' - fluorine: diff --git a/jjb/bgpcep/bgpcep-patch-test.yaml b/jjb/bgpcep/bgpcep-patch-test.yaml index 36ef21235..7430d14da 100644 --- a/jjb/bgpcep/bgpcep-patch-test.yaml +++ b/jjb/bgpcep/bgpcep-patch-test.yaml @@ -9,8 +9,10 @@ # Project branches stream: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' - fluorine: diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml index 94f551508..0f5321900 100644 --- a/jjb/bgpcep/bgpcep.yaml +++ b/jjb/bgpcep/bgpcep.yaml @@ -1,4 +1,34 @@ --- +- project: + name: bgpcep-magnesium + 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: magnesium + 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-sodium jobs: @@ -16,7 +46,7 @@ project-name: 'bgpcep' build-node: centos7-builder-8c-8g build-timeout: 120 - branch: 'master' + branch: 'stable/sodium' 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 ba7a52179..3a6754588 100644 --- a/jjb/bier/bier-csit-basic.yaml +++ b/jjb/bier/bier-csit-basic.yaml @@ -14,8 +14,10 @@ # Project branches stream: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' - fluorine: diff --git a/jjb/bier/bier.yaml b/jjb/bier/bier.yaml index fc3e31d9b..9d6b0eb72 100644 --- a/jjb/bier/bier.yaml +++ b/jjb/bier/bier.yaml @@ -1,4 +1,24 @@ --- +- project: + name: bier-magnesium + jobs: + - odl-maven-jobs + + stream: magnesium + 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]' + disable-job: true + + # Used by the release job + staging-profile-id: 942a8075b1f2a + - project: name: bier-sodium jobs: @@ -7,7 +27,7 @@ stream: sodium project: 'bier' project-name: 'bier' - branch: 'master' + branch: 'stable/sodium' build-node: centos7-builder-2c-8g build-timeout: 90 mvn-settings: 'bier-settings' diff --git a/jjb/coe/coe-csit.yaml b/jjb/coe/coe-csit.yaml index d5f3ad426..819b47705 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 - 20190211-225526.126 stream: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' - fluorine: diff --git a/jjb/coe/coe-patch-test.yaml b/jjb/coe/coe-patch-test.yaml index 11672aeb9..6916ebadf 100644 --- a/jjb/coe/coe-patch-test.yaml +++ b/jjb/coe/coe-patch-test.yaml @@ -7,8 +7,10 @@ project: 'coe' stream: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' - fluorine: diff --git a/jjb/coe/coe.yaml b/jjb/coe/coe.yaml index 4621f57cd..ad6f2ff17 100644 --- a/jjb/coe/coe.yaml +++ b/jjb/coe/coe.yaml @@ -1,4 +1,28 @@ --- +- project: + name: coe-magnesium + 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: magnesium + 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-sodium jobs: @@ -13,7 +37,7 @@ project: 'coe' project-name: 'coe' stream: sodium - branch: 'master' + branch: 'stable/sodium' 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 e47fa7530..e20b5a8ad 100644 --- a/jjb/controller/controller-csit-akka1.yaml +++ b/jjb/controller/controller-csit-akka1.yaml @@ -11,8 +11,10 @@ functionality: 'akka1' stream: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' - fluorine: diff --git a/jjb/controller/controller-csit-clustering.yaml b/jjb/controller/controller-csit-clustering.yaml index f5531d4cf..b4f1a779f 100644 --- a/jjb/controller/controller-csit-clustering.yaml +++ b/jjb/controller/controller-csit-clustering.yaml @@ -10,8 +10,10 @@ - 'clustering-tell' stream: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' - fluorine: diff --git a/jjb/controller/controller-csit-cs-chasing-leader.yaml b/jjb/controller/controller-csit-cs-chasing-leader.yaml index c6751a3f2..2785ba227 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: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' - fluorine: diff --git a/jjb/controller/controller-csit-cs-partnheal.yaml b/jjb/controller/controller-csit-cs-partnheal.yaml index ce92ead15..52d1a160e 100644 --- a/jjb/controller/controller-csit-cs-partnheal.yaml +++ b/jjb/controller/controller-csit-cs-partnheal.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' - fluorine: diff --git a/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml b/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml index 5bb582fe0..52080dd93 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: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' - fluorine: diff --git a/jjb/controller/controller-csit-dnb-noloss.yaml b/jjb/controller/controller-csit-dnb-noloss.yaml index ef0ecc07c..38aec2005 100644 --- a/jjb/controller/controller-csit-dnb-noloss.yaml +++ b/jjb/controller/controller-csit-dnb-noloss.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' - fluorine: diff --git a/jjb/controller/controller-csit-drb-partnheal.yaml b/jjb/controller/controller-csit-drb-partnheal.yaml index b8bd04743..c8b7eea0d 100644 --- a/jjb/controller/controller-csit-drb-partnheal.yaml +++ b/jjb/controller/controller-csit-drb-partnheal.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' - fluorine: diff --git a/jjb/controller/controller-csit-drb-precedence.yaml b/jjb/controller/controller-csit-drb-precedence.yaml index 4f2aad082..694d53c74 100644 --- a/jjb/controller/controller-csit-drb-precedence.yaml +++ b/jjb/controller/controller-csit-drb-precedence.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' - fluorine: diff --git a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml index de95463be..825849eef 100644 --- a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml +++ b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' - fluorine: diff --git a/jjb/controller/controller-csit-dsbenchmark.yaml b/jjb/controller/controller-csit-dsbenchmark.yaml index 16e29821f..8270c5a57 100644 --- a/jjb/controller/controller-csit-dsbenchmark.yaml +++ b/jjb/controller/controller-csit-dsbenchmark.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' - fluorine: diff --git a/jjb/controller/controller-csit-rest-cars-perf.yaml b/jjb/controller/controller-csit-rest-cars-perf.yaml index d78dbdbad..f9185af27 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: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' - fluorine: diff --git a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml index 89fe12dc1..39d1e3dc6 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: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' - fluorine: diff --git a/jjb/controller/controller-patch-test.yaml b/jjb/controller/controller-patch-test.yaml index 292a41c57..9b519a2d6 100644 --- a/jjb/controller/controller-patch-test.yaml +++ b/jjb/controller/controller-patch-test.yaml @@ -7,9 +7,12 @@ project: 'controller' stream: - - sodium: + - magnesium: branch: 'master' os-branch: 'queens' + - sodium: + branch: 'stable/sodium' + os-branch: 'queens' - neon: branch: 'stable/neon' os-branch: 'queens' diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml index d5275e845..20a93b051 100644 --- a/jjb/controller/controller.yaml +++ b/jjb/controller/controller.yaml @@ -1,4 +1,30 @@ --- +- project: + name: controller-magnesium + jobs: + - '{project-name}-distribution-check-{stream}' + - '{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: magnesium + 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-sodium jobs: @@ -13,7 +39,7 @@ stream: sodium project: 'controller' project-name: 'controller' - branch: 'master' + branch: 'stable/sodium' mvn-settings: 'controller-settings' mvn-goals: 'clean deploy -Pintegrationtests,docs' mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' diff --git a/jjb/daexim/daexim-csit-basic.yaml b/jjb/daexim/daexim-csit-basic.yaml index e84f71cc5..7b769aaf8 100644 --- a/jjb/daexim/daexim-csit-basic.yaml +++ b/jjb/daexim/daexim-csit-basic.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' - fluorine: diff --git a/jjb/daexim/daexim-csit-clustering-basic.yaml b/jjb/daexim/daexim-csit-clustering-basic.yaml index 6eb81685d..28d7317c4 100644 --- a/jjb/daexim/daexim-csit-clustering-basic.yaml +++ b/jjb/daexim/daexim-csit-clustering-basic.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' - fluorine: diff --git a/jjb/daexim/daexim.yaml b/jjb/daexim/daexim.yaml index c62c4b794..b147016b4 100644 --- a/jjb/daexim/daexim.yaml +++ b/jjb/daexim/daexim.yaml @@ -1,4 +1,27 @@ --- +- project: + name: daexim-magnesium + 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: magnesium + 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-sodium jobs: @@ -13,7 +36,7 @@ project: 'daexim' project-name: 'daexim' stream: sodium - branch: 'master' + branch: 'stable/sodium' mvn-settings: 'daexim-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' diff --git a/jjb/detnet/detnet.yaml b/jjb/detnet/detnet.yaml index 34dcef1dc..8dedf8bcd 100644 --- a/jjb/detnet/detnet.yaml +++ b/jjb/detnet/detnet.yaml @@ -1,4 +1,27 @@ --- +- project: + name: detnet-magnesium + jobs: + - '{project-name}-rtd-jobs': + build-node: centos7-builder-2c-2g + project-pattern: detnet + rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-detnet/86479/ + rtd-token: 5195d77d11453a03e4b4ad3688b7026ab02cfcce + - odl-maven-jobs + + stream: magnesium + project: 'detnet' + project-name: 'detnet' + branch: 'master' + mvn-settings: 'detnet-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' + email-upstream: '[detnet] [odlparent] [yangtools] [controller]' + build-node: centos7-docker-2c-8g + + # Used by the release job + staging-profile-id: 8981976d0fea7 + - project: name: detnet-sodium jobs: @@ -12,7 +35,7 @@ stream: sodium project: 'detnet' project-name: 'detnet' - branch: 'master' + branch: 'stable/sodium' mvn-settings: 'detnet-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' diff --git a/jjb/dlux/dlux.yaml b/jjb/dlux/dlux.yaml index fd9b0d9ee..3ff7282f2 100644 --- a/jjb/dlux/dlux.yaml +++ b/jjb/dlux/dlux.yaml @@ -1,4 +1,22 @@ --- +- project: + name: dlux-magnesium + jobs: + - odl-maven-jobs + + stream: magnesium + 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]' + disable-job: true + + # Used by the release job + staging-profile-id: 96e6a0327484f + - project: name: dlux-sodium jobs: @@ -7,7 +25,7 @@ stream: sodium project: 'dlux' project-name: 'dlux' - branch: 'master' + branch: 'stable/sodium' 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 8fa8dd24e..1041a18c9 100644 --- a/jjb/dluxapps/dluxapps-csit-yangman.yaml +++ b/jjb/dluxapps/dluxapps-csit-yangman.yaml @@ -14,8 +14,10 @@ # Project branches stream: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' - fluorine: diff --git a/jjb/dluxapps/dluxapps.yaml b/jjb/dluxapps/dluxapps.yaml index a478078d7..8efd76728 100644 --- a/jjb/dluxapps/dluxapps.yaml +++ b/jjb/dluxapps/dluxapps.yaml @@ -1,4 +1,23 @@ --- +- project: + name: dluxapps-magnesium + jobs: + - odl-maven-jobs + + project: 'dluxapps' + project-name: 'dluxapps' + stream: magnesium + 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]' + disable-job: true + + # Used by the release job + staging-profile-id: 96e6fb1e65bf9 + - project: name: dluxapps-sodium jobs: @@ -7,7 +26,7 @@ project: 'dluxapps' project-name: 'dluxapps' stream: sodium - branch: 'master' + branch: 'stable/sodium' 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 dcaeb7bfd..9471e1df6 100644 --- a/jjb/docs/docs-rtd.yaml +++ b/jjb/docs/docs-rtd.yaml @@ -6,8 +6,10 @@ - gerrit-tox-verify stream: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' - fluorine: diff --git a/jjb/genius/genius-csit-genius.yaml b/jjb/genius/genius-csit-genius.yaml index 1c3fe7def..ceb1a1a13 100644 --- a/jjb/genius/genius-csit-genius.yaml +++ b/jjb/genius/genius-csit-genius.yaml @@ -16,8 +16,10 @@ testplan: '{project}-{functionality}.txt' stream: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' - fluorine: diff --git a/jjb/genius/genius-patch-test.yaml b/jjb/genius/genius-patch-test.yaml index 716664463..278c3f1a2 100644 --- a/jjb/genius/genius-patch-test.yaml +++ b/jjb/genius/genius-patch-test.yaml @@ -7,9 +7,12 @@ project: 'genius' stream: - - sodium: + - magnesium: branch: 'master' os-branch: 'queens' + - sodium: + branch: 'stable/sodium' + os-branch: 'queens' - neon: branch: 'stable/neon' os-branch: 'queens' diff --git a/jjb/genius/genius.yaml b/jjb/genius/genius.yaml index 2e75ccf3b..d796dc8c2 100644 --- a/jjb/genius/genius.yaml +++ b/jjb/genius/genius.yaml @@ -1,4 +1,38 @@ --- +- project: + name: genius-magnesium + 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: magnesium + 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-sodium jobs: @@ -17,7 +51,7 @@ stream: sodium project: 'genius' project-name: 'genius' - branch: 'master' + branch: 'stable/sodium' 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 9a4e1bd62..39a1eb13b 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml @@ -20,8 +20,10 @@ functionality: 'openstack' stream: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf' diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml index 90e9866ff..6445646fd 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' - fluorine: diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml index c955dbccf..fe81914e8 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml @@ -14,8 +14,10 @@ # Project branches stream: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' - fluorine: diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml index 6202a755b..8ee86a956 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml @@ -14,8 +14,10 @@ # Project branches stream: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' - fluorine: diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml index c80c65d24..bb1737d18 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' - fluorine: diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.yaml b/jjb/groupbasedpolicy/groupbasedpolicy.yaml index 36b12ad69..f8f518b41 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy.yaml @@ -1,4 +1,30 @@ --- +- project: + name: groupbasedpolicy-magnesium + jobs: + - odl-maven-jobs + + stream: magnesium + 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]' + disable-job: true + + # Used by the release job + staging-profile-id: 96fbb93f95a76 + - project: name: groupbasedpolicy-sodium jobs: @@ -7,7 +33,7 @@ stream: sodium project: 'groupbasedpolicy' project-name: 'groupbasedpolicy' - branch: 'master' + branch: 'stable/sodium' 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 e3d869d73..77b819506 100644 --- a/jjb/honeycomb/vbd/vbd.yaml +++ b/jjb/honeycomb/vbd/vbd.yaml @@ -1,4 +1,21 @@ --- +- project: + name: vbd-magnesium + jobs: + - odl-maven-jobs + + stream: magnesium + 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-sodium jobs: @@ -7,7 +24,7 @@ stream: sodium project: 'honeycomb/vbd' project-name: 'vbd' - branch: 'master' + branch: 'stable/sodium' 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 f49c2d6c1..e8d8df135 100644 --- a/jjb/infrautils/infrautils-patch-test.yaml +++ b/jjb/infrautils/infrautils-patch-test.yaml @@ -7,9 +7,12 @@ project: 'infrautils' stream: - - sodium: + - magnesium: branch: 'master' os-branch: 'queens' + - sodium: + branch: 'stable/sodium' + os-branch: 'queens' - neon: branch: 'stable/neon' os-branch: 'queens' diff --git a/jjb/infrautils/infrautils.yaml b/jjb/infrautils/infrautils.yaml index c391f02a0..3462e110b 100644 --- a/jjb/infrautils/infrautils.yaml +++ b/jjb/infrautils/infrautils.yaml @@ -1,4 +1,29 @@ --- +- project: + name: infrautils-magnesium + 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: magnesium + 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-sodium jobs: @@ -15,7 +40,7 @@ stream: sodium project: 'infrautils' project-name: 'infrautils' - branch: 'master' + branch: 'stable/sodium' mvn-settings: 'infrautils-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream}' diff --git a/jjb/integration/csit-jobs-magnesium.lst b/jjb/integration/csit-jobs-magnesium.lst new file mode 100644 index 000000000..f137bc5fd --- /dev/null +++ b/jjb/integration/csit-jobs-magnesium.lst @@ -0,0 +1,74 @@ +aaa-csit-1node-authn-all-magnesium, +bgpcep-csit-1node-bgp-ingest-all-magnesium, +bgpcep-csit-1node-bgp-ingest-mixed-all-magnesium, +bgpcep-csit-1node-throughpcep-all-magnesium, +bgpcep-csit-1node-userfeatures-all-magnesium, +bgpcep-csit-3node-bgpclustering-all-magnesium, +bgpcep-csit-3node-bgpclustering-ha-only-magnesium, +coe-csit-1node-container-networking-only-magnesium, +controller-csit-1node-akka1-all-magnesium, +controller-csit-1node-benchmark-all-magnesium, +controller-csit-1node-rest-cars-perf-all-magnesium, +controller-csit-3node-benchmark-all-magnesium, +controller-csit-3node-clustering-ask-all-magnesium, +controller-csit-3node-clustering-tell-all-magnesium, +controller-csit-3node-rest-clust-cars-perf-ask-only-magnesium, +controller-csit-3node-rest-clust-cars-perf-tell-only-magnesium, +daexim-csit-1node-basic-only-magnesium, +daexim-csit-3node-clustering-basic-only-magnesium, +distribution-csit-1node-userfeatures-all-magnesium, +distribution-csit-managed-magnesium, +genius-csit-1node-upstream-only-magnesium, +genius-csit-3node-upstream-only-magnesium, +lispflowmapping-csit-1node-msmr-all-magnesium, +lispflowmapping-csit-1node-performance-only-magnesium, +lispflowmapping-csit-3node-msmr-all-magnesium, +mdsal-csit-1node-bindingv1-only-magnesium, +netconf-csit-1node-callhome-only-magnesium, +netconf-csit-1node-scale-max-devices-only-magnesium, +netconf-csit-1node-scale-only-magnesium, +netconf-csit-1node-userfeatures-all-magnesium, +netconf-csit-3node-clustering-only-magnesium, +netconf-csit-3node-clustering-scale-only-magnesium, +netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-upstream-snat-conntrack-magnesium, +netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-dcgw-magnesium, +netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-sfc-magnesium, +netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upgrade-snat-conntrack-magnesium, +netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upgrade-magnesium, +netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-itm-direct-tunnels-magnesium, +netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-snat-conntrack-magnesium, +netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-magnesium, +netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-dcgw-magnesium, +netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-itm-direct-tunnels-magnesium, +netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-snat-conntrack-magnesium, +netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-magnesium, +netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-snat-conntrack-magnesium, +netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-magnesium, +netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-rocky-upstream-stateful-itm-direct-tunnels-magnesium, +netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-rocky-upstream-stateful-snat-conntrack-magnesium, +netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-rocky-upstream-stateful-magnesium, +netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-queens-dcgw-magnesium, +netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-itm-direct-tunnels-magnesium, +netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-snat-conntrack-magnesium, +netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-magnesium, +netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-rocky-dcgw-magnesium, +netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-itm-direct-tunnels-magnesium, +netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-snat-conntrack-magnesium, +netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-magnesium, +odltools-csit-1node-upstream-all-magnesium, +openflowplugin-csit-1node-bundle-based-reconciliation-all-magnesium, +openflowplugin-csit-1node-cbench-only-magnesium, +openflowplugin-csit-1node-flow-services-all-magnesium, +openflowplugin-csit-1node-perf-bulkomatic-only-magnesium, +openflowplugin-csit-1node-perf-stats-collection-only-magnesium, +openflowplugin-csit-1node-scale-link-only-magnesium, +openflowplugin-csit-1node-scale-only-magnesium, +openflowplugin-csit-1node-scale-switch-only-magnesium, +openflowplugin-csit-3node-clustering-bulkomatic-only-magnesium, +openflowplugin-csit-3node-clustering-only-magnesium, +openflowplugin-csit-3node-clustering-perf-bulkomatic-only-magnesium, +ovsdb-csit-1node-upstream-southbound-all-magnesium, +ovsdb-csit-3node-upstream-clustering-only-magnesium, +sfc-csit-3node-docker-full-deploy-all-magnesium, +sfc-csit-3node-rest-basic-all-magnesium, +yangtools-csit-1node-system-only-magnesium, diff --git a/jjb/integration/distribution/distribution-csit-userfeatures.yaml b/jjb/integration/distribution/distribution-csit-userfeatures.yaml index 8bb89d2a9..f7cded29e 100644 --- a/jjb/integration/distribution/distribution-csit-userfeatures.yaml +++ b/jjb/integration/distribution/distribution-csit-userfeatures.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' - fluorine: diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml index e16edb39e..510197c60 100644 --- a/jjb/integration/distribution/distribution-jobs.yaml +++ b/jjb/integration/distribution/distribution-jobs.yaml @@ -21,8 +21,10 @@ nexus-iq-stage: release email-upstream: '[int/dist]' stream: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' karaf-version: odl # Self-Managed projects repos and features: sm-repos: > diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml index efb227448..906469ea3 100644 --- a/jjb/integration/integration-test-jobs.yaml +++ b/jjb/integration/integration-test-jobs.yaml @@ -18,9 +18,18 @@ # CSIT Lists in defaults.yaml stream: - - sodium: + - magnesium: branch: 'master' mvn-version: 'mvn35' + csit-list: !include: csit-jobs-magnesium.lst + build-order: > + odlparent yangtools mdsal infrautils controller serviceutils aaa netconf + daexim ovsdb neutron openflowplugin coe genius lispflowmapping sfc netvirt + bgpcep integration/distribution + + - sodium: + branch: 'stable/sodium' + mvn-version: 'mvn35' csit-list: !include: csit-jobs-sodium.lst build-order: > odlparent yangtools mdsal infrautils controller serviceutils aaa netconf diff --git a/jjb/jsonrpc/jsonrpc-csit-basic.yaml b/jjb/jsonrpc/jsonrpc-csit-basic.yaml index 443dd1807..ea6e69349 100644 --- a/jjb/jsonrpc/jsonrpc-csit-basic.yaml +++ b/jjb/jsonrpc/jsonrpc-csit-basic.yaml @@ -15,8 +15,10 @@ # Project branches stream: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' - fluorine: diff --git a/jjb/jsonrpc/jsonrpc.yaml b/jjb/jsonrpc/jsonrpc.yaml index 4d8b6da30..9507f7afc 100644 --- a/jjb/jsonrpc/jsonrpc.yaml +++ b/jjb/jsonrpc/jsonrpc.yaml @@ -1,4 +1,26 @@ --- +- project: + name: jsonrpc-magnesium + jobs: + - '{project-name}-rtd-jobs': + build-node: centos7-builder-2c-2g + project-pattern: jsonrpc + rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-jsonrpc/91870/ + rtd-token: 04d31d4414734686d63f9b160e974fe5a18d031d + - odl-maven-jobs + + project: 'jsonrpc' + project-name: 'jsonrpc' + stream: magnesium + 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-sodium jobs: @@ -12,7 +34,7 @@ project: 'jsonrpc' project-name: 'jsonrpc' stream: sodium - branch: 'master' + branch: 'stable/sodium' 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 a1cde7a89..678479910 100644 --- a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml +++ b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' - fluorine: diff --git a/jjb/l2switch/l2switch-csit-scalability.yaml b/jjb/l2switch/l2switch-csit-scalability.yaml index 679a9b30f..3a785761a 100644 --- a/jjb/l2switch/l2switch-csit-scalability.yaml +++ b/jjb/l2switch/l2switch-csit-scalability.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' - fluorine: diff --git a/jjb/l2switch/l2switch-csit-switch.yaml b/jjb/l2switch/l2switch-csit-switch.yaml index acc6bff9b..a30448d1d 100644 --- a/jjb/l2switch/l2switch-csit-switch.yaml +++ b/jjb/l2switch/l2switch-csit-switch.yaml @@ -14,8 +14,10 @@ # Project branches stream: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' - fluorine: diff --git a/jjb/l2switch/l2switch-patch-test.yaml b/jjb/l2switch/l2switch-patch-test.yaml index 4984e5ee1..10905d551 100644 --- a/jjb/l2switch/l2switch-patch-test.yaml +++ b/jjb/l2switch/l2switch-patch-test.yaml @@ -10,9 +10,12 @@ # Project branches stream: - - sodium: + - magnesium: branch: 'master' os-branch: 'queens' + - sodium: + branch: 'stable/sodium' + os-branch: 'queens' - neon: branch: 'stable/neon' - fluorine: diff --git a/jjb/l2switch/l2switch.yaml b/jjb/l2switch/l2switch.yaml index b317c206e..91ce16853 100644 --- a/jjb/l2switch/l2switch.yaml +++ b/jjb/l2switch/l2switch.yaml @@ -1,4 +1,27 @@ --- +- project: + name: l2switch-magnesium + jobs: + - odl-maven-jobs + + stream: magnesium + 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]' + disable-job: true + + # Used by the release job + staging-profile-id: 96fee85953ca0 + - project: name: l2switch-sodium jobs: @@ -7,7 +30,7 @@ stream: sodium project: 'l2switch' project-name: 'l2switch' - branch: 'master' + branch: 'stable/sodium' mvn-settings: 'l2switch-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' dependencies: > diff --git a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml index edbb8f03f..964854a20 100644 --- a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml +++ b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml @@ -14,8 +14,10 @@ # Project branches stream: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' - fluorine: diff --git a/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml b/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml index c8b05965b..ad2c1da82 100644 --- a/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml +++ b/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' - fluorine: diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml index 6b6f17fb1..2778218c6 100644 --- a/jjb/lispflowmapping/lispflowmapping.yaml +++ b/jjb/lispflowmapping/lispflowmapping.yaml @@ -1,4 +1,37 @@ --- +- project: + name: lispflowmapping-magnesium + 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: magnesium + 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-sodium jobs: @@ -17,7 +50,7 @@ stream: sodium project: 'lispflowmapping' project-name: 'lispflowmapping' - branch: 'master' + branch: 'stable/sodium' 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 1dc5719ff..e44d1e523 100644 --- a/jjb/mdsal/mdsal-csit-bindingv1.yaml +++ b/jjb/mdsal/mdsal-csit-bindingv1.yaml @@ -12,8 +12,10 @@ functionality: 'bindingv1' stream: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' - fluorine: diff --git a/jjb/mdsal/mdsal-patch-test.yaml b/jjb/mdsal/mdsal-patch-test.yaml index c24407703..9f6dfa48a 100644 --- a/jjb/mdsal/mdsal-patch-test.yaml +++ b/jjb/mdsal/mdsal-patch-test.yaml @@ -7,9 +7,12 @@ project: 'mdsal' stream: - - sodium: + - magnesium: branch: 'master' os-branch: 'queens' + - sodium: + branch: 'stable/sodium' + os-branch: 'queens' - neon: branch: 'stable/neon' os-branch: 'queens' diff --git a/jjb/nemo/nemo-csit-engine.yaml b/jjb/nemo/nemo-csit-engine.yaml index ecf7605ca..9545dab9e 100644 --- a/jjb/nemo/nemo-csit-engine.yaml +++ b/jjb/nemo/nemo-csit-engine.yaml @@ -14,8 +14,10 @@ # Project branches stream: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' - fluorine: diff --git a/jjb/nemo/nemo.yaml b/jjb/nemo/nemo.yaml index d47144d06..254933687 100644 --- a/jjb/nemo/nemo.yaml +++ b/jjb/nemo/nemo.yaml @@ -1,4 +1,22 @@ --- +- project: + name: nemo-magnesium + jobs: + - odl-maven-jobs + + stream: magnesium + project: 'nemo' + project-name: 'nemo' + branch: 'master' + mvn-settings: 'nemo-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: '' + email-upstream: '[nemo]' + disable-job: true + + # Used by the release job + staging-profile-id: a67a9890f6202 + - project: name: nemo-sodium jobs: @@ -7,7 +25,7 @@ stream: sodium project: 'nemo' project-name: 'nemo' - branch: 'master' + branch: 'stable/sodium' 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 5fd3de7c7..c1cb19f93 100644 --- a/jjb/netconf/netconf-clustering-scale.yaml +++ b/jjb/netconf/netconf-clustering-scale.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' - fluorine: diff --git a/jjb/netconf/netconf-clustering.yaml b/jjb/netconf/netconf-clustering.yaml index c2c36726c..af9921d66 100644 --- a/jjb/netconf/netconf-clustering.yaml +++ b/jjb/netconf/netconf-clustering.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' - fluorine: diff --git a/jjb/netconf/netconf-csit-callhome.yaml b/jjb/netconf/netconf-csit-callhome.yaml index 80efa8043..8a7c1faec 100644 --- a/jjb/netconf/netconf-csit-callhome.yaml +++ b/jjb/netconf/netconf-csit-callhome.yaml @@ -14,8 +14,10 @@ # Project branches stream: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' - fluorine: diff --git a/jjb/netconf/netconf-patch-test.yaml b/jjb/netconf/netconf-patch-test.yaml index 756b9b1bc..eb07b3c71 100644 --- a/jjb/netconf/netconf-patch-test.yaml +++ b/jjb/netconf/netconf-patch-test.yaml @@ -7,9 +7,12 @@ project: 'netconf' stream: - - sodium: + - magnesium: branch: 'master' os-branch: 'queens' + - sodium: + branch: 'stable/sodium' + os-branch: 'queens' - neon: branch: 'stable/neon' os-branch: 'queens' diff --git a/jjb/netconf/netconf-scale.yaml b/jjb/netconf/netconf-scale.yaml index 2204b211b..1e8170ff7 100644 --- a/jjb/netconf/netconf-scale.yaml +++ b/jjb/netconf/netconf-scale.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' - fluorine: diff --git a/jjb/netconf/netconf-userfeatures.yaml b/jjb/netconf/netconf-userfeatures.yaml index 53be57d70..095f31d6b 100644 --- a/jjb/netconf/netconf-userfeatures.yaml +++ b/jjb/netconf/netconf-userfeatures.yaml @@ -15,8 +15,10 @@ # Project branches stream: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' - fluorine: diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml index b5c684321..fc7a32e58 100644 --- a/jjb/netconf/netconf.yaml +++ b/jjb/netconf/netconf.yaml @@ -1,4 +1,30 @@ --- +- project: + name: netconf-magnesium + 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: magnesium + 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-sodium jobs: @@ -13,7 +39,7 @@ stream: sodium project: 'netconf' project-name: 'netconf' - branch: 'master' + branch: 'stable/sodium' build-node: centos7-builder-2c-8g mvn-settings: 'netconf-settings' mvn-goals: 'clean deploy -Pintegrationtests' diff --git a/jjb/netvirt/netvirt-csit-multi-apex.yaml b/jjb/netvirt/netvirt-csit-multi-apex.yaml index 7274d996a..afb5ed8f7 100644 --- a/jjb/netvirt/netvirt-csit-multi-apex.yaml +++ b/jjb/netvirt/netvirt-csit-multi-apex.yaml @@ -6,8 +6,10 @@ project: 'netvirt' stream: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' - fluorine: diff --git a/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml b/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml index 0377cc987..f64662b78 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: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' - fluorine: diff --git a/jjb/netvirt/netvirt-patch-test.yaml b/jjb/netvirt/netvirt-patch-test.yaml index 6065a5abc..3b1f711f3 100644 --- a/jjb/netvirt/netvirt-patch-test.yaml +++ b/jjb/netvirt/netvirt-patch-test.yaml @@ -7,9 +7,12 @@ project: 'netvirt' stream: - - sodium: + - magnesium: branch: 'master' os-branch: 'queens' + - sodium: + branch: 'stable/sodium' + os-branch: 'queens' - neon: branch: 'stable/neon' os-branch: 'queens' diff --git a/jjb/netvirt/netvirt.yaml b/jjb/netvirt/netvirt.yaml index 967564c31..76e572559 100644 --- a/jjb/netvirt/netvirt.yaml +++ b/jjb/netvirt/netvirt.yaml @@ -17,8 +17,10 @@ block_on_csit: false stream: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' - fluorine: diff --git a/jjb/neutron/neutron-patch-test.yaml b/jjb/neutron/neutron-patch-test.yaml index 9b1b75e37..a0fde10d8 100644 --- a/jjb/neutron/neutron-patch-test.yaml +++ b/jjb/neutron/neutron-patch-test.yaml @@ -7,9 +7,12 @@ project: 'neutron' stream: - - sodium: + - magnesium: branch: 'master' os-branch: 'queens' + - sodium: + branch: 'stable/sodium' + os-branch: 'queens' - neon: branch: 'stable/neon' os-branch: 'queens' diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml index 23f7620ca..5c8773830 100644 --- a/jjb/neutron/neutron.yaml +++ b/jjb/neutron/neutron.yaml @@ -1,4 +1,24 @@ --- +- project: + name: neutron-magnesium + jobs: + - '{project-name}-distribution-check-{stream}' + - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs + + stream: magnesium + 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-sodium jobs: @@ -10,7 +30,7 @@ project: 'neutron' project-name: 'neutron' build-timeout: 90 - branch: 'master' + branch: 'stable/sodium' mvn-settings: 'neutron-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}' diff --git a/jjb/odlparent/odlparent-patch-test.yaml b/jjb/odlparent/odlparent-patch-test.yaml index 88c47d85f..3913444f1 100644 --- a/jjb/odlparent/odlparent-patch-test.yaml +++ b/jjb/odlparent/odlparent-patch-test.yaml @@ -7,9 +7,12 @@ project: 'odlparent' stream: - - sodium: + - magnesium: branch: 'master' os-branch: 'queens' + - sodium: + branch: 'stable/sodium' + os-branch: 'queens' - neon: branch: 'stable/neon' os-branch: 'queens' diff --git a/jjb/odltools/odltools-csit.yaml b/jjb/odltools/odltools-csit.yaml index 944eb6100..0a705927a 100644 --- a/jjb/odltools/odltools-csit.yaml +++ b/jjb/odltools/odltools-csit.yaml @@ -10,8 +10,10 @@ testplan: '{project}-basic.txt' stream: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' - fluorine: diff --git a/jjb/odltools/odltools-patch-test.yaml b/jjb/odltools/odltools-patch-test.yaml index 89d1baae8..28ced1e9d 100644 --- a/jjb/odltools/odltools-patch-test.yaml +++ b/jjb/odltools/odltools-patch-test.yaml @@ -8,8 +8,10 @@ jdk: openjdk8 stream: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' - fluorine: diff --git a/jjb/odltools/odltools.yaml b/jjb/odltools/odltools.yaml index 1d8966ed6..8ec7e43c6 100644 --- a/jjb/odltools/odltools.yaml +++ b/jjb/odltools/odltools.yaml @@ -11,8 +11,10 @@ rtd-token: 225d4ef64e1efce4fe3ba4c9c4fe772355d3c8b2 stream: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' - fluorine: diff --git a/jjb/of-config/of-config.yaml b/jjb/of-config/of-config.yaml index c4040d950..d9c8d7846 100644 --- a/jjb/of-config/of-config.yaml +++ b/jjb/of-config/of-config.yaml @@ -1,4 +1,22 @@ --- +- project: + name: of-config-magnesium + jobs: + - odl-maven-jobs + + stream: magnesium + 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]' + disable-job: true + + # Used by the release job + staging-profile-id: a6880455efe67 + - project: name: of-config-sodium jobs: @@ -7,7 +25,7 @@ stream: sodium project: 'of-config' project-name: 'of-config' - branch: 'master' + branch: 'stable/sodium' 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 3338d6ec4..5aa37ff81 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: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' - fluorine: diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml index fe6b1cde9..7f6c06b15 100644 --- a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' - fluorine: diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml index c863948f0..14ceaaf28 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml @@ -14,8 +14,10 @@ # Project branches stream: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' - fluorine: diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml index 2a77f8d02..3b27711e9 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: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' - fluorine: diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml index 2722546b8..c53e2a1fd 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml @@ -14,8 +14,10 @@ # Project branches stream: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' - fluorine: diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml index 44935b9b2..02fdb435b 100644 --- a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml @@ -14,8 +14,10 @@ # Project branches stream: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' - fluorine: diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml index 665120745..d452031e2 100644 --- a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' - fluorine: diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml index 4b29ac717..ce261c60e 100644 --- a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml @@ -14,8 +14,10 @@ # Project branches stream: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' - fluorine: diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml index 1acb68f59..cfd329647 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: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' - fluorine: diff --git a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml index 04a8bc21e..b43445558 100644 --- a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' - fluorine: diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml index bff54f26f..083311098 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' - fluorine: diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml index 139cde214..8cac147f2 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' - fluorine: diff --git a/jjb/openflowplugin/openflowplugin-csit-scale.yaml b/jjb/openflowplugin/openflowplugin-csit-scale.yaml index 58fe8cd60..737b583ab 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale.yaml @@ -14,8 +14,10 @@ # Project branches stream: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' - fluorine: diff --git a/jjb/openflowplugin/openflowplugin-patch-test.yaml b/jjb/openflowplugin/openflowplugin-patch-test.yaml index f0ce435bc..4fdf5c1aa 100644 --- a/jjb/openflowplugin/openflowplugin-patch-test.yaml +++ b/jjb/openflowplugin/openflowplugin-patch-test.yaml @@ -9,9 +9,12 @@ # Project branches stream: - - sodium: + - magnesium: branch: 'master' os-branch: 'queens' + - sodium: + branch: 'stable/sodium' + os-branch: 'queens' - neon: branch: 'stable/neon' os-branch: 'queens' diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml index d5f5ce40f..8d7b6f57e 100644 --- a/jjb/openflowplugin/openflowplugin.yaml +++ b/jjb/openflowplugin/openflowplugin.yaml @@ -1,4 +1,39 @@ --- +- project: + name: openflowplugin-magnesium + 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: magnesium + 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-sodium jobs: @@ -18,7 +53,7 @@ stream: sodium project: 'openflowplugin' project-name: 'openflowplugin' - branch: 'master' + branch: 'stable/sodium' 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 217de21b5..03875ddff 100644 --- a/jjb/opflex/opflex-custom.yaml +++ b/jjb/opflex/opflex-custom.yaml @@ -6,11 +6,16 @@ - 'opflex-merge-{stream}' stream: - - sodium: + - magnesium: branch: 'master' libuv-version: '1.8.0' rapidjson-version: '1.0.2' openvswitch-version: '2.6.0' + - sodium: + branch: 'stable/sodium' + libuv-version: '1.8.0' + rapidjson-version: '1.0.2' + openvswitch-version: '2.6.0' - neon: branch: 'stable/neon' libuv-version: '1.8.0' diff --git a/jjb/opflex/opflex.yaml b/jjb/opflex/opflex.yaml index ddca4e02d..f626297c3 100644 --- a/jjb/opflex/opflex.yaml +++ b/jjb/opflex/opflex.yaml @@ -10,11 +10,16 @@ - 'opflex-release-{stream}' stream: - - sodium: + - magnesium: branch: 'master' libuv-version: '1.8.0' rapidjson-version: '1.0.2' openvswitch-version: '2.6.0' + - sodium: + branch: 'stable/sodium' + libuv-version: '1.8.0' + rapidjson-version: '1.0.2' + openvswitch-version: '2.6.0' - neon: branch: 'stable/neon' libuv-version: '1.8.0' diff --git a/jjb/ovsdb/ovsdb-csit-clustering.yaml b/jjb/ovsdb/ovsdb-csit-clustering.yaml index bade29c75..4333d12b6 100644 --- a/jjb/ovsdb/ovsdb-csit-clustering.yaml +++ b/jjb/ovsdb/ovsdb-csit-clustering.yaml @@ -14,8 +14,10 @@ # Project branches stream: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' - fluorine: diff --git a/jjb/ovsdb/ovsdb-csit-southbound.yaml b/jjb/ovsdb/ovsdb-csit-southbound.yaml index 96d4a5f81..ee8797aa3 100644 --- a/jjb/ovsdb/ovsdb-csit-southbound.yaml +++ b/jjb/ovsdb/ovsdb-csit-southbound.yaml @@ -14,8 +14,10 @@ # Project branches stream: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' - fluorine: diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml index 803116ad7..9f568f17f 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: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' - fluorine: diff --git a/jjb/ovsdb/ovsdb-patch-test.yaml b/jjb/ovsdb/ovsdb-patch-test.yaml index c80f878be..89ac7decb 100644 --- a/jjb/ovsdb/ovsdb-patch-test.yaml +++ b/jjb/ovsdb/ovsdb-patch-test.yaml @@ -8,9 +8,12 @@ project: 'ovsdb' stream: - - sodium: + - magnesium: branch: 'master' os-branch: 'queens' + - sodium: + branch: 'stable/sodium' + os-branch: 'queens' - neon: branch: 'stable/neon' os-branch: 'queens' diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml index 991e030e7..ade587d5f 100644 --- a/jjb/ovsdb/ovsdb.yaml +++ b/jjb/ovsdb/ovsdb.yaml @@ -1,4 +1,32 @@ --- +- project: + name: ovsdb-magnesium + 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: magnesium + 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-sodium jobs: @@ -17,7 +45,7 @@ stream: sodium project: 'ovsdb' project-name: 'ovsdb' - branch: 'master' + branch: 'stable/sodium' 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 cf9c19ca2..5a89b31cf 100644 --- a/jjb/p4plugin/p4plugin.yaml +++ b/jjb/p4plugin/p4plugin.yaml @@ -1,4 +1,22 @@ --- +- project: + name: p4plugin-magnesium + jobs: + - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs + + stream: magnesium + 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-sodium jobs: @@ -8,7 +26,7 @@ stream: sodium project: 'p4plugin' project-name: 'p4plugin' - branch: 'master' + branch: 'stable/sodium' 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 c8ed20200..7130b9c46 100644 --- a/jjb/packetcable/packetcable-csit-pcmm.yaml +++ b/jjb/packetcable/packetcable-csit-pcmm.yaml @@ -15,8 +15,10 @@ # Project branches stream: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' - fluorine: diff --git a/jjb/packetcable/packetcable.yaml b/jjb/packetcable/packetcable.yaml index fb1e2d689..d84a50eee 100644 --- a/jjb/packetcable/packetcable.yaml +++ b/jjb/packetcable/packetcable.yaml @@ -1,4 +1,22 @@ --- +- project: + name: packetcable-magnesium + jobs: + - odl-maven-jobs + + stream: magnesium + project: 'packetcable' + project-name: 'packetcable' + branch: 'master' + mvn-settings: 'packetcable-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: '' + email-upstream: '[packetcable]' + disable-job: true + + # Used by the release job + staging-profile-id: a68ca4a24655c + - project: name: packetcable-sodium jobs: @@ -7,7 +25,7 @@ stream: sodium project: 'packetcable' project-name: 'packetcable' - branch: 'master' + branch: 'stable/sodium' mvn-settings: 'packetcable-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' diff --git a/jjb/serviceutils/serviceutils-patch-test.yaml b/jjb/serviceutils/serviceutils-patch-test.yaml index 450cbc2ba..6055c53a4 100644 --- a/jjb/serviceutils/serviceutils-patch-test.yaml +++ b/jjb/serviceutils/serviceutils-patch-test.yaml @@ -7,9 +7,12 @@ project: 'serviceutils' stream: - - sodium: + - magnesium: branch: 'master' os-branch: 'queens' + - sodium: + branch: 'stable/sodium' + os-branch: 'queens' - neon: branch: 'stable/neon' os-branch: 'queens' diff --git a/jjb/serviceutils/serviceutils.yaml b/jjb/serviceutils/serviceutils.yaml index 2a69a9309..3ea02ff10 100644 --- a/jjb/serviceutils/serviceutils.yaml +++ b/jjb/serviceutils/serviceutils.yaml @@ -12,8 +12,10 @@ - odl-maven-jobs stream: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' - fluorine: diff --git a/jjb/sfc/sfc-csit-full-deploy.yaml b/jjb/sfc/sfc-csit-full-deploy.yaml index bca4fbc0f..9fd1ab506 100644 --- a/jjb/sfc/sfc-csit-full-deploy.yaml +++ b/jjb/sfc/sfc-csit-full-deploy.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' - fluorine: diff --git a/jjb/sfc/sfc-csit-rest-basic.yaml b/jjb/sfc/sfc-csit-rest-basic.yaml index 9c2a82031..7fe2cfbfc 100644 --- a/jjb/sfc/sfc-csit-rest-basic.yaml +++ b/jjb/sfc/sfc-csit-rest-basic.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' - fluorine: diff --git a/jjb/sfc/sfc-patch-test.yaml b/jjb/sfc/sfc-patch-test.yaml index 597bba707..c70783595 100644 --- a/jjb/sfc/sfc-patch-test.yaml +++ b/jjb/sfc/sfc-patch-test.yaml @@ -9,9 +9,12 @@ # Project branches stream: - - sodium: + - magnesium: branch: 'master' os-branch: 'queens' + - sodium: + branch: 'stable/sodium' + os-branch: 'queens' - neon: branch: 'stable/neon' os-branch: 'queens' diff --git a/jjb/sfc/sfc-python.yaml b/jjb/sfc/sfc-python.yaml index 3152dfa38..e54988256 100644 --- a/jjb/sfc/sfc-python.yaml +++ b/jjb/sfc/sfc-python.yaml @@ -5,8 +5,10 @@ - 'gerrit-tox-verify' stream: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' - fluorine: diff --git a/jjb/sfc/sfc.yaml b/jjb/sfc/sfc.yaml index cd9e99228..618da7521 100644 --- a/jjb/sfc/sfc.yaml +++ b/jjb/sfc/sfc.yaml @@ -1,4 +1,29 @@ --- +- project: + name: sfc-magnesium + 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: magnesium + 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-sodium jobs: @@ -13,7 +38,7 @@ stream: sodium project: 'sfc' project-name: 'sfc' - branch: 'master' + branch: 'stable/sodium' mvn-settings: 'sfc-settings' mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' build-timeout: 120 diff --git a/jjb/snmp/snmp.yaml b/jjb/snmp/snmp.yaml index 996ea76c1..c861c3cb2 100644 --- a/jjb/snmp/snmp.yaml +++ b/jjb/snmp/snmp.yaml @@ -1,4 +1,21 @@ --- +- project: + name: snmp-magnesium + jobs: + - odl-maven-jobs + + stream: magnesium + 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-sodium jobs: @@ -7,7 +24,7 @@ stream: sodium project: 'snmp' project-name: 'snmp' - branch: 'master' + branch: 'stable/sodium' 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 aa910ff41..da531bc30 100644 --- a/jjb/snmp4sdn/snmp4sdn.yaml +++ b/jjb/snmp4sdn/snmp4sdn.yaml @@ -1,4 +1,26 @@ --- +- project: + name: snmp4sdn-magnesium + jobs: + - '{project-name}-rtd-jobs': + build-node: centos7-builder-2c-2g + project-pattern: snmp4sdn + rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-snmp4sdn/75649/ + rtd-token: 55ee5e520f96e1fa691b277b2919e8d62cb0b71f + - odl-maven-jobs + + stream: magnesium + 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-sodium jobs: @@ -12,7 +34,7 @@ stream: sodium project: 'snmp4sdn' project-name: 'snmp4sdn' - branch: 'master' + branch: 'stable/sodium' 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 58a779435..7641777ab 100644 --- a/jjb/sxp/sxp-csit-basic.yaml +++ b/jjb/sxp/sxp-csit-basic.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' trigger-jobs: '{project}-merge-{stream}' diff --git a/jjb/sxp/sxp-csit-binding-origin.yaml b/jjb/sxp/sxp-csit-binding-origin.yaml index 34683f847..49a7df277 100644 --- a/jjb/sxp/sxp-csit-binding-origin.yaml +++ b/jjb/sxp/sxp-csit-binding-origin.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' trigger-jobs: '{project}-merge-{stream}' diff --git a/jjb/sxp/sxp-csit-cluster-binding.yaml b/jjb/sxp/sxp-csit-cluster-binding.yaml index 1c67fec39..9e35536b0 100644 --- a/jjb/sxp/sxp-csit-cluster-binding.yaml +++ b/jjb/sxp/sxp-csit-cluster-binding.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' trigger-jobs: '{project}-merge-{stream}' diff --git a/jjb/sxp/sxp-csit-clustering.yaml b/jjb/sxp/sxp-csit-clustering.yaml index 09ac3079d..cb1205100 100644 --- a/jjb/sxp/sxp-csit-clustering.yaml +++ b/jjb/sxp/sxp-csit-clustering.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' trigger-jobs: '{project}-merge-{stream}' diff --git a/jjb/sxp/sxp-csit-filtering.yaml b/jjb/sxp/sxp-csit-filtering.yaml index ef910c9d6..2805a33d2 100644 --- a/jjb/sxp/sxp-csit-filtering.yaml +++ b/jjb/sxp/sxp-csit-filtering.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' trigger-jobs: '{project}-merge-{stream}' diff --git a/jjb/sxp/sxp-csit-performance.yaml b/jjb/sxp/sxp-csit-performance.yaml index 7f970e61e..e69af885d 100644 --- a/jjb/sxp/sxp-csit-performance.yaml +++ b/jjb/sxp/sxp-csit-performance.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' trigger-jobs: '{project}-merge-{stream}' diff --git a/jjb/sxp/sxp-csit-topology.yaml b/jjb/sxp/sxp-csit-topology.yaml index ab4be0034..fb17a7b77 100644 --- a/jjb/sxp/sxp-csit-topology.yaml +++ b/jjb/sxp/sxp-csit-topology.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' trigger-jobs: '{project}-merge-{stream}' diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml index cc5572874..91dd59afb 100644 --- a/jjb/sxp/sxp.yaml +++ b/jjb/sxp/sxp.yaml @@ -1,4 +1,32 @@ --- +- project: + name: sxp-magnesium + 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: magnesium + 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-sodium jobs: @@ -16,7 +44,7 @@ stream: sodium project: 'sxp' project-name: 'sxp' - branch: 'master' + branch: 'stable/sodium' mvn-settings: 'sxp-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/telemetry/telemetry-csit-basic.yaml b/jjb/telemetry/telemetry-csit-basic.yaml index 61caadd4f..6428cbedf 100644 --- a/jjb/telemetry/telemetry-csit-basic.yaml +++ b/jjb/telemetry/telemetry-csit-basic.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' diff --git a/jjb/telemetry/telemetry.yaml b/jjb/telemetry/telemetry.yaml index fe6f0efb3..89393c98a 100644 --- a/jjb/telemetry/telemetry.yaml +++ b/jjb/telemetry/telemetry.yaml @@ -1,4 +1,28 @@ --- +- project: + name: telemetry-magnesium + 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: magnesium + project: 'telemetry' + project-name: 'telemetry' + branch: 'master' + mvn-settings: 'telemetry-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: '' + email-upstream: '[telemetry]' + archive-artifacts: '' + + # Used by the release job + staging-profile-id: 8ed9c52266504 + - project: name: telemetry-sodium jobs: @@ -13,7 +37,7 @@ stream: sodium project: 'telemetry' project-name: 'telemetry' - branch: 'master' + branch: 'stable/sodium' mvn-settings: 'telemetry-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' diff --git a/jjb/transportpce/transportpce.yaml b/jjb/transportpce/transportpce.yaml index 0f844d556..fbe30b7c2 100644 --- a/jjb/transportpce/transportpce.yaml +++ b/jjb/transportpce/transportpce.yaml @@ -1,4 +1,29 @@ --- +- project: + name: transportpce-magnesium + 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: magnesium + 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-sodium jobs: @@ -15,7 +40,7 @@ project: 'transportpce' project-name: 'transportpce' stream: sodium - branch: 'master' + branch: 'stable/sodium' 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 172e03ab1..3a2ac553a 100644 --- a/jjb/tsdr/tsdr-csit-cassandra.yaml +++ b/jjb/tsdr/tsdr-csit-cassandra.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' trigger-jobs: '{project}-merge-{stream}' diff --git a/jjb/tsdr/tsdr-csit-elasticsearch.yaml b/jjb/tsdr/tsdr-csit-elasticsearch.yaml index 29fe32e26..516c12762 100644 --- a/jjb/tsdr/tsdr-csit-elasticsearch.yaml +++ b/jjb/tsdr/tsdr-csit-elasticsearch.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' trigger-jobs: '{project}-merge-{stream}' diff --git a/jjb/tsdr/tsdr-csit-hbase.yaml b/jjb/tsdr/tsdr-csit-hbase.yaml index 96b2b2080..6ee8f009d 100644 --- a/jjb/tsdr/tsdr-csit-hbase.yaml +++ b/jjb/tsdr/tsdr-csit-hbase.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' trigger-jobs: '{project}-merge-{stream}' diff --git a/jjb/tsdr/tsdr-csit-hsqldb.yaml b/jjb/tsdr/tsdr-csit-hsqldb.yaml index 7db3bab5b..7220fe63f 100644 --- a/jjb/tsdr/tsdr-csit-hsqldb.yaml +++ b/jjb/tsdr/tsdr-csit-hsqldb.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' trigger-jobs: '{project}-merge-{stream}' diff --git a/jjb/tsdr/tsdr.yaml b/jjb/tsdr/tsdr.yaml index c90043f8c..3a3047a96 100644 --- a/jjb/tsdr/tsdr.yaml +++ b/jjb/tsdr/tsdr.yaml @@ -1,4 +1,26 @@ --- +- project: + name: tsdr-magnesium + 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: magnesium + 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-sodium jobs: @@ -12,7 +34,7 @@ stream: sodium project: 'tsdr' project-name: 'tsdr' - branch: 'master' + branch: 'stable/sodium' mvn-settings: 'tsdr-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' diff --git a/jjb/unimgr/unimgr.yaml b/jjb/unimgr/unimgr.yaml index 504d22045..d0712a3ac 100644 --- a/jjb/unimgr/unimgr.yaml +++ b/jjb/unimgr/unimgr.yaml @@ -1,4 +1,27 @@ --- +- project: + name: unimgr-magnesium + 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: magnesium + 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-sodium jobs: @@ -12,7 +35,7 @@ stream: sodium project: 'unimgr' project-name: 'unimgr' - branch: 'master' + branch: 'stable/sodium' 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 0b373cc7e..0a2145702 100644 --- a/jjb/usc/usc-csit-tcp.yaml +++ b/jjb/usc/usc-csit-tcp.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' - fluorine: diff --git a/jjb/usc/usc.yaml b/jjb/usc/usc.yaml index bdbebca14..a1f3aa5c6 100644 --- a/jjb/usc/usc.yaml +++ b/jjb/usc/usc.yaml @@ -1,4 +1,22 @@ --- +- project: + name: usc-magnesium + jobs: + - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs + + stream: magnesium + 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-sodium jobs: @@ -8,7 +26,7 @@ stream: sodium project: 'usc' project-name: 'usc' - branch: 'master' + branch: 'stable/sodium' mvn-settings: 'usc-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}' diff --git a/jjb/yangtools/yangtools-csit-system.yaml b/jjb/yangtools/yangtools-csit-system.yaml index 58c2bb48c..35a54f71b 100644 --- a/jjb/yangtools/yangtools-csit-system.yaml +++ b/jjb/yangtools/yangtools-csit-system.yaml @@ -12,8 +12,10 @@ # Project branches. stream: - - sodium: + - magnesium: branch: 'master' + - sodium: + branch: 'stable/sodium' - neon: branch: 'stable/neon' - fluorine: diff --git a/jjb/yangtools/yangtools-patch-test.yaml b/jjb/yangtools/yangtools-patch-test.yaml index 2491d1630..cb3f01f53 100644 --- a/jjb/yangtools/yangtools-patch-test.yaml +++ b/jjb/yangtools/yangtools-patch-test.yaml @@ -7,9 +7,12 @@ project: 'yangtools' stream: - - sodium: + - magnesium: branch: 'master' os-branch: 'queens' + - sodium: + branch: 'stable/sodium' + os-branch: 'queens' - neon: branch: 'stable/neon' os-branch: 'queens'