X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fnetvirt%2Fnetvirt.yaml;h=375e2c5654118f5824aef4e4149733ab8b77946f;hb=dfe4d15ae3b146981dde66774aa45069a2c267b5;hp=97877eea5ab070d5469a92a001c8c333219d36fd;hpb=e6d7f315bb47c0546035b16b4dbe89930bb18699;p=releng%2Fbuilder.git

diff --git a/jjb/netvirt/netvirt.yaml b/jjb/netvirt/netvirt.yaml
index 97877eea5..375e2c565 100644
--- a/jjb/netvirt/netvirt.yaml
+++ b/jjb/netvirt/netvirt.yaml
@@ -1,6 +1,84 @@
 ---
 - project:
-    name: netvirt
+    name: netvirt-magnesium
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-maven-javadoc-jobs'
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          doc-dir: .tox/docs/tmp/html
+          project-pattern: netvirt
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-netvirt/32929/
+          rtd-token: 7b6a1dcfc729957ace511e016274e253e07a8d6c
+      - gerrit-tox-verify
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
+
+    csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
+    block_on_csit: false
+
+    stream: magnesium
+    branch: 'master'
+
+    project: 'netvirt'
+    project-name: 'netvirt'
+
+    java-version: 'openjdk11'
+    mvn-settings: 'netvirt-settings'
+    mvn-opts: '-Xmx2048m'
+    build-timeout: 90
+    build-node: centos7-builder-8c-8g
+    dependencies: >
+        genius-merge-{stream},
+        neutron-merge-{stream},
+        openflowjava-merge-{stream},
+        openflowplugin-merge-{stream},
+        ovsdb-merge-{stream}
+    email-upstream: '[genius] [netvirt] [neutron] [openflowjava] [openflowplugin] [ovsdb]'
+
+    # Used by the release job
+    staging-profile-id: a67da0ffbb1ba
+
+- project:
+    name: netvirt-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: netvirt
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-netvirt/32929/
+          rtd-token: 7b6a1dcfc729957ace511e016274e253e07a8d6c
+      - gerrit-tox-verify
+      - odl-maven-jobs
+      - odl-maven-verify-jobs
+
+    csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
+    block_on_csit: false
+
+    stream: sodium
+    branch: 'stable/sodium'
+
+    project: 'netvirt'
+    project-name: 'netvirt'
+    mvn-settings: 'netvirt-settings'
+    mvn-opts: '-Xmx2048m'
+    build-timeout: 90
+    build-node: centos7-builder-8c-8g
+    dependencies: >
+        genius-merge-{stream},
+        neutron-merge-{stream},
+        openflowjava-merge-{stream},
+        openflowplugin-merge-{stream},
+        ovsdb-merge-{stream}
+    email-upstream: '[genius] [netvirt] [neutron] [openflowjava] [openflowplugin] [ovsdb]'
+
+    # Used by the release job
+    staging-profile-id: a67da0ffbb1ba
+
+- project:
+    name: netvirt-neon
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
@@ -12,25 +90,18 @@
           rtd-token: 7b6a1dcfc729957ace511e016274e253e07a8d6c
       - gerrit-tox-verify
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
     csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
     block_on_csit: false
 
-    stream:
-      - sodium:
-          branch: 'master'
-      - neon:
-          branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-          disable-job: true
+    stream: neon
+    branch: 'stable/neon'
 
     project: 'netvirt'
     project-name: 'netvirt'
     mvn-settings: 'netvirt-settings'
-    mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m'
+    mvn-opts: '-Xmx2048m'
     build-timeout: 90
     build-node: centos7-builder-8c-8g
     dependencies: >
@@ -38,9 +109,8 @@
         neutron-merge-{stream},
         openflowjava-merge-{stream},
         openflowplugin-merge-{stream},
-        ovsdb-merge-{stream},
-        sfc-merge-{stream}
-    email-upstream: '[genius] [netvirt] [neutron] [openflowjava] [openflowplugin] [ovsdb] [sfc]'
+        ovsdb-merge-{stream}
+    email-upstream: '[genius] [netvirt] [neutron] [openflowjava] [openflowplugin] [ovsdb]'
 
     # Used by the release job
     staging-profile-id: a67da0ffbb1ba
@@ -53,8 +123,9 @@
     project: 'netvirt'
     project-name: 'netvirt'
     branch: 'master'
+    java-version: 'openjdk11'
     mvn-settings: 'netvirt-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
 
 - project:
     name: netvirt-csit-view