Magnesium branch cut

Create jobs for 'stable/magnesium', and move master
to aluminium.

Change-Id: Ic0982025a47db0d4ea1bc8ca53d3370edc7d5803
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 b67ca0d566957cb30a073693029359b8aae4ce53..0d8d75ac2b62f49270842df570e7c6d8e2a2f80c 100644 (file)
--- a/jjb/aaa/aaa-csit-authn.yaml
+++ b/jjb/aaa/aaa-csit-authn.yaml
@@ -13,9 +13,12 @@
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:
@@ -34,4 +37,3 @@
 
     # Don't spin up mininet vms as aaa-csit-authn jobs don't need them
     tools_system_count: 0
-

diff --git a/jjb/aaa/aaa-patch-test.yaml b/jjb/aaa/aaa-patch-test.yaml
index 83024fb9facc1a51ab98b0f2d9f90363ad5d42ed..5c254fb5cbf3601327b411ba9f0a48e2ba6ad935 100644 (file)
--- a/jjb/aaa/aaa-patch-test.yaml
+++ b/jjb/aaa/aaa-patch-test.yaml
@@ -7,16 +7,18 @@
     project: 'aaa'
 
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
-          os-branch: 'queens'
+          java-version: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
           java-version: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-          os-branch: 'queens'
       - neon:
           branch: 'stable/neon'
-          os-branch: 'queens'
+
+    os-branch: 'queens'
 
     feature:
       - authn:

diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml
index 379aeb37e9790b65080f347f2841fbc46fb80e5f..b1a4f8192e063c5e512adea3599d582a2e67d158 100644 (file)
--- a/jjb/aaa/aaa.yaml
+++ b/jjb/aaa/aaa.yaml
@@ -1,4 +1,29 @@
 ---
+- project:
+    name: aaa-aluminium
+    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-jdk11
+      - odl-maven-verify-jobs
+
+    stream: aluminium
+    project: 'aaa'
+    project-name: 'aaa'
+    branch: 'master'
+    java-version: 'openjdk11'
+    mvn-settings: 'aaa-settings'
+    mvn-opts: '-Xmx1024m'
+    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-magnesium
     jobs:
@@ -14,7 +39,7 @@
     stream: magnesium
     project: 'aaa'
     project-name: 'aaa'
-    branch: 'master'
+    branch: 'stable/magnesium'
     java-version: 'openjdk11'
     mvn-settings: 'aaa-settings'
     mvn-opts: '-Xmx1024m'

diff --git a/jjb/alt-datastores/alt-datastores.yaml b/jjb/alt-datastores/alt-datastores.yaml
index 5f3a8790236af7a4d9b844b197d8c7c5d5a0528b..dc359c7563f9443cf2ec97e32c43ea075b16256f 100644 (file)
--- a/jjb/alt-datastores/alt-datastores.yaml
+++ b/jjb/alt-datastores/alt-datastores.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: alt-datastores-magnesium
+    name: alt-datastores-aluminium
     jobs:
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
@@ -11,7 +11,7 @@
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: magnesium
+    stream: aluminium
     project: 'alt-datastores'
     project-name: 'alt-datastores'
     branch: 'master'
@@ -24,6 +24,30 @@
     # Used by the release job
     staging-profile-id: daa2b00117ed6
 
+- 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
+      - odl-maven-verify-jobs
+
+    stream: magnesium
+    project: 'alt-datastores'
+    project-name: 'alt-datastores'
+    branch: 'stable/magnesium'
+    mvn-settings: 'alt-datastores-settings'
+    mvn-opts: '-Xmx1024m'
+    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:

diff --git a/jjb/alto/alto-csit-setup.yaml b/jjb/alto/alto-csit-setup.yaml
index 5814a47b915afc9e85677814eb3d7d7768158a35..f06a3f08c12e5caca94d5e58869cd22a914f8ae0 100644 (file)
--- a/jjb/alto/alto-csit-setup.yaml
+++ b/jjb/alto/alto-csit-setup.yaml
@@ -14,9 +14,12 @@
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/alto/alto.yaml b/jjb/alto/alto.yaml
index 509485f5d6cead8c5d32de6a99f9f89071af2adf..15bbeb59f282684a80583e34756abccbd5b66f65 100644 (file)
--- a/jjb/alto/alto.yaml
+++ b/jjb/alto/alto.yaml
@@ -1,12 +1,12 @@
 ---
 - project:
-    name: alto-magnesium
+    name: alto-aluminium
     jobs:
       - gerrit-release-merge
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: magnesium
+    stream: aluminium
     project: 'alto'
     project-name: 'alto'
     branch: 'master'
@@ -20,6 +20,26 @@
     # Used by the release job
     staging-profile-id: 931eabae9693c
 
+- project:
+    name: alto-magnesium
+    jobs:
+      - odl-maven-jobs
+      - odl-maven-verify-jobs
+
+    stream: magnesium
+    project: 'alto'
+    project-name: 'alto'
+    branch: 'stable/magnesium'
+    build-node: centos7-builder-2c-8g
+    mvn-settings: 'alto-settings'
+    mvn-opts: '-Xmx1024m'
+    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:

diff --git a/jjb/ansible/ansible.yaml b/jjb/ansible/ansible.yaml
index 5f832011771957c573f60c48f947662d8b81978b..e48200e20c5c9a2d10a7ec7c45c751ee4c03798a 100644 (file)
--- a/jjb/ansible/ansible.yaml
+++ b/jjb/ansible/ansible.yaml
@@ -9,8 +9,10 @@
       - odl-maven-verify-jobs
 
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
+      - magnesium:
+          branch: 'stable/magnesium'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/archetypes/archetypes.yaml b/jjb/archetypes/archetypes.yaml
index 8c1614b4eea344f3cb8bdaddc5605a0e19cb7bf1..0cb92fb193e26ee7fe0b0155162d8a8fc8797a50 100644 (file)
--- a/jjb/archetypes/archetypes.yaml
+++ b/jjb/archetypes/archetypes.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: archetypes-magnesium
+    name: archetypes-aluminium
     jobs:
       - gerrit-release-merge
       - gerrit-maven-clm
@@ -12,7 +12,7 @@
           sign-artifacts: true
       - odl-maven-verify-jobs
 
-    stream: magnesium
+    stream: aluminium
     project: 'archetypes'
     project-name: 'archetypes'
     branch: 'master'
@@ -24,6 +24,30 @@
     # Used by the release job
     staging-profile-id: d88dcfe6ce48d
 
+- 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
+      - odl-maven-verify-jobs
+
+    stream: magnesium
+    project: 'archetypes'
+    project-name: 'archetypes'
+    branch: 'stable/magnesium'
+    java-version: 'openjdk11'
+    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:

diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml
index 738b664ae981e74e76ccf360d97132eb74f46633..ed3c68f4bccab9d31078f58d6b2ecba08efbf39d 100644 (file)
--- a/jjb/autorelease/autorelease-projects.yaml
+++ b/jjb/autorelease/autorelease-projects.yaml
@@ -52,9 +52,12 @@
           build-node: centos7-autorelease-4c-16g
 
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
-          integration-test: magnesium
+          integration-test: aluminium-dev-null
+      - magnesium:
+          branch: 'stable/magnesium'
+          integration-test: magnesium-dev-null
       - sodium:
           branch: 'stable/sodium'
           integration-test: sodium-dev-null

diff --git a/jjb/autorelease/autorelease-version-management.yaml b/jjb/autorelease/autorelease-version-management.yaml
index d31b686c57cc45a26536ab8c93b418fcd7fb6957..672a199dde07c98f2bf1979de33d3a857cf4a0e2 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:
-      - magnesium:
+      - aluminium:
           branch: 'master'
+      - magnesium:
+          branch: 'stable/magnesium'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
index 023597fe1bf75a3e507b99a9d9d87a3a1b642bd9..234c1570bf778f6f9e41d2746a0f858b8f0db3fd 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
@@ -14,9 +14,12 @@
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
index 37bcaa2404f89b6344601a0943ddc97974f5672c..386d9fad497a36490908ecf8ed7e54540763ac13 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
@@ -13,9 +13,12 @@
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml
index 3c287c3baf7808681689d81f09ce1fde81c22a9a..57cee509d6044c0674ce668f938fecf6f0fecb71 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml
index 8696e40962d8601bf4c8f3c42d98341c20c42a75..856a654920126c14e1a2e0101f1f51652795de64 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml
@@ -15,9 +15,12 @@
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
index c2426f069d36be7c9391c51cded8d0d7a27fa673..f9430de8448471a1c3daa56405bce278aeef1ba8 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
index 56cfa04d70685467f51c5382a432787e6432b3df..bdee08fe2151a94dfbc2746c5cb210bb7a909ba5 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
+++ b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
@@ -14,9 +14,12 @@
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
index 3e3f54d91ff13ddfb372a68d84ea8e9ba497cf72..e556ae51f494a88f4b8a5fbd257c2187ccb357e7 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
+++ b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
@@ -14,9 +14,12 @@
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/bgpcep/bgpcep-patch-test.yaml b/jjb/bgpcep/bgpcep-patch-test.yaml
index 15d1e0cc263d49d564639c6f098ff3837307f961..704397a30a9e888051eb268850078fafdd06db82 100644 (file)
--- a/jjb/bgpcep/bgpcep-patch-test.yaml
+++ b/jjb/bgpcep/bgpcep-patch-test.yaml
@@ -9,9 +9,12 @@
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           java-version: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          java-version: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml
index a13b03118e9e33e7f6051c7bd101049b5e3746dc..23d8e956ee56400ffec687216b599a7afed94fcc 100644 (file)
--- a/jjb/bgpcep/bgpcep.yaml
+++ b/jjb/bgpcep/bgpcep.yaml
@@ -1,4 +1,36 @@
 ---
+- project:
+    name: bgpcep-aluminium
+    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-jdk11
+      - odl-maven-verify-jobs
+
+    stream: aluminium
+    project: 'bgpcep'
+    project-name: 'bgpcep'
+    build-node: centos7-builder-8c-8g
+    build-timeout: 120
+    branch: 'master'
+    java-version: 'openjdk11'
+    mvn-settings: 'bgpcep-settings'
+    mvn-opts: '-Xmx2048m'
+    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-magnesium
     jobs:
@@ -17,7 +49,7 @@
     project-name: 'bgpcep'
     build-node: centos7-builder-8c-8g
     build-timeout: 120
-    branch: 'master'
+    branch: 'stable/magnesium'
     java-version: 'openjdk11'
     mvn-settings: 'bgpcep-settings'
     mvn-opts: '-Xmx2048m'

diff --git a/jjb/bier/bier-csit-basic.yaml b/jjb/bier/bier-csit-basic.yaml
index 00d53d026d0f3e29e772d15eddb5c937ef569de8..f705a3f18c908a94afd5e4c815379b7381d8e04f 100644 (file)
--- a/jjb/bier/bier-csit-basic.yaml
+++ b/jjb/bier/bier-csit-basic.yaml
@@ -14,9 +14,12 @@
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/bier/bier.yaml b/jjb/bier/bier.yaml
index b9bbc1d08b93878413ea91cd68f02a9c4de01979..0d7c677fe3673cd96622e1dbbb5c59b454afec1c 100644 (file)
--- a/jjb/bier/bier.yaml
+++ b/jjb/bier/bier.yaml
@@ -1,12 +1,12 @@
 ---
 - project:
-    name: bier-magnesium
+    name: bier-aluminium
     jobs:
       - gerrit-release-merge
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: magnesium
+    stream: aluminium
     project: 'bier'
     project-name: 'bier'
     branch: 'master'
@@ -21,6 +21,27 @@
     # Used by the release job
     staging-profile-id: 942a8075b1f2a
 
+- project:
+    name: bier-magnesium
+    jobs:
+      - odl-maven-jobs
+      - odl-maven-verify-jobs
+
+    stream: magnesium
+    project: 'bier'
+    project-name: 'bier'
+    branch: 'stable/magnesium'
+    build-node: centos7-builder-2c-8g
+    build-timeout: 90
+    mvn-settings: 'bier-settings'
+    mvn-opts: '-Xmx1024m'
+    dependencies: ''
+    email-upstream: '[bier]'
+    disable-job: true
+
+    # Used by the release job
+    staging-profile-id: 942a8075b1f2a
+
 - project:
     name: bier-sodium
     jobs:

diff --git a/jjb/coe/coe.yaml b/jjb/coe/coe.yaml
index b321b2bb7ba68492fe4591ebed2a37de8a3c48d5..fe0191b8dcca85a2e0ced0dab96ddb6489ff18fb 100644 (file)
--- a/jjb/coe/coe.yaml
+++ b/jjb/coe/coe.yaml
@@ -1,4 +1,29 @@
 ---
+- project:
+    name: coe-aluminium
+    jobs:
+      - '{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-jdk11
+      - odl-maven-verify-jobs
+
+    project: 'coe'
+    project-name: 'coe'
+    stream: aluminium
+    branch: 'master'
+    java-version: 'openjdk11'
+    mvn-settings: 'coe-settings'
+    mvn-opts: '-Xmx1024m'
+    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-magnesium
     jobs:
@@ -13,7 +38,7 @@
     project: 'coe'
     project-name: 'coe'
     stream: magnesium
-    branch: 'master'
+    branch: 'stable/magnesium'
     java-version: 'openjdk11'
     mvn-settings: 'coe-settings'
     mvn-opts: '-Xmx1024m'

diff --git a/jjb/controller/controller-csit-akka1.yaml b/jjb/controller/controller-csit-akka1.yaml
index c1744ecf1b90052b8ac73dc7c8078ed04268153f..8eb807845536187355b3012c93c47eea2141e377 100644 (file)
--- a/jjb/controller/controller-csit-akka1.yaml
+++ b/jjb/controller/controller-csit-akka1.yaml
@@ -11,9 +11,12 @@
     functionality: 'akka1'
 
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/controller/controller-csit-clustering.yaml b/jjb/controller/controller-csit-clustering.yaml
index 770fc4619bcbf6464d2e3acc60577d0dd624bb21..928a39ef8c66d1de368cabecb5dbbc5bf61e9d27 100644 (file)
--- a/jjb/controller/controller-csit-clustering.yaml
+++ b/jjb/controller/controller-csit-clustering.yaml
@@ -12,9 +12,12 @@
     elasticsearch-attribute: 'disabled'
 
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/controller/controller-csit-cs-chasing-leader.yaml b/jjb/controller/controller-csit-cs-chasing-leader.yaml
index 817c8cec91dfa33be809718f9e30b797246f7eaf..65aa0a6af6390f6792dcf3333f4dd6cbe579f4c7 100644 (file)
--- a/jjb/controller/controller-csit-cs-chasing-leader.yaml
+++ b/jjb/controller/controller-csit-cs-chasing-leader.yaml
@@ -15,9 +15,12 @@
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/controller/controller-csit-cs-partnheal.yaml b/jjb/controller/controller-csit-cs-partnheal.yaml
index 09e74efcc0ca9f1865a46a745cec36a84787b435..90352ea8f7972c58e95da1e75827ef81aac5eec3 100644 (file)
--- a/jjb/controller/controller-csit-cs-partnheal.yaml
+++ b/jjb/controller/controller-csit-cs-partnheal.yaml
@@ -15,9 +15,12 @@
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml b/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml
index a8bc4c5652675b51bf9106eebc2686958ce0a003..0018a8248e0ca52886731f4996ed9b81d3e44202 100644 (file)
--- a/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml
+++ b/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml
@@ -15,9 +15,12 @@
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/controller/controller-csit-dnb-noloss.yaml b/jjb/controller/controller-csit-dnb-noloss.yaml
index e26330c501eea6d652fdc6a89e7016bbd91a6ca0..e8cb03bb8efd7b3e55eb04636184ae5dead1c971 100644 (file)
--- a/jjb/controller/controller-csit-dnb-noloss.yaml
+++ b/jjb/controller/controller-csit-dnb-noloss.yaml
@@ -15,9 +15,12 @@
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/controller/controller-csit-drb-partnheal.yaml b/jjb/controller/controller-csit-drb-partnheal.yaml
index 239f268a35844875e6561ac3b5d647da998c3462..1ae96bd6c4fa67424157dae5c34c69dd596ff4fb 100644 (file)
--- a/jjb/controller/controller-csit-drb-partnheal.yaml
+++ b/jjb/controller/controller-csit-drb-partnheal.yaml
@@ -15,9 +15,12 @@
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/controller/controller-csit-drb-precedence.yaml b/jjb/controller/controller-csit-drb-precedence.yaml
index c26699bd48a5d8b380c1573bdda2080d3efc1fb1..adabb39190a38b71bcda3a53357581a7135b9dfa 100644 (file)
--- a/jjb/controller/controller-csit-drb-precedence.yaml
+++ b/jjb/controller/controller-csit-drb-precedence.yaml
@@ -15,9 +15,12 @@
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml
index 90968375479283666559a49b64c7ad22ccaf6512..06cc97256e4981a4ce26e89e2758bd4956f160ed 100644 (file)
--- a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml
+++ b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/controller/controller-csit-dsbenchmark.yaml b/jjb/controller/controller-csit-dsbenchmark.yaml
index 2437f3aff6c7b0b8c250c1543c109b934632d956..c482bbeb4dbb9fb689a904519d0e0e61238a7b57 100644 (file)
--- a/jjb/controller/controller-csit-dsbenchmark.yaml
+++ b/jjb/controller/controller-csit-dsbenchmark.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/controller/controller-csit-rest-cars-perf.yaml b/jjb/controller/controller-csit-rest-cars-perf.yaml
index 660f6d599d053ee2d240d3c4b3a04774e689ff6e..1c69e68698ef98f53d7d0eb3f4a57734605f0d1c 100644 (file)
--- a/jjb/controller/controller-csit-rest-cars-perf.yaml
+++ b/jjb/controller/controller-csit-rest-cars-perf.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml
index 995f6f9f40a75ca21f68123a4127fb24c3ad9cd3..9f2b57789ce57028164375a60cdf71b71834b07f 100644 (file)
--- a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml
+++ b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml
@@ -14,9 +14,12 @@
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/controller/controller-patch-test.yaml b/jjb/controller/controller-patch-test.yaml
index 898143288a09ec1e11bf297f5c3331787dc52868..d654040050d2553b37739686569a14eab97df110 100644 (file)
--- a/jjb/controller/controller-patch-test.yaml
+++ b/jjb/controller/controller-patch-test.yaml
@@ -7,17 +7,18 @@
     project: 'controller'
 
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
-          os-branch: 'queens'
+          java-version: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
           java-version: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-          os-branch: 'queens'
       - neon:
           branch: 'stable/neon'
-          os-branch: 'queens'
 
+    os-branch: 'queens'
     jdk: 'openjdk8'
 
     feature:

diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml
index 8efe2f4ebde9b5a7c582224a0f926ce5315d5344..8b7e54375fb76d44308d09581cdc16b2ff9e983f 100644 (file)
--- a/jjb/controller/controller.yaml
+++ b/jjb/controller/controller.yaml
@@ -1,4 +1,32 @@
 ---
+- project:
+    name: controller-aluminium
+    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-jdk11
+      - odl-maven-verify-jobs
+
+    stream: aluminium
+    project: 'controller'
+    project-name: 'controller'
+    branch: 'master'
+    java-version: 'openjdk11'
+    mvn-settings: 'controller-settings'
+    mvn-goals: 'clean deploy -Pintegrationtests,docs'
+    mvn-opts: '-Xmx4096m -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-magnesium
     jobs:
@@ -14,7 +42,7 @@
     stream: magnesium
     project: 'controller'
     project-name: 'controller'
-    branch: 'master'
+    branch: 'stable/magnesium'
     java-version: 'openjdk11'
     mvn-settings: 'controller-settings'
     mvn-goals: 'clean deploy -Pintegrationtests,docs'

diff --git a/jjb/daexim/daexim-csit-basic.yaml b/jjb/daexim/daexim-csit-basic.yaml
index e7c7948fe619c0bf0e680fabd30037fa52136d10..d5919816096e6c03ce135ea918b5c023c53659ce 100644 (file)
--- a/jjb/daexim/daexim-csit-basic.yaml
+++ b/jjb/daexim/daexim-csit-basic.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/daexim/daexim-csit-clustering-basic.yaml b/jjb/daexim/daexim-csit-clustering-basic.yaml
index 9ca289f08f20b50fff20a2569c09a5b4287692eb..67d500fdc66294bbc2c70bf5c70c05920f6d5bb9 100644 (file)
--- a/jjb/daexim/daexim-csit-clustering-basic.yaml
+++ b/jjb/daexim/daexim-csit-clustering-basic.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/daexim/daexim.yaml b/jjb/daexim/daexim.yaml
index f63e557dd8280cd7cdab26ae46264a90a52fe1b3..556ac2a7ee9dccf1097f99a7fbcd919ea363cb59 100644 (file)
--- a/jjb/daexim/daexim.yaml
+++ b/jjb/daexim/daexim.yaml
@@ -1,4 +1,29 @@
 ---
+- project:
+    name: daexim-aluminium
+    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-jdk11
+      - odl-maven-verify-jobs
+
+    project: 'daexim'
+    project-name: 'daexim'
+    stream: aluminium
+    branch: 'master'
+    java-version: 'openjdk11'
+    mvn-settings: 'daexim-settings'
+    mvn-opts: '-Xmx1024m'
+    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-magnesium
     jobs:
@@ -14,7 +39,7 @@
     project: 'daexim'
     project-name: 'daexim'
     stream: magnesium
-    branch: 'master'
+    branch: 'stable/magnesium'
     java-version: 'openjdk11'
     mvn-settings: 'daexim-settings'
     mvn-opts: '-Xmx1024m'

diff --git a/jjb/detnet/detnet.yaml b/jjb/detnet/detnet.yaml
index 1e68013b4f456bd42a5503fd598fcd67d379225c..2cade96987dff6751797dc3f957e6d5c074d0bde 100644 (file)
--- a/jjb/detnet/detnet.yaml
+++ b/jjb/detnet/detnet.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: detnet-magnesium
+    name: detnet-aluminium
     jobs:
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
@@ -11,7 +11,7 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: magnesium
+    stream: aluminium
     project: 'detnet'
     project-name: 'detnet'
     branch: 'master'
@@ -25,6 +25,31 @@
     # Used by the release job
     staging-profile-id: 8981976d0fea7
 
+- 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-jdk11
+      - odl-maven-verify-jobs
+
+    stream: magnesium
+    project: 'detnet'
+    project-name: 'detnet'
+    branch: 'stable/magnesium'
+    java-version: 'openjdk11'
+    mvn-settings: 'detnet-settings'
+    mvn-opts: '-Xmx1024m'
+    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-sonar
     jobs:

diff --git a/jjb/dluxapps/dluxapps-csit-yangman.yaml b/jjb/dluxapps/dluxapps-csit-yangman.yaml
index 162d6d93fb1f5252732f71b07667c1286e5a1d45..b6e9295c874e65bb42250ef146be202a7129e518 100644 (file)
--- a/jjb/dluxapps/dluxapps-csit-yangman.yaml
+++ b/jjb/dluxapps/dluxapps-csit-yangman.yaml
@@ -14,9 +14,12 @@
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/dluxapps/dluxapps.yaml b/jjb/dluxapps/dluxapps.yaml
index 485570b5cdd4f5e68eef1269df8369fbd4407834..982601c8123114a67161e6f1032f254ff41f5a2c 100644 (file)
--- a/jjb/dluxapps/dluxapps.yaml
+++ b/jjb/dluxapps/dluxapps.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: dluxapps-magnesium
+    name: dluxapps-aluminium
     jobs:
       - gerrit-release-merge
       - odl-maven-jobs
@@ -8,7 +8,7 @@
 
     project: 'dluxapps'
     project-name: 'dluxapps'
-    stream: magnesium
+    stream: aluminium
     branch: 'master'
     build-node: centos7-builder-2c-8g
     mvn-settings: 'dluxapps-settings'
@@ -20,6 +20,26 @@
     # Used by the release job
     staging-profile-id: 96e6fb1e65bf9
 
+- project:
+    name: dluxapps-magnesium
+    jobs:
+      - odl-maven-jobs
+      - odl-maven-verify-jobs
+
+    project: 'dluxapps'
+    project-name: 'dluxapps'
+    stream: magnesium
+    branch: 'stable/magnesium'
+    build-node: centos7-builder-2c-8g
+    mvn-settings: 'dluxapps-settings'
+    mvn-opts: '-Xmx1024m'
+    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:

diff --git a/jjb/docs/docs-rtd.yaml b/jjb/docs/docs-rtd.yaml
index b61f6b06fec39ab55df61a8ff943d98c81ab8882..91106df7e2238b8533b7d870c686dba11402000a 100644 (file)
--- a/jjb/docs/docs-rtd.yaml
+++ b/jjb/docs/docs-rtd.yaml
@@ -6,8 +6,10 @@
       - gerrit-tox-verify
 
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
+      - magnesium:
+          branch: 'stable/magnesium'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/genius/genius-csit-genius.yaml b/jjb/genius/genius-csit-genius.yaml
index ac90a6e0c7257f665cbe66c3549752fe00c22bdc..84ea8aa68a2fe6f6bf6f29ef63b634aa8743abc1 100644 (file)
--- a/jjb/genius/genius-csit-genius.yaml
+++ b/jjb/genius/genius-csit-genius.yaml
@@ -16,9 +16,12 @@
     testplan: '{project}-{functionality}.txt'
 
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/genius/genius-patch-test.yaml b/jjb/genius/genius-patch-test.yaml
index b1b96a8fbee71a16a39a3d10885d5fb6a94f86b1..a9fb132c6dbea340daceef06b2ac088018ce519a 100644 (file)
--- a/jjb/genius/genius-patch-test.yaml
+++ b/jjb/genius/genius-patch-test.yaml
@@ -7,16 +7,18 @@
     project: 'genius'
 
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
-          os-branch: 'queens'
+          java-version: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
           java-version: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-          os-branch: 'queens'
       - neon:
           branch: 'stable/neon'
-          os-branch: 'queens'
+
+    os-branch: 'queens'
 
     feature:
       - netvirt:

diff --git a/jjb/genius/genius.yaml b/jjb/genius/genius.yaml
index e0c98e504e9aa1baa65ff155777c0ab72a96e3c2..a58e783e411b3a4ae28a310da5b4b6ab49fefdf9 100644 (file)
--- a/jjb/genius/genius.yaml
+++ b/jjb/genius/genius.yaml
@@ -1,4 +1,40 @@
 ---
+- project:
+    name: genius-aluminium
+    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-jdk11
+      - odl-maven-verify-jobs
+
+    csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
+    block_on_csit: false
+
+    stream: aluminium
+    project: 'genius'
+    project-name: 'genius'
+    branch: 'master'
+    build-node: centos7-builder-2c-8g
+    java-version: 'openjdk11'
+    mvn-settings: 'genius-settings'
+    mvn-opts: '-Xmx1024m'
+    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-magnesium
     jobs:
@@ -18,7 +54,7 @@
     stream: magnesium
     project: 'genius'
     project-name: 'genius'
-    branch: 'master'
+    branch: 'stable/magnesium'
     build-node: centos7-builder-2c-8g
     java-version: 'openjdk11'
     mvn-settings: 'genius-settings'

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
index b232113d634e46add318d7c1e48639bb88f20b26..05d84a60555ce094c224d1d055ad10c77096fbbf 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
@@ -20,9 +20,12 @@
     functionality: 'openstack'
 
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
index fbd23e6ada465e053ac4902a4b9a05952e3a790c..c52fa0a45b2d83edebfe8ffd4364d8afb74e9966 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
@@ -13,9 +13,12 @@
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
index e32e60d69199e2c0f230fdfcabe5930e372cb462..5e6f5a28e47319ce2dd140d0a9a53bdd9ebb0d91 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
@@ -14,9 +14,12 @@
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml
index 78462910d7431321f9254f70769e5392eacd2e5b..d65c801dcf52da4464505078db4fb300104e8939 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml
@@ -14,9 +14,12 @@
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml
index af0df03a35d8ba88cd66281c0e99d54d4db07ca2..3e78d054726afb4251f0d3cde1c356fcb817da3f 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.yaml b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
index dcec8895c6499a32dfc2c0f6c2b97c9c4b241e3e..eb3cb602b9dd6039b70a1bee1f40a52b39e991b9 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
@@ -1,12 +1,12 @@
 ---
 - project:
-    name: groupbasedpolicy-magnesium
+    name: groupbasedpolicy-aluminium
     jobs:
       - gerrit-release-merge
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: magnesium
+    stream: aluminium
     project: 'groupbasedpolicy'
     project-name: 'groupbasedpolicy'
     branch: 'master'
@@ -27,6 +27,33 @@
     # Used by the release job
     staging-profile-id: 96fbb93f95a76
 
+- project:
+    name: groupbasedpolicy-magnesium
+    jobs:
+      - odl-maven-jobs
+      - odl-maven-verify-jobs
+
+    stream: magnesium
+    project: 'groupbasedpolicy'
+    project-name: 'groupbasedpolicy'
+    branch: 'stable/magnesium'
+    build-node: centos7-builder-2c-8g
+    mvn-settings: 'groupbasedpolicy-settings'
+    mvn-goals: '-U clean deploy findbugs:findbugs'
+    mvn-opts: '-Xmx1024m'
+    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:

diff --git a/jjb/honeycomb/vbd/vbd.yaml b/jjb/honeycomb/vbd/vbd.yaml
index b6956c8215dba7662565386191a96e600e0030fa..68704e4835a6f8b6fedd8a03b3ca879f0f8e1137 100644 (file)
--- a/jjb/honeycomb/vbd/vbd.yaml
+++ b/jjb/honeycomb/vbd/vbd.yaml
@@ -1,12 +1,12 @@
 ---
 - project:
-    name: vbd-magnesium
+    name: vbd-aluminium
     jobs:
       - gerrit-release-merge
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: magnesium
+    stream: aluminium
     project: 'honeycomb/vbd'
     project-name: 'vbd'
     branch: 'master'
@@ -18,6 +18,24 @@
     # Used by the release job
     staging-profile-id: 96fc362c36862
 
+- project:
+    name: vbd-magnesium
+    jobs:
+      - odl-maven-jobs
+      - odl-maven-verify-jobs
+
+    stream: magnesium
+    project: 'honeycomb/vbd'
+    project-name: 'vbd'
+    branch: 'stable/magnesium'
+    mvn-settings: 'honeycomb-vbd-settings'
+    mvn-opts: '-Xmx1024m'
+    dependencies: ''
+    email-upstream: '[vbd]'
+
+    # Used by the release job
+    staging-profile-id: 96fc362c36862
+
 - project:
     name: vbd-sodium
     jobs:

diff --git a/jjb/infrautils/infrautils-patch-test.yaml b/jjb/infrautils/infrautils-patch-test.yaml
index fe18e0c0175c38fd1a7e0fcbd8226c5c1e8fb896..ad61a69ae428cb56710f4a343c67efb1d7088374 100644 (file)
--- a/jjb/infrautils/infrautils-patch-test.yaml
+++ b/jjb/infrautils/infrautils-patch-test.yaml
@@ -7,17 +7,18 @@
     project: 'infrautils'
 
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
-          os-branch: 'queens'
+          jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-          os-branch: 'queens'
       - neon:
           branch: 'stable/neon'
-          os-branch: 'queens'
 
+    os-branch: 'queens'
     jdk: 'openjdk8'
 
     feature:

diff --git a/jjb/infrautils/infrautils.yaml b/jjb/infrautils/infrautils.yaml
index 18ec7c823f4ab413c6aa6082880c27313bccc30a..0e5f0119f8ba0c9ae773f1d2ad3df82486b05476 100644 (file)
--- a/jjb/infrautils/infrautils.yaml
+++ b/jjb/infrautils/infrautils.yaml
@@ -1,4 +1,31 @@
 ---
+- project:
+    name: infrautils-aluminium
+    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-jdk11
+      - odl-maven-verify-jobs
+
+    stream: aluminium
+    project: 'infrautils'
+    project-name: 'infrautils'
+    branch: 'master'
+    java-version: 'openjdk11'
+    mvn-settings: 'infrautils-settings'
+    mvn-opts: '-Xmx1024m'
+    dependencies: 'odlparent-merge-{stream}'
+    email-upstream: '[infrautils] [odlparent]'
+
+    # Used by the release job
+    staging-profile-id: 96fca0367756c
+
 - project:
     name: infrautils-magnesium
     jobs:
@@ -16,7 +43,7 @@
     stream: magnesium
     project: 'infrautils'
     project-name: 'infrautils'
-    branch: 'master'
+    branch: 'stable/magnesium'
     java-version: 'openjdk11'
     mvn-settings: 'infrautils-settings'
     mvn-opts: '-Xmx1024m'

diff --git a/jjb/integration/csit-jobs-aluminium.lst b/jjb/integration/csit-jobs-aluminium.lst
new file mode 100644 (file)
index 0000000..b5b03b5
--- /dev/null
+++ b/jjb/integration/csit-jobs-aluminium.lst
@@ -0,0 +1,77 @@
+aaa-csit-1node-authn-all-sodium,
+bgpcep-csit-1node-bgp-ingest-all-sodium,
+bgpcep-csit-1node-bgp-ingest-mixed-all-sodium,
+bgpcep-csit-1node-throughpcep-all-sodium,
+bgpcep-csit-1node-userfeatures-all-sodium,
+bgpcep-csit-3node-bgpclustering-all-sodium,
+bgpcep-csit-3node-bgpclustering-ha-only-sodium,
+controller-csit-1node-akka1-all-sodium,
+controller-csit-1node-benchmark-all-sodium,
+controller-csit-1node-rest-cars-perf-all-sodium,
+controller-csit-3node-benchmark-all-sodium,
+controller-csit-3node-clustering-ask-all-sodium,
+controller-csit-3node-clustering-tell-all-sodium,
+controller-csit-3node-rest-clust-cars-perf-ask-only-sodium,
+controller-csit-3node-rest-clust-cars-perf-tell-only-sodium,
+daexim-csit-1node-basic-only-sodium,
+daexim-csit-3node-clustering-basic-only-sodium,
+distribution-csit-1node-userfeatures-all-sodium,
+distribution-csit-managed-sodium,
+genius-csit-1node-upstream-only-sodium,
+genius-csit-3node-upstream-only-sodium,
+lispflowmapping-csit-1node-msmr-all-sodium,
+lispflowmapping-csit-1node-performance-only-sodium,
+lispflowmapping-csit-3node-msmr-all-sodium,
+mdsal-csit-1node-bindingv1-only-sodium,
+netconf-csit-1node-callhome-only-sodium,
+netconf-csit-1node-scale-max-devices-only-sodium,
+netconf-csit-1node-scale-only-sodium,
+netconf-csit-1node-userfeatures-all-sodium,
+netconf-csit-3node-clustering-only-sodium,
+netconf-csit-3node-clustering-scale-only-sodium,
+netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-upstream-snat-conntrack-sodium,
+netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-dcgw-sodium,
+netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upgrade-snat-conntrack-sodium,
+netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upgrade-sodium,
+netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-itm-direct-tunnels-sodium,
+netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-snat-conntrack-sodium,
+netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-sodium,
+netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-dcgw-sodium,
+netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-itm-direct-tunnels-sodium,
+netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-snat-conntrack-sodium,
+netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-sodium,
+netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-snat-conntrack-sodium,
+netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-sodium,
+netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-rocky-upstream-stateful-itm-direct-tunnels-sodium,
+netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-rocky-upstream-stateful-snat-conntrack-sodium,
+netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-rocky-upstream-stateful-sodium,
+netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-stein-upstream-stateful-itm-direct-tunnels-sodium,
+netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-stein-upstream-stateful-snat-conntrack-sodium,
+netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-stein-upstream-stateful-sodium,
+netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-queens-dcgw-sodium,
+netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-itm-direct-tunnels-sodium,
+netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-snat-conntrack-sodium,
+netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-sodium,
+netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-rocky-dcgw-sodium,
+netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-itm-direct-tunnels-sodium,
+netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-snat-conntrack-sodium,
+netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-sodium,
+netvirt-csit-hwvtep-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-sodium,
+netvirt-csit-hwvtep-3node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-sodium,
+odltools-csit-1node-upstream-all-sodium,
+openflowplugin-csit-1node-bundle-based-reconciliation-all-sodium,
+openflowplugin-csit-1node-cbench-only-sodium,
+openflowplugin-csit-1node-flow-services-all-sodium,
+openflowplugin-csit-1node-perf-bulkomatic-only-sodium,
+openflowplugin-csit-1node-perf-stats-collection-only-sodium,
+openflowplugin-csit-1node-scale-link-only-sodium,
+openflowplugin-csit-1node-scale-only-sodium,
+openflowplugin-csit-1node-scale-switch-only-sodium,
+openflowplugin-csit-3node-clustering-bulkomatic-only-sodium,
+openflowplugin-csit-3node-clustering-only-sodium,
+openflowplugin-csit-3node-clustering-perf-bulkomatic-only-sodium,
+ovsdb-csit-1node-upstream-southbound-all-sodium,
+ovsdb-csit-3node-upstream-clustering-only-sodium,
+sfc-csit-3node-docker-full-deploy-all-sodium,
+sfc-csit-3node-rest-basic-all-sodium,
+yangtools-csit-1node-system-only-sodium,

diff --git a/jjb/integration/distribution/distribution-csit-userfeatures.yaml b/jjb/integration/distribution/distribution-csit-userfeatures.yaml
index 440077193640fb611efd183c38c53335f31d444d..35c33656abc21ebfa566db6811e558adfec42271 100644 (file)
--- a/jjb/integration/distribution/distribution-csit-userfeatures.yaml
+++ b/jjb/integration/distribution/distribution-csit-userfeatures.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml
index e6d5806a4d915966f2ccf508d0f022355353b0e6..93b2925fe7a4bbda855e3ad70de6f399f093bbd7 100644 (file)
--- a/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@ -21,9 +21,12 @@
     nexus-iq-stage: release
     email-upstream: '[int/dist]'
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
-          java-version: 'openjdk11'
+          jre: 'openjdk11'
+          karaf-version: odl
+      - magnesium:
+          branch: 'stable/magnesium'
           jre: 'openjdk11'
           karaf-version: odl
       - sodium:

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index 78ae351289a6f40f9a9a687f74ab5bd63f97b50e..eb179df976200ba735fafeab465550d65ed8d05a 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -18,10 +18,20 @@
 
     # CSIT Lists in defaults.yaml
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           mvn-version: 'mvn35'
           java-version: 'openjdk11'
+          csit-list: !include: csit-jobs-aluminium.lst
+          build-order: >
+              odlparent yangtools mdsal infrautils controller serviceutils aaa netconf
+              daexim jsonrpc ovsdb neutron openflowplugin genius lispflowmapping netvirt
+              bgpcep integration/distribution
+
+      - magnesium:
+          branch: 'stable/magnesium'
+          mvn-version: 'mvn35'
+          java-version: 'openjdk11'
           csit-list: !include: csit-jobs-magnesium.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 f8ef58d36381f821a77e1741e87088ea2988a8ed..8ee71ddeebd55195d29cc4c8be0f30323ff1b85f 100644 (file)
--- a/jjb/jsonrpc/jsonrpc-csit-basic.yaml
+++ b/jjb/jsonrpc/jsonrpc-csit-basic.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/jsonrpc/jsonrpc.yaml b/jjb/jsonrpc/jsonrpc.yaml
index d9ac0887c9e1c2eaaf38922812c891152be53851..7e12df9693c4aec39ce1b10dc2bec3dee65977e6 100644 (file)
--- a/jjb/jsonrpc/jsonrpc.yaml
+++ b/jjb/jsonrpc/jsonrpc.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: jsonrpc-magnesium
+    name: jsonrpc-aluminium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-rtd-jobs':
@@ -14,7 +14,7 @@
 
     project: 'jsonrpc'
     project-name: 'jsonrpc'
-    stream: magnesium
+    stream: aluminium
     java-version: 'openjdk11'
     branch: 'master'
     mvn-settings: 'jsonrpc-settings'
@@ -25,6 +25,31 @@
     # Used by the release job
     staging-profile-id: 96fdf4408765d
 
+- project:
+    name: jsonrpc-magnesium
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - '{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-jdk11
+      - odl-maven-verify-jobs
+
+    project: 'jsonrpc'
+    project-name: 'jsonrpc'
+    stream: magnesium
+    java-version: 'openjdk11'
+    branch: 'stable/magnesium'
+    mvn-settings: 'jsonrpc-settings'
+    mvn-opts: '-Xmx1024m'
+    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:

diff --git a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
index c98b2e4ecf5e5b12570af64ccc813e8e612f04dc..db2687d8ea0bf94d1e26591421fc1182c5b08612 100644 (file)
--- a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
+++ b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
@@ -13,9 +13,12 @@
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/l2switch/l2switch-csit-scalability.yaml b/jjb/l2switch/l2switch-csit-scalability.yaml
index 6263547c9d5f116f5fa31d7a5dde1016e0f9bbea..c83124089d5c9ae509e5e6cd77b6eb88c651844c 100644 (file)
--- a/jjb/l2switch/l2switch-csit-scalability.yaml
+++ b/jjb/l2switch/l2switch-csit-scalability.yaml
@@ -13,9 +13,12 @@
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/l2switch/l2switch-csit-switch.yaml b/jjb/l2switch/l2switch-csit-switch.yaml
index c80044e17a20af08fd56603b1a515ddf28db5430..a4bf5a4dd03e7ee0459b491aecc3fec569f4cefc 100644 (file)
--- a/jjb/l2switch/l2switch-csit-switch.yaml
+++ b/jjb/l2switch/l2switch-csit-switch.yaml
@@ -14,9 +14,12 @@
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/l2switch/l2switch-patch-test.yaml b/jjb/l2switch/l2switch-patch-test.yaml
index a2d0fa8fb90bcae9b0af0376a28022a000697816..9b161f4aed07913c90466aa7dcf74dded61c4baa 100644 (file)
--- a/jjb/l2switch/l2switch-patch-test.yaml
+++ b/jjb/l2switch/l2switch-patch-test.yaml
@@ -10,16 +10,19 @@
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
-          os-branch: 'queens'
-          java-version: 'openjdk11'
+          jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-          os-branch: 'queens'
       - neon:
           branch: 'stable/neon'
 
+    os-branch: 'queens'
+
     feature:
       - all:
           csit-list: >

diff --git a/jjb/l2switch/l2switch.yaml b/jjb/l2switch/l2switch.yaml
index 1253ed55267ef70ea8fef7c168df4570d5048210..20dcd26ffa63a515668e01a31315a344fef142e4 100644 (file)
--- a/jjb/l2switch/l2switch.yaml
+++ b/jjb/l2switch/l2switch.yaml
@@ -1,12 +1,12 @@
 ---
 - project:
-    name: l2switch-magnesium
+    name: l2switch-aluminium
     jobs:
       - gerrit-release-merge
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: magnesium
+    stream: aluminium
     project: 'l2switch'
     project-name: 'l2switch'
     branch: 'master'
@@ -24,6 +24,30 @@
     # Used by the release job
     staging-profile-id: 96fee85953ca0
 
+- project:
+    name: l2switch-magnesium
+    jobs:
+      - odl-maven-jobs
+      - odl-maven-verify-jobs
+
+    stream: magnesium
+    project: 'l2switch'
+    project-name: 'l2switch'
+    branch: 'stable/magnesium'
+    mvn-settings: 'l2switch-settings'
+    mvn-opts: '-Xmx1024m -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:

diff --git a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
index a73f0402ae08f7dc8474e48d724e0480ceacbc1d..b2e8a24b6ce58e54ebd16433437b0e37ac71436f 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
+++ b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
@@ -14,9 +14,12 @@
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml b/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml
index a5f30b4760fd1c64d43228079bd731cbc6a6d934..5d8336bf0fe2d63d674f7cf66517572f3f5156dc 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml
+++ b/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml
index 0b99c46c51cded90957ed0c4c81d7810153650db..acab71681dc177133fdd3c8fecc857f164556f88 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping.yaml
+++ b/jjb/lispflowmapping/lispflowmapping.yaml
@@ -1,4 +1,36 @@
 ---
+- project:
+    name: lispflowmapping-aluminium
+    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-jdk11
+      - odl-maven-verify-jobs
+
+    stream: aluminium
+    project: 'lispflowmapping'
+    project-name: 'lispflowmapping'
+    branch: 'master'
+    java-version: 'openjdk11'
+    mvn-settings: 'lispflowmapping-settings'
+    mvn-goals: 'clean deploy -DrepoBuild'
+    mvn-opts: '-Xmx2048m -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-magnesium
     jobs:
@@ -15,7 +47,7 @@
     stream: magnesium
     project: 'lispflowmapping'
     project-name: 'lispflowmapping'
-    branch: 'master'
+    branch: 'stable/magnesium'
     java-version: 'openjdk11'
     mvn-settings: 'lispflowmapping-settings'
     mvn-goals: 'clean deploy -DrepoBuild'

diff --git a/jjb/mdsal/mdsal-csit-bindingv1.yaml b/jjb/mdsal/mdsal-csit-bindingv1.yaml
index 44da788e2c1fe5ed804cbca8f4c3de0dbd2dde3b..deb5c3deedf8dafd019c5030e79e7bd19ee995af 100644 (file)
--- a/jjb/mdsal/mdsal-csit-bindingv1.yaml
+++ b/jjb/mdsal/mdsal-csit-bindingv1.yaml
@@ -12,9 +12,12 @@
     functionality: 'bindingv1'
 
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/mdsal/mdsal-patch-test.yaml b/jjb/mdsal/mdsal-patch-test.yaml
index 87a3cbd2bc24cd6d0ca9fd4cc6946e4d11d013d3..dc1aa8f29d882519126f45ab041bb7fe3a538fd3 100644 (file)
--- a/jjb/mdsal/mdsal-patch-test.yaml
+++ b/jjb/mdsal/mdsal-patch-test.yaml
@@ -7,16 +7,18 @@
     project: 'mdsal'
 
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
-          os-branch: 'queens'
+          java-version: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
           java-version: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-          os-branch: 'queens'
       - neon:
           branch: 'stable/neon'
-          os-branch: 'queens'
+
+    os-branch: 'queens'
 
     jdk: 'openjdk8'
 

diff --git a/jjb/nemo/nemo-csit-engine.yaml b/jjb/nemo/nemo-csit-engine.yaml
index b6c6f3b58ba74f2140af77e80f9681ede5d0eba1..d74980f50cb6badaf3f9523f31f6a9ac63e783ab 100644 (file)
--- a/jjb/nemo/nemo-csit-engine.yaml
+++ b/jjb/nemo/nemo-csit-engine.yaml
@@ -14,9 +14,12 @@
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/nemo/nemo.yaml b/jjb/nemo/nemo.yaml
index 7489622dd5e6476638c85eaeb3d9ea1e7df3957a..735706fd7b8dc2b27f0fe07aa9ed5c6865ded6c6 100644 (file)
--- a/jjb/nemo/nemo.yaml
+++ b/jjb/nemo/nemo.yaml
@@ -1,12 +1,12 @@
 ---
 - project:
-    name: nemo-magnesium
+    name: nemo-aluminium
     jobs:
       - odl-maven-jobs
       - odl-maven-verify-jobs
       - gerrit-release-merge
 
-    stream: magnesium
+    stream: aluminium
     project: 'nemo'
     project-name: 'nemo'
     branch: 'master'
@@ -19,6 +19,25 @@
     # Used by the release job
     staging-profile-id: a67a9890f6202
 
+- project:
+    name: nemo-magnesium
+    jobs:
+      - odl-maven-jobs
+      - odl-maven-verify-jobs
+
+    stream: magnesium
+    project: 'nemo'
+    project-name: 'nemo'
+    branch: 'stable/magnesium'
+    mvn-settings: 'nemo-settings'
+    mvn-opts: '-Xmx1024m'
+    dependencies: ''
+    email-upstream: '[nemo]'
+    disable-job: true
+
+    # Used by the release job
+    staging-profile-id: a67a9890f6202
+
 - project:
     name: nemo-sodium
     jobs:

diff --git a/jjb/netconf/netconf-clustering-scale.yaml b/jjb/netconf/netconf-clustering-scale.yaml
index 64c987eb91b06e95caa9534acb29c247a33cfdc5..fa1e35b84db296f8fac96676cdde9162e02862ce 100644 (file)
--- a/jjb/netconf/netconf-clustering-scale.yaml
+++ b/jjb/netconf/netconf-clustering-scale.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/netconf/netconf-clustering.yaml b/jjb/netconf/netconf-clustering.yaml
index 37bfcca3cf832dc04b88f3c87c3de68da1eb3276..7879f357953cde2e6c151b85bb4f187e4ec49a08 100644 (file)
--- a/jjb/netconf/netconf-clustering.yaml
+++ b/jjb/netconf/netconf-clustering.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/netconf/netconf-csit-callhome.yaml b/jjb/netconf/netconf-csit-callhome.yaml
index 1e307e011318d31d0c532170e8ed721d11a09a5f..fea79f43c97f4b23f17bb40cf041fefee2e4cdb1 100644 (file)
--- a/jjb/netconf/netconf-csit-callhome.yaml
+++ b/jjb/netconf/netconf-csit-callhome.yaml
@@ -14,9 +14,12 @@
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/netconf/netconf-patch-test.yaml b/jjb/netconf/netconf-patch-test.yaml
index 92b181aa7e2c50a55022850d63d93a791f214af9..dc7215445e8db79e861f822ce512a257b3595c91 100644 (file)
--- a/jjb/netconf/netconf-patch-test.yaml
+++ b/jjb/netconf/netconf-patch-test.yaml
@@ -7,16 +7,18 @@
     project: 'netconf'
 
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
-          os-branch: 'queens'
+          java-version: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
           java-version: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-          os-branch: 'queens'
       - neon:
           branch: 'stable/neon'
-          os-branch: 'queens'
+
+    os-branch: 'queens'
 
     feature:
       - core:

diff --git a/jjb/netconf/netconf-scale.yaml b/jjb/netconf/netconf-scale.yaml
index 44118a8a9e981fc792c8bde2e4a46ef369e3359c..5335547db813a5afcc81e5705358c0bbae3fd9e3 100644 (file)
--- a/jjb/netconf/netconf-scale.yaml
+++ b/jjb/netconf/netconf-scale.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/netconf/netconf-userfeatures.yaml b/jjb/netconf/netconf-userfeatures.yaml
index 01ad34ef7e6a57b5bc61678cbd08c32e6459704c..d27ef73d37ec624c21b764f2c105d097dc554a48 100644 (file)
--- a/jjb/netconf/netconf-userfeatures.yaml
+++ b/jjb/netconf/netconf-userfeatures.yaml
@@ -14,9 +14,12 @@
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml
index 8a308cb73e6adf04e19db90b7c2250b7d658df12..d983fb0f9860dc7e4d9d91d2a959e9c33ecd0f12 100644 (file)
--- a/jjb/netconf/netconf.yaml
+++ b/jjb/netconf/netconf.yaml
@@ -1,4 +1,32 @@
 ---
+- project:
+    name: netconf-aluminium
+    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-jdk11
+      - odl-maven-verify-jobs
+
+    stream: aluminium
+    project: 'netconf'
+    project-name: 'netconf'
+    branch: 'master'
+    build-node: centos7-builder-2c-8g
+    java-version: 'openjdk11'
+    mvn-settings: 'netconf-settings'
+    mvn-goals: 'clean deploy -Pintegrationtests'
+    mvn-opts: '-Xmx2048m -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-magnesium
     jobs:
@@ -14,7 +42,7 @@
     stream: magnesium
     project: 'netconf'
     project-name: 'netconf'
-    branch: 'master'
+    branch: 'stable/magnesium'
     build-node: centos7-builder-2c-8g
     java-version: 'openjdk11'
     mvn-settings: 'netconf-settings'

diff --git a/jjb/netvirt/netvirt-csit-multi-apex.yaml b/jjb/netvirt/netvirt-csit-multi-apex.yaml
index 3b23bbf1aea954537a717ca7b89c3d3c3d7c6f52..5bc86374dbca5eb8f6f3603e1aec08e53f1677b4 100644 (file)
--- a/jjb/netvirt/netvirt-csit-multi-apex.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-apex.yaml
@@ -8,9 +8,12 @@
 
     project: 'netvirt'
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml b/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml
index 1d169c4b0ab4f6df41ade505f2bdb4f62b2f49ff..4d829e8c30441fce2a4887634e5e6c54726d20b9 100644 (file)
--- a/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml
@@ -7,9 +7,12 @@
     project: 'netvirt'
 
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/netvirt/netvirt-patch-test.yaml b/jjb/netvirt/netvirt-patch-test.yaml
index e141afbc2c1a344d53f28104e239a8b9ed86db0f..017474df31c34cc5d5c96385f881de80c0033d93 100644 (file)
--- a/jjb/netvirt/netvirt-patch-test.yaml
+++ b/jjb/netvirt/netvirt-patch-test.yaml
@@ -7,16 +7,18 @@
     project: 'netvirt'
 
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
-          os-branch: 'queens'
-          java-version: 'openjdk11'
+          jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-          os-branch: 'queens'
       - neon:
           branch: 'stable/neon'
-          os-branch: 'queens'
+
+    os-branch: 'queens'
 
     jdk: 'openjdk8'
 

diff --git a/jjb/netvirt/netvirt.yaml b/jjb/netvirt/netvirt.yaml
index 375e2c5654118f5824aef4e4149733ab8b77946f..b0afc46ea8bff48baebb244d4a107fb0989eba7d 100644 (file)
--- a/jjb/netvirt/netvirt.yaml
+++ b/jjb/netvirt/netvirt.yaml
@@ -1,4 +1,44 @@
 ---
+- project:
+    name: netvirt-aluminium
+    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: netvirt
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-netvirt/32929/
+          rtd-token: 7b6a1dcfc729957ace511e016274e253e07a8d6c
+      - gerrit-tox-verify
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
+
+    csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
+    block_on_csit: false
+
+    stream: aluminium
+    branch: 'master'
+
+    project: 'netvirt'
+    project-name: 'netvirt'
+
+    java-version: 'openjdk11'
+    mvn-settings: 'netvirt-settings'
+    mvn-opts: '-Xmx2048m'
+    build-timeout: 90
+    build-node: centos7-builder-8c-8g
+    dependencies: >
+        genius-merge-{stream},
+        neutron-merge-{stream},
+        openflowjava-merge-{stream},
+        openflowplugin-merge-{stream},
+        ovsdb-merge-{stream}
+    email-upstream: '[genius] [netvirt] [neutron] [openflowjava] [openflowplugin] [ovsdb]'
+
+    # Used by the release job
+    staging-profile-id: a67da0ffbb1ba
+
 - project:
     name: netvirt-magnesium
     jobs:
@@ -18,7 +58,7 @@
     block_on_csit: false
 
     stream: magnesium
-    branch: 'master'
+    branch: 'stable/magnesium'
 
     project: 'netvirt'
     project-name: 'netvirt'

diff --git a/jjb/neutron/neutron-patch-test.yaml b/jjb/neutron/neutron-patch-test.yaml
index e6837b0113500446228ba46caf0be249d2cf3eac..2c79fccf2cd4c592382842ae052d1326634d7ada 100644 (file)
--- a/jjb/neutron/neutron-patch-test.yaml
+++ b/jjb/neutron/neutron-patch-test.yaml
@@ -7,15 +7,16 @@
     project: 'neutron'
 
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
-          os-branch: 'queens'
+      - magnesium:
+          branch: 'stable/magnesium'
       - sodium:
           branch: 'stable/sodium'
-          os-branch: 'queens'
       - neon:
           branch: 'stable/neon'
-          os-branch: 'queens'
+
+    os-branch: 'queens'
 
     jdk: 'openjdk8'
 

diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml
index 6ece2ce8b88ab5e685bcfa32e3b5232e99e17006..4ac441c60778e216b6ab1699ccbdfe522c1329a6 100644 (file)
--- a/jjb/neutron/neutron.yaml
+++ b/jjb/neutron/neutron.yaml
@@ -1,4 +1,26 @@
 ---
+- project:
+    name: neutron-aluminium
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
+
+    stream: aluminium
+    project: 'neutron'
+    project-name: 'neutron'
+    build-timeout: 90
+    branch: 'master'
+    java-version: 'openjdk11'
+    mvn-settings: 'neutron-settings'
+    mvn-opts: '-Xmx1024m'
+    dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}'
+    email-upstream: '[neutron] [odlparent] [aaa]'
+
+    # Used by the release job
+    staging-profile-id: a67e1b40d7419
+
 - project:
     name: neutron-magnesium
     jobs:
@@ -11,7 +33,7 @@
     project: 'neutron'
     project-name: 'neutron'
     build-timeout: 90
-    branch: 'master'
+    branch: 'stable/magnesium'
     java-version: 'openjdk11'
     mvn-settings: 'neutron-settings'
     mvn-opts: '-Xmx1024m'

diff --git a/jjb/odlparent/odlparent-patch-test.yaml b/jjb/odlparent/odlparent-patch-test.yaml
index 2dbb20fbd6e55347da0cc6ada4fcb2826a0fa151..f03912f5d8bf6dc7c7012c13345713d4eaf94cbc 100644 (file)
--- a/jjb/odlparent/odlparent-patch-test.yaml
+++ b/jjb/odlparent/odlparent-patch-test.yaml
@@ -7,15 +7,16 @@
     project: 'odlparent'
 
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
-          os-branch: 'queens'
+      - magnesium:
+          branch: 'stable/magnesium'
       - sodium:
           branch: 'stable/sodium'
-          os-branch: 'queens'
       - neon:
           branch: 'stable/neon'
-          os-branch: 'queens'
+
+    os-branch: 'queens'
 
     jdk: 'openjdk8'
 

diff --git a/jjb/odltools/odltools-csit.yaml b/jjb/odltools/odltools-csit.yaml
index 0ccc84561db0e8f37e864966d6564d08e1ebb4e4..c666759232498f6b4454b4887764ec4f76b65068 100644 (file)
--- a/jjb/odltools/odltools-csit.yaml
+++ b/jjb/odltools/odltools-csit.yaml
@@ -10,9 +10,12 @@
     testplan: '{project}-basic.txt'
 
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/odltools/odltools-patch-test.yaml b/jjb/odltools/odltools-patch-test.yaml
index f3d77f3172b24ec5fa14542180e8f32b566ffcea..67f5768d532afe8704b22b3e1d5251d12faceded 100644 (file)
--- a/jjb/odltools/odltools-patch-test.yaml
+++ b/jjb/odltools/odltools-patch-test.yaml
@@ -8,8 +8,10 @@
     jdk: openjdk8
 
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
+      - magnesium:
+          branch: 'stable/magnesium'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/odltools/odltools.yaml b/jjb/odltools/odltools.yaml
index 4e2743d3447fbff7b2bcf0fbf19da8f854bcec90..f3d7cc3b55e632fe1339eabc88aa8b4e255ef305 100644 (file)
--- a/jjb/odltools/odltools.yaml
+++ b/jjb/odltools/odltools.yaml
@@ -12,8 +12,10 @@
           rtd-token: 225d4ef64e1efce4fe3ba4c9c4fe772355d3c8b2
 
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
+      - magnesium:
+          branch: 'stable/magnesium'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/of-config/of-config.yaml b/jjb/of-config/of-config.yaml
index 1800cf6de51dc8e8d531b24dd68edd017f5c9c31..2654fe70be9d1cab4d0f7940fa47d4be92328e93 100644 (file)
--- a/jjb/of-config/of-config.yaml
+++ b/jjb/of-config/of-config.yaml
@@ -1,12 +1,12 @@
 ---
 - project:
-    name: of-config-magnesium
+    name: of-config-aluminium
     jobs:
       - gerrit-release-merge
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: magnesium
+    stream: aluminium
     project: 'of-config'
     project-name: 'of-config'
     branch: 'master'
@@ -19,6 +19,25 @@
     # Used by the release job
     staging-profile-id: a6880455efe67
 
+- project:
+    name: of-config-magnesium
+    jobs:
+      - odl-maven-jobs
+      - odl-maven-verify-jobs
+
+    stream: magnesium
+    project: 'of-config'
+    project-name: 'of-config'
+    branch: 'stable/magnesium'
+    mvn-settings: 'of-config-settings'
+    mvn-opts: '-Xmx1024m'
+    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:

diff --git a/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml b/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml
index 4dbaa9ce21f7fd64ff9fa76e32bae470b4f93832..055b1c22d64857e13cf889788ea0d4086e85174c 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml
@@ -10,9 +10,12 @@
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml
index 31f189ce2b9676a3a3af8d8ec4cb89f6b3088246..ab79f3271f1e2ada8f41e66c9dcdc3a606c251e9 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml
index 6e4981092feb08281555ac785fc7f425316045c4..d7937aa346ad42b356011a0174f27612d86b9f9e 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml
@@ -14,9 +14,12 @@
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml
index 550864c2b7daaff1efcac21c9c1c8178440e8c02..61116a0fae8c9097d8c824fe30e3b57cff3d9e3e 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml
@@ -14,9 +14,12 @@
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
index c3b4c4df0eb7779edeb9eab72f095b7d543efc7b..8a2055228931f1daa931c4f693e23a498865f007 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
@@ -14,9 +14,12 @@
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
index 4f47b917d3f1e7e03abdaaa74d705ef5ec20b4ce..1b18709454db5ac692f2cff5f5406493f7a94b85 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
@@ -14,9 +14,12 @@
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
index 81258823d25130bdf4616bd67464733a2fa5dfb8..1d14c2bc5b3e525abea09de7986b733abb77fe0d 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
@@ -16,9 +16,12 @@
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml
index df510fc9994eb61f4376a698205ec3562e8bc017..cfc24608ed5ad0823913d25a2498bcd6077c08b7 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml
@@ -14,9 +14,12 @@
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml
index d2f324fb0855316d456be343fd1a22ab4df4a43d..e5372c42262c6a9a2628500fae1d1ed90628b361 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml
@@ -14,9 +14,12 @@
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml
index e413c3a290dcb4488554964c482a6bd7efa1dfab..be78a664e75271a2526f2517208cf1a25a5fed43 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml
@@ -13,9 +13,12 @@
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml
index 408a310aa844282cafb026e65aea0e2b72de7099..cfc8f6429c344db23c2973d246f0572442bfeae9 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml
index 8cf859bb31ce52db41d3606c8a7c7cbfff158ddf..c90e944a031b2b8bdb39a2a29ede0e545cf1cd84 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale.yaml b/jjb/openflowplugin/openflowplugin-csit-scale.yaml
index ce2c1824795e78769636762ea3d983270aba0d83..686c0c73c26c4cb7ed923f182a012c41b8aee3f8 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scale.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale.yaml
@@ -14,9 +14,12 @@
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/openflowplugin/openflowplugin-patch-test.yaml b/jjb/openflowplugin/openflowplugin-patch-test.yaml
index 7da1a5c0911e5642a8827d9ad85376ed601cd23a..8578920090e2007e7ffe22493cc1f355712abd6e 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-patch-test.yaml
+++ b/jjb/openflowplugin/openflowplugin-patch-test.yaml
@@ -9,17 +9,18 @@
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
-          os-branch: 'queens'
+          java-version: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
           java-version: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-          os-branch: 'queens'
       - neon:
           branch: 'stable/neon'
-          os-branch: 'queens'
 
+    os-branch: 'queens'
     jdk: 'openjdk8'
 
     feature:

diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml
index 9831cece446eebf52a42a590451a825421395f6f..5d40fcf3643ea91a132e7df681682e61e20682bb 100644 (file)
--- a/jjb/openflowplugin/openflowplugin.yaml
+++ b/jjb/openflowplugin/openflowplugin.yaml
@@ -1,4 +1,41 @@
 ---
+- project:
+    name: openflowplugin-aluminium
+    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-jdk11
+      - odl-maven-verify-jobs
+
+    csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
+    block_on_csit: false
+
+    stream: aluminium
+    project: 'openflowplugin'
+    project-name: 'openflowplugin'
+    branch: 'master'
+    build-node: centos7-builder-2c-8g
+    build-timeout: 90
+    java-version: 'openjdk11'
+    mvn-settings: 'openflowplugin-settings'
+    mvn-goals: 'clean deploy javadoc:aggregate'
+    mvn-opts: '-Xmx1024m'
+    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-magnesium
     jobs:
@@ -19,7 +56,7 @@
     stream: magnesium
     project: 'openflowplugin'
     project-name: 'openflowplugin'
-    branch: 'master'
+    branch: 'stable/magnesium'
     build-node: centos7-builder-2c-8g
     build-timeout: 90
     java-version: 'openjdk11'

diff --git a/jjb/opflex/opflex-custom.yaml b/jjb/opflex/opflex-custom.yaml
index 939a3673c2ea0e6b116346be64d000ef6b07d9f4..53e085f0f834740e28c06dc8611ae16a222c1bc2 100644 (file)
--- a/jjb/opflex/opflex-custom.yaml
+++ b/jjb/opflex/opflex-custom.yaml
@@ -6,11 +6,16 @@
       - 'opflex-merge-{stream}'
 
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           libuv-version: '1.20.2'
           rapidjson-version: '1.1.0'
           openvswitch-version: '2.12.0'
+      - magnesium:
+          branch: 'stable/magnesium'
+          libuv-version: '1.20.2'
+          rapidjson-version: '1.1.0'
+          openvswitch-version: '2.12.0'
       - sodium:
           branch: 'stable/sodium'
           libuv-version: '1.8.0'

diff --git a/jjb/opflex/opflex.yaml b/jjb/opflex/opflex.yaml
index 6511ce90c8a7a416207522ca3b2c1a7c48e0f706..002d1ed6226af560457d325dded0f7c0f612ceff 100644 (file)
--- a/jjb/opflex/opflex.yaml
+++ b/jjb/opflex/opflex.yaml
@@ -10,11 +10,16 @@
       - 'opflex-release-{stream}'
 
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           libuv-version: '1.20.2'
           rapidjson-version: '1.1.0'
           openvswitch-version: '2.12.0'
+      - magnesium:
+          branch: 'stable/magnesium'
+          libuv-version: '1.20.2'
+          rapidjson-version: '1.1.0'
+          openvswitch-version: '2.12.0'
       - sodium:
           branch: 'stable/sodium'
           libuv-version: '1.8.0'

diff --git a/jjb/ovsdb/ovsdb-csit-clustering.yaml b/jjb/ovsdb/ovsdb-csit-clustering.yaml
index 5a8ecae80a80249304d50819739d89f39c2ce209..40a4c9e8ea08c0d31d148783171d506df9ba8b68 100644 (file)
--- a/jjb/ovsdb/ovsdb-csit-clustering.yaml
+++ b/jjb/ovsdb/ovsdb-csit-clustering.yaml
@@ -14,8 +14,11 @@
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
+          java-version: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'

diff --git a/jjb/ovsdb/ovsdb-csit-southbound.yaml b/jjb/ovsdb/ovsdb-csit-southbound.yaml
index 4da2bcbd1e657b1c6a47f44993a4e6f47ff76896..a9cbe5b1763f1071d5000ec9e4440b66b0548d03 100644 (file)
--- a/jjb/ovsdb/ovsdb-csit-southbound.yaml
+++ b/jjb/ovsdb/ovsdb-csit-southbound.yaml
@@ -14,8 +14,11 @@
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
+          java-version: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'

diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml
index 1acc416fa2f0f078e595da5239efc8269f8da214..e8245a6d9958a237837c46238643e00348885adf 100644 (file)
--- a/jjb/ovsdb/ovsdb-full-integration.yaml
+++ b/jjb/ovsdb/ovsdb-full-integration.yaml
@@ -5,8 +5,11 @@
       - 'ovsdb-daily-full-integration-{stream}'
 
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
+          java-version: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/ovsdb/ovsdb-patch-test.yaml b/jjb/ovsdb/ovsdb-patch-test.yaml
index 23cf86b4bd680b7015eb3ce3b9fe32814b884c1e..9663ee6e567263d26cf5c7342706c70ec4351e74 100644 (file)
--- a/jjb/ovsdb/ovsdb-patch-test.yaml
+++ b/jjb/ovsdb/ovsdb-patch-test.yaml
@@ -8,17 +8,18 @@
     project: 'ovsdb'
 
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
-          os-branch: 'queens'
+          java-version: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
           java-version: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-          os-branch: 'queens'
       - neon:
           branch: 'stable/neon'
-          os-branch: 'queens'
 
+    os-branch: 'queens'
     jdk: 'openjdk8'
 
     feature:

diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml
index 1a9736ff9c6a01d8f2cd1ec8b597d74c4e5aec9d..af71e7880234f1d15c0b6d4acb67212e752dfa9a 100644 (file)
--- a/jjb/ovsdb/ovsdb.yaml
+++ b/jjb/ovsdb/ovsdb.yaml
@@ -1,4 +1,34 @@
 ---
+- project:
+    name: ovsdb-aluminium
+    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-jdk11
+      - odl-maven-verify-jobs
+
+    csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
+    block_on_csit: false
+
+    stream: aluminium
+    project: 'ovsdb'
+    project-name: 'ovsdb'
+    branch: 'master'
+    build-node: centos7-builder-2c-8g
+    java-version: 'openjdk11'
+    mvn-settings: 'ovsdb-settings'
+    mvn-opts: '-Xmx1024m'
+    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-magnesium
     jobs:
@@ -18,7 +48,7 @@
     stream: magnesium
     project: 'ovsdb'
     project-name: 'ovsdb'
-    branch: 'master'
+    branch: 'stable/magnesium'
     build-node: centos7-builder-2c-8g
     java-version: 'openjdk11'
     mvn-settings: 'ovsdb-settings'

diff --git a/jjb/p4plugin/p4plugin.yaml b/jjb/p4plugin/p4plugin.yaml
index 13a0d1b5b59b4c1439dbf006576f443042a5f9ed..87732e3daa98a67f93907e446bf982bb64e64776 100644 (file)
--- a/jjb/p4plugin/p4plugin.yaml
+++ b/jjb/p4plugin/p4plugin.yaml
@@ -1,13 +1,13 @@
 ---
 - project:
-    name: p4plugin-magnesium
+    name: p4plugin-aluminium
     jobs:
       - '{project-name}-maven-javadoc-jobs'
       - gerrit-release-merge
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: magnesium
+    stream: aluminium
     project: 'p4plugin'
     project-name: 'p4plugin'
     branch: 'master'
@@ -19,6 +19,25 @@
     # Used by the release job
     staging-profile-id: a68bf26e208d4
 
+- project:
+    name: p4plugin-magnesium
+    jobs:
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
+      - odl-maven-verify-jobs
+
+    stream: magnesium
+    project: 'p4plugin'
+    project-name: 'p4plugin'
+    branch: 'stable/magnesium'
+    mvn-settings: 'p4plugin-settings'
+    mvn-opts: '-Xmx1024m'
+    dependencies: ''
+    email-upstream: '[p4plugin]'
+
+    # Used by the release job
+    staging-profile-id: a68bf26e208d4
+
 - project:
     name: p4plugin-sodium
     jobs:

diff --git a/jjb/packetcable/packetcable-csit-pcmm.yaml b/jjb/packetcable/packetcable-csit-pcmm.yaml
index eda5976753dc45f9723316189e584e8145055318..d1355abd337569405f7f34b841faf4a73e26c4eb 100644 (file)
--- a/jjb/packetcable/packetcable-csit-pcmm.yaml
+++ b/jjb/packetcable/packetcable-csit-pcmm.yaml
@@ -15,9 +15,12 @@
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/packetcable/packetcable.yaml b/jjb/packetcable/packetcable.yaml
index 346735aac584273bebb743a4d8cb0ea7bdf4a6f1..0997797ae6fd5232ff1a50626d66f7c3253b14af 100644 (file)
--- a/jjb/packetcable/packetcable.yaml
+++ b/jjb/packetcable/packetcable.yaml
@@ -1,12 +1,12 @@
 ---
 - project:
-    name: packetcable-magnesium
+    name: packetcable-aluminium
     jobs:
       - gerrit-release-merge
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: magnesium
+    stream: aluminium
     project: 'packetcable'
     project-name: 'packetcable'
     branch: 'master'
@@ -19,6 +19,25 @@
     # Used by the release job
     staging-profile-id: a68ca4a24655c
 
+- project:
+    name: packetcable-magnesium
+    jobs:
+      - odl-maven-jobs
+      - odl-maven-verify-jobs
+
+    stream: magnesium
+    project: 'packetcable'
+    project-name: 'packetcable'
+    branch: 'stable/magnesium'
+    mvn-settings: 'packetcable-settings'
+    mvn-opts: '-Xmx1024m'
+    dependencies: ''
+    email-upstream: '[packetcable]'
+    disable-job: true
+
+    # Used by the release job
+    staging-profile-id: a68ca4a24655c
+
 - project:
     name: packetcable-sodium
     jobs:

diff --git a/jjb/serviceutils/serviceutils-patch-test.yaml b/jjb/serviceutils/serviceutils-patch-test.yaml
index 2a592fdb8ed975b15bb9b84bde66c73d3967483f..00bd91e7ca4830c7fbca59e4ecc61f154f124c96 100644 (file)
--- a/jjb/serviceutils/serviceutils-patch-test.yaml
+++ b/jjb/serviceutils/serviceutils-patch-test.yaml
@@ -7,16 +7,16 @@
     project: 'serviceutils'
 
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
-          os-branch: 'queens'
+      - magnesium:
+          branch: 'stable/magnesium'
       - sodium:
           branch: 'stable/sodium'
-          os-branch: 'queens'
       - neon:
           branch: 'stable/neon'
-          os-branch: 'queens'
 
+    os-branch: 'queens'
     jdk: 'openjdk8'
 
     feature:

diff --git a/jjb/serviceutils/serviceutils.yaml b/jjb/serviceutils/serviceutils.yaml
index 953cc6941fc60e4069999ddad589dfbdebbf7e68..c726ad13d1d32aac28c80182dfa5977af71a5fec 100644 (file)
--- a/jjb/serviceutils/serviceutils.yaml
+++ b/jjb/serviceutils/serviceutils.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: serviceutils-magnesium
+    name: serviceutils-aluminium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
@@ -13,6 +13,39 @@
       - odl-maven-verify-jobs
 
     branch: 'master'
+    stream: aluminium
+
+    project: 'serviceutils'
+    project-name: 'serviceutils'
+    build-node: centos7-builder-2c-2g
+    java-version: 'openjdk11'
+    mvn-settings: 'serviceutils-settings'
+    mvn-opts: '-Xmx1024m'
+    build-timeout: 90
+    dependencies: >
+        controller-merge-{stream},
+        yangtools-merge-{stream},
+        odlparent-merge-{stream},
+        infrautils-merge-{stream}
+    email-upstream: '[serviceutils] [controller] [yangtools] [odlparent] [infrautils]'
+
+    # Used by the release job
+    staging-profile-id: 12cc4ba8bf01ba
+
+- project:
+    name: serviceutils-magnesium
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-maven-javadoc-jobs'
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          project-pattern: serviceutils
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-serviceutils/40541/
+          rtd-token: 866f76be38ed7efc7027b9c52e7ad869e523e7c4
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
+
+    branch: 'stable/magnesium'
     stream: magnesium
 
     project: 'serviceutils'

diff --git a/jjb/sfc/sfc-csit-full-deploy.yaml b/jjb/sfc/sfc-csit-full-deploy.yaml
index 3ffe3401dcb1524d4ffec1e61a4bdb641555faa4..4cfabd8a55fade838dadb21e0b757f3e889aab50 100644 (file)
--- a/jjb/sfc/sfc-csit-full-deploy.yaml
+++ b/jjb/sfc/sfc-csit-full-deploy.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/sfc/sfc-csit-rest-basic.yaml b/jjb/sfc/sfc-csit-rest-basic.yaml
index ecb62e765f9f1403f4d86eb3816825a804ddd9c9..6298d7fd0b3b19c7bccd1dc4a68eab8564809f39 100644 (file)
--- a/jjb/sfc/sfc-csit-rest-basic.yaml
+++ b/jjb/sfc/sfc-csit-rest-basic.yaml
@@ -13,9 +13,12 @@
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/sfc/sfc-patch-test.yaml b/jjb/sfc/sfc-patch-test.yaml
index f412d80269b6dee233bebdd7908ef18ac6e1784c..e3734df41f0eece4b95f8574ab2adeb88ac73d70 100644 (file)
--- a/jjb/sfc/sfc-patch-test.yaml
+++ b/jjb/sfc/sfc-patch-test.yaml
@@ -9,16 +9,18 @@
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
-          os-branch: 'queens'
+          java-version: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
           java-version: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-          os-branch: 'queens'
       - neon:
           branch: 'stable/neon'
-          os-branch: 'queens'
+
+    os-branch: 'queens'
 
     feature:
       - basic:

diff --git a/jjb/sfc/sfc-python.yaml b/jjb/sfc/sfc-python.yaml
index 6de3b14dbb7051fdee1f006171696d9f0396897a..a4f2bcc1c2a53b5d18019db67f7ebdb4cc2fbb6d 100644 (file)
--- a/jjb/sfc/sfc-python.yaml
+++ b/jjb/sfc/sfc-python.yaml
@@ -5,8 +5,10 @@
       - 'gerrit-tox-verify'
 
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
+      - magnesium:
+          branch: 'stable/magnesium'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/sfc/sfc.yaml b/jjb/sfc/sfc.yaml
index 44356d4341f18cfc56710060938298dde08308eb..c46aca90d66b53fbe2b40ab04bb231eee1a37fbd 100644 (file)
--- a/jjb/sfc/sfc.yaml
+++ b/jjb/sfc/sfc.yaml
@@ -1,4 +1,30 @@
 ---
+- project:
+    name: sfc-aluminium
+    jobs:
+      - '{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-jdk11
+      - odl-maven-verify-jobs
+
+    stream: aluminium
+    project: 'sfc'
+    project-name: 'sfc'
+    branch: 'master'
+    java-version: 'openjdk11'
+    mvn-settings: 'sfc-settings'
+    mvn-opts: '-Xmx2048m -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-magnesium
     jobs:
@@ -13,7 +39,7 @@
     stream: magnesium
     project: 'sfc'
     project-name: 'sfc'
-    branch: 'master'
+    branch: 'stable/magnesium'
     java-version: 'openjdk11'
     mvn-settings: 'sfc-settings'
     mvn-opts: '-Xmx2048m -Dmaven.compile.fork=true'

diff --git a/jjb/snmp/snmp.yaml b/jjb/snmp/snmp.yaml
index 8dd08a140e360c7de03f25098fb6de9e811cfa4e..14c91faf199a0294740beb44395405f1b8ffa921 100644 (file)
--- a/jjb/snmp/snmp.yaml
+++ b/jjb/snmp/snmp.yaml
@@ -1,12 +1,12 @@
 ---
 - project:
-    name: snmp-magnesium
+    name: snmp-aluminium
     jobs:
       - gerrit-release-merge
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: magnesium
+    stream: aluminium
     project: 'snmp'
     project-name: 'snmp'
     branch: 'master'
@@ -18,6 +18,24 @@
     # Used by the release job
     staging-profile-id: a68fb236b93a6
 
+- project:
+    name: snmp-magnesium
+    jobs:
+      - odl-maven-jobs
+      - odl-maven-verify-jobs
+
+    stream: magnesium
+    project: 'snmp'
+    project-name: 'snmp'
+    branch: 'stable/magnesium'
+    mvn-settings: 'snmp-settings'
+    mvn-opts: '-Xmx1024m'
+    dependencies: 'odlparent-merge-{stream}'
+    email-upstream: '[snmp] [odlparent]'
+
+    # Used by the release job
+    staging-profile-id: a68fb236b93a6
+
 - project:
     name: snmp-sodium
     jobs:

diff --git a/jjb/snmp4sdn/snmp4sdn.yaml b/jjb/snmp4sdn/snmp4sdn.yaml
index 03ed8de9842939e05012ec253bdbc6a53be87540..568bb9ba774d6299ece7cfb4d2b1d672ebccec65 100644 (file)
--- a/jjb/snmp4sdn/snmp4sdn.yaml
+++ b/jjb/snmp4sdn/snmp4sdn.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: snmp4sdn-magnesium
+    name: snmp4sdn-aluminium
     jobs:
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
@@ -11,7 +11,7 @@
       - odl-maven-verify-jobs
       - gerrit-release-merge
 
-    stream: magnesium
+    stream: aluminium
     project: 'snmp4sdn'
     project-name: 'snmp4sdn'
     branch: 'master'
@@ -23,6 +23,29 @@
     # Used by the release job
     staging-profile-id: a69034a4b6ef5
 
+- 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
+      - odl-maven-verify-jobs
+
+    stream: magnesium
+    project: 'snmp4sdn'
+    project-name: 'snmp4sdn'
+    branch: 'stable/magnesium'
+    mvn-settings: 'snmp4sdn-settings'
+    mvn-opts: '-Xmx1024m'
+    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:

diff --git a/jjb/sxp/sxp-csit-basic.yaml b/jjb/sxp/sxp-csit-basic.yaml
index ffbdeb981fbe5cef7a84a37b5ed5311c0a2ec716..e5a3f7d63cfcf542722c4ca912291df18e9458cc 100644 (file)
--- a/jjb/sxp/sxp-csit-basic.yaml
+++ b/jjb/sxp/sxp-csit-basic.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/sxp/sxp-csit-binding-origin.yaml b/jjb/sxp/sxp-csit-binding-origin.yaml
index ee524c73f3e886d740fbafef713975d50bbed23f..93dcaa0db1f624a5df4e9244938ba779d93f6132 100644 (file)
--- a/jjb/sxp/sxp-csit-binding-origin.yaml
+++ b/jjb/sxp/sxp-csit-binding-origin.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/sxp/sxp-csit-cluster-binding.yaml b/jjb/sxp/sxp-csit-cluster-binding.yaml
index 09790fbad2d52707e65bda66ca068ab721917d62..4ab1a47e48c58ad6575d503c3f9829170fb47803 100644 (file)
--- a/jjb/sxp/sxp-csit-cluster-binding.yaml
+++ b/jjb/sxp/sxp-csit-cluster-binding.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/sxp/sxp-csit-clustering.yaml b/jjb/sxp/sxp-csit-clustering.yaml
index 372822e6ee68c9745805db09adc1b5ec187ff58e..a15cf06fb90010efafa8336ed1373a5bae545252 100644 (file)
--- a/jjb/sxp/sxp-csit-clustering.yaml
+++ b/jjb/sxp/sxp-csit-clustering.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/sxp/sxp-csit-filtering.yaml b/jjb/sxp/sxp-csit-filtering.yaml
index 1fdebcbbd1dbb7c8f193d9d7b597d47b0cf8f653..cdbb10396245e83b364b3c5ba4fec4623be77005 100644 (file)
--- a/jjb/sxp/sxp-csit-filtering.yaml
+++ b/jjb/sxp/sxp-csit-filtering.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/sxp/sxp-csit-performance.yaml b/jjb/sxp/sxp-csit-performance.yaml
index f9bebfe318aaf92b496980224aec91dbf7014060..1ad7ab22c0a2e024d26ad88077ddb9539957d9d4 100644 (file)
--- a/jjb/sxp/sxp-csit-performance.yaml
+++ b/jjb/sxp/sxp-csit-performance.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/sxp/sxp-csit-topology.yaml b/jjb/sxp/sxp-csit-topology.yaml
index b701b947b8518ab943fef414f74aa644a82bcdf1..1e74c4093097aed1f1af3abe351d01662e674564 100644 (file)
--- a/jjb/sxp/sxp-csit-topology.yaml
+++ b/jjb/sxp/sxp-csit-topology.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml
index 1bfd5310201a708d19480dfafad9566ef1193ac9..14b655fc7f80fdc466fb9b2452cdb0cc4f39f8cd 100644 (file)
--- a/jjb/sxp/sxp.yaml
+++ b/jjb/sxp/sxp.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: sxp-magnesium
+    name: sxp-aluminium
     jobs:
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
@@ -13,7 +13,7 @@
 
     java-version: 'openjdk11'
 
-    stream: magnesium
+    stream: aluminium
     project: 'sxp'
     project-name: 'sxp'
     branch: 'master'
@@ -27,6 +27,33 @@
     # Used by the release job
     staging-profile-id: a6909c75719b7
 
+- 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
+      - odl-maven-verify-jobs
+
+    java-version: 'openjdk11'
+
+    stream: magnesium
+    project: 'sxp'
+    project-name: 'sxp'
+    branch: 'stable/magnesium'
+
+    mvn-settings: 'sxp-settings'
+    mvn-opts: '-Xmx1024m'
+
+    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:

diff --git a/jjb/telemetry/telemetry-csit-basic.yaml b/jjb/telemetry/telemetry-csit-basic.yaml
index cc17f29bcfc3b13116e0bc36a15abc50feea652a..0ac33f1ef83afe3b19384d63549999b53c3a20c7 100644 (file)
--- a/jjb/telemetry/telemetry-csit-basic.yaml
+++ b/jjb/telemetry/telemetry-csit-basic.yaml
@@ -13,9 +13,12 @@
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/telemetry/telemetry.yaml b/jjb/telemetry/telemetry.yaml
index 8c04f1cf4789e7b40263bba70b1a494bb0e7eb54..7fd08fdf3420ce9c1c28050059c161b33367696c 100644 (file)
--- a/jjb/telemetry/telemetry.yaml
+++ b/jjb/telemetry/telemetry.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: telemetry-magnesium
+    name: telemetry-aluminium
     jobs:
       - 'odl-maven-jobs'
       - odl-maven-verify-jobs
@@ -12,7 +12,7 @@
           rtd-token: 694bcbf8e0b45b3c4e53174c6e5773ca351e1efb
       - gerrit-release-merge
 
-    stream: magnesium
+    stream: aluminium
     project: 'telemetry'
     project-name: 'telemetry'
     branch: 'master'
@@ -25,6 +25,31 @@
     # Used by the release job
     staging-profile-id: 8ed9c52266504
 
+- project:
+    name: telemetry-magnesium
+    jobs:
+      - 'odl-maven-jobs'
+      - odl-maven-verify-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: 'stable/magnesium'
+    mvn-settings: 'telemetry-settings'
+    mvn-opts: '-Xmx1024m'
+    dependencies: ''
+    email-upstream: '[telemetry]'
+    archive-artifacts: ''
+
+    # Used by the release job
+    staging-profile-id: 8ed9c52266504
+
 - project:
     name: telemetry-sodium
     jobs:

diff --git a/jjb/transportpce/transportpce.yaml b/jjb/transportpce/transportpce.yaml
index 46f8b7b30fcae0866edd22f28e27539c5bb3670a..f5fc5009337d6f486a650eb0ecafbbf6a05d6e25 100644 (file)
--- a/jjb/transportpce/transportpce.yaml
+++ b/jjb/transportpce/transportpce.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: transportpce-magnesium
+    name: transportpce-aluminium
     jobs:
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
@@ -16,7 +16,7 @@
 
     project: 'transportpce'
     project-name: 'transportpce'
-    stream: magnesium
+    stream: aluminium
     branch: 'master'
     java-version: 'openjdk11'
     mvn-settings: 'transportpce-settings'
@@ -27,6 +27,32 @@
     # Used by the release job
     staging-profile-id: a6927323fa3d4
 
+- 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
+      - odl-maven-verify-jobs
+
+    project: 'transportpce'
+    project-name: 'transportpce'
+    stream: magnesium
+    branch: 'stable/magnesium'
+    mvn-settings: 'transportpce-settings'
+    mvn-opts: '-Xmx1024m'
+    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:

diff --git a/jjb/tsdr/tsdr-csit-cassandra.yaml b/jjb/tsdr/tsdr-csit-cassandra.yaml
index 606978e654000ae9dce2284d06e815750dcc5ffe..a260f5fdd9e83de1c14415f23e5e8c2ef5e9c128 100644 (file)
--- a/jjb/tsdr/tsdr-csit-cassandra.yaml
+++ b/jjb/tsdr/tsdr-csit-cassandra.yaml
@@ -13,9 +13,12 @@
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/tsdr/tsdr-csit-elasticsearch.yaml b/jjb/tsdr/tsdr-csit-elasticsearch.yaml
index 5b9a83d8642a0045c6c7676861922687c8300238..c3c784012bca6308527e4f390d1df1be9b503294 100644 (file)
--- a/jjb/tsdr/tsdr-csit-elasticsearch.yaml
+++ b/jjb/tsdr/tsdr-csit-elasticsearch.yaml
@@ -13,9 +13,12 @@
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/tsdr/tsdr-csit-hbase.yaml b/jjb/tsdr/tsdr-csit-hbase.yaml
index f8687f553edd3d4da8d248a1e553f116426a5f2e..b12efaa39a5343221398c3f9f93c10af4ccb650c 100644 (file)
--- a/jjb/tsdr/tsdr-csit-hbase.yaml
+++ b/jjb/tsdr/tsdr-csit-hbase.yaml
@@ -13,9 +13,12 @@
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/tsdr/tsdr-csit-hsqldb.yaml b/jjb/tsdr/tsdr-csit-hsqldb.yaml
index 49f447c746398c035c8d8908a7ff461dc7ccc62d..ebd5dda6241572e579bc6d4508423a7d073d956f 100644 (file)
--- a/jjb/tsdr/tsdr-csit-hsqldb.yaml
+++ b/jjb/tsdr/tsdr-csit-hsqldb.yaml
@@ -13,9 +13,12 @@
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/tsdr/tsdr.yaml b/jjb/tsdr/tsdr.yaml
index 34e5d03cc073763f8804e8020a72cb1093f53515..88b16cdd7e9e575137d73edd4d1ec9ea7b067244 100644 (file)
--- a/jjb/tsdr/tsdr.yaml
+++ b/jjb/tsdr/tsdr.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: tsdr-magnesium
+    name: tsdr-aluminium
     jobs:
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
@@ -11,7 +11,7 @@
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: magnesium
+    stream: aluminium
     project: 'tsdr'
     project-name: 'tsdr'
     branch: 'master'
@@ -23,6 +23,29 @@
     # Used by the release job
     staging-profile-id: a69373036303c
 
+- 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
+      - odl-maven-verify-jobs
+
+    stream: magnesium
+    project: 'tsdr'
+    project-name: 'tsdr'
+    branch: 'stable/magnesium'
+    mvn-settings: 'tsdr-settings'
+    mvn-opts: '-Xmx1024m'
+    dependencies: ''
+    email-upstream: '[tsdr]'
+
+    # Used by the release job
+    staging-profile-id: a69373036303c
+
 - project:
     name: tsdr-sodium
     jobs:

diff --git a/jjb/unimgr/unimgr.yaml b/jjb/unimgr/unimgr.yaml
index f6ffac6774ebdd475af05d7d38b177b4aeb77bf8..5ff0630b2947739a512ac5094f25835296a104b3 100644 (file)
--- a/jjb/unimgr/unimgr.yaml
+++ b/jjb/unimgr/unimgr.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: unimgr-magnesium
+    name: unimgr-aluminium
     jobs:
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
@@ -11,7 +11,7 @@
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: magnesium
+    stream: aluminium
     project: 'unimgr'
     project-name: 'unimgr'
     branch: 'master'
@@ -24,6 +24,30 @@
     # Used by the release job
     staging-profile-id: a695d0a0b8d51
 
+- 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
+      - odl-maven-verify-jobs
+
+    stream: magnesium
+    project: 'unimgr'
+    project-name: 'unimgr'
+    branch: 'stable/magnesium'
+    mvn-settings: 'unimgr-settings'
+    mvn-opts: '-Xmx1024m'
+    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:

diff --git a/jjb/usc/usc-csit-tcp.yaml b/jjb/usc/usc-csit-tcp.yaml
index 1404bee7c9f81598b23489c3e4ff4546a1f5cc83..98b528163583a2cc329cfea7aea47cac78e4832a 100644 (file)
--- a/jjb/usc/usc-csit-tcp.yaml
+++ b/jjb/usc/usc-csit-tcp.yaml
@@ -13,9 +13,12 @@
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/usc/usc.yaml b/jjb/usc/usc.yaml
index e069737627638e8aa98520c8219b7a940af513ab..eddcf409ed9d706095f99f9290e306164228a8bf 100644 (file)
--- a/jjb/usc/usc.yaml
+++ b/jjb/usc/usc.yaml
@@ -1,13 +1,13 @@
 ---
 - project:
-    name: usc-magnesium
+    name: usc-aluminium
     jobs:
       - '{project-name}-maven-javadoc-jobs'
       - gerrit-release-merge
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: magnesium
+    stream: aluminium
     project: 'usc'
     project-name: 'usc'
     branch: 'master'
@@ -19,6 +19,25 @@
     # Used by the release job
     staging-profile-id: a697b633b3ffe
 
+- project:
+    name: usc-magnesium
+    jobs:
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
+      - odl-maven-verify-jobs
+
+    stream: magnesium
+    project: 'usc'
+    project-name: 'usc'
+    branch: 'stable/magnesium'
+    mvn-settings: 'usc-settings'
+    mvn-opts: '-Xmx1024m'
+    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:

diff --git a/jjb/yangtools/yangtools-csit-system.yaml b/jjb/yangtools/yangtools-csit-system.yaml
index 0d6c51d541f69244e625dabb75c212c221ac4b84..7fd5210fb0b966943bf7e3f6af8e6ecb2304db7a 100644 (file)
--- a/jjb/yangtools/yangtools-csit-system.yaml
+++ b/jjb/yangtools/yangtools-csit-system.yaml
@@ -12,9 +12,12 @@
 
     # Project branches.
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/yangtools/yangtools-patch-test.yaml b/jjb/yangtools/yangtools-patch-test.yaml
index 01bb964f3df95178dbb301ed281f8b83716f19df..ddad34fddf45f921504282c7be3d041099b6a18e 100644 (file)
--- a/jjb/yangtools/yangtools-patch-test.yaml
+++ b/jjb/yangtools/yangtools-patch-test.yaml
@@ -7,17 +7,18 @@
     project: 'yangtools'
 
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
-          os-branch: 'queens'
-          java-version: 'openjdk11'
+          jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-          os-branch: 'queens'
       - neon:
           branch: 'stable/neon'
-          os-branch: 'queens'
 
+    os-branch: 'queens'
     jdk: 'openjdk8'
 
     feature: