Create stable/neon branch bump master to sodium

author Anil Belur <abelur@linuxfoundation.org>

Sat, 2 Feb 2019 12:45:31 +0000 (22:45 +1000)

committer Anil Belur <abelur@linuxfoundation.org>

Sun, 3 Feb 2019 10:38:31 +0000 (20:38 +1000)
author Anil Belur <abelur@linuxfoundation.org>
Sat, 2 Feb 2019 12:45:31 +0000 (22:45 +1000)
committer Anil Belur <abelur@linuxfoundation.org>
Sun, 3 Feb 2019 10:38:31 +0000 (20:38 +1000)
diff --git a/jjb/aaa/aaa-csit-authn.yaml b/jjb/aaa/aaa-csit-authn.yaml

index 8d328842cf906a2be04e5f9c5acb88bcd482e58d..f50680dea964dd27cb2bab2d326af1e1b6edea33 100644 (file)
--- a/jjb/aaa/aaa-csit-authn.yaml
+++ b/jjb/aaa/aaa-csit-authn.yaml
@@ -13,8 +13,10 @@
  
      # Project branches
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
        - oxygen:
diff --git a/jjb/aaa/aaa-csit-keystone.yaml b/jjb/aaa/aaa-csit-keystone.yaml

index 614ef0465451b27d8ca82e308706f47f569e9106..05aa6150dfc069e85b2a218dedd6ca16efaf9f46 100644 (file)
--- a/jjb/aaa/aaa-csit-keystone.yaml
+++ b/jjb/aaa/aaa-csit-keystone.yaml
@@ -13,8 +13,10 @@
  
      # Project branches
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
        - oxygen:
diff --git a/jjb/aaa/aaa-csit-tls.yaml b/jjb/aaa/aaa-csit-tls.yaml

index fc0c7a97b0ddc833ba460e01d4021dc38368d09b..906e9601a27549329b0f03fe1c3111043b3b090b 100644 (file)
--- a/jjb/aaa/aaa-csit-tls.yaml
+++ b/jjb/aaa/aaa-csit-tls.yaml
@@ -12,8 +12,10 @@
  
      # Project branches
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
        - oxygen:
diff --git a/jjb/aaa/aaa-patch-test.yaml b/jjb/aaa/aaa-patch-test.yaml

index 06f0b3224df15dd51f7c1d47612e15c92775a53e..d3c9d0344bf55d9f3129663868a605bc319448c5 100644 (file)
--- a/jjb/aaa/aaa-patch-test.yaml
+++ b/jjb/aaa/aaa-patch-test.yaml
@@ -7,9 +7,12 @@
      project: 'aaa'
  
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
            os-branch: 'queens'
+      - neon:
+          branch: 'stable/neon'
+          os-branch: 'queens'
        - fluorine:
            branch: 'stable/fluorine'
            os-branch: 'queens'
diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml

index 7284ed1988c230664000acf7a765e426b4231a74..e656fd486a725abf034deb306f3f454e4bf2bf4d 100644 (file)
--- a/jjb/aaa/aaa.yaml
+++ b/jjb/aaa/aaa.yaml
@@ -1,4 +1,27 @@
  ---
+- project:
+    name: aaa-sodium
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          project-pattern: aaa
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-aaa/47615/
+          rtd-token: 621132230e1307d38f4aaf27e669d7dfdf98532f
+      - odl-maven-jobs
+
+    stream: sodium
+    project: 'aaa'
+    project-name: 'aaa'
+    branch: 'master'
+    mvn-settings: 'aaa-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
+    email-upstream: '[aaa] [odlparent] [yangtools] [controller]'
+
+    # Used by the release job
+    staging-profile-id: 9318cf3c82c33
+
  - project:
      name: aaa-neon
      jobs:
@@ -13,7 +36,7 @@
      stream: neon
      project: 'aaa'
      project-name: 'aaa'
-    branch: 'master'
+    branch: 'stable/neon'
      mvn-settings: 'aaa-settings'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
diff --git a/jjb/alto/alto-csit-setup.yaml b/jjb/alto/alto-csit-setup.yaml

index ef5c322acfaa0ffa1d0913ce7f5d02ec8bce5d94..f6551354fa42a9c44f0e5b8af356fd509bf04a1a 100644 (file)
--- a/jjb/alto/alto-csit-setup.yaml
+++ b/jjb/alto/alto-csit-setup.yaml
@@ -12,8 +12,10 @@
  
      # Project branches
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
        - oxygen:
diff --git a/jjb/alto/alto.yaml b/jjb/alto/alto.yaml

index bde65374976126bafbe24f0718023f3025e4d5d9..0c52a87cd886d5ee9de47fa88bb6e3e77665fa30 100644 (file)
--- a/jjb/alto/alto.yaml
+++ b/jjb/alto/alto.yaml
@@ -1,4 +1,22 @@
  ---
+- project:
+    name: alto-sodium
+    jobs:
+      - odl-maven-jobs
+
+    stream: sodium
+    project: 'alto'
+    project-name: 'alto'
+    branch: 'master'
+    build-node: centos7-builder-2c-8g
+    mvn-settings: 'alto-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'l2switch-merge-{stream}'
+    email-upstream: '[alto] [l2switch]'
+
+    # Used by the release job
+    staging-profile-id: 931eabae9693c
+
  - project:
      name: alto-neon
      jobs:
@@ -7,7 +25,7 @@
      stream: neon
      project: 'alto'
      project-name: 'alto'
-    branch: 'master'
+    branch: 'stable/neon'
      build-node: centos7-builder-2c-8g
      mvn-settings: 'alto-settings'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/ansible/ansible.yaml b/jjb/ansible/ansible.yaml

index 0295d49eb937685b1db440532a9f4fd2402e4b94..157305b8bfca59ee026ddfdeb492949c8a6ea945 100644 (file)
--- a/jjb/ansible/ansible.yaml
+++ b/jjb/ansible/ansible.yaml
@@ -8,8 +8,10 @@
        - odl-maven-jobs
  
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
  
diff --git a/jjb/archetypes/archetypes.yaml b/jjb/archetypes/archetypes.yaml

index b9a9761215044ce3f932877d849dacc86e2ddf94..0dd66f8255d67eecfa6b7201521428879d4b3717 100644 (file)
--- a/jjb/archetypes/archetypes.yaml
+++ b/jjb/archetypes/archetypes.yaml
@@ -1,4 +1,28 @@
  ---
+- project:
+    name: archetypes-sodium
+    jobs:
+      - gerrit-maven-clm
+      - '{project-name}-merge-{stream}':
+          build-timeout: 180
+          cron: '@daily'
+          mvn-goals: clean install -V -Dmaven.compile.fork=true
+      - gerrit-maven-stage
+      - gerrit-maven-verify
+      - gerrit-maven-verify-dependencies:
+          build-timeout: 180
+
+    stream: sodium
+    project: 'archetypes'
+    project-name: 'archetypes'
+    branch: 'master'
+    mvn-settings: 'archetypes-settings'
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}'
+    email-upstream: '[archetypes] [odlparent] [yangtools] [controller] [mdsal]'
+
+    # Used by the release job
+    staging-profile-id: d88dcfe6ce48d
+
  - project:
      name: archetypes-neon
      jobs:
@@ -15,7 +39,7 @@
      stream: neon
      project: 'archetypes'
      project-name: 'archetypes'
-    branch: 'master'
+    branch: 'stable/neon'
      mvn-settings: 'archetypes-settings'
      dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}'
      email-upstream: '[archetypes] [odlparent] [yangtools] [controller] [mdsal]'
diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml

index 7860abfec0ceb3a7e9f00fc30b81e126f5c5bd18..896d5aabe97d95a43bae176a622a0f4628eb9737 100644 (file)
--- a/jjb/autorelease/autorelease-projects.yaml
+++ b/jjb/autorelease/autorelease-projects.yaml
@@ -14,8 +14,13 @@
        - gerrit-tox-verify
  
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+          integration-test: sodium
+          extra-mvn-opts: -P!karaf -Pignore-lispflowmapping-integrationtest -Dsft.heap.max=4g
+              -Dskip.karaf.featureTest=true
+      - neon:
+          branch: 'stable/neon'
            integration-test: neon
            extra-mvn-opts: -P!karaf -Pignore-lispflowmapping-integrationtest -Dsft.heap.max=4g
                -Dskip.karaf.featureTest=true
diff --git a/jjb/autorelease/autorelease-version-management.yaml b/jjb/autorelease/autorelease-version-management.yaml

index 20b96a4343088dbd7a0f8d9f72cd903956116f68..4427eacf1865da22ac4a3b8cd6080af643611b8b 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:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
        - oxygen:
diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml

index 7347ea018976bc677bfc8c29c26ec5ce788d2608..793c33783abd22d8d64dccf81f5cd2a97aae7d03 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
@@ -14,8 +14,10 @@
  
      # Project branches
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
        - oxygen:
diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml

index 31794be641cde9ee810b5f90d6f4d1983315f139..ce2cd23c82159752aab9b65020c095903ca6f55e 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
@@ -13,8 +13,10 @@
  
      # Project branches
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
        - oxygen:
diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml

index b6f0ca61dab511d6dc0a12ff224c8cfe4c59f9cb..f416cc881a8c8a9cd3c3f743994d71576b287788 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml
@@ -12,8 +12,10 @@
  
      # Project branches
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
        - oxygen:
diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml

index 84e5bb2a603d317f20b132e4b25d06ac362a8b69..a13904274d00f12c38a1c94ed21454489c077ef5 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml
@@ -12,8 +12,10 @@
  
      # Project branches
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
        - oxygen:
diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml

index c8902b46ba191342973358e3423a74453e2948b1..3866469df253f0b9593975da06558ceb71f94516 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
@@ -12,8 +12,10 @@
  
      # Project branches
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
        - oxygen:
diff --git a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml

index 534b08f25b4e6a101d88d25b967590e5cbff00f0..3e01dd93f7de792f105a781b94180bb7a92e3007 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
+++ b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
@@ -14,8 +14,10 @@
  
      # Project branches
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
        - oxygen:
diff --git a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml

index 40e58d612ae23af1fc2febc2b8297b20128b7692..7045ad2e3f9754dbc42f83a57c28a8edf46acecb 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
+++ b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
@@ -15,8 +15,10 @@
  
      # Project branches
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
        - oxygen:
diff --git a/jjb/bgpcep/bgpcep-patch-test.yaml b/jjb/bgpcep/bgpcep-patch-test.yaml

index 2405fe4bd5969eb25aa03658aad74e543d2fe089..2f2fbc6e7a2b9516c08b1a889fd02222c9da4c7a 100644 (file)
--- a/jjb/bgpcep/bgpcep-patch-test.yaml
+++ b/jjb/bgpcep/bgpcep-patch-test.yaml
@@ -9,8 +9,10 @@
  
      # Project branches
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
        - oxygen:
diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml

index 82b640e10104fce4d6efbb4db0615a25eac42bb2..65641f9d708f9e964ca85165b7e92b3a1647ce65 100644 (file)
--- a/jjb/bgpcep/bgpcep.yaml
+++ b/jjb/bgpcep/bgpcep.yaml
@@ -1,4 +1,34 @@
  ---
+- project:
+    name: bgpcep-sodium
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-maven-javadoc-jobs'
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          project-pattern: bgpcep
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-bgpcep/47576/
+          rtd-token: dbe9d1aabbe8812a26b428908f6613c28e3191fc
+      - odl-maven-jobs
+
+    stream: sodium
+    project: 'bgpcep'
+    project-name: 'bgpcep'
+    build-node: centos7-builder-8c-8g
+    build-timeout: 120
+    branch: 'master'
+    mvn-settings: 'bgpcep-settings'
+    mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m'
+    dependencies: >
+        odlparent-merge-{stream},
+        yangtools-merge-{stream},
+        controller-merge-{stream},
+        mdsal-merge-{stream}
+    email-upstream: '[bgpcep] [odlparent] [yangtools] [controller] [mdsal]'
+
+    # Used by the release job
+    staging-profile-id: 9427a05049030
+
  - project:
      name: bgpcep-neon
      jobs:
@@ -16,7 +46,7 @@
      project-name: 'bgpcep'
      build-node: centos7-builder-8c-8g
      build-timeout: 120
-    branch: 'master'
+    branch: 'stable/neon'
      mvn-settings: 'bgpcep-settings'
      mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m'
      dependencies: >
diff --git a/jjb/bier/bier-csit-basic.yaml b/jjb/bier/bier-csit-basic.yaml

index dc38606699874d43a08207f3bb817b1db153001f..5c785e7cab97124bbcd77d0e224935c1fbc4248a 100644 (file)
--- a/jjb/bier/bier-csit-basic.yaml
+++ b/jjb/bier/bier-csit-basic.yaml
@@ -13,8 +13,10 @@
  
      # Project branches
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
        - oxygen:
diff --git a/jjb/bier/bier.yaml b/jjb/bier/bier.yaml

index bbebe4c86fc43af4aed1c8831cf10cbbf09eb048..e7c0c897b41f40f0a34e812c6b4ffa6a37c8b8e4 100644 (file)
--- a/jjb/bier/bier.yaml
+++ b/jjb/bier/bier.yaml
@@ -1,4 +1,23 @@
  ---
+- project:
+    name: bier-sodium
+    jobs:
+      - odl-maven-jobs
+
+    stream: sodium
+    project: 'bier'
+    project-name: 'bier'
+    branch: 'master'
+    build-node: centos7-builder-2c-8g
+    build-timeout: 90
+    mvn-settings: 'bier-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[bier]'
+
+    # Used by the release job
+    staging-profile-id: 942a8075b1f2a
+
  - project:
      name: bier-neon
      jobs:
@@ -7,7 +26,7 @@
      stream: neon
      project: 'bier'
      project-name: 'bier'
-    branch: 'master'
+    branch: 'stable/neon'
      build-node: centos7-builder-2c-8g
      build-timeout: 90
      mvn-settings: 'bier-settings'
diff --git a/jjb/capwap/capwap-csit-ac.yaml b/jjb/capwap/capwap-csit-ac.yaml

index 1e2c783a5ce79cf185de9f169d82f76afd7a5ae4..551603f71720e0374f553e8851f9a029f2577ceb 100644 (file)
--- a/jjb/capwap/capwap-csit-ac.yaml
+++ b/jjb/capwap/capwap-csit-ac.yaml
@@ -13,8 +13,10 @@
  
      # Project branches
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
        - oxygen:
diff --git a/jjb/capwap/capwap.yaml b/jjb/capwap/capwap.yaml

index 55af0a842e071011dcf3ebf8f056b88913ca5a62..f9c38ad78da33bf6ad35a16a1fdf3e32eb88d366 100644 (file)
--- a/jjb/capwap/capwap.yaml
+++ b/jjb/capwap/capwap.yaml
@@ -1,4 +1,21 @@
  ---
+- project:
+    name: capwap-sodium
+    jobs:
+      - odl-maven-jobs
+
+    stream: sodium
+    project: 'capwap'
+    project-name: 'capwap'
+    branch: 'master'
+    mvn-settings: 'capwap-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[capwap]'
+
+    # Used by the release job
+    staging-profile-id: 96bd6b5bf86e3
+
  - project:
      name: capwap-neon
      jobs:
@@ -7,7 +24,7 @@
      stream: neon
      project: 'capwap'
      project-name: 'capwap'
-    branch: 'master'
+    branch: 'stable/neon'
      mvn-settings: 'capwap-settings'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: ''
diff --git a/jjb/cardinal/cardinal.yaml b/jjb/cardinal/cardinal.yaml

index 24fad7f9afe868017b985e3869cc864a4fdbb070..420f2af24146de57aa2e969f285954fa08b21e3d 100644 (file)
--- a/jjb/cardinal/cardinal.yaml
+++ b/jjb/cardinal/cardinal.yaml
@@ -1,4 +1,21 @@
  ---
+- project:
+    name: cardinal-sodium
+    jobs:
+      - odl-maven-jobs
+
+    stream: sodium
+    project: 'cardinal'
+    project-name: 'cardinal'
+    branch: 'master'
+    mvn-settings: 'cardinal-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'openflowplugin-merge-{stream},iotdm-merge-{stream},sfc-merge-{stream}'
+    email-upstream: '[cardinal] [openflowplugin] [iotdm] [sfc]'
+
+    # Used by the release job
+    staging-profile-id: 96be20348f0f2
+
  - project:
      name: cardinal-neon
      jobs:
@@ -7,7 +24,7 @@
      stream: neon
      project: 'cardinal'
      project-name: 'cardinal'
-    branch: 'master'
+    branch: 'stable/neon'
      mvn-settings: 'cardinal-settings'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'openflowplugin-merge-{stream},iotdm-merge-{stream},sfc-merge-{stream}'
diff --git a/jjb/centinel/centinel-csit-basic.yaml b/jjb/centinel/centinel-csit-basic.yaml

index 71988d3ae93d538acd51951d01d9f4aed5a48a1e..7cb7518cffe652c4e1fc4d71ff7dcb4971ae2903 100644 (file)
--- a/jjb/centinel/centinel-csit-basic.yaml
+++ b/jjb/centinel/centinel-csit-basic.yaml
@@ -13,8 +13,10 @@
  
      # Project branches
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
        - oxygen:
diff --git a/jjb/centinel/centinel.yaml b/jjb/centinel/centinel.yaml

index fc12a575bfa3aa4012dba3a14634398e5e73db52..8806d681d4c321cd535983dc872b4d8cb8634439 100644 (file)
--- a/jjb/centinel/centinel.yaml
+++ b/jjb/centinel/centinel.yaml
@@ -1,4 +1,21 @@
  ---
+- project:
+    name: centinel-sodium
+    jobs:
+      - odl-maven-jobs
+
+    stream: sodium
+    project: 'centinel'
+    project-name: 'centinel'
+    branch: 'master'
+    mvn-settings: 'centinel-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[centinel]'
+
+    # Used by the release job
+    staging-profile-id: 96bf9b3fefd8a
+
  - project:
      name: centinel-neon
      jobs:
@@ -7,7 +24,7 @@
      stream: neon
      project: 'centinel'
      project-name: 'centinel'
-    branch: 'master'
+    branch: 'stable/neon'
      mvn-settings: 'centinel-settings'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: ''
diff --git a/jjb/coe/coe-csit.yaml b/jjb/coe/coe-csit.yaml

index 7f6b1205e8063dff02cee158b4b9da56bf5be2dd..74e57ec1b6dc5f2922dad2dd9224769aa7ac6d69 100644 (file)
--- a/jjb/coe/coe-csit.yaml
+++ b/jjb/coe/coe-csit.yaml
@@ -11,8 +11,10 @@
      tools_system_image: ZZCI - Ubuntu 16.04 - kubernetes - 20180723-235526.580
  
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
        - oxygen:
diff --git a/jjb/coe/coe-patch-test.yaml b/jjb/coe/coe-patch-test.yaml

index c22ec726c7f9175cb68356f2fcabd37ebd97658b..3a85ed34663d34ab037a7f067c6109caf3ac24b4 100644 (file)
--- a/jjb/coe/coe-patch-test.yaml
+++ b/jjb/coe/coe-patch-test.yaml
@@ -7,8 +7,10 @@
      project: 'coe'
  
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
        - oxygen:
diff --git a/jjb/coe/coe.yaml b/jjb/coe/coe.yaml

index 8b01c9e56ca5c8b2082bb95ccd5d44cf8eec1bfa..ae6e8c6fd64052b4bc9b4153279b136d611bbbc3 100644 (file)
--- a/jjb/coe/coe.yaml
+++ b/jjb/coe/coe.yaml
@@ -1,4 +1,28 @@
  ---
+- project:
+    name: coe-sodium
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          project-pattern: coe
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-coe/34924/
+          rtd-token: 95a5a8fed43b75c6be8432a2643f20a344ba5155
+      - odl-maven-jobs
+
+    project: 'coe'
+    project-name: 'coe'
+    stream: sodium
+    branch: 'master'
+    mvn-settings: 'coe-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
+    email-upstream: '[coe] [odlparent] [yangtools] [controller]'
+    build-node: centos7-docker-2c-8g
+
+    # Used by the release job
+    staging-profile-id: 96c0be46aac33
+
  - project:
      name: coe-neon
      jobs:
@@ -13,7 +37,7 @@
      project: 'coe'
      project-name: 'coe'
      stream: neon
-    branch: 'master'
+    branch: 'stable/neon'
      mvn-settings: 'coe-settings'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
diff --git a/jjb/controller/controller-csit-akka1.yaml b/jjb/controller/controller-csit-akka1.yaml

index 2b655baa6582b70bd6912cca0b55da38bfdd7de7..6dfdeb468daf15b5ed5e6d3303eae5d0ecb14639 100644 (file)
--- a/jjb/controller/controller-csit-akka1.yaml
+++ b/jjb/controller/controller-csit-akka1.yaml
@@ -11,8 +11,10 @@
      functionality: 'akka1'
  
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
        - oxygen:
diff --git a/jjb/controller/controller-csit-clustering.yaml b/jjb/controller/controller-csit-clustering.yaml

index e0c41376e93c3d9b44697d2b8e0152a8a9f456cf..775be11311d29ebb352f851df8f3387fe55e0d19 100644 (file)
--- a/jjb/controller/controller-csit-clustering.yaml
+++ b/jjb/controller/controller-csit-clustering.yaml
@@ -11,8 +11,10 @@
        - 'clustering-tell'
  
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
        - oxygen:
diff --git a/jjb/controller/controller-csit-cs-chasing-leader.yaml b/jjb/controller/controller-csit-cs-chasing-leader.yaml

index 7397512ac038a9d542e7a00139c4caf456176a8c..c35ccb77cf1d543bd61e9e339d610a57d5a2f364 100644 (file)
--- a/jjb/controller/controller-csit-cs-chasing-leader.yaml
+++ b/jjb/controller/controller-csit-cs-chasing-leader.yaml
@@ -12,8 +12,10 @@
  
      # Project branches
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
        - oxygen:
diff --git a/jjb/controller/controller-csit-cs-partnheal.yaml b/jjb/controller/controller-csit-cs-partnheal.yaml

index db10859a7bd9748b58d3084dcc977a41832646f5..c415e70d670fd94cd7b1c39e67b89fdc28672522 100644 (file)
--- a/jjb/controller/controller-csit-cs-partnheal.yaml
+++ b/jjb/controller/controller-csit-cs-partnheal.yaml
@@ -12,8 +12,10 @@
  
      # Project branches
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
        - oxygen:
diff --git a/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml b/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml

index 250ce7da19cc298d378ab615a5592c326ecfe6f9..5a9d876ebb3be661221acde94ba986b2ca264121 100644 (file)
--- a/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml
+++ b/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml
@@ -12,8 +12,10 @@
  
      # Project branches
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
        - oxygen:
diff --git a/jjb/controller/controller-csit-dnb-noloss.yaml b/jjb/controller/controller-csit-dnb-noloss.yaml

index 0aefef94dd6d8eb48f184c6fd5e9eb8044a3abcd..c51db91a90fbb3e0e2e0d1c892af9a949ea05ade 100644 (file)
--- a/jjb/controller/controller-csit-dnb-noloss.yaml
+++ b/jjb/controller/controller-csit-dnb-noloss.yaml
@@ -12,8 +12,10 @@
  
      # Project branches
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
        - oxygen:
diff --git a/jjb/controller/controller-csit-drb-partnheal.yaml b/jjb/controller/controller-csit-drb-partnheal.yaml

index 1239d74f6667f80c6e320cf37a7a065172072a58..c4d563788a7095850af16bd7ff42adb29c1059ee 100644 (file)
--- a/jjb/controller/controller-csit-drb-partnheal.yaml
+++ b/jjb/controller/controller-csit-drb-partnheal.yaml
@@ -12,8 +12,10 @@
  
      # Project branches
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
        - oxygen:
diff --git a/jjb/controller/controller-csit-drb-precedence.yaml b/jjb/controller/controller-csit-drb-precedence.yaml

index 6f95f90c47b96fb2948bb08d4483d1fe1b3344b2..a7964a3a0e355a8cbb66eda20acd278c44b6b8c9 100644 (file)
--- a/jjb/controller/controller-csit-drb-precedence.yaml
+++ b/jjb/controller/controller-csit-drb-precedence.yaml
@@ -12,8 +12,10 @@
  
      # Project branches
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
        - oxygen:
diff --git a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml

index 9f14470e84f77e6d69956dc4f4582182aca12f2d..20da46c3b8b846c14797643d0d11a0adcc02b6a7 100644 (file)
--- a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml
+++ b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml
@@ -12,8 +12,10 @@
  
      # Project branches
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
        - oxygen:
diff --git a/jjb/controller/controller-csit-dsbenchmark.yaml b/jjb/controller/controller-csit-dsbenchmark.yaml

index b54e60c4ae0c3491e7d7c7c967172c385d89f6d4..b012d01e86d0724d86ea3bb5e07e64ff06f7b475 100644 (file)
--- a/jjb/controller/controller-csit-dsbenchmark.yaml
+++ b/jjb/controller/controller-csit-dsbenchmark.yaml
@@ -12,8 +12,10 @@
  
      # Project branches
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
        - oxygen:
diff --git a/jjb/controller/controller-csit-rest-cars-perf.yaml b/jjb/controller/controller-csit-rest-cars-perf.yaml

index a631e6282d62aa4fef3e040c35a9241d158c0ddf..24de0ac2bf8ca6eee9933b5f54f169a99220b360 100644 (file)
--- a/jjb/controller/controller-csit-rest-cars-perf.yaml
+++ b/jjb/controller/controller-csit-rest-cars-perf.yaml
@@ -12,8 +12,10 @@
  
      # Project branches
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
        - oxygen:
diff --git a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml

index a1546a218aa08daacc23b88c97db1d725b2bd4b2..5b38236a665774acd758dd8c66438f8d7a9ebac5 100644 (file)
--- a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml
+++ b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml
@@ -14,8 +14,10 @@
  
      # Project branches
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
        - oxygen:
diff --git a/jjb/controller/controller-patch-test.yaml b/jjb/controller/controller-patch-test.yaml

index a0890e13056d2ec6fe9a62a63611ebca40fbcc39..c36e730afe455455fbbb87ecac3b252f4fe0595b 100644 (file)
--- a/jjb/controller/controller-patch-test.yaml
+++ b/jjb/controller/controller-patch-test.yaml
@@ -7,9 +7,12 @@
      project: 'controller'
  
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
            os-branch: 'queens'
+      - neon:
+          branch: 'stable/neon'
+          os-branch: 'queens'
        - fluorine:
            branch: 'stable/fluorine'
            os-branch: 'queens'
diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml

index 0a16ec99ad9883c675f10003098d23aa6223f1a9..a4ae7d016ba719b6cbec7ee5fff4ab6d3ba1adc0 100644 (file)
--- a/jjb/controller/controller.yaml
+++ b/jjb/controller/controller.yaml
@@ -1,4 +1,31 @@
  ---
+- project:
+    name: controller-sodium
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-maven-javadoc-jobs'
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          project-pattern: controller
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-controller/48288/
+          rtd-token: b8440116c823a80c0fb0479eb7448a9196e6932f
+      - odl-maven-jobs
+
+    stream: sodium
+    project: 'controller'
+    project-name: 'controller'
+    branch: 'master'
+    mvn-settings: 'controller-settings'
+    mvn-goals: 'clean deploy -Pintegrationtests,docs'
+    mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
+    build-node: centos7-builder-8c-8g
+    build-timeout: 90
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}'
+    email-upstream: '[controller] [odlparent] [yangtools] [aaa]'
+
+    # Used by the release job
+    staging-profile-id: 96c1c9177efdd
+
  - project:
      name: controller-neon
      jobs:
@@ -14,7 +41,7 @@
      stream: neon
      project: 'controller'
      project-name: 'controller'
-    branch: 'master'
+    branch: 'stable/neon'
      mvn-settings: 'controller-settings'
      mvn-goals: 'clean deploy -Pintegrationtests,docs'
      mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
diff --git a/jjb/coretutorials/coretutorials.yaml b/jjb/coretutorials/coretutorials.yaml

index 98897a155f893277985cbf567c45a8e55828de34..1ce641b53e03ab31256bf347aa49e2a45d0aa4ea 100644 (file)
--- a/jjb/coretutorials/coretutorials.yaml
+++ b/jjb/coretutorials/coretutorials.yaml
@@ -1,4 +1,22 @@
  ---
+- project:
+    name: coretutorials-sodium
+    jobs:
+      - odl-maven-jobs
+
+    stream: sodium
+    project: 'coretutorials'
+    project-name: 'coretutorials'
+    branch: 'master'
+    mvn-settings: 'coretutorials-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[coretutorials]'
+    build-timeout: 120
+
+    # Used by the release job
+    staging-profile-id: 96cd299563ec6
+
  - project:
      name: coretutorials-neon
      jobs:
@@ -7,7 +25,7 @@
      stream: neon
      project: 'coretutorials'
      project-name: 'coretutorials'
-    branch: 'master'
+    branch: 'stable/neon'
      mvn-settings: 'coretutorials-settings'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: ''
diff --git a/jjb/daexim/daexim-csit-basic.yaml b/jjb/daexim/daexim-csit-basic.yaml

index 731844dea318efb09327c0648ef03025425f452e..c1a6ba502ee31191717d23a1f2291ce8ac4b5b2f 100644 (file)
--- a/jjb/daexim/daexim-csit-basic.yaml
+++ b/jjb/daexim/daexim-csit-basic.yaml
@@ -12,8 +12,10 @@
  
      # Project branches
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
        - oxygen:
diff --git a/jjb/daexim/daexim-csit-clustering-basic.yaml b/jjb/daexim/daexim-csit-clustering-basic.yaml

index bf041892ca6dbe24596ac07db4fb0a74a85ac0ff..dfed23ea74dee679898a1ff2a4482f34409c7896 100644 (file)
--- a/jjb/daexim/daexim-csit-clustering-basic.yaml
+++ b/jjb/daexim/daexim-csit-clustering-basic.yaml
@@ -12,8 +12,10 @@
  
      # Project branches
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
        - oxygen:
diff --git a/jjb/daexim/daexim.yaml b/jjb/daexim/daexim.yaml

index 99057ec6fb5dc56681ef72d5f0b3f420b3c72890..cee7acfafa72bb72ea76411a7cad0632e35748b7 100644 (file)
--- a/jjb/daexim/daexim.yaml
+++ b/jjb/daexim/daexim.yaml
@@ -1,4 +1,27 @@
  ---
+- project:
+    name: daexim-sodium
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          project-pattern: daexim
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-daexim/47611/
+          rtd-token: 76284f12638574f131cdccdf257d852d07c195fc
+      - odl-maven-jobs
+
+    project: 'daexim'
+    project-name: 'daexim'
+    stream: sodium
+    branch: 'master'
+    mvn-settings: 'daexim-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
+    email-upstream: '[daexim] [odlparent] [yangtools] [controller]'
+
+    # Used by the release job
+    staging-profile-id: 96e4dade34bd7
+
  - project:
      name: daexim-neon
      jobs:
@@ -13,7 +36,7 @@
      project: 'daexim'
      project-name: 'daexim'
      stream: neon
-    branch: 'master'
+    branch: 'stable/neon'
      mvn-settings: 'daexim-settings'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
diff --git a/jjb/didm/didm-csit-discovery.yaml b/jjb/didm/didm-csit-discovery.yaml

index 2c630ac722928fe39be851ae3b756168b00a5b5b..ce312defde6128cac9126e9356bbc8ac7343bce7 100644 (file)
--- a/jjb/didm/didm-csit-discovery.yaml
+++ b/jjb/didm/didm-csit-discovery.yaml
@@ -13,8 +13,10 @@
  
      # Project branches
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
        - oxygen:
diff --git a/jjb/didm/didm.yaml b/jjb/didm/didm.yaml

index baf62c47e26c3a165113693ace6c69b9c239f388..b8e7e7399fb48a7829eeec9727e4c4b31c2a2750 100644 (file)
--- a/jjb/didm/didm.yaml
+++ b/jjb/didm/didm.yaml
@@ -1,4 +1,21 @@
  ---
+- project:
+    name: didm-sodium
+    jobs:
+      - odl-maven-jobs
+
+    stream: sodium
+    project: 'didm'
+    project-name: 'didm'
+    branch: 'master'
+    mvn-settings: 'didm-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[didm]'
+
+    # Used by the release job
+    staging-profile-id: 96e6338c870f5
+
  - project:
      name: didm-neon
      jobs:
@@ -7,7 +24,7 @@
      stream: neon
      project: 'didm'
      project-name: 'didm'
-    branch: 'master'
+    branch: 'stable/neon'
      mvn-settings: 'didm-settings'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: ''
diff --git a/jjb/dlux/dlux.yaml b/jjb/dlux/dlux.yaml

index d3aa75ecfa05e85b56152f9f50f3074b74e89201..f342bf494b59c3c21b396ccc43a633cb886f3521 100644 (file)
--- a/jjb/dlux/dlux.yaml
+++ b/jjb/dlux/dlux.yaml
@@ -1,4 +1,21 @@
  ---
+- project:
+    name: dlux-sodium
+    jobs:
+      - odl-maven-jobs
+
+    stream: sodium
+    project: 'dlux'
+    project-name: 'dlux'
+    branch: 'master'
+    mvn-settings: 'dlux-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream}'
+    email-upstream: '[dlux] [odlparent]'
+
+    # Used by the release job
+    staging-profile-id: 96e6a0327484f
+
  - project:
      name: dlux-neon
      jobs:
@@ -7,7 +24,7 @@
      stream: neon
      project: 'dlux'
      project-name: 'dlux'
-    branch: 'master'
+    branch: 'stable/neon'
      mvn-settings: 'dlux-settings'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'odlparent-merge-{stream}'
diff --git a/jjb/dluxapps/dluxapps-csit-yangman.yaml b/jjb/dluxapps/dluxapps-csit-yangman.yaml

index 65f5c6f85880dbb7566e835b4f51f6c450422316..2afc8ff05ec5ec2a5f2f540ee505df7ae9bc46da 100644 (file)
--- a/jjb/dluxapps/dluxapps-csit-yangman.yaml
+++ b/jjb/dluxapps/dluxapps-csit-yangman.yaml
@@ -13,8 +13,10 @@
  
      # Project branches
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
        - oxygen:
diff --git a/jjb/dluxapps/dluxapps.yaml b/jjb/dluxapps/dluxapps.yaml

index 14e23e2dfd65002e687655620fc21a40f56802bd..11a03a780428626defbe30b47c13566949eae9f1 100644 (file)
--- a/jjb/dluxapps/dluxapps.yaml
+++ b/jjb/dluxapps/dluxapps.yaml
@@ -1,4 +1,22 @@
  ---
+- project:
+    name: dluxapps-sodium
+    jobs:
+      - odl-maven-jobs
+
+    project: 'dluxapps'
+    project-name: 'dluxapps'
+    stream: sodium
+    branch: 'master'
+    build-node: centos7-builder-2c-8g
+    mvn-settings: 'dluxapps-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
+    email-upstream: '[dluxapps] [odlparent] [yangtools] [controller]'
+
+    # Used by the release job
+    staging-profile-id: 96e6fb1e65bf9
+
  - project:
      name: dluxapps-neon
      jobs:
@@ -7,7 +25,7 @@
      project: 'dluxapps'
      project-name: 'dluxapps'
      stream: neon
-    branch: 'master'
+    branch: 'stable/neon'
      build-node: centos7-builder-2c-8g
      mvn-settings: 'dluxapps-settings'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/docs/docs-rtd.yaml b/jjb/docs/docs-rtd.yaml

index 53ed32f95cd24cd7fe9bb056a4e57c57951e1ad5..b624019bfc584eac219b1bf5cc3334cbe2a5d04d 100644 (file)
--- a/jjb/docs/docs-rtd.yaml
+++ b/jjb/docs/docs-rtd.yaml
@@ -6,8 +6,10 @@
        - gerrit-tox-verify
  
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
        - oxygen:
diff --git a/jjb/eman/eman.yaml b/jjb/eman/eman.yaml

index be113bbe2615604d97cbf5e22235764b6fcb5667..c9896ae49181dd18fcc9111c39259ddb1b445084 100644 (file)
--- a/jjb/eman/eman.yaml
+++ b/jjb/eman/eman.yaml
@@ -1,4 +1,23 @@
  ---
+- project:
+    name: eman-sodium
+    jobs:
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
+
+    stream: sodium
+    project: 'eman'
+    project-name: 'eman'
+    branch: 'master'
+    mvn-settings: 'eman-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[eman]'
+    build-node: centos7-builder-4c-16g
+
+    # Used by the release job
+    staging-profile-id: 96e9352979521
+
  - project:
      name: eman-neon
      jobs:
@@ -8,7 +27,7 @@
      stream: neon
      project: 'eman'
      project-name: 'eman'
-    branch: 'master'
+    branch: 'stable/neon'
      mvn-settings: 'eman-settings'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: ''
diff --git a/jjb/faas/faas.yaml b/jjb/faas/faas.yaml

index 1cc73c323edef59132bb845863b42ff1dc3a3198..3f99f83c003a9f0503b428da3017f5e63701da1f 100644 (file)
--- a/jjb/faas/faas.yaml
+++ b/jjb/faas/faas.yaml
@@ -1,4 +1,21 @@
  ---
+- project:
+    name: faas-sodium
+    jobs:
+      - odl-maven-jobs
+
+    stream: sodium
+    project: 'faas'
+    project-name: 'faas'
+    branch: 'master'
+    mvn-settings: 'faas-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[faas]'
+
+    # Used by the release job
+    staging-profile-id: 96f5ac591d858
+
  - project:
      name: faas-neon
      jobs:
@@ -7,7 +24,7 @@
      stream: neon
      project: 'faas'
      project-name: 'faas'
-    branch: 'master'
+    branch: 'stable/neon'
      mvn-settings: 'faas-settings'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: ''
diff --git a/jjb/federation/federation.yaml b/jjb/federation/federation.yaml

index 1769fe85d5882e4b8f53b640dd71e0a4fde49765..764a9f67705b6cfe8f2f6f282369dc333fcd64d3 100644 (file)
--- a/jjb/federation/federation.yaml
+++ b/jjb/federation/federation.yaml
@@ -1,4 +1,22 @@
  ---
+- project:
+    name: federation-sodium
+    jobs:
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
+
+    project: 'federation'
+    project-name: 'federation'
+    stream: sodium
+    branch: 'master'
+    mvn-settings: 'federation-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
+    email-upstream: '[federation] [odlparent] [yangtools] [controller]'
+
+    # Used by the release job
+    staging-profile-id: 96f78c7a40a24
+
  - project:
      name: federation-neon
      jobs:
@@ -8,7 +26,7 @@
      project: 'federation'
      project-name: 'federation'
      stream: neon
-    branch: 'master'
+    branch: 'stable/neon'
      mvn-settings: 'federation-settings'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
diff --git a/jjb/genius/genius-csit-genius.yaml b/jjb/genius/genius-csit-genius.yaml

index 46315bb4b09d9bdde34ed71345342177d91a1428..184d1d07cbfc9dd7483c36771a2684ea46ffb43f 100644 (file)
--- a/jjb/genius/genius-csit-genius.yaml
+++ b/jjb/genius/genius-csit-genius.yaml
@@ -16,8 +16,10 @@
      testplan: '{project}-{functionality}.txt'
  
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
        - oxygen:
diff --git a/jjb/genius/genius-patch-test.yaml b/jjb/genius/genius-patch-test.yaml

index 77067e5cb78b551cdb949ffa7448bca760d84fa1..6d95705bd6821f0898c3bbda34430098e691aa87 100644 (file)
--- a/jjb/genius/genius-patch-test.yaml
+++ b/jjb/genius/genius-patch-test.yaml
@@ -7,9 +7,12 @@
      project: 'genius'
  
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
            os-branch: 'queens'
+      - neon:
+          branch: 'stable/neon'
+          os-branch: 'queens'
        - fluorine:
            branch: 'stable/fluorine'
            os-branch: 'queens'
diff --git a/jjb/genius/genius.yaml b/jjb/genius/genius.yaml

index 6aad10ae9aafcc58efe4c6af2f1263da3946ba5b..fb3452d81569ffd29cd37a9b7bf7ac58fb42ba9d 100644 (file)
--- a/jjb/genius/genius.yaml
+++ b/jjb/genius/genius.yaml
@@ -1,4 +1,38 @@
  ---
+- project:
+    name: genius-sodium
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-maven-javadoc-jobs'
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          project-pattern: genius
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-genius/34944/
+          rtd-token: 7ba691afb89bd53d19fd7d8585fdd8bd6620de7f
+      - odl-maven-jobs
+
+    csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
+    block_on_csit: false
+
+    stream: sodium
+    project: 'genius'
+    project-name: 'genius'
+    branch: 'master'
+    build-node: centos7-builder-2c-8g
+    mvn-settings: 'genius-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    build-timeout: 90
+    dependencies: >
+        controller-merge-{stream},
+        yangtools-merge-{stream},
+        odlparent-merge-{stream},
+        openflowplugin-merge-{stream},
+        neutron-merge-{stream}
+    email-upstream: '[genius] [controller] [yangtools] [odlparent] [openflowplugin] [neutron]'
+
+    # Used by the release job
+    staging-profile-id: 96fb4b6d9d1ee
+
  - project:
      name: genius-neon
      jobs:
@@ -17,7 +51,7 @@
      stream: neon
      project: 'genius'
      project-name: 'genius'
-    branch: 'master'
+    branch: 'stable/neon'
      build-node: centos7-builder-2c-8g
      mvn-settings: 'genius-settings'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml

index 732faf41eecfd4210190392bb47318bfba7dbefd..48e130981990b1eea381cab36e5a69c19345c872 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
@@ -19,8 +19,10 @@
      functionality: 'openstack'
  
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
            install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf'
        - fluorine:
            branch: 'stable/fluorine'
diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml

index 5589adb53cc981946f1fd51c3888ebac10c95ae8..f929bfcb5c750a9a2ec30e6caad2421e1ae5ce41 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
@@ -12,8 +12,10 @@
  
      # Project branches
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
        - oxygen:
diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml

index 5779e1a1dfc34ba75b1864d9ed73bc71b067ec50..896762a32ed5ec7c4ed7e960af0440f8e4e42cf1 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
@@ -13,8 +13,10 @@
  
      # Project branches
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
        - oxygen:
diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml

index 10dbc33ad7b23f1340b857c0d09d888d60f4b681..868757e387bdb8e320b470e4c9b1b307834811e1 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml
@@ -13,8 +13,10 @@
  
      # Project branches
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
        - oxygen:
diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml

index 6a826d4746648029e82bda1b61eb9981c18b7d78..c86eeb22f5fcc47aa247e426ccbea746eb893429 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml
@@ -11,8 +11,10 @@
  
      # Project branches
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
        - oxygen:
diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.yaml b/jjb/groupbasedpolicy/groupbasedpolicy.yaml

index 25cbca1dc9b00f088e6d585210da657e3825ebaf..5e1efac09d537546b236fc3ed166c48186abc9e9 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
@@ -1,4 +1,29 @@
  ---
+- project:
+    name: groupbasedpolicy-sodium
+    jobs:
+      - odl-maven-jobs
+
+    stream: sodium
+    project: 'groupbasedpolicy'
+    project-name: 'groupbasedpolicy'
+    branch: 'master'
+    build-node: centos7-builder-2c-8g
+    mvn-settings: 'groupbasedpolicy-settings'
+    mvn-goals: '-U clean deploy findbugs:findbugs'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    build-timeout: 90
+    dependencies: >
+        openflowjava-merge-{stream},
+        openflowplugin-merge-{stream},
+        neutron-merge-{stream},
+        sfc-merge-{stream},
+        ovsdb-merge-{stream}
+    email-upstream: '[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron] [sfc] [ovsdb]'
+
+    # Used by the release job
+    staging-profile-id: 96fbb93f95a76
+
  - project:
      name: groupbasedpolicy-neon
      jobs:
@@ -7,7 +32,7 @@
      stream: neon
      project: 'groupbasedpolicy'
      project-name: 'groupbasedpolicy'
-    branch: 'master'
+    branch: 'stable/neon'
      build-node: centos7-builder-2c-8g
      mvn-settings: 'groupbasedpolicy-settings'
      mvn-goals: '-U clean deploy findbugs:findbugs'
diff --git a/jjb/honeycomb/vbd/vbd.yaml b/jjb/honeycomb/vbd/vbd.yaml

index 659a5765527f5d883be8afeced29d28d5c32fbee..eb8ef932beeb766a6404ff592a71121de5e1b2c4 100644 (file)
--- a/jjb/honeycomb/vbd/vbd.yaml
+++ b/jjb/honeycomb/vbd/vbd.yaml
@@ -1,4 +1,21 @@
  ---
+- project:
+    name: vbd-sodium
+    jobs:
+      - odl-maven-jobs
+
+    stream: sodium
+    project: 'honeycomb/vbd'
+    project-name: 'vbd'
+    branch: 'master'
+    mvn-settings: 'honeycomb-vbd-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[vbd]'
+
+    # Used by the release job
+    staging-profile-id: 96fc362c36862
+
  - project:
      name: vbd-neon
      jobs:
@@ -7,7 +24,7 @@
      stream: neon
      project: 'honeycomb/vbd'
      project-name: 'vbd'
-    branch: 'master'
+    branch: 'stable/neon'
      mvn-settings: 'honeycomb-vbd-settings'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: ''
diff --git a/jjb/infrautils/infrautils-patch-test.yaml b/jjb/infrautils/infrautils-patch-test.yaml

index b584fff798d72c56743f40865683a0e6d113176b..7a9233626fc8db3d7ad640249adf5603e116c4a4 100644 (file)
--- a/jjb/infrautils/infrautils-patch-test.yaml
+++ b/jjb/infrautils/infrautils-patch-test.yaml
@@ -7,9 +7,12 @@
      project: 'infrautils'
  
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
            os-branch: 'queens'
+      - neon:
+          branch: 'stable/neon'
+          os-branch: 'queens'
        - fluorine:
            branch: 'stable/fluorine'
            os-branch: 'queens'
diff --git a/jjb/infrautils/infrautils.yaml b/jjb/infrautils/infrautils.yaml

index 563eb54f694c76975d65e6893f9b79035c5ae694..ccf4124da9ff2d00a1052ae3918a5b56e3f9bf8c 100644 (file)
--- a/jjb/infrautils/infrautils.yaml
+++ b/jjb/infrautils/infrautils.yaml
@@ -1,4 +1,29 @@
  ---
+- project:
+    name: infrautils-sodium
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-maven-javadoc-jobs'
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          doc-dir: .tox/docs/tmp/html
+          project-pattern: infrautils
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-infrautils/38993/
+          rtd-token: 294c76173237e3a088365c31012cf4ddaa767dc9
+      - odl-maven-jobs
+
+    stream: sodium
+    project: 'infrautils'
+    project-name: 'infrautils'
+    branch: 'master'
+    mvn-settings: 'infrautils-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream}'
+    email-upstream: '[infrautils] [odlparent]'
+
+    # Used by the release job
+    staging-profile-id: 96fca0367756c
+
  - project:
      name: infrautils-neon
      jobs:
@@ -15,7 +40,7 @@
      stream: neon
      project: 'infrautils'
      project-name: 'infrautils'
-    branch: 'master'
+    branch: 'stable/neon'
      mvn-settings: 'infrautils-settings'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'odlparent-merge-{stream}'
diff --git a/jjb/integration/distribution/distribution-csit-userfeatures.yaml b/jjb/integration/distribution/distribution-csit-userfeatures.yaml

index 1381e246b30d37cf4159e23d63d8fe4d29254567..f8eaf14f492ccec9aa7400d9a6b5ec4739dacbe9 100644 (file)
--- a/jjb/integration/distribution/distribution-csit-userfeatures.yaml
+++ b/jjb/integration/distribution/distribution-csit-userfeatures.yaml
@@ -12,8 +12,10 @@
  
      # Project branches
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
        - oxygen:
diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml

index 004b1e79622dca93cd68567ff4266a5fa4045ea4..fe292d19aa05cddc9f0da41a9e69c88851c8f91b 100644 (file)
--- a/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@ -19,7 +19,7 @@
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      email-upstream: '[int/dist]'
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
            karaf-version: odl
            # Self-Managed projects repos and features:
@@ -31,6 +31,18 @@
                odl-telemetry-collector,
                odl-telemetry-configurator,
                odl-telemetry-all
+      - neon:
+          branch: 'stable/neon'
+          karaf-version: odl
+          # Self-Managed projects repos and features:
+          sm-repos: >
+              mvn:org.opendaylight.sxp/features-sxp//xml/features,
+              mvn:org.opendaylight.telemetry/features-telemetry//xml/features
+          sm-features: >
+              odl-sxp-routing,
+              odl-telemetry-collector,
+              odl-telemetry-configurator,
+              odl-telemetry-all
        - fluorine:
            branch: 'stable/fluorine'
            karaf-version: odl
@@ -71,7 +83,7 @@
      dist-pom: 'distribution/pom.xml'
  
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
            dependencies: >
                aaa-merge-{stream},
@@ -90,6 +102,25 @@
                ovsdb-merge-{stream},
                serviceutils-merge-{stream},
                sfc-merge-{stream}
+      - neon:
+          branch: 'stable/neon'
+          dependencies: >
+              aaa-merge-{stream},
+              bgpcep-merge-{stream},
+              coe-merge-{stream},
+              controller-merge-{stream},
+              daexim-merge-{stream},
+              genius-merge-{stream},
+              infrautils-merge-{stream},
+              lispflowmapping-merge-{stream},
+              mdsal-merge-{stream},
+              netconf-merge-{stream},
+              netvirt-merge-{stream}
+              neutron-merge-{stream},
+              openflowplugin-merge-{stream},
+              ovsdb-merge-{stream},
+              serviceutils-merge-{stream},
+              sfc-merge-{stream}
        - fluorine:
            branch: 'stable/fluorine'
            dependencies: >
@@ -169,7 +200,7 @@
      dist-pom: 'distribution/opendaylight/pom.xml'
  
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
            karaf-version: odl
            dependencies: >
@@ -178,6 +209,15 @@
                telemetry-merge-{stream},
                tsdr-merge-{stream},
                unimgr-merge-{stream}
+      - neon:
+          branch: 'stable/neon'
+          karaf-version: odl
+          dependencies: >
+              distribution-merge-managed-{stream},
+              sxp-merge-{stream},
+              telemetry-merge-{stream},
+              tsdr-merge-{stream},
+              unimgr-merge-{stream}
        - fluorine:
            branch: 'stable/fluorine'
            karaf-version: odl
@@ -208,9 +248,12 @@
      staging-profile-id: 2af042ed81d5e2
  
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
  
+      - neon:
+          branch: 'stable/neon'
+
        - fluorine:
            branch: 'stable/fluorine'
  
diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml

index b1b6c24d74f9c3cd2ef342cdfd9ebc3925d511ec..3b73465a4b3cac153b82b5b720f139ef3eab013a 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -18,7 +18,7 @@
  
      # CSIT Lists in defaults.yaml
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
            mvn-version: 'mvn35'
            csit-list: !include: csit-jobs-neon.lst
@@ -27,6 +27,15 @@
                daexim ovsdb neutron openflowplugin coe genius lispflowmapping sfc netvirt
                bgpcep integration/distribution
  
+      - neon:
+          branch: 'stable/neon'
+          mvn-version: 'mvn35'
+          csit-list: !include: csit-jobs-neon.lst
+          build-order: >
+              odlparent yangtools infrautils mdsal controller serviceutils aaa netconf
+              daexim ovsdb neutron openflowplugin coe genius lispflowmapping sfc netvirt
+              bgpcep integration/distribution
+
        - fluorine:
            branch: 'stable/fluorine'
            mvn-version: 'mvn35'
diff --git a/jjb/iotdm/iotdm-csit-basic.yaml b/jjb/iotdm/iotdm-csit-basic.yaml

index df7ec1e491997661772e5225a456d3690fe8424b..6d3c7e2e0cecc31dc4d6356f6d78c9768f84a233 100644 (file)
--- a/jjb/iotdm/iotdm-csit-basic.yaml
+++ b/jjb/iotdm/iotdm-csit-basic.yaml
@@ -13,8 +13,10 @@
  
      # Project branches
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
        - oxygen:
diff --git a/jjb/iotdm/iotdm.yaml b/jjb/iotdm/iotdm.yaml

index 784e75ccdf80c98491c313e240b44d3edb694ef0..cbc1aa35557f58d94048665bd3cfd74337c18fdc 100644 (file)
--- a/jjb/iotdm/iotdm.yaml
+++ b/jjb/iotdm/iotdm.yaml
@@ -1,4 +1,22 @@
  ---
+- project:
+    name: iotdm-sodium
+    jobs:
+      - odl-maven-jobs
+
+    stream: sodium
+    project: 'iotdm'
+    project-name: 'iotdm'
+    branch: 'master'
+    build-node: centos7-builder-2c-8g
+    mvn-settings: 'iotdm-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'aaa-merge-{stream}'
+    email-upstream: '[iotdm] [aaa]'
+
+    # Used by the release job
+    staging-profile-id: 96fd6e9453970
+
  - project:
      name: iotdm-neon
      jobs:
@@ -7,7 +25,7 @@
      stream: neon
      project: 'iotdm'
      project-name: 'iotdm'
-    branch: 'master'
+    branch: 'stable/neon'
      build-node: centos7-builder-2c-8g
      mvn-settings: 'iotdm-settings'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/jsonrpc/jsonrpc-csit-basic.yaml b/jjb/jsonrpc/jsonrpc-csit-basic.yaml

index c6a0cb8fec4a44b78d87b6f8fe282e6cd1cca4a1..d91bb5769d6b60b3f35e9210bfe2703ff5ebf12d 100644 (file)
--- a/jjb/jsonrpc/jsonrpc-csit-basic.yaml
+++ b/jjb/jsonrpc/jsonrpc-csit-basic.yaml
@@ -15,8 +15,10 @@
  
      # Project branches
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
        - oxygen:
diff --git a/jjb/jsonrpc/jsonrpc.yaml b/jjb/jsonrpc/jsonrpc.yaml

index 5059f3172e785d9f8fb0f37b675e0fcb9672b436..2900923fbdab3c88815cada58c87f05e6d89ecb1 100644 (file)
--- a/jjb/jsonrpc/jsonrpc.yaml
+++ b/jjb/jsonrpc/jsonrpc.yaml
@@ -1,4 +1,21 @@
  ---
+- project:
+    name: jsonrpc-sodium
+    jobs:
+      - odl-maven-jobs
+
+    project: 'jsonrpc'
+    project-name: 'jsonrpc'
+    stream: sodium
+    branch: 'master'
+    mvn-settings: 'jsonrpc-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}'
+    email-upstream: '[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]'
+
+    # Used by the release job
+    staging-profile-id: 96fdf4408765d
+
  - project:
      name: jsonrpc-neon
      jobs:
@@ -7,7 +24,7 @@
      project: 'jsonrpc'
      project-name: 'jsonrpc'
      stream: neon
-    branch: 'master'
+    branch: 'stable/neon'
      mvn-settings: 'jsonrpc-settings'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}'
diff --git a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml

index 332eddb349ec5fdd31ad6da6653e8e86807f9927..864ac008d8e627629788cafabc203e9437636151 100644 (file)
--- a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
+++ b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
@@ -12,8 +12,10 @@
  
      # Project branches
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
        - oxygen:
diff --git a/jjb/l2switch/l2switch-csit-scalability.yaml b/jjb/l2switch/l2switch-csit-scalability.yaml

index 2366e31e099b7e3406ddc1548a8144066168b2d5..c056515c3454f45ef8c029a49ade2abbef20b63e 100644 (file)
--- a/jjb/l2switch/l2switch-csit-scalability.yaml
+++ b/jjb/l2switch/l2switch-csit-scalability.yaml
@@ -12,8 +12,10 @@
  
      # Project branches
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
        - oxygen:
diff --git a/jjb/l2switch/l2switch-csit-switch.yaml b/jjb/l2switch/l2switch-csit-switch.yaml

index 3c7fd0e8171f2c16abd99207cdd63336c1717012..816c2a609128bdf81dabef5d8baca492500d38a6 100644 (file)
--- a/jjb/l2switch/l2switch-csit-switch.yaml
+++ b/jjb/l2switch/l2switch-csit-switch.yaml
@@ -13,8 +13,10 @@
  
      # Project branches
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
        - oxygen:
diff --git a/jjb/l2switch/l2switch-patch-test.yaml b/jjb/l2switch/l2switch-patch-test.yaml

index 8634fd4497c213d298f45643ef763eda7d0050b5..6b00d9eb2835637fa0b141cb90d1e0edca879058 100644 (file)
--- a/jjb/l2switch/l2switch-patch-test.yaml
+++ b/jjb/l2switch/l2switch-patch-test.yaml
@@ -9,8 +9,11 @@
  
      # Project branches
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+          os-branch: 'queens'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
        - oxygen:
diff --git a/jjb/l2switch/l2switch.yaml b/jjb/l2switch/l2switch.yaml

index 176de3580dfcb6f6e5ea164abb657c99bf8f19e0..60277c1509042afbd608b71cb3fe3f47a82f53bd 100644 (file)
--- a/jjb/l2switch/l2switch.yaml
+++ b/jjb/l2switch/l2switch.yaml
@@ -1,4 +1,26 @@
  ---
+- project:
+    name: l2switch-sodium
+    jobs:
+      - odl-maven-jobs
+
+    stream: sodium
+    project: 'l2switch'
+    project-name: 'l2switch'
+    branch: 'master'
+    mvn-settings: 'l2switch-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+    dependencies: >
+        odlparent-merge-{stream},
+        yangtools-merge-{stream},
+        controller-merge-{stream},
+        openflowjava-merge-{stream},
+        openflowplugin-merge-{stream}
+    email-upstream: '[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]'
+
+    # Used by the release job
+    staging-profile-id: 96fee85953ca0
+
  - project:
      name: l2switch-neon
      jobs:
@@ -7,7 +29,7 @@
      stream: neon
      project: 'l2switch'
      project-name: 'l2switch'
-    branch: 'master'
+    branch: 'stable/neon'
      mvn-settings: 'l2switch-settings'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
      dependencies: >
diff --git a/jjb/lacp/lacp-csit-lacp.yaml b/jjb/lacp/lacp-csit-lacp.yaml

index 1cc1b232f97b2d4af776b5204c16339de3b74256..1195292a925d0adb5ec115fb8f6e14e51929716b 100644 (file)
--- a/jjb/lacp/lacp-csit-lacp.yaml
+++ b/jjb/lacp/lacp-csit-lacp.yaml
@@ -13,8 +13,10 @@
  
      # Project branches
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
        - oxygen:
diff --git a/jjb/lacp/lacp.yaml b/jjb/lacp/lacp.yaml

index 67ac76291d9bfa7b6248aa95e2eb55a5186a1aa4..322f27baa7b22325d324ae3506d488e814954f6b 100644 (file)
--- a/jjb/lacp/lacp.yaml
+++ b/jjb/lacp/lacp.yaml
@@ -1,4 +1,21 @@
  ---
+- project:
+    name: lacp-sodium
+    jobs:
+      - odl-maven-jobs
+
+    stream: sodium
+    project: 'lacp'
+    project-name: 'lacp'
+    branch: 'master'
+    mvn-settings: 'lacp-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'openflowjava-merge-{stream},openflowplugin-merge-{stream}'
+    email-upstream: '[lacp] [openflowjava] [openflowplugin]'
+
+    # Used by the release job
+    staging-profile-id: 96ff6c0ff6ab1
+
  - project:
      name: lacp-neon
      jobs:
@@ -7,7 +24,7 @@
      stream: neon
      project: 'lacp'
      project-name: 'lacp'
-    branch: 'master'
+    branch: 'stable/neon'
      mvn-settings: 'lacp-settings'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'openflowjava-merge-{stream},openflowplugin-merge-{stream}'
diff --git a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml

index a08c79e5a82be0e4f12c6288d253eab2eb158f61..cfdc281d64f921debb7eade7f85724ba08fa78e9 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
+++ b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
@@ -14,8 +14,10 @@
  
      # Project branches
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
        - oxygen:
diff --git a/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml b/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml

index 9017bc0674e0d966731c45eb926e3f4a7d425b89..88f17c38fa3f89907b448b1fba0d497de8188874 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml
+++ b/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml
@@ -12,8 +12,10 @@
  
      # Project branches
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
        - oxygen:
diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml

index 4d5492db04098df6d2d362da47b49630c44f0a70..957bc14dd709006af291dd8e73512ad64ed1c4b8 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping.yaml
+++ b/jjb/lispflowmapping/lispflowmapping.yaml
@@ -1,4 +1,37 @@
  ---
+- project:
+    name: lispflowmapping-sodium
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-maven-javadoc-jobs'
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          project-pattern: lispflowmapping
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-lispflowmapping/47783/
+          rtd-token: 181be9dd804e4969b9f318a6f1988e3cbee9d9a8
+      - odl-maven-jobs
+
+    java-version:
+      - openjdk8
+      - openjdk11
+    stream: sodium
+    project: 'lispflowmapping'
+    project-name: 'lispflowmapping'
+    branch: 'master'
+    mvn-settings: 'lispflowmapping-settings'
+    mvn-goals: 'clean deploy findbugs:findbugs javadoc:aggregate -DrepoBuild'
+    mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m -Dmaven.compile.fork=true'
+    dependencies: 'controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream},neutron-merge-{stream}'
+    email-upstream: '[lispflowmapping] [controller] [odlparent] [yangtools] [neutron]'
+    archive-artifacts: >
+        **/*.log
+        **/target/surefire-reports/*-output.txt
+
+    build-node: centos7-builder-8c-8g
+
+    # Used by the release job
+    staging-profile-id: 96fff2503b766
+
  - project:
      name: lispflowmapping-neon
      jobs:
@@ -17,7 +50,7 @@
      stream: neon
      project: 'lispflowmapping'
      project-name: 'lispflowmapping'
-    branch: 'master'
+    branch: 'stable/neon'
      mvn-settings: 'lispflowmapping-settings'
      mvn-goals: 'clean deploy findbugs:findbugs javadoc:aggregate -DrepoBuild'
      mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m -Dmaven.compile.fork=true'
diff --git a/jjb/mdsal/mdsal-csit-bindingv1.yaml b/jjb/mdsal/mdsal-csit-bindingv1.yaml

index 0f36f54fe2a90722147fc89ee399f8563d655062..7b9e2ad0c637a6eed94737a02860b085dd682702 100644 (file)
--- a/jjb/mdsal/mdsal-csit-bindingv1.yaml
+++ b/jjb/mdsal/mdsal-csit-bindingv1.yaml
@@ -12,8 +12,10 @@
      functionality: 'bindingv1'
  
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
        - oxygen:
diff --git a/jjb/mdsal/mdsal-patch-test.yaml b/jjb/mdsal/mdsal-patch-test.yaml

index ffafa87c310ffd9849f5f0b0b1957fe15104a832..720d0d6a42d1a824549de98d5e54aaef3fc1cc2c 100644 (file)
--- a/jjb/mdsal/mdsal-patch-test.yaml
+++ b/jjb/mdsal/mdsal-patch-test.yaml
@@ -7,9 +7,12 @@
      project: 'mdsal'
  
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
            os-branch: 'queens'
+      - neon:
+          branch: 'stable/neon'
+          os-branch: 'queens'
        - fluorine:
            branch: 'stable/fluorine'
            os-branch: 'queens'
diff --git a/jjb/natapp/natapp.yaml b/jjb/natapp/natapp.yaml

index 26098a6fa192febcd89e504112696e2b99fba5a8..073a5c03ae3aac24a58dd8460fe018efaca28422 100644 (file)
--- a/jjb/natapp/natapp.yaml
+++ b/jjb/natapp/natapp.yaml
@@ -1,4 +1,22 @@
  ---
+- project:
+    name: natapp-sodium
+    jobs:
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
+
+    stream: sodium
+    project: 'natapp'
+    project-name: 'natapp'
+    branch: 'master'
+    mvn-settings: 'natapp-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'openflowplugin-merge-{stream}'
+    email-upstream: '[natapp] [openflowplugin]'
+
+    # Used by the release job
+    staging-profile-id: a679c0f4f08a8
+
  - project:
      name: natapp-neon
      jobs:
@@ -8,7 +26,7 @@
      stream: neon
      project: 'natapp'
      project-name: 'natapp'
-    branch: 'master'
+    branch: 'stable/neon'
      mvn-settings: 'natapp-settings'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'openflowplugin-merge-{stream}'
diff --git a/jjb/nemo/nemo-csit-engine.yaml b/jjb/nemo/nemo-csit-engine.yaml

index d56aeb22e9fa3622d1f08dd6886d27255f15f962..74e979bc2b63f0b4cd4b01e279e5280008278cbc 100644 (file)
--- a/jjb/nemo/nemo-csit-engine.yaml
+++ b/jjb/nemo/nemo-csit-engine.yaml
@@ -13,8 +13,10 @@
  
      # Project branches
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
        - oxygen:
diff --git a/jjb/nemo/nemo.yaml b/jjb/nemo/nemo.yaml

index dc24a888f044c146c914ec86b0d7a2224bea8e76..b66975f183284dd73908529232d8494f88d255c4 100644 (file)
--- a/jjb/nemo/nemo.yaml
+++ b/jjb/nemo/nemo.yaml
@@ -1,4 +1,21 @@
  ---
+- project:
+    name: nemo-sodium
+    jobs:
+      - odl-maven-jobs
+
+    stream: sodium
+    project: 'nemo'
+    project-name: 'nemo'
+    branch: 'master'
+    mvn-settings: 'nemo-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[nemo]'
+
+    # Used by the release job
+    staging-profile-id: a67a9890f6202
+
  - project:
      name: nemo-neon
      jobs:
@@ -7,7 +24,7 @@
      stream: neon
      project: 'nemo'
      project-name: 'nemo'
-    branch: 'master'
+    branch: 'stable/neon'
      mvn-settings: 'nemo-settings'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: ''
diff --git a/jjb/netconf/netconf-clustering-scale.yaml b/jjb/netconf/netconf-clustering-scale.yaml

index 7652b068fb23f96001147d23bbee74f793fae30d..99e7ca44b4cd0ce7b0920b150dd8b17f4ed1138c 100644 (file)
--- a/jjb/netconf/netconf-clustering-scale.yaml
+++ b/jjb/netconf/netconf-clustering-scale.yaml
@@ -12,8 +12,10 @@
  
      # Project branches
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
        - oxygen:
diff --git a/jjb/netconf/netconf-clustering.yaml b/jjb/netconf/netconf-clustering.yaml

index 85766f77d4235bb6ceee02633e9bb1de3e63e6a7..b4dc4b99316359797e0217dbf9922b42bfe7d91d 100644 (file)
--- a/jjb/netconf/netconf-clustering.yaml
+++ b/jjb/netconf/netconf-clustering.yaml
@@ -12,8 +12,10 @@
  
      # Project branches
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
        - oxygen:
diff --git a/jjb/netconf/netconf-csit-callhome.yaml b/jjb/netconf/netconf-csit-callhome.yaml

index 7e85868e0045b347133ca037cad87c54cac2eacd..9fefcbb30aa2f8d50b0f2bab99ea5e0bca74ee37 100644 (file)
--- a/jjb/netconf/netconf-csit-callhome.yaml
+++ b/jjb/netconf/netconf-csit-callhome.yaml
@@ -14,8 +14,10 @@
  
      # Project branches
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
        - oxygen:
diff --git a/jjb/netconf/netconf-patch-test.yaml b/jjb/netconf/netconf-patch-test.yaml

index 8c2119f2cfbe74838d03dabb3bfb9f8a87b1e505..5af1fa1ee52effb128bf095f7f2a19346b53e849 100644 (file)
--- a/jjb/netconf/netconf-patch-test.yaml
+++ b/jjb/netconf/netconf-patch-test.yaml
@@ -7,9 +7,12 @@
      project: 'netconf'
  
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
            os-branch: 'queens'
+      - neon:
+          branch: 'stable/neon'
+          os-branch: 'queens'
        - fluorine:
            branch: 'stable/fluorine'
            os-branch: 'queens'
diff --git a/jjb/netconf/netconf-scale.yaml b/jjb/netconf/netconf-scale.yaml

index 6070964f4e70201ce8bc34582f7df72fcb1f879f..ccef3541361a9a11caeba58340a86a2f95c5d4df 100644 (file)
--- a/jjb/netconf/netconf-scale.yaml
+++ b/jjb/netconf/netconf-scale.yaml
@@ -12,8 +12,10 @@
  
      # Project branches
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
        - oxygen:
diff --git a/jjb/netconf/netconf-userfeatures.yaml b/jjb/netconf/netconf-userfeatures.yaml

index fdbd77aaa90ea0f827117a44f47d383cb80e8d44..f38af32c1fa918561fa0a1e2b92c9295b4142822 100644 (file)
--- a/jjb/netconf/netconf-userfeatures.yaml
+++ b/jjb/netconf/netconf-userfeatures.yaml
@@ -15,8 +15,10 @@
  
      # Project branches
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
        - oxygen:
diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml

index e3f6be7f604a87e9d8b680190eaebfaa608727db..2e633990691a3afa1acb36afa10efb13936a8c8b 100644 (file)
--- a/jjb/netconf/netconf.yaml
+++ b/jjb/netconf/netconf.yaml
@@ -1,4 +1,30 @@
  ---
+- project:
+    name: netconf-sodium
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          project-pattern: netconf
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-netconf/48397/
+          rtd-token: aee2df909686ab7ba36f2ed08d90bdcf81f7b8dc
+      - odl-maven-jobs
+
+    stream: sodium
+    project: 'netconf'
+    project-name: 'netconf'
+    branch: 'master'
+    build-node: centos7-builder-2c-8g
+    mvn-settings: 'netconf-settings'
+    mvn-goals: 'clean deploy -Pintegrationtests'
+    mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
+    build-timeout: 90
+    dependencies: 'aaa-merge-{stream},controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream}'
+    email-upstream: '[netconf] [aaa] [controller] [odlparent] [yangtools]'
+
+    # Used by the release job
+    staging-profile-id: a67b22fc3663f
+
  - project:
      name: netconf-neon
      jobs:
@@ -13,7 +39,7 @@
      stream: neon
      project: 'netconf'
      project-name: 'netconf'
-    branch: 'master'
+    branch: 'stable/neon'
      build-node: centos7-builder-2c-8g
      mvn-settings: 'netconf-settings'
      mvn-goals: 'clean deploy -Pintegrationtests'
diff --git a/jjb/netide/netide.yaml b/jjb/netide/netide.yaml

index 4a6e1609b68e7cdee5a87f3ef7c7ce43b0ea8196..206a3ce2e070c779ddb8c4899ca01c30cebd53bf 100644 (file)
--- a/jjb/netide/netide.yaml
+++ b/jjb/netide/netide.yaml
@@ -1,4 +1,21 @@
  ---
+- project:
+    name: netide-sodium
+    jobs:
+      - odl-maven-jobs
+
+    stream: sodium
+    project: 'netide'
+    project-name: 'netide'
+    branch: 'master'
+    mvn-settings: 'netide-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'openflowjava-merge-{stream}'
+    email-upstream: '[netide] [openflowjava]'
+
+    # Used by the release job
+    staging-profile-id: a67bab3755815
+
  - project:
      name: netide-neon
      jobs:
@@ -7,7 +24,7 @@
      stream: neon
      project: 'netide'
      project-name: 'netide'
-    branch: 'master'
+    branch: 'stable/neon'
      mvn-settings: 'netide-settings'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'openflowjava-merge-{stream}'
diff --git a/jjb/netvirt/netvirt-csit-multi-apex.yaml b/jjb/netvirt/netvirt-csit-multi-apex.yaml

index 005558ef50971ca114ad26d625951e5f8977107f..72c21f8e2240f214df5434a67a0658cfd265e101 100644 (file)
--- a/jjb/netvirt/netvirt-csit-multi-apex.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-apex.yaml
@@ -6,8 +6,10 @@
  
      project: 'netvirt'
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
        - oxygen:
diff --git a/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml b/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml

index d4a244d316f531c1d484f453a04aa2bb4ce8ddaa..de87d89611da5890081f847e8e16b430cdc2baed 100644 (file)
--- a/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml
@@ -7,8 +7,10 @@
      project: 'netvirt'
  
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
  
diff --git a/jjb/netvirt/netvirt-patch-test.yaml b/jjb/netvirt/netvirt-patch-test.yaml

index 1827b80726242b112e1c9cab4a6545bc55eab102..3fd404a3809cefc8efadabb9c8747079918f39c2 100644 (file)
--- a/jjb/netvirt/netvirt-patch-test.yaml
+++ b/jjb/netvirt/netvirt-patch-test.yaml
@@ -7,9 +7,12 @@
      project: 'netvirt'
  
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
            os-branch: 'queens'
+      - neon:
+          branch: 'stable/neon'
+          os-branch: 'queens'
        - fluorine:
            branch: 'stable/fluorine'
            os-branch: 'queens'
diff --git a/jjb/netvirt/netvirt.yaml b/jjb/netvirt/netvirt.yaml

index 02039887a075ee64bde7ed607e474077a6383b7c..aa10596e594e677732a3529061dac38aaa5856b5 100644 (file)
--- a/jjb/netvirt/netvirt.yaml
+++ b/jjb/netvirt/netvirt.yaml
@@ -17,8 +17,10 @@
      block_on_csit: false
  
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
        - oxygen:
diff --git a/jjb/neutron/neutron-patch-test.yaml b/jjb/neutron/neutron-patch-test.yaml

index 2453f98128c214316d655b39720352f4f711c735..35d51233eaf3e345548c97fa7adcd6622fff1662 100644 (file)
--- a/jjb/neutron/neutron-patch-test.yaml
+++ b/jjb/neutron/neutron-patch-test.yaml
@@ -7,9 +7,12 @@
      project: 'neutron'
  
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
            os-branch: 'queens'
+      - neon:
+          branch: 'stable/neon'
+          os-branch: 'queens'
        - fluorine:
            branch: 'stable/fluorine'
            os-branch: 'queens'
diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml

index 20e835ed5e4028bb0178bbec050beca6dd4f1030..a1260d178ceb574f8d5fb2bd1c51bdf16b50e013 100644 (file)
--- a/jjb/neutron/neutron.yaml
+++ b/jjb/neutron/neutron.yaml
@@ -1,4 +1,24 @@
  ---
+- project:
+    name: neutron-sodium
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
+
+    stream: sodium
+    project: 'neutron'
+    project-name: 'neutron'
+    build-timeout: 90
+    branch: 'master'
+    mvn-settings: 'neutron-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}'
+    email-upstream: '[neutron] [odlparent] [aaa]'
+
+    # Used by the release job
+    staging-profile-id: a67e1b40d7419
+
  - project:
      name: neutron-neon
      jobs:
@@ -10,7 +30,7 @@
      project: 'neutron'
      project-name: 'neutron'
      build-timeout: 90
-    branch: 'master'
+    branch: 'stable/neon'
      mvn-settings: 'neutron-settings'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}'
diff --git a/jjb/next/next.yaml b/jjb/next/next.yaml

index ed3e16aed51e31693c130171103a8418895597a8..a984e31e6a7acfc04170522925c4d52452bd2156 100644 (file)
--- a/jjb/next/next.yaml
+++ b/jjb/next/next.yaml
@@ -1,4 +1,21 @@
  ---
+- project:
+    name: next-sodium
+    jobs:
+      - odl-maven-jobs
+
+    stream: sodium
+    project: 'next'
+    project-name: 'next'
+    branch: 'master'
+    mvn-settings: 'next-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[next]'
+
+    # Used by the release job
+    staging-profile-id: a67e7c516f385
+
  - project:
      name: next-neon
      jobs:
@@ -7,7 +24,7 @@
      stream: neon
      project: 'next'
      project-name: 'next'
-    branch: 'master'
+    branch: 'stable/neon'
      mvn-settings: 'next-settings'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: ''
diff --git a/jjb/nic/nic.yaml b/jjb/nic/nic.yaml

index c8421b900d5d1f0497d3ae1208951dd13584c6b1..6f5b8722e6556c3ee109fa6a7d0dac1a536a6060 100644 (file)
--- a/jjb/nic/nic.yaml
+++ b/jjb/nic/nic.yaml
@@ -1,4 +1,22 @@
  ---
+- project:
+    name: nic-sodium
+    jobs:
+      - odl-maven-jobs
+
+    stream: sodium
+    project: 'nic'
+    project-name: 'nic'
+    branch: 'master'
+    build-node: centos7-builder-2c-8g
+    mvn-settings: 'nic-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'vtn-merge-{stream},groupbasedpolicy-merge-{stream}'
+    email-upstream: '[nic] [vtn] [groupbasedpolicy]'
+
+    # Used by the release job
+    staging-profile-id: a67ef386204aa
+
  - project:
      name: nic-neon
      jobs:
@@ -7,7 +25,7 @@
      stream: neon
      project: 'nic'
      project-name: 'nic'
-    branch: 'master'
+    branch: 'stable/neon'
      build-node: centos7-builder-2c-8g
      mvn-settings: 'nic-settings'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/ocpplugin/ocpplugin.yaml b/jjb/ocpplugin/ocpplugin.yaml

index c07b59a6581e8490d059045a9f98556c07c1c98c..9ecbf5106e2645eae7ae11c3536494714548f6f5 100644 (file)
--- a/jjb/ocpplugin/ocpplugin.yaml
+++ b/jjb/ocpplugin/ocpplugin.yaml
@@ -1,4 +1,21 @@
  ---
+- project:
+    name: ocpplugin-sodium
+    jobs:
+      - odl-maven-jobs
+
+    stream: sodium
+    project: 'ocpplugin'
+    project-name: 'ocpplugin'
+    branch: 'master'
+    mvn-settings: 'ocpplugin-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
+    email-upstream: '[ocpplugin] [odlparent] [yangtools] [controller]'
+
+    # Used by the release job
+    staging-profile-id: a687673279f9c
+
  - project:
      name: ocpplugin-neon
      jobs:
@@ -7,7 +24,7 @@
      stream: neon
      project: 'ocpplugin'
      project-name: 'ocpplugin'
-    branch: 'master'
+    branch: 'stable/neon'
      mvn-settings: 'ocpplugin-settings'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
diff --git a/jjb/odlparent/odlparent-patch-test.yaml b/jjb/odlparent/odlparent-patch-test.yaml

index 1ba9d383be03469e4b91533625200f4552f59f2e..ad6d163ce80b3b43b74cda3bfd9400c320a38247 100644 (file)
--- a/jjb/odlparent/odlparent-patch-test.yaml
+++ b/jjb/odlparent/odlparent-patch-test.yaml
@@ -7,9 +7,12 @@
      project: 'odlparent'
  
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
            os-branch: 'queens'
+      - neon:
+          branch: 'stable/neon'
+          os-branch: 'queens'
        - fluorine:
            branch: 'stable/fluorine'
            os-branch: 'queens'
diff --git a/jjb/odltools/odltools-csit.yaml b/jjb/odltools/odltools-csit.yaml

index 4c848fa5893e87ce7237b52382513cddd213105f..944eb6100d8f0cc20438c64c8e5145093859a446 100644 (file)
--- a/jjb/odltools/odltools-csit.yaml
+++ b/jjb/odltools/odltools-csit.yaml
@@ -10,8 +10,10 @@
      testplan: '{project}-basic.txt'
  
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
  
diff --git a/jjb/odltools/odltools-patch-test.yaml b/jjb/odltools/odltools-patch-test.yaml

index 6104f4fd5e741fa0a1dd6769efa16e946993e0fa..89d1baae80de46099eee40a44f95c113d5dc561f 100644 (file)
--- a/jjb/odltools/odltools-patch-test.yaml
+++ b/jjb/odltools/odltools-patch-test.yaml
@@ -8,8 +8,10 @@
      jdk: openjdk8
  
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
  
diff --git a/jjb/odltools/odltools.yaml b/jjb/odltools/odltools.yaml

index 60055fe106140b4be9ddaffe317e962be017c8f2..c323c7cf4b6988df151dcf1532f5a291c88dee91 100644 (file)
--- a/jjb/odltools/odltools.yaml
+++ b/jjb/odltools/odltools.yaml
@@ -11,8 +11,10 @@
            rtd-token: 225d4ef64e1efce4fe3ba4c9c4fe772355d3c8b2
  
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
  
diff --git a/jjb/of-config/of-config.yaml b/jjb/of-config/of-config.yaml

index c4baf3664d86abcfee2a55b2dd5b265c11e18b9e..d58d472758d064a1c1ed5232f52082858ed9f381 100644 (file)
--- a/jjb/of-config/of-config.yaml
+++ b/jjb/of-config/of-config.yaml
@@ -1,4 +1,21 @@
  ---
+- project:
+    name: of-config-sodium
+    jobs:
+      - odl-maven-jobs
+
+    stream: sodium
+    project: 'of-config'
+    project-name: 'of-config'
+    branch: 'master'
+    mvn-settings: 'of-config-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: netconf-merge-{stream}'
+    email-upstream: '[of-config] [netconf]'
+
+    # Used by the release job
+    staging-profile-id: a6880455efe67
+
  - project:
      name: of-config-neon
      jobs:
@@ -7,7 +24,7 @@
      stream: neon
      project: 'of-config'
      project-name: 'of-config'
-    branch: 'master'
+    branch: 'stable/neon'
      mvn-settings: 'of-config-settings'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: netconf-merge-{stream}'
diff --git a/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml b/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml

index 4cda23afcd78b588732113a154b87782828f10b5..7e42629e1a32e4098e3386f452f768c88064591e 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml
@@ -10,8 +10,10 @@
  
      # Project branches
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
        - oxygen:
diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml

index b404b273f4e1b8f1fef7da48146815486f5105c6..cc0769a33ab874aec3acb6b12133958a3e3cc31b 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml
@@ -12,8 +12,10 @@
  
      # Project branches
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
        - oxygen:
diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml

index 04b07adb1f677b61f1fb9f872ff15c45ad8ae55b..ea16ddbf7091ff4f36dd76309f7e90c83a7494be 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml
@@ -14,8 +14,10 @@
  
      # Project branches
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
        - oxygen:
diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml

index 6cf7e904ee4a74eee84dc36d75112b6ac83eaa83..eaa1bed6d9e5038640f3813efb6ef4b5c2761586 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml
@@ -14,8 +14,10 @@
  
      # Project branches
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
        - oxygen:
diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml

index 9bbc4cf698cde000b6576fff60d2b5b33b52ba10..7c93f51616b2f53fd13b763ecbd2995fc66e0a4f 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
@@ -14,8 +14,10 @@
  
      # Project branches
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
        - oxygen:
diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml

index 36c42a25308ce6be16775c7450add4a55d9a1f1d..bd26c91cb8accf6e4c02f49c24cf996b7e2b8469 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
@@ -14,8 +14,10 @@
  
      # Project branches
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
        - oxygen:
diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml

index ca0d53dbe07e80754405eec5f0e5715112493002..115eb1425e2485e5552e5c3ea75bba0488d8cf44 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
@@ -13,8 +13,10 @@
  
      # Project branches
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
        - oxygen:
diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml

index 540f34830855505b7f2c7b53fa7566651026a7a7..723c44bd1b776c56869d96bfffeac78cb4e63643 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml
@@ -14,8 +14,10 @@
  
      # Project branches
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
        - oxygen:
diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml

index 1232f7ff9dbb45834d8fc0122dcd2baecb76dff0..d85f6e9b46e0e9163bfdcb02af88e9d394efcac0 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml
@@ -14,8 +14,10 @@
  
      # Project branches
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
        - oxygen:
diff --git a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml

index aa2a4db56aa826284460afec764323678b4b6920..f3a37540ea5ef78c59e5cb6f3dd0aa9439a91ac4 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml
@@ -13,8 +13,10 @@
  
      # Project branches
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
        - oxygen:
diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml

index f5287d8b9cd3ce36d370f7c4e5aa6c61177f8554..d3a3b5fdb06a527ba836aa8a06b0e570af568d18 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml
@@ -12,8 +12,10 @@
  
      # Project branches
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
        - oxygen:
diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml

index 7bd8ad239e5e831f3f376f9f3236e951f6b7d22b..0b07f9c9f1a9edc359ce195a557d388d864b17c7 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml
@@ -12,8 +12,10 @@
  
      # Project branches
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
        - oxygen:
diff --git a/jjb/openflowplugin/openflowplugin-csit-scale.yaml b/jjb/openflowplugin/openflowplugin-csit-scale.yaml

index 7d0a84343612501424320651bb236e3204ec3414..f0d78b2dc03c89eace04992732d93e70f1ec527a 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scale.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale.yaml
@@ -14,8 +14,10 @@
  
      # Project branches
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
        - oxygen:
diff --git a/jjb/openflowplugin/openflowplugin-patch-test.yaml b/jjb/openflowplugin/openflowplugin-patch-test.yaml

index bcfd5647e3a9c417485658667ad1553c84e215a3..c261be8bff22cd2f44874e96d98a6a78d5204ca2 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-patch-test.yaml
+++ b/jjb/openflowplugin/openflowplugin-patch-test.yaml
@@ -9,9 +9,12 @@
  
      # Project branches
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
            os-branch: 'queens'
+      - neon:
+          branch: 'stable/neon'
+          os-branch: 'queens'
        - fluorine:
            branch: 'stable/fluorine'
            os-branch: 'queens'
diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml

index 7805f8dbcabeca30da4395e8e10d5436ba7dec96..1d730cd27a6ce07d5df42930d475481aaa1d5c26 100644 (file)
--- a/jjb/openflowplugin/openflowplugin.yaml
+++ b/jjb/openflowplugin/openflowplugin.yaml
@@ -1,4 +1,39 @@
  ---
+- project:
+    name: openflowplugin-sodium
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-maven-javadoc-jobs'
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          doc-dir: .tox/docs/tmp/html
+          project-pattern: openflowplugin
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-openflowplugin/38994/
+          rtd-token: 86ce095922558b890c61b1b05d682521d1d66d5f
+      - odl-maven-jobs
+
+    csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
+    block_on_csit: false
+
+    stream: sodium
+    project: 'openflowplugin'
+    project-name: 'openflowplugin'
+    branch: 'master'
+    build-node: centos7-builder-2c-8g
+    build-timeout: 90
+    mvn-settings: 'openflowplugin-settings'
+    mvn-goals: 'clean deploy javadoc:aggregate'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: >
+        odlparent-merge-{stream},
+        yangtools-merge-{stream},
+        controller-merge-{stream},
+        openflowjava-merge-{stream}
+    email-upstream: '[openflowplugin] [odlparent] [yangtools] [controller] [openflowjava]'
+
+    # Used by the release job
+    staging-profile-id: a68a76dc1b44c
+
  - project:
      name: openflowplugin-neon
      jobs:
@@ -18,7 +53,7 @@
      stream: neon
      project: 'openflowplugin'
      project-name: 'openflowplugin'
-    branch: 'master'
+    branch: 'stable/neon'
      build-node: centos7-builder-2c-8g
      build-timeout: 90
      mvn-settings: 'openflowplugin-settings'
diff --git a/jjb/opflex/opflex-custom.yaml b/jjb/opflex/opflex-custom.yaml

index 9702ce9c814dec8a62c89e48daa75defcdca0a3a..073a49077e4b844a8fcfc1fd97c8a23d809f4e23 100644 (file)
--- a/jjb/opflex/opflex-custom.yaml
+++ b/jjb/opflex/opflex-custom.yaml
@@ -6,11 +6,16 @@
        - 'opflex-merge-{stream}'
  
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
            libuv-version: '1.8.0'
            rapidjson-version: '1.0.2'
            openvswitch-version: '2.6.0'
+      - neon:
+          branch: 'stable/neon'
+          libuv-version: '1.8.0'
+          rapidjson-version: '1.0.2'
+          openvswitch-version: '2.6.0'
        - fluorine:
            branch: 'stable/fluorine'
            libuv-version: '1.8.0'
diff --git a/jjb/opflex/opflex.yaml b/jjb/opflex/opflex.yaml

index ff6acfc8af15a8ca4e3fc53d05b6f16305370f64..92639892a0647579807327b1dfcebf45343f168a 100644 (file)
--- a/jjb/opflex/opflex.yaml
+++ b/jjb/opflex/opflex.yaml
@@ -10,11 +10,16 @@
        - 'opflex-release-{stream}'
  
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
            libuv-version: '1.8.0'
            rapidjson-version: '1.0.2'
            openvswitch-version: '2.6.0'
+      - neon:
+          branch: 'stable/neon'
+          libuv-version: '1.8.0'
+          rapidjson-version: '1.0.2'
+          openvswitch-version: '2.6.0'
        - fluorine:
            branch: 'stable/fluorine'
            libuv-version: '1.8.0'
diff --git a/jjb/ovil/ovil.yaml b/jjb/ovil/ovil.yaml

index 6e7ef19a7661b3e7ac7877eb469c8b613d196da4..cdd86432653afb7a0fef8c9e83858e0acda29ce7 100644 (file)
--- a/jjb/ovil/ovil.yaml
+++ b/jjb/ovil/ovil.yaml
@@ -1,4 +1,23 @@
  ---
+- project:
+    name: ovil-sodium
+    jobs:
+      - odl-maven-jobs
+      - gerrit-tox-verify
+
+    stream: sodium
+    project: ovil
+    project-name: ovil
+    branch: 'master'
+    mvn-settings: ovil-settings
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+    dependencies: ''
+    email-upstream: '[ovil]'
+
+    # Used by the release job
+    staging-profile-id: 7b48866c207d8
+
  - project:
      name: ovil-neon
      jobs:
@@ -8,7 +27,7 @@
      stream: neon
      project: ovil
      project-name: ovil
-    branch: 'master'
+    branch: 'stable/neon'
      mvn-settings: ovil-settings
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
  
diff --git a/jjb/ovsdb/ovsdb-csit-clustering.yaml b/jjb/ovsdb/ovsdb-csit-clustering.yaml

index 4eb6ee08b65c163b925699ccb88f6a0d090c5a4e..4f8f8d0d2fd794cf3b71bb7e39b2572925a7f7b4 100644 (file)
--- a/jjb/ovsdb/ovsdb-csit-clustering.yaml
+++ b/jjb/ovsdb/ovsdb-csit-clustering.yaml
@@ -14,8 +14,10 @@
  
      # Project branches
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
        - oxygen:
diff --git a/jjb/ovsdb/ovsdb-csit-southbound.yaml b/jjb/ovsdb/ovsdb-csit-southbound.yaml

index 7453bddb94aad3719e4a7809094d66671dc23d99..cca79c0f9fcc9398b9a06c0e4cec8bbf0d1b54c6 100644 (file)
--- a/jjb/ovsdb/ovsdb-csit-southbound.yaml
+++ b/jjb/ovsdb/ovsdb-csit-southbound.yaml
@@ -14,8 +14,10 @@
  
      # Project branches
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
        - oxygen:
diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml

index 8f02b5d3eb0b469694cb00e75eac9bec3bbad8cd..4936a4704785bdad7c764c368bd8da603b38170f 100644 (file)
--- a/jjb/ovsdb/ovsdb-full-integration.yaml
+++ b/jjb/ovsdb/ovsdb-full-integration.yaml
@@ -5,8 +5,10 @@
        - 'ovsdb-daily-full-integration-{stream}'
  
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
        - oxygen:
diff --git a/jjb/ovsdb/ovsdb-patch-test.yaml b/jjb/ovsdb/ovsdb-patch-test.yaml

index 560e8b127b4ff5ddec1282d609fe4e72efa64094..1aed1eb6610ce822f7ea0cf33100b32f93b5c179 100644 (file)
--- a/jjb/ovsdb/ovsdb-patch-test.yaml
+++ b/jjb/ovsdb/ovsdb-patch-test.yaml
@@ -8,9 +8,12 @@
      project: 'ovsdb'
  
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
            os-branch: 'queens'
+      - neon:
+          branch: 'stable/neon'
+          os-branch: 'queens'
        - fluorine:
            branch: 'stable/fluorine'
            os-branch: 'queens'
diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml

index c8c482541170477f1d8861c860419d8c89ffef00..0da62ad81fef5b320a750d53bdfc75976629b4ea 100644 (file)
--- a/jjb/ovsdb/ovsdb.yaml
+++ b/jjb/ovsdb/ovsdb.yaml
@@ -1,4 +1,32 @@
  ---
+- project:
+    name: ovsdb-sodium
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-maven-javadoc-jobs'
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          project-pattern: ovsdb
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-ovsdb/35667/
+          rtd-token: 46030df8681cf7fc857aa80c1a7695f46ed252be
+      - odl-maven-jobs
+
+    csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
+    block_on_csit: false
+
+    stream: sodium
+    project: 'ovsdb'
+    project-name: 'ovsdb'
+    branch: 'master'
+    build-node: centos7-builder-2c-8g
+    mvn-settings: 'ovsdb-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
+    email-upstream: '[ovsdb] [odlparent] [controller] [yangtools]'
+
+    # Used by the release job
+    staging-profile-id: a68b188166958
+
  - project:
      name: ovsdb-neon
      jobs:
@@ -17,7 +45,7 @@
      stream: neon
      project: 'ovsdb'
      project-name: 'ovsdb'
-    branch: 'master'
+    branch: 'stable/neon'
      build-node: centos7-builder-2c-8g
      mvn-settings: 'ovsdb-settings'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/p4plugin/p4plugin.yaml b/jjb/p4plugin/p4plugin.yaml

index 6025be9a1e0b149f0ed1fd5eea00f6a431ce709e..b9dad70127ac6c9b3dd403b2263c534fb47795d6 100644 (file)
--- a/jjb/p4plugin/p4plugin.yaml
+++ b/jjb/p4plugin/p4plugin.yaml
@@ -1,4 +1,22 @@
  ---
+- project:
+    name: p4plugin-sodium
+    jobs:
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
+
+    stream: sodium
+    project: 'p4plugin'
+    project-name: 'p4plugin'
+    branch: 'master'
+    mvn-settings: 'p4plugin-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[p4plugin]'
+
+    # Used by the release job
+    staging-profile-id: a68bf26e208d4
+
  - project:
      name: p4plugin-neon
      jobs:
@@ -8,7 +26,7 @@
      stream: neon
      project: 'p4plugin'
      project-name: 'p4plugin'
-    branch: 'master'
+    branch: 'stable/neon'
      mvn-settings: 'p4plugin-settings'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: ''
diff --git a/jjb/packetcable/packetcable-csit-pcmm.yaml b/jjb/packetcable/packetcable-csit-pcmm.yaml

index 1c2b4563232d0c20282ba690140db508d468b94a..27eaabf41245cd41ecead2a3f299c5fd14fc9c8b 100644 (file)
--- a/jjb/packetcable/packetcable-csit-pcmm.yaml
+++ b/jjb/packetcable/packetcable-csit-pcmm.yaml
@@ -13,8 +13,10 @@
  
      # Project branches
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
        - oxygen:
diff --git a/jjb/packetcable/packetcable.yaml b/jjb/packetcable/packetcable.yaml

index 7d500b4e9a2908c59a495f5e35ebb2bce4b79785..3bf35a474eac2332fd77a7c6b4b1a2e88938ae26 100644 (file)
--- a/jjb/packetcable/packetcable.yaml
+++ b/jjb/packetcable/packetcable.yaml
@@ -1,4 +1,21 @@
  ---
+- project:
+    name: packetcable-sodium
+    jobs:
+      - odl-maven-jobs
+
+    stream: sodium
+    project: 'packetcable'
+    project-name: 'packetcable'
+    branch: 'master'
+    mvn-settings: 'packetcable-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[packetcable]'
+
+    # Used by the release job
+    staging-profile-id: a68ca4a24655c
+
  - project:
      name: packetcable-neon
      jobs:
@@ -7,7 +24,7 @@
      stream: neon
      project: 'packetcable'
      project-name: 'packetcable'
-    branch: 'master'
+    branch: 'stable/neon'
      mvn-settings: 'packetcable-settings'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: ''
diff --git a/jjb/sdninterfaceapp/sdninterfaceapp.yaml b/jjb/sdninterfaceapp/sdninterfaceapp.yaml

index 146c188931ba94c18d602739f13abe1681e5d2f3..eecc955a160ff1cccbf7dd54b52dfd8aa696ac70 100644 (file)
--- a/jjb/sdninterfaceapp/sdninterfaceapp.yaml
+++ b/jjb/sdninterfaceapp/sdninterfaceapp.yaml
@@ -1,4 +1,22 @@
  ---
+- project:
+    name: sdninterfaceapp-sodium
+    jobs:
+      - odl-maven-jobs
+
+    stream: sodium
+    project: 'sdninterfaceapp'
+    project-name: 'sdninterfaceapp'
+    branch: 'master'
+    build-node: centos7-builder-2c-8g
+    mvn-settings: 'sdninterfaceapp-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'bgpcep-merge-{stream}'
+    email-upstream: '[sdninterfaceapp] [bgpcep]'
+
+    # Used by the release job
+    staging-profile-id: a68e3d1ff55e3
+
  - project:
      name: sdninterfaceapp-neon
      jobs:
@@ -7,7 +25,7 @@
      stream: neon
      project: 'sdninterfaceapp'
      project-name: 'sdninterfaceapp'
-    branch: 'master'
+    branch: 'stable/neon'
      build-node: centos7-builder-2c-8g
      mvn-settings: 'sdninterfaceapp-settings'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/serviceutils/serviceutils-patch-test.yaml b/jjb/serviceutils/serviceutils-patch-test.yaml

index da018f3a1bd522538555cb6abe29ec1328c8af1c..0512c6467bbf6ce6c1e25d16eb4d6881c4128fbc 100644 (file)
--- a/jjb/serviceutils/serviceutils-patch-test.yaml
+++ b/jjb/serviceutils/serviceutils-patch-test.yaml
@@ -7,9 +7,12 @@
      project: 'serviceutils'
  
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
            os-branch: 'queens'
+      - neon:
+          branch: 'stable/neon'
+          os-branch: 'queens'
        - fluorine:
            branch: 'stable/fluorine'
            os-branch: 'queens'
diff --git a/jjb/serviceutils/serviceutils.yaml b/jjb/serviceutils/serviceutils.yaml

index 98801745618fb27223023542db4d9c97dfb6e44e..6f26e6c43ccfacbe2f27a35a8fea8de7bbcc197a 100644 (file)
--- a/jjb/serviceutils/serviceutils.yaml
+++ b/jjb/serviceutils/serviceutils.yaml
@@ -12,8 +12,10 @@
        - odl-maven-jobs
  
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
        - oxygen:
diff --git a/jjb/sfc/sfc-csit-full-deploy.yaml b/jjb/sfc/sfc-csit-full-deploy.yaml

index 05b7fd2f825a8100355b234eb181d9bb7a2aa507..3d69353d3f86c9fdda744b6b87b32201be39f9a1 100644 (file)
--- a/jjb/sfc/sfc-csit-full-deploy.yaml
+++ b/jjb/sfc/sfc-csit-full-deploy.yaml
@@ -12,8 +12,10 @@
  
      # Project branches
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
        - oxygen:
diff --git a/jjb/sfc/sfc-csit-rest-basic.yaml b/jjb/sfc/sfc-csit-rest-basic.yaml

index d12157507d4179ce7a55737ab03d5b47bdda43dd..989b543147e3d6340858eb853104239072d4185c 100644 (file)
--- a/jjb/sfc/sfc-csit-rest-basic.yaml
+++ b/jjb/sfc/sfc-csit-rest-basic.yaml
@@ -13,8 +13,10 @@
  
      # Project branches
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
        - oxygen:
diff --git a/jjb/sfc/sfc-patch-test.yaml b/jjb/sfc/sfc-patch-test.yaml

index 1e4833e31b9cafd84d241149a68b59756a6eb7e4..4f02422c1a4d761f646b5957c0eb66b311d332ef 100644 (file)
--- a/jjb/sfc/sfc-patch-test.yaml
+++ b/jjb/sfc/sfc-patch-test.yaml
@@ -9,9 +9,12 @@
  
      # Project branches
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
            os-branch: 'queens'
+      - neon:
+          branch: 'stable/neon'
+          os-branch: 'queens'
        - fluorine:
            branch: 'stable/fluorine'
            os-branch: 'queens'
diff --git a/jjb/sfc/sfc-python.yaml b/jjb/sfc/sfc-python.yaml

index 3dfecd935726b5ce9ecbb8e2ee488770295352ab..084d292c62bdb50cc3836526f6dd6eeaed4e4692 100644 (file)
--- a/jjb/sfc/sfc-python.yaml
+++ b/jjb/sfc/sfc-python.yaml
@@ -5,8 +5,10 @@
        - 'gerrit-tox-verify'
  
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
        - oxygen:
diff --git a/jjb/sfc/sfc.yaml b/jjb/sfc/sfc.yaml

index 4e659c575643eee72f1865f4361d4cf6ad31154b..5ae6d832b6c5d5c368895b355f077356beefc90f 100644 (file)
--- a/jjb/sfc/sfc.yaml
+++ b/jjb/sfc/sfc.yaml
@@ -1,4 +1,29 @@
  ---
+- project:
+    name: sfc-sodium
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          project-pattern: sfc
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-sfc/38996/
+          rtd-token: 2fa6c2900bbe181b0427ad65df3dc494ac749edb
+      - odl-maven-jobs
+
+    stream: sodium
+    project: 'sfc'
+    project-name: 'sfc'
+    branch: 'master'
+    mvn-settings: 'sfc-settings'
+    mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+    build-timeout: 120
+    dependencies: 'openflowplugin-merge-{stream},ovsdb-merge-{stream},lispflowmapping-merge-{stream}'
+    email-upstream: '[sfc] [openflowplugin] [ovsdb] [lispflowmapping]'
+    build-node: centos7-builder-8c-8g
+
+    # Used by the release job
+    staging-profile-id: a68eb361ca48a
+
  - project:
      name: sfc-neon
      jobs:
@@ -13,7 +38,7 @@
      stream: neon
      project: 'sfc'
      project-name: 'sfc'
-    branch: 'master'
+    branch: 'stable/neon'
      mvn-settings: 'sfc-settings'
      mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
      build-timeout: 120
diff --git a/jjb/snbi/snbi.yaml b/jjb/snbi/snbi.yaml

index 9d6ef95f5bb6b46bc2d48b6ac31a449f2f28cec0..98a5f8bc437db77519abe62a4803969b0b2bd97c 100644 (file)
--- a/jjb/snbi/snbi.yaml
+++ b/jjb/snbi/snbi.yaml
@@ -1,4 +1,21 @@
  ---
+- project:
+    name: snbi-sodium
+    jobs:
+      - odl-maven-jobs
+
+    stream: sodium
+    project: 'snbi'
+    project-name: 'snbi'
+    branch: 'master'
+    mvn-settings: 'snbi-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[snbi]'
+
+    # Used by the release job
+    staging-profile-id: a68f328cefed6
+
  - project:
      name: snbi-neon
      jobs:
@@ -7,7 +24,7 @@
      stream: neon
      project: 'snbi'
      project-name: 'snbi'
-    branch: 'master'
+    branch: 'stable/neon'
      mvn-settings: 'snbi-settings'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: ''
diff --git a/jjb/snmp/snmp.yaml b/jjb/snmp/snmp.yaml

index 10a13ea7912921135a4d4a30094e877f8ba6556b..edd4944c51993ddc97f436e5d7d09a1f9ac58bdd 100644 (file)
--- a/jjb/snmp/snmp.yaml
+++ b/jjb/snmp/snmp.yaml
@@ -1,4 +1,21 @@
  ---
+- project:
+    name: snmp-sodium
+    jobs:
+      - odl-maven-jobs
+
+    stream: sodium
+    project: 'snmp'
+    project-name: 'snmp'
+    branch: 'master'
+    mvn-settings: 'snmp-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream}'
+    email-upstream: '[snmp] [odlparent]'
+
+    # Used by the release job
+    staging-profile-id: a68fb236b93a6
+
  - project:
      name: snmp-neon
      jobs:
@@ -7,7 +24,7 @@
      stream: neon
      project: 'snmp'
      project-name: 'snmp'
-    branch: 'master'
+    branch: 'stable/neon'
      mvn-settings: 'snmp-settings'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'odlparent-merge-{stream}'
diff --git a/jjb/snmp4sdn/snmp4sdn.yaml b/jjb/snmp4sdn/snmp4sdn.yaml

index 228b19f42d54ffd7e0b201bec28bbcee7d328b45..e4d6b0dc686fe1e17ed0f4a9e3ab8084e93e2046 100644 (file)
--- a/jjb/snmp4sdn/snmp4sdn.yaml
+++ b/jjb/snmp4sdn/snmp4sdn.yaml
@@ -1,4 +1,21 @@
  ---
+- project:
+    name: snmp4sdn-sodium
+    jobs:
+      - odl-maven-jobs
+
+    stream: sodium
+    project: 'snmp4sdn'
+    project-name: 'snmp4sdn'
+    branch: 'master'
+    mvn-settings: 'snmp4sdn-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
+    email-upstream: '[snmp4sdn] [odlparent] [controller] [yangtools]'
+
+    # Used by the release job
+    staging-profile-id: a69034a4b6ef5
+
  - project:
      name: snmp4sdn-neon
      jobs:
@@ -7,7 +24,7 @@
      stream: neon
      project: 'snmp4sdn'
      project-name: 'snmp4sdn'
-    branch: 'master'
+    branch: 'stable/neon'
      mvn-settings: 'snmp4sdn-settings'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
diff --git a/jjb/sxp/sxp-csit-basic.yaml b/jjb/sxp/sxp-csit-basic.yaml

index bbc6f40b42fff7cf4e916befa83c2d25703362f0..69c15f615192000bc39f393c271d585b49ed9d25 100644 (file)
--- a/jjb/sxp/sxp-csit-basic.yaml
+++ b/jjb/sxp/sxp-csit-basic.yaml
@@ -12,8 +12,10 @@
  
      # Project branches
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
            trigger-jobs: '{project}-merge-{stream}'
            karaf-version: 'odl'
            # yamllint disable-line rule:line-length
diff --git a/jjb/sxp/sxp-csit-binding-origin.yaml b/jjb/sxp/sxp-csit-binding-origin.yaml

index 422864f56a099b97666b5f1170833f7605a3b97d..34683f847320ff150a0b8a058b1bcac7a08d27ad 100644 (file)
--- a/jjb/sxp/sxp-csit-binding-origin.yaml
+++ b/jjb/sxp/sxp-csit-binding-origin.yaml
@@ -12,8 +12,10 @@
  
      # Project branches
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
            trigger-jobs: '{project}-merge-{stream}'
            karaf-version: 'odl'
            # yamllint disable-line rule:line-length
diff --git a/jjb/sxp/sxp-csit-cluster-binding.yaml b/jjb/sxp/sxp-csit-cluster-binding.yaml

index 89da503b9a41c6098ce6c9e1b8ec4e0f85e36809..1c67fec39637bb1de7e4636be2bd5937ebd70741 100644 (file)
--- a/jjb/sxp/sxp-csit-cluster-binding.yaml
+++ b/jjb/sxp/sxp-csit-cluster-binding.yaml
@@ -12,8 +12,10 @@
  
      # Project branches
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
            trigger-jobs: '{project}-merge-{stream}'
            karaf-version: 'odl'
            # yamllint disable-line rule:line-length
diff --git a/jjb/sxp/sxp-csit-clustering.yaml b/jjb/sxp/sxp-csit-clustering.yaml

index 6a898e951910f80e1e99760ec9010c2dec518180..35549ffb45431c89a68ba32a4a8a1cfb7b5f708c 100644 (file)
--- a/jjb/sxp/sxp-csit-clustering.yaml
+++ b/jjb/sxp/sxp-csit-clustering.yaml
@@ -12,8 +12,10 @@
  
      # Project branches
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
            trigger-jobs: '{project}-merge-{stream}'
            karaf-version: 'odl'
            # yamllint disable-line rule:line-length
diff --git a/jjb/sxp/sxp-csit-filtering.yaml b/jjb/sxp/sxp-csit-filtering.yaml

index 706ffb44e7684b56ad0dae38f9b0b686a672c9da..abe0b39e21bc2a3899dbf461c7258e2d37c9cb9f 100644 (file)
--- a/jjb/sxp/sxp-csit-filtering.yaml
+++ b/jjb/sxp/sxp-csit-filtering.yaml
@@ -12,8 +12,10 @@
  
      # Project branches
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
            trigger-jobs: '{project}-merge-{stream}'
            karaf-version: 'odl'
            # yamllint disable-line rule:line-length
diff --git a/jjb/sxp/sxp-csit-performance.yaml b/jjb/sxp/sxp-csit-performance.yaml

index 56417eafc9b5973a5eb5527b0a0f99337c786fc4..2a430e6693466cd86b44e386119d819f5b9096a7 100644 (file)
--- a/jjb/sxp/sxp-csit-performance.yaml
+++ b/jjb/sxp/sxp-csit-performance.yaml
@@ -12,8 +12,10 @@
  
      # Project branches
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
            trigger-jobs: '{project}-merge-{stream}'
            karaf-version: 'odl'
            # yamllint disable-line rule:line-length
diff --git a/jjb/sxp/sxp-csit-topology.yaml b/jjb/sxp/sxp-csit-topology.yaml

index 6d4882a3d4f94e8efe3028fba79656a736a922ef..2a0508168caa6bbe4f7c72f503679d9420427e90 100644 (file)
--- a/jjb/sxp/sxp-csit-topology.yaml
+++ b/jjb/sxp/sxp-csit-topology.yaml
@@ -12,8 +12,10 @@
  
      # Project branches
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
            trigger-jobs: '{project}-merge-{stream}'
            karaf-version: 'odl'
            # yamllint disable-line rule:line-length
diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml

index c84828118ea7577b29fac4a06bfaba8cf78eb9e5..7e94e769255b8ac9638f1522b4288c609e68a644 100644 (file)
--- a/jjb/sxp/sxp.yaml
+++ b/jjb/sxp/sxp.yaml
@@ -1,4 +1,32 @@
  ---
+- project:
+    name: sxp-sodium
+    jobs:
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          project-pattern: sxp
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-sxp/47573/
+          rtd-token: 4a78556e59ce3ef35e61e2fa19ebae049acf6d5d
+      - odl-maven-jobs
+
+    java-version:
+      - openjdk8
+      - openjdk11
+
+    stream: sodium
+    project: 'sxp'
+    project-name: 'sxp'
+    branch: 'master'
+
+    mvn-settings: 'sxp-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
+    email-upstream: '[sxp] [odlparent] [controller] [yangtools]'
+
+    # Used by the release job
+    staging-profile-id: a6909c75719b7
+
  - project:
      name: sxp-neon
      jobs:
@@ -16,7 +44,7 @@
      stream: neon
      project: 'sxp'
      project-name: 'sxp'
-    branch: 'master'
+    branch: 'stable/neon'
  
      mvn-settings: 'sxp-settings'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/systemmetrics/systemmetrics.yaml b/jjb/systemmetrics/systemmetrics.yaml

index 87c311e3e65d407d0a85616246f90f5534846986..ddcaeb720c9f6e23a58ff98152452e9973090bd0 100644 (file)
--- a/jjb/systemmetrics/systemmetrics.yaml
+++ b/jjb/systemmetrics/systemmetrics.yaml
@@ -1,4 +1,21 @@
  ---
+- project:
+    name: systemmetrics-sodium
+    jobs:
+      - odl-maven-jobs
+
+    project: 'systemmetrics'
+    project-name: 'systemmetrics'
+    stream: sodium
+    branch: 'master'
+    mvn-settings: 'systemmetrics-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
+    email-upstream: '[systemmetrics] [odlparent] [yangtools] [controller]'
+
+    # Used by the release job
+    staging-profile-id: a69113575458e
+
  - project:
      name: systemmetrics-neon
      jobs:
@@ -7,7 +24,7 @@
      project: 'systemmetrics'
      project-name: 'systemmetrics'
      stream: neon
-    branch: 'master'
+    branch: 'stable/neon'
      mvn-settings: 'systemmetrics-settings'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
diff --git a/jjb/telemetry/telemetry-csit-basic.yaml b/jjb/telemetry/telemetry-csit-basic.yaml

index b7f9829a624ad8c84f01ae4e2252f00605264fca..61caadd4f7d8686e7eac0a9b3779fec38c9d1fa0 100644 (file)
--- a/jjb/telemetry/telemetry-csit-basic.yaml
+++ b/jjb/telemetry/telemetry-csit-basic.yaml
@@ -13,8 +13,10 @@
  
      # Project branches
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
  
      install:
        - all:
diff --git a/jjb/telemetry/telemetry.yaml b/jjb/telemetry/telemetry.yaml

index c14d5a77c94435d7774d2945ae6941d598d0f35e..914fec7d96d2da8a4be353f6def0d19a941f177f 100644 (file)
--- a/jjb/telemetry/telemetry.yaml
+++ b/jjb/telemetry/telemetry.yaml
@@ -1,4 +1,34 @@
  ---
+- project:
+    name: telemetry-sodium
+    jobs:
+      - 'odl-maven-jobs'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          project-pattern: telemetry
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-telemetry/57583/
+          rtd-token: 694bcbf8e0b45b3c4e53174c6e5773ca351e1efb
+
+    stream: sodium
+    project: 'telemetry'
+    project-name: 'telemetry'
+    branch: 'master'
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'telemetry-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[telemetry]'
+    archive-artifacts: ''
+
+    # Used by the release job
+    staging-profile-id: 8ed9c52266504
+
  - project:
      name: telemetry-neon
      jobs:
@@ -13,7 +43,7 @@
      stream: neon
      project: 'telemetry'
      project-name: 'telemetry'
-    branch: 'master'
+    branch: 'stable/neon'
      jdks:
        - openjdk8
      maven:
diff --git a/jjb/transportpce/transportpce.yaml b/jjb/transportpce/transportpce.yaml

index 508d53e69e3f3708ffd87fcb107b3d3460ae4b89..e7e126992da27a01b9ca1ceabd9b2853b6362bc7 100644 (file)
--- a/jjb/transportpce/transportpce.yaml
+++ b/jjb/transportpce/transportpce.yaml
@@ -1,4 +1,29 @@
  ---
+- project:
+    name: transportpce-sodium
+    jobs:
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          project-pattern: transportpce
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-transportpce/47688/
+          rtd-token: 6f37ba63226bdcc6c823ee455e62237cf68813fd
+      - gerrit-tox-verify:
+          build-timeout: 120
+          build-node: centos7-builder-8c-8g
+      - odl-maven-jobs
+
+    project: 'transportpce'
+    project-name: 'transportpce'
+    stream: sodium
+    branch: 'master'
+    mvn-settings: 'transportpce-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
+    email-upstream: '[transportpce] [odlparent] [yangtools] [controller]'
+
+    # Used by the release job
+    staging-profile-id: a6927323fa3d4
+
  - project:
      name: transportpce-neon
      jobs:
@@ -15,7 +40,7 @@
      project: 'transportpce'
      project-name: 'transportpce'
      stream: neon
-    branch: 'master'
+    branch: 'stable/neon'
      mvn-settings: 'transportpce-settings'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
diff --git a/jjb/tsdr/tsdr-csit-cassandra.yaml b/jjb/tsdr/tsdr-csit-cassandra.yaml

index 3af4a36affbfb574c5cab5dbc605ae66f6c38aa1..e54162502fa18a0310fa7b13fd53f6d8f83fd85d 100644 (file)
--- a/jjb/tsdr/tsdr-csit-cassandra.yaml
+++ b/jjb/tsdr/tsdr-csit-cassandra.yaml
@@ -13,8 +13,10 @@
  
      # Project branches
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
            trigger-jobs: '{project}-merge-{stream}'
            karaf-version: 'odl'
            # yamllint disable-line rule:line-length
diff --git a/jjb/tsdr/tsdr-csit-elasticsearch.yaml b/jjb/tsdr/tsdr-csit-elasticsearch.yaml

index f18d9c41fb01b13bb53d428d600bca435c5d96cf..541f105b10555dcdcd1062221211816cbcbde927 100644 (file)
--- a/jjb/tsdr/tsdr-csit-elasticsearch.yaml
+++ b/jjb/tsdr/tsdr-csit-elasticsearch.yaml
@@ -13,8 +13,10 @@
  
      # Project branches
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
            trigger-jobs: '{project}-merge-{stream}'
            karaf-version: 'odl'
            # yamllint disable-line rule:line-length
diff --git a/jjb/tsdr/tsdr-csit-hbase.yaml b/jjb/tsdr/tsdr-csit-hbase.yaml

index 219472b649569275aba672fde32e2851c822233e..a01b684e85acc1fee7dabde468a44140a8ad0156 100644 (file)
--- a/jjb/tsdr/tsdr-csit-hbase.yaml
+++ b/jjb/tsdr/tsdr-csit-hbase.yaml
@@ -13,8 +13,10 @@
  
      # Project branches
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
            trigger-jobs: '{project}-merge-{stream}'
            karaf-version: 'odl'
            # yamllint disable-line rule:line-length
diff --git a/jjb/tsdr/tsdr-csit-hsqldb.yaml b/jjb/tsdr/tsdr-csit-hsqldb.yaml

index cf00cd88636d3b1fdde25ba7807fbf4de5367849..97d4d76a30ef4903a5886e77057c49b5bfef2e02 100644 (file)
--- a/jjb/tsdr/tsdr-csit-hsqldb.yaml
+++ b/jjb/tsdr/tsdr-csit-hsqldb.yaml
@@ -13,8 +13,10 @@
  
      # Project branches
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
            trigger-jobs: '{project}-merge-{stream}'
            karaf-version: 'odl'
            # yamllint disable-line rule:line-length
diff --git a/jjb/tsdr/tsdr.yaml b/jjb/tsdr/tsdr.yaml

index f16049f8291378991e9ccfe3d00a13d8f758fe25..8327da28c1dfb21e0639b0c5b9e1896dcce19971 100644 (file)
--- a/jjb/tsdr/tsdr.yaml
+++ b/jjb/tsdr/tsdr.yaml
@@ -1,4 +1,26 @@
  ---
+- project:
+    name: tsdr-sodium
+    jobs:
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          project-pattern: tsdr
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-tsdr/47532/
+          rtd-token: 96c97641155132afcc5900bafc68af3364d91c99
+      - odl-maven-jobs
+
+    stream: sodium
+    project: 'tsdr'
+    project-name: 'tsdr'
+    branch: 'master'
+    mvn-settings: 'tsdr-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[tsdr]'
+
+    # Used by the release job
+    staging-profile-id: a69373036303c
+
  - project:
      name: tsdr-neon
      jobs:
@@ -12,7 +34,7 @@
      stream: neon
      project: 'tsdr'
      project-name: 'tsdr'
-    branch: 'master'
+    branch: 'stable/neon'
      mvn-settings: 'tsdr-settings'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: ''
diff --git a/jjb/ttp/ttp.yaml b/jjb/ttp/ttp.yaml

index 59becd5b06097e5cd21c9aea7033a55fa6ca8263..bdf20fb95679f9d478bb892fff8e4b4f81650638 100644 (file)
--- a/jjb/ttp/ttp.yaml
+++ b/jjb/ttp/ttp.yaml
@@ -1,4 +1,21 @@
  ---
+- project:
+    name: ttp-sodium
+    jobs:
+      - odl-maven-jobs
+
+    stream: sodium
+    project: 'ttp'
+    project-name: 'ttp'
+    branch: 'master'
+    mvn-settings: 'ttp-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream}'
+    email-upstream: '[ttp] [odlparent]'
+
+    # Used by the release job
+    staging-profile-id: a693f948563d5
+
  - project:
      name: ttp-neon
      jobs:
@@ -7,7 +24,7 @@
      stream: neon
      project: 'ttp'
      project-name: 'ttp'
-    branch: 'master'
+    branch: 'stable/neon'
      mvn-settings: 'ttp-settings'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'odlparent-merge-{stream}'
diff --git a/jjb/unimgr/unimgr.yaml b/jjb/unimgr/unimgr.yaml

index cc769ff41d09d15a04ec4f07f61233b1c9195c09..4ca410d155be6dd917b582455f5a7acce1a24f21 100644 (file)
--- a/jjb/unimgr/unimgr.yaml
+++ b/jjb/unimgr/unimgr.yaml
@@ -1,4 +1,27 @@
  ---
+- project:
+    name: unimgr-sodium
+    jobs:
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          project-pattern: unimgr
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-unimgr/49748/
+          rtd-token: e12225e9b9ac67f5439c1619dcad342393b7ea31
+      - odl-maven-jobs
+
+    stream: sodium
+    project: 'unimgr'
+    project-name: 'unimgr'
+    branch: 'master'
+    mvn-settings: 'unimgr-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'ovsdb-merge-{stream}'
+    email-upstream: '[unimgr] [ovsdb]'
+    build-node: centos7-builder-4c-16g
+
+    # Used by the release job
+    staging-profile-id: a695d0a0b8d51
+
  - project:
      name: unimgr-neon
      jobs:
@@ -12,7 +35,7 @@
      stream: neon
      project: 'unimgr'
      project-name: 'unimgr'
-    branch: 'master'
+    branch: 'stable/neon'
      mvn-settings: 'unimgr-settings'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'ovsdb-merge-{stream}'
diff --git a/jjb/usc/usc-csit-tcp.yaml b/jjb/usc/usc-csit-tcp.yaml

index 0b71f0a2bc939c7bcc9ab853d961035917a58ce5..7f3615834a2c7e7b142b09e92f4545aa8651e6b7 100644 (file)
--- a/jjb/usc/usc-csit-tcp.yaml
+++ b/jjb/usc/usc-csit-tcp.yaml
@@ -13,8 +13,10 @@
  
      # Project branches
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
            # yamllint disable-line rule:line-length
diff --git a/jjb/usc/usc.yaml b/jjb/usc/usc.yaml

index a8fb8b199092a06ec470eae310c2ddbb9d33ec9c..878e8d3ff36654d2df75cc649bff8892be8fcbd5 100644 (file)
--- a/jjb/usc/usc.yaml
+++ b/jjb/usc/usc.yaml
@@ -1,4 +1,22 @@
  ---
+- project:
+    name: usc-sodium
+    jobs:
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
+
+    stream: sodium
+    project: 'usc'
+    project-name: 'usc'
+    branch: 'master'
+    mvn-settings: 'usc-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}'
+    email-upstream: '[usc] [controller] [yangtools] [odlparent]'
+
+    # Used by the release job
+    staging-profile-id: a697b633b3ffe
+
  - project:
      name: usc-neon
      jobs:
@@ -8,7 +26,7 @@
      stream: neon
      project: 'usc'
      project-name: 'usc'
-    branch: 'master'
+    branch: 'stable/neon'
      mvn-settings: 'usc-settings'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}'
diff --git a/jjb/usecplugin/usecplugin.yaml b/jjb/usecplugin/usecplugin.yaml

index 8f51afc8a7fde6550f0d30e1108470ee81ad52f5..8a62676179e8dbe91c269f3ead1427da2a1c79d3 100644 (file)
--- a/jjb/usecplugin/usecplugin.yaml
+++ b/jjb/usecplugin/usecplugin.yaml
@@ -1,4 +1,21 @@
  ---
+- project:
+    name: usecplugin-sodium
+    jobs:
+      - odl-maven-jobs
+
+    stream: sodium
+    project: 'usecplugin'
+    project-name: 'usecplugin'
+    branch: 'master'
+    mvn-settings: 'usecplugin-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'openflowplugin-merge-{stream}'
+    email-upstream: '[usecplugin] [openflowplugin]'
+
+    # Used by the release job
+    staging-profile-id: a69902281e037
+
  - project:
      name: usecplugin-neon
      jobs:
@@ -7,7 +24,7 @@
      stream: neon
      project: 'usecplugin'
      project-name: 'usecplugin'
-    branch: 'master'
+    branch: 'stable/neon'
      mvn-settings: 'usecplugin-settings'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'openflowplugin-merge-{stream}'
diff --git a/jjb/yangtools/yangtools-csit-system.yaml b/jjb/yangtools/yangtools-csit-system.yaml

index a40bcf5ab9e84dbf09258c21e8770e8625757e51..b21066fe95f3609ebeec8f69a0af181c87b578ea 100644 (file)
--- a/jjb/yangtools/yangtools-csit-system.yaml
+++ b/jjb/yangtools/yangtools-csit-system.yaml
@@ -12,8 +12,10 @@
  
      # Project branches.
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
+      - neon:
+          branch: 'stable/neon'
        - fluorine:
            branch: 'stable/fluorine'
        - oxygen:
diff --git a/jjb/yangtools/yangtools-patch-test.yaml b/jjb/yangtools/yangtools-patch-test.yaml

index e414787cd7c75c085865695cfe83be585b640e31..cc89c7a669750b23803aa5af5cfd74bfe1eab520 100644 (file)
--- a/jjb/yangtools/yangtools-patch-test.yaml
+++ b/jjb/yangtools/yangtools-patch-test.yaml
@@ -7,9 +7,12 @@
      project: 'yangtools'
  
      stream:
-      - neon:
+      - sodium:
            branch: 'master'
            os-branch: 'queens'
+      - neon:
+          branch: 'stable/neon'
+          os-branch: 'queens'
        - fluorine:
            branch: 'stable/fluorine'
            os-branch: 'queens'
author	Anil Belur <abelur@linuxfoundation.org>
	Sat, 2 Feb 2019 12:45:31 +0000 (22:45 +1000)
committer	Anil Belur <abelur@linuxfoundation.org>
	Sun, 3 Feb 2019 10:38:31 +0000 (20:38 +1000)
jjb/aaa/aaa-csit-authn.yaml		patch \| blob \| history
jjb/aaa/aaa-csit-keystone.yaml		patch \| blob \| history
jjb/aaa/aaa-csit-tls.yaml		patch \| blob \| history
jjb/aaa/aaa-patch-test.yaml		patch \| blob \| history
jjb/aaa/aaa.yaml		patch \| blob \| history
jjb/alto/alto-csit-setup.yaml		patch \| blob \| history
jjb/alto/alto.yaml		patch \| blob \| history
jjb/ansible/ansible.yaml		patch \| blob \| history
jjb/archetypes/archetypes.yaml		patch \| blob \| history
jjb/autorelease/autorelease-projects.yaml		patch \| blob \| history
jjb/autorelease/autorelease-version-management.yaml		patch \| blob \| history
jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml		patch \| blob \| history
jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml		patch \| blob \| history
jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml		patch \| blob \| history
jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml		patch \| blob \| history
jjb/bgpcep/bgpcep-csit-bgpclustering.yaml		patch \| blob \| history
jjb/bgpcep/bgpcep-csit-throughpcep.yaml		patch \| blob \| history
jjb/bgpcep/bgpcep-csit-userfeatures.yaml		patch \| blob \| history
jjb/bgpcep/bgpcep-patch-test.yaml		patch \| blob \| history
jjb/bgpcep/bgpcep.yaml		patch \| blob \| history
jjb/bier/bier-csit-basic.yaml		patch \| blob \| history
jjb/bier/bier.yaml		patch \| blob \| history
jjb/capwap/capwap-csit-ac.yaml		patch \| blob \| history
jjb/capwap/capwap.yaml		patch \| blob \| history
jjb/cardinal/cardinal.yaml		patch \| blob \| history
jjb/centinel/centinel-csit-basic.yaml		patch \| blob \| history
jjb/centinel/centinel.yaml		patch \| blob \| history
jjb/coe/coe-csit.yaml		patch \| blob \| history
jjb/coe/coe-patch-test.yaml		patch \| blob \| history
jjb/coe/coe.yaml		patch \| blob \| history
jjb/controller/controller-csit-akka1.yaml		patch \| blob \| history
jjb/controller/controller-csit-clustering.yaml		patch \| blob \| history
jjb/controller/controller-csit-cs-chasing-leader.yaml		patch \| blob \| history
jjb/controller/controller-csit-cs-partnheal.yaml		patch \| blob \| history
jjb/controller/controller-csit-ddb-expl-lead-movement.yaml		patch \| blob \| history
jjb/controller/controller-csit-dnb-noloss.yaml		patch \| blob \| history
jjb/controller/controller-csit-drb-partnheal.yaml		patch \| blob \| history
jjb/controller/controller-csit-drb-precedence.yaml		patch \| blob \| history
jjb/controller/controller-csit-dsbenchmark-cluster.yaml		patch \| blob \| history
jjb/controller/controller-csit-dsbenchmark.yaml		patch \| blob \| history
jjb/controller/controller-csit-rest-cars-perf.yaml		patch \| blob \| history
jjb/controller/controller-csit-rest-clust-cars-perf.yaml		patch \| blob \| history
jjb/controller/controller-patch-test.yaml		patch \| blob \| history
jjb/controller/controller.yaml		patch \| blob \| history
jjb/coretutorials/coretutorials.yaml		patch \| blob \| history
jjb/daexim/daexim-csit-basic.yaml		patch \| blob \| history
jjb/daexim/daexim-csit-clustering-basic.yaml		patch \| blob \| history
jjb/daexim/daexim.yaml		patch \| blob \| history
jjb/didm/didm-csit-discovery.yaml		patch \| blob \| history
jjb/didm/didm.yaml		patch \| blob \| history
jjb/dlux/dlux.yaml		patch \| blob \| history
jjb/dluxapps/dluxapps-csit-yangman.yaml		patch \| blob \| history
jjb/dluxapps/dluxapps.yaml		patch \| blob \| history
jjb/docs/docs-rtd.yaml		patch \| blob \| history
jjb/eman/eman.yaml		patch \| blob \| history
jjb/faas/faas.yaml		patch \| blob \| history
jjb/federation/federation.yaml		patch \| blob \| history
jjb/genius/genius-csit-genius.yaml		patch \| blob \| history
jjb/genius/genius-patch-test.yaml		patch \| blob \| history
jjb/genius/genius.yaml		patch \| blob \| history
jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml		patch \| blob \| history
jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml		patch \| blob \| history
jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml		patch \| blob \| history
jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml		patch \| blob \| history
jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml		patch \| blob \| history
jjb/groupbasedpolicy/groupbasedpolicy.yaml		patch \| blob \| history
jjb/honeycomb/vbd/vbd.yaml		patch \| blob \| history
jjb/infrautils/infrautils-patch-test.yaml		patch \| blob \| history
jjb/infrautils/infrautils.yaml		patch \| blob \| history
jjb/integration/distribution/distribution-csit-userfeatures.yaml		patch \| blob \| history
jjb/integration/distribution/distribution-jobs.yaml		patch \| blob \| history
jjb/integration/integration-test-jobs.yaml		patch \| blob \| history
jjb/iotdm/iotdm-csit-basic.yaml		patch \| blob \| history
jjb/iotdm/iotdm.yaml		patch \| blob \| history
jjb/jsonrpc/jsonrpc-csit-basic.yaml		patch \| blob \| history
jjb/jsonrpc/jsonrpc.yaml		patch \| blob \| history
jjb/l2switch/l2switch-csit-host-scalability-daily.yaml		patch \| blob \| history
jjb/l2switch/l2switch-csit-scalability.yaml		patch \| blob \| history
jjb/l2switch/l2switch-csit-switch.yaml		patch \| blob \| history
jjb/l2switch/l2switch-patch-test.yaml		patch \| blob \| history
jjb/l2switch/l2switch.yaml		patch \| blob \| history
jjb/lacp/lacp-csit-lacp.yaml		patch \| blob \| history
jjb/lacp/lacp.yaml		patch \| blob \| history
jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml		patch \| blob \| history
jjb/lispflowmapping/lispflowmapping-csit-performance.yaml		patch \| blob \| history
jjb/lispflowmapping/lispflowmapping.yaml		patch \| blob \| history
jjb/mdsal/mdsal-csit-bindingv1.yaml		patch \| blob \| history
jjb/mdsal/mdsal-patch-test.yaml		patch \| blob \| history
jjb/natapp/natapp.yaml		patch \| blob \| history
jjb/nemo/nemo-csit-engine.yaml		patch \| blob \| history
jjb/nemo/nemo.yaml		patch \| blob \| history
jjb/netconf/netconf-clustering-scale.yaml		patch \| blob \| history
jjb/netconf/netconf-clustering.yaml		patch \| blob \| history
jjb/netconf/netconf-csit-callhome.yaml		patch \| blob \| history
jjb/netconf/netconf-patch-test.yaml		patch \| blob \| history
jjb/netconf/netconf-scale.yaml		patch \| blob \| history
jjb/netconf/netconf-userfeatures.yaml		patch \| blob \| history
jjb/netconf/netconf.yaml		patch \| blob \| history
jjb/netide/netide.yaml		patch \| blob \| history
jjb/netvirt/netvirt-csit-multi-apex.yaml		patch \| blob \| history
jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml		patch \| blob \| history
jjb/netvirt/netvirt-patch-test.yaml		patch \| blob \| history
jjb/netvirt/netvirt.yaml		patch \| blob \| history
jjb/neutron/neutron-patch-test.yaml		patch \| blob \| history
jjb/neutron/neutron.yaml		patch \| blob \| history
jjb/next/next.yaml		patch \| blob \| history
jjb/nic/nic.yaml		patch \| blob \| history
jjb/ocpplugin/ocpplugin.yaml		patch \| blob \| history
jjb/odlparent/odlparent-patch-test.yaml		patch \| blob \| history
jjb/odltools/odltools-csit.yaml		patch \| blob \| history
jjb/odltools/odltools-patch-test.yaml		patch \| blob \| history
jjb/odltools/odltools.yaml		patch \| blob \| history
jjb/of-config/of-config.yaml		patch \| blob \| history
jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml		patch \| blob \| history
jjb/openflowplugin/openflowplugin-csit-cbench.yaml		patch \| blob \| history
jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml		patch \| blob \| history
jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml		patch \| blob \| history
jjb/openflowplugin/openflowplugin-csit-clustering.yaml		patch \| blob \| history
jjb/openflowplugin/openflowplugin-csit-flow-services.yaml		patch \| blob \| history
jjb/openflowplugin/openflowplugin-csit-longevity.yaml		patch \| blob \| history
jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml		patch \| blob \| history
jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml		patch \| blob \| history
jjb/openflowplugin/openflowplugin-csit-sanity.yaml		patch \| blob \| history
jjb/openflowplugin/openflowplugin-csit-scale-link.yaml		patch \| blob \| history
jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml		patch \| blob \| history
jjb/openflowplugin/openflowplugin-csit-scale.yaml		patch \| blob \| history
jjb/openflowplugin/openflowplugin-patch-test.yaml		patch \| blob \| history
jjb/openflowplugin/openflowplugin.yaml		patch \| blob \| history
jjb/opflex/opflex-custom.yaml		patch \| blob \| history
jjb/opflex/opflex.yaml		patch \| blob \| history
jjb/ovil/ovil.yaml		patch \| blob \| history
jjb/ovsdb/ovsdb-csit-clustering.yaml		patch \| blob \| history
jjb/ovsdb/ovsdb-csit-southbound.yaml		patch \| blob \| history
jjb/ovsdb/ovsdb-full-integration.yaml		patch \| blob \| history
jjb/ovsdb/ovsdb-patch-test.yaml		patch \| blob \| history
jjb/ovsdb/ovsdb.yaml		patch \| blob \| history
jjb/p4plugin/p4plugin.yaml		patch \| blob \| history
jjb/packetcable/packetcable-csit-pcmm.yaml		patch \| blob \| history
jjb/packetcable/packetcable.yaml		patch \| blob \| history
jjb/sdninterfaceapp/sdninterfaceapp.yaml		patch \| blob \| history
jjb/serviceutils/serviceutils-patch-test.yaml		patch \| blob \| history
jjb/serviceutils/serviceutils.yaml		patch \| blob \| history
jjb/sfc/sfc-csit-full-deploy.yaml		patch \| blob \| history
jjb/sfc/sfc-csit-rest-basic.yaml		patch \| blob \| history
jjb/sfc/sfc-patch-test.yaml		patch \| blob \| history
jjb/sfc/sfc-python.yaml		patch \| blob \| history
jjb/sfc/sfc.yaml		patch \| blob \| history
jjb/snbi/snbi.yaml		patch \| blob \| history
jjb/snmp/snmp.yaml		patch \| blob \| history
jjb/snmp4sdn/snmp4sdn.yaml		patch \| blob \| history
jjb/sxp/sxp-csit-basic.yaml		patch \| blob \| history
jjb/sxp/sxp-csit-binding-origin.yaml		patch \| blob \| history
jjb/sxp/sxp-csit-cluster-binding.yaml		patch \| blob \| history
jjb/sxp/sxp-csit-clustering.yaml		patch \| blob \| history
jjb/sxp/sxp-csit-filtering.yaml		patch \| blob \| history
jjb/sxp/sxp-csit-performance.yaml		patch \| blob \| history
jjb/sxp/sxp-csit-topology.yaml		patch \| blob \| history
jjb/sxp/sxp.yaml		patch \| blob \| history
jjb/systemmetrics/systemmetrics.yaml		patch \| blob \| history
jjb/telemetry/telemetry-csit-basic.yaml		patch \| blob \| history
jjb/telemetry/telemetry.yaml		patch \| blob \| history
jjb/transportpce/transportpce.yaml		patch \| blob \| history
jjb/tsdr/tsdr-csit-cassandra.yaml		patch \| blob \| history
jjb/tsdr/tsdr-csit-elasticsearch.yaml		patch \| blob \| history
jjb/tsdr/tsdr-csit-hbase.yaml		patch \| blob \| history
jjb/tsdr/tsdr-csit-hsqldb.yaml		patch \| blob \| history
jjb/tsdr/tsdr.yaml		patch \| blob \| history
jjb/ttp/ttp.yaml		patch \| blob \| history
jjb/unimgr/unimgr.yaml		patch \| blob \| history
jjb/usc/usc-csit-tcp.yaml		patch \| blob \| history
jjb/usc/usc.yaml		patch \| blob \| history
jjb/usecplugin/usecplugin.yaml		patch \| blob \| history
jjb/yangtools/yangtools-csit-system.yaml		patch \| blob \| history
jjb/yangtools/yangtools-patch-test.yaml		patch \| blob \| history