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 <abelur@linuxfoundation.org>

diff --git a/jjb/aaa/aaa-csit-authn.yaml b/jjb/aaa/aaa-csit-authn.yaml
index 8404aec2bb81b6c399bb8f66dfc739e34e69205b..03e6d8ae89b9286c84401063dfc0a01c970cb87c 100644 (file)
--- 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 b873069078f44029a2a3f67b1c54289385166531..9d55e968e61ceb954e2b38b0809ead1be4793382 100644 (file)
--- 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 5cd894b9abd9bcab2109ef9a8edc9bc971ebaf23..29ec140cf9fb1c7634a2145f4daafcb9815f4aa2 100644 (file)
--- 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 03dc74933fc15f3cb214c23ca4e526c6ca6c93e0..9b5c2d79e7a85a36f2e78f7db9abf3a38c234248 100644 (file)
--- 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 ee913d8da6f5b9278d48e8bfebdfabdabc917bfb..969ab49350d05bb74c5c56e27b0decbcdd1141d5 100644 (file)
--- 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 bab58b8d080bfd29820fcf0499890283bb973637..4ec455d8365e9f46fef77927e9613d46f426156b 100644 (file)
--- 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 157305b8bfca59ee026ddfdeb492949c8a6ea945..e3f697c4bbcf55479e0edfa9b373c171f44c3124 100644 (file)
--- 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 0e4d0fd72e00ae354f31e6f7ebae2336037ef72f..2018a349157a4b7b23c409b98383ccd668181c37 100644 (file)
--- 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 d60c8cbd750de9a889f743392b0ac025b2a3e3cf..1aaceb430f72338abf5eeb19056cf43abb96065a 100644 (file)
--- 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 9b1203b71c38a586e22898836e290dbee1aa245c..863a9749fc42526609a24f9664a93991b4884d28 100644 (file)
--- 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 25f5e33aa45d04529c6740e70039dd536fa0bd8d..b8940a236dc81fea3c64abcaa3995c925bee5993 100644 (file)
--- 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 01fa4f6689858e16f04ca3e182e1667645cf745d..47a276034714267a3d16c71ade28b2c86ad27405 100644 (file)
--- 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 bbfa54b5531fc0c74eb12b16dac09c6b04a439e7..d829e552c547ea0229dacc8570864e8cde592d7d 100644 (file)
--- 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 41bc854b92420f73d33ad38752592e1569d455bf..768761b44e11ddd3225a2014d865af77004769a6 100644 (file)
--- 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 222032dff5c35e4458fc6b2515b469dbdd0dbc24..6c6253997fc4769dd27245353bc7913f594cce0a 100644 (file)
--- 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 cb07e4a3dba4f05a0886615b8a5543ec8c883504..88c449b8f07abfe04cafc2a4c19ec377b05e7e5f 100644 (file)
--- 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 ed80862a4f56d911d9b956ff0a378afc566d1808..0f1f802139b7b64ba969ad5b4a5094ce6ea4aad9 100644 (file)
--- 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 36ef21235050e4692faf192b62637ff94db8ec5b..7430d14da323b02f8125bf7caecef8bbf2907889 100644 (file)
--- 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 94f5515089f6a6689909c6e7ccc98167f6bbd866..0f53219003144e6b2474e37b528f75769f421736 100644 (file)
--- 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 ba7a52179e2c495c3bbca1704831022d527bfcd2..3a675458812060d8ce4576f199099f774bdd761f 100644 (file)
--- 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 fc3e31d9ba51421bdbf43bd23566bde116dbba43..9d6b0eb72ccaa75538b5492b4c1350b268851475 100644 (file)
--- 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 d5f3ad426030d74fe8aebb9f1b9b56c63a72dfef..819b47705d5c47827762f0d1c2de195e9a582c88 100644 (file)
--- 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 11672aeb94c98ff989e993d3ddfd92a751d32989..6916ebadfd2e4a1fa7462f91736aa44c3d681f42 100644 (file)
--- 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 4621f57cd02052bb210356d0ff68573e052c1362..ad6f2ff179f5375cc75ff2e31bc45f2bbfe68b4d 100644 (file)
--- 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 e47fa75302dc3d0f60675cb867b7143a1dc9399c..e20b5a8ad645299bc42cb03bc9144373f12dd2ff 100644 (file)
--- 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 f5531d4cf984016ce4760c3c389f4a205e6f6464..b4f1a779f7bdd337624942eb81798785487b723e 100644 (file)
--- 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 c6751a3f2a84573f793e0a541cfe62b3140bfd3e..2785ba227d1d34799a6edb845dd954a8c72a2593 100644 (file)
--- 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 ce92ead15b56d12681ab033d7ecd2f3fb11b2e7b..52d1a160e16d33915bb86220a19c845589e8c6df 100644 (file)
--- 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 5bb582fe04e34a7496baa4d1d25b158f26cc8e21..52080dd9387c1af4094f150db763571657d35707 100644 (file)
--- 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 ef0ecc07ca9cd3c0d50f83dd97dffec8d147c418..38aec200540d8d0304977de6c6f957a434e67401 100644 (file)
--- 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 b8bd04743bf41a92d34c9e87a001bc30b6bb8853..c8b7eea0d17c515389a4748a78dada81dcd793a4 100644 (file)
--- 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 4f2aad082810eac1ef1f87a9f0b6e5dce928925e..694d53c74d1db66a861153521f1c96bda23f4397 100644 (file)
--- 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 de95463be12b906bca67b1840dce799fe2a1021d..825849eef073a33c60953f215325022446fc0710 100644 (file)
--- 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 16e29821f4e5b2c5617d385ef4e2a77f9c847684..8270c5a57731e2915fc2cd7b91d3e3579ebc0b55 100644 (file)
--- 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 d78dbdbad03fb989e9594d825b35d3cf3038ccc2..f9185af2779f8a49f11110e92cc6d4cfb575e0a1 100644 (file)
--- 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 89fe12dc156a46e7acd48a819b0be48b28ae9215..39d1e3dc6d53c8d980e743dd4bb854117f92ed9f 100644 (file)
--- 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 292a41c57df576c9140f91ff4a0b4f64393f787a..9b519a2d69ca34a6a8e3b787fe0c45b3354222d9 100644 (file)
--- 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 d5275e845801c465c6086189e33e1f63cfa40c0d..20a93b0512b23d81fb1a431eaf9c25e584e972b3 100644 (file)
--- 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 e84f71cc5339c20001ca2ddf742b421fc533f2c4..7b769aaf8d35f09b65fa37a94082c3b3c98f2027 100644 (file)
--- 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 6eb81685de50f7abb61be8d2db5654b07beb3343..28d7317c4980947b1683e4188e05311915070443 100644 (file)
--- 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 c62c4b7943f9b301a764c91e2de93cd025eae969..b147016b4f149a18eca15a9e0f42a55cc4282832 100644 (file)
--- 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 34dcef1dc58356e23b07ee4e05c0cc31221cd690..8dedf8bcd9e5bdde41fb486a1fdebcb2f7dcb8a2 100644 (file)
--- 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 fd9b0d9ee257bd50a0236edd3a8c080d97026ee0..3ff7282f212fcc822887ed9bdb33246c436e2fc6 100644 (file)
--- 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 8fa8dd24eb44ec2c6f15fc669b398fd35410ad8e..1041a18c941699784e082b6c985fb5123c6c1ad4 100644 (file)
--- 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 a478078d727abfd146d9dfb37035e71d192bba41..8efd767285f4ffffacf077537708886d0c201a09 100644 (file)
--- 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 dcaeb7bfd980ffab5759c7a903419f6560f7fd58..9471e1df649dc5d2a85c970b74ac9422e888210c 100644 (file)
--- 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 1c3fe7def58692fac530d84ebfc5faa467e14bcc..ceb1a1a139c9da9d23c2fcea861bd766d12344d7 100644 (file)
--- 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 716664463ad465ab34f8e84c30b42f7bf4bc92d6..278c3f1a2811bad8c3b613b233cfa8884faaab1b 100644 (file)
--- 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 2e75ccf3be848a85288942ad47ecf9fa858a427e..d796dc8c265b006168a7aa92c9fb4eaba7090924 100644 (file)
--- 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 9a4e1bd62e2be531f02c140b2181db5b959311e9..39a1eb13bb791798d09d52c76a0f34078732453d 100644 (file)
--- 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 90e9866ffe689bb04a89dda67e8df7c08cc9575f..6445646fd3bfc259f297e3ff3d87ae5f11557911 100644 (file)
--- 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 c955dbccf8be2feaa9b5c03ecd5bb019e7270ee4..fe81914e88e7c0f4d030c1e5541f71ba131e5a0b 100644 (file)
--- 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 6202a755beef6cd1d00b2e8ec4abca92b94e93e4..8ee86a956c44c97a92cef1eb03a4cb6e20ba36f4 100644 (file)
--- 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 c80c65d248a34710465cc25aebbfd52877d1923c..bb1737d185b69e326f661f600958f6501cd92b2d 100644 (file)
--- 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 36b12ad69b7741a6b4fc2f3b7235d66c8605a304..f8f518b417a1ee456d629c5b531240c2cf44d526 100644 (file)
--- 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 e3d869d73abc1eb435859d39d1bdbbaa3c5f0ca5..77b819506a4125f4a5f720b7ecfeb43cc7947021 100644 (file)
--- 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 f49c2d6c1cfb1dcb13c7f5cb7770612761fe51f7..e8d8df1357147ece780b1bf06ade91411213bbde 100644 (file)
--- 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 c391f02a022f826a6388a51d26fecd32c36a254d..3462e110b6598dba06a9291539c5dd3e694b0862 100644 (file)
--- 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 (file)
index 0000000..f137bc5
--- /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 8bb89d2a9ffafe0006d1c98ea5153c35192c35a7..f7cded29ee6f57682e483a66931236507748978d 100644 (file)
--- 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 e16edb39e3e6708dcd3b3df64f719a0a0384b35f..510197c60231dd04573906c6fc10e794d9d9ba2a 100644 (file)
--- 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 efb22744881a2a4e206cf746d5dac8252e5ceddf..906469ea333719b28ea22bdd88ade2925c477053 100644 (file)
--- 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 443dd1807d3fcee6dce4bf14b3237744fa8ccc08..ea6e693498ae741fd3b27347fd1ff152e78bf243 100644 (file)
--- 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 4d8b6da302786fc8b90934a7e3fe6a138a3f97b9..9507f7afcee0bcc18306581682140ddb35d800ea 100644 (file)
--- 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 a1cde7a89af93015fb7d40f6ab8feffd60dde121..678479910a9f2aefc02fafa4667f3adc848e0155 100644 (file)
--- 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 679a9b30fe959285585675b6c07f0b7982387cc1..3a785761ade4c78348e751310347c654de63b3b3 100644 (file)
--- 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 acc6bff9bfba30d8154bf7203f1a09f4e32abbdb..a30448d1d48cd65fe8c1cb27dffabc73d4cea611 100644 (file)
--- 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 4984e5ee1d2a7e201602316c549eb61ad61726c5..10905d551dc6e9459a1d763527691467a8bc71db 100644 (file)
--- 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 b317c206ed2e9daf427168f53dbb2253b8d28c7d..91ce168538a2a9e0b91bc163b3e89322e6c2098b 100644 (file)
--- 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 edbb8f03f5dcab8cdfb0999616fc2d8cf2f3ea25..964854a20aefb7b717426eea376d31d81ae7678b 100644 (file)
--- 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 c8b05965bc0bbf1c44584804830d5f725a40f2c4..ad2c1da82ca7811caabeee9df86a77d79c4efe2a 100644 (file)
--- 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 6b6f17fb149e6324948517e98698a0b2e3bb4090..2778218c60f8369b93e3ddce71e6fe73fefefccd 100644 (file)
--- 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 1dc5719ffd46498e6a7172244c6aad24b4d24be5..e44d1e523ba084e5c7a4f77817d9d66f5fdb8a1a 100644 (file)
--- 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 c2440770384942e7540e501561eaff54cbabc336..9f6dfa48ada3b0417316416eedcbd5d7f2e6fdd9 100644 (file)
--- 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 ecf7605caea1cb50054faa07ca0f855de4155fc2..9545dab9e339a2170b6edbefb92083d3fc0b469e 100644 (file)
--- 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 d47144d06fd3c9300080940ee907eb2e6b3a62b2..254933687b718683265e3d176d391181907ba94a 100644 (file)
--- 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 5fd3de7c71ee1a184a5f0ef4d6ef05c1e944cfec..c1cb19f9338b70942b5ef02ae9f11d9aee4d3ffc 100644 (file)
--- 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 c2c36726c814d06cf78e890d1967936d0307a9a7..af9921d664e02e30a3daa341748ad82e6222aebd 100644 (file)
--- 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 80efa80439cc53f2be3e6d56ba43d80b320c0f99..8a7c1faec3bb37ca009358218d1e727bf77ed11b 100644 (file)
--- 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 756b9b1bc09280c90d54f712a03d51e6376a59ec..eb07b3c71b317180aa618a22aad3edb45947c1dd 100644 (file)
--- 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 2204b211ba2e92c38afe98a84a49fe2dac026ba8..1e8170ff72d42edf26b2eeaa5ef5f93eb85670f5 100644 (file)
--- 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 53be57d709e506a072b0e5e1d5467546c9793508..095f31d6ba6255535b5e6c0178ffb570f8c5b177 100644 (file)
--- 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 b5c6843211aae0ef1cd9c3398f2869ae0a22ca10..fc7a32e587fd78b1d44ad603eb96c9569a6a5ce3 100644 (file)
--- 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 7274d996a3d2f3b9274902b4e3b6f5336ed26f58..afb5ed8f714614fa062157a71a908a0bbec42020 100644 (file)
--- 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 0377cc987cf65aa44e2234344caacd2fc35feccf..f64662b7869fe886e89d630fce9fc5237eaaf337 100644 (file)
--- 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 6065a5abcecb0a2f434839dc0fdb71fa2e8e6bae..3b1f711f35ec572d02969f6efcf73f0600bce393 100644 (file)
--- 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 967564c311bef9836edc02bcee8bd8fbae5f11ff..76e572559b9262a8937e0bf60cc3eb2ea7f88fb5 100644 (file)
--- 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 9b1b75e37f363455e5b93fdc79d83dc03c5f7c1e..a0fde10d818a4cd8b941095620639f4471f948dd 100644 (file)
--- 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 23f7620ca81b19c5dea9201f47a2914e425f2e57..5c8773830ff92c6017db5a96a3cd9d8865b3283b 100644 (file)
--- 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 88c47d85f7a4b09e04b467803ab93f9cfb1c153f..3913444f18f965f6ccc7e682c5382f05809b8bde 100644 (file)
--- 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 944eb6100d8f0cc20438c64c8e5145093859a446..0a705927a8973cbc83aacc779c88e481d3fdd120 100644 (file)
--- 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 89d1baae80de46099eee40a44f95c113d5dc561f..28ced1e9d6a1d70dae8c42aa921c4ca6aed7f3b6 100644 (file)
--- 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 1d8966ed6ed878051d588b8a39fe76650bfeea8e..8ec7e43c65c728746da02f7507daaff73cb10321 100644 (file)
--- 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 c4040d9509e1bb47a2dc1353e1c2e45d44ea6bb3..d9c8d7846aec28d822c7eb3c66ef2bca2c55f44c 100644 (file)
--- 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 3338d6ec4bd28e6bf2724375d49a786fc5f54fb5..5aa37ff8128a26f027a98b3bbc6736a9f06188ce 100644 (file)
--- 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 fe6b1cde99298adf575e8e1cdee235fd222ab888..7f6c06b152b5860a336920838b5683d0142e96ce 100644 (file)
--- 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 c863948f0d6015bafbfaa3d9115eeb59893b10f9..14ceaaf2828c6268406fb5557732de704ed319d2 100644 (file)
--- 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 2a77f8d02b5c1dc7451caa0ca56f0bf48a579701..3b27711e9544257de99a430ac1930e0a77ed872f 100644 (file)
--- 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 2722546b8f3d06924a8c86fb7986b73ad88f4002..c53e2a1fd7046dfd963b0bc0e9c24a684ad6071f 100644 (file)
--- 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 44935b9b290fa0185eba57c419b34e10b08008c1..02fdb435b734df3b41cfb87e3c0a6523fab59730 100644 (file)
--- 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 665120745048d76b992c20c44ffb1427a4b041de..d452031e2bc889b8fce9ca0bd73d61e553a96db8 100644 (file)
--- 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 4b29ac7176d0fd140172ce18bbc12160538c913d..ce261c60e1517d5332fd1386f1278c3561e7b9e9 100644 (file)
--- 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 1acb68f595d9b81e709ef84d2611035d45785748..cfd329647229d2cba2f1634d7258580e98393863 100644 (file)
--- 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 04a8bc21e920d7c6259d636df610875de695155d..b4344555850118b8fb05bb639750baf4242212ec 100644 (file)
--- 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 bff54f26f8d49b93cf995292ba4cd74cc00c9609..08331109810de47c4986a02309875935b34f1084 100644 (file)
--- 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 139cde214e0d074ba0f2a3b4db43010ded0f127c..8cac147f2fcd50a46b82639f126ec5296d990516 100644 (file)
--- 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 58fe8cd60f7b1315bc3cf5e31a881cd43784f36a..737b583ab2d0a74116fc0450efc9ede464a7ff60 100644 (file)
--- 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 f0ce435bc96726d911e110a73c908fcce0145aea..4fdf5c1aa256d616f2b5dd612e3f0be2c935b651 100644 (file)
--- 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 d5f5ce40fb00d3c90b79589e3cd4da63bfcdd02f..8d7b6f57e9549a307a1bdc459766910b2f577b57 100644 (file)
--- 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 217de21b5ea61059bc40b9f41fbb3d3e26a5b790..03875ddff89d83ecda7f26df9556e1f69a351cd5 100644 (file)
--- 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 ddca4e02dc2cd544cb1f787dbaa6660a087dc924..f626297c3f1d0c9617c6bc448bb38da387507495 100644 (file)
--- 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 bade29c759dee212ec927549c5f8006506fa2621..4333d12b6dddccc98bc1beccdd185401b8f5ab10 100644 (file)
--- 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 96d4a5f81f399c2dc71d1fb993db62c0e8f29057..ee8797aa3b3a36fe2e0b414ea76d3b21999f889d 100644 (file)
--- 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 803116ad7fbc3b0385347d3db9670321544e998e..9f568f17f9885fe681558b70f89c922aa55dfb0c 100644 (file)
--- 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 c80f878beaef4c48543cdeaedc0e9173eafd9177..89ac7decb700b013c732f89626f06db89a566550 100644 (file)
--- 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 991e030e79d5fd44dc864b3015375eb8b00c7d3f..ade587d5fdc5e395c2d9be944a4c26e526e8afbb 100644 (file)
--- 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 cf9c19ca2921fa6e9d52775750539b3de1f8b9f8..5a89b31cf19178d2ec7743dfbeffe9d85c658c76 100644 (file)
--- 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 c8ed2020054067e3f8fdfcb71dcff931bed0fed8..7130b9c4685964d9042506f5acf19d97954e0256 100644 (file)
--- 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 fb1e2d6896c5bc7662efedf4aef9c2eab1fd3615..d84a50eeebb80ca0f252b290f054128940fb0cc5 100644 (file)
--- 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 450cbc2ba226e65d5a978625a4aa49d45ecf46b0..6055c53a42f9a22e4257df40d874f9d4e8d6edd8 100644 (file)
--- 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 2a69a930919ce1808dfc7f06baf132a5760eba1c..3ea02ff10d22d669b9b079341e03f5083dee6055 100644 (file)
--- 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 bca4fbc0f5a4a24a65872cb0f5a40eeab57ac633..9fd1ab5068c56a96f17fa54f9fe28807eac43dfb 100644 (file)
--- 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 9c2a82031709800c9b0cc26ed137cb9066f4e40f..7fe2cfbfc18e3e6a2945afd73ad50d6b32b8c344 100644 (file)
--- 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 597bba707c550b4aee7105dd6d143dbed75882b5..c70783595b8ae967fa9a741b77d976b4c607317f 100644 (file)
--- 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 3152dfa38b9122750d8a27ff36f5edc48d6bff59..e54988256e8ca95a2f51ae7ddfce9974803c4792 100644 (file)
--- 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 cd9e992288c599f1024d5f6af937aaf9f5c99d27..618da7521d46da00160337f8bb0d1693e8440aa8 100644 (file)
--- 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 996ea76c1611d009b9c316aa9b4854f4eecf556b..c861c3cb2b5ae57689b281c30e7d06ccc711e720 100644 (file)
--- 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 aa910ff41186a413f6189a2c68a817fc96d4672e..da531bc30fb45980c64bdfb399932c92f23c6b92 100644 (file)
--- 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 58a77943568268a15ab1100fddc48191298d93a6..7641777abd2f9715a72a25903016027156250a89 100644 (file)
--- 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 34683f847320ff150a0b8a058b1bcac7a08d27ad..49a7df2773a3f9c29ebe50d1b2079aedf0464224 100644 (file)
--- 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 1c67fec39637bb1de7e4636be2bd5937ebd70741..9e35536b08e94715868b4842b52ab1dc75175b86 100644 (file)
--- 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 09ac3079d164bf2dfd37ddfac46dd2000eca4ad3..cb1205100c931f90b3af5a939458785fe5ecf76e 100644 (file)
--- 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 ef910c9d6391977310a4b5b10ed9809c0bfda23f..2805a33d2a365465d97fc4f775dd2d11a20b8d7a 100644 (file)
--- 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 7f970e61eaf1485551d6fc92552c8f42ea761775..e69af885d2bac2ec689541c5b6b80e45f0a47061 100644 (file)
--- 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 ab4be0034ca7078b6f2854a5a4ba96d1b219eb74..fb17a7b77f5797b2f4d895f3ece5d9de1b94fac7 100644 (file)
--- 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 cc55728741389659d656d4c0aaea2fe70508dd24..91dd59afb3be889325079ad2bd36d6838105ffde 100644 (file)
--- 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 61caadd4f7d8686e7eac0a9b3779fec38c9d1fa0..6428cbedf680627dcc069e85fa0133c39fea2797 100644 (file)
--- 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 fe6f0efb3ea8aa23732b99e3f23e77a0965acce7..89393c98ac142db8ec4c2459ca08cf3c5a9ef967 100644 (file)
--- 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 0f844d556f98389cb4dd72ef9c781acb5a6196a9..fbe30b7c25e727b845bd838047f72b3c7e6edcb9 100644 (file)
--- 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 172e03ab170bf7a322e8eb47ec09c987e9bdc9a6..3a2ac553ad00f0cf97e5f70990cd861e1993fd13 100644 (file)
--- 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 29fe32e26291225250ab26122c4106722dc23460..516c12762a5519190edf86288149733612f1e870 100644 (file)
--- 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 96b2b208020c4bc798c8378b9ed22f6e3bf6a512..6ee8f009d4c0b11da9bc3cfc23d897ba8bc41ace 100644 (file)
--- 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 7db3bab5bf9a3acf3c877fdc105267fb20f6bf05..7220fe63f4087499a4bb8070f8efdce27a736e93 100644 (file)
--- 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 c90043f8c2f0d8815d506f4ec5b20d43fa8d9f82..3a3047a96ac28c840529f8a10dd0a4781be4a9f0 100644 (file)
--- 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 504d2204564577ed1cd481968e121251f8589045..d0712a3ac1cff1885ba6de2d6d061f00b54f2adb 100644 (file)
--- 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 0b373cc7e46f526a73371a8f58796ab7c0cce5c5..0a214570237c513453567d5548518090b9654e9f 100644 (file)
--- 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 bdbebca14c2652fe388ce90884286e2c644a03ff..a1f3aa5c62c5521e621bce91f97760ade9b0d208 100644 (file)
--- 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 58c2bb48cd25cef4b9f6d5c304fe15544e75640a..35a54f71b5a2704b6ee37c26d42820ae780b7f46 100644 (file)
--- 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 2491d1630f2786e1cb7fabb964e08abea2fc0d9e..cb3f01f53ed90341f111c6442019215e0c492096 100644 (file)
--- 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'