X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fnetvirt%2Fnetvirt.yaml;h=6f83a6b8131b20b2739e126bbf05aa222dded35f;hb=fbb6852790ef13e01d614200cf9c9ac821105ef5;hp=1f5a0ffaf35dcb8649cfd786b96b17bfa2225d2a;hpb=c792dd0bbcd7293ac7097d12a5170e7f69369a68;p=releng%2Fbuilder.git

diff --git a/jjb/netvirt/netvirt.yaml b/jjb/netvirt/netvirt.yaml
index 1f5a0ffaf..709e9fd98 100644
--- a/jjb/netvirt/netvirt.yaml
+++ b/jjb/netvirt/netvirt.yaml
@@ -4,23 +4,33 @@
     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:
-      - fluorine:
+      - magnesium:
           branch: 'master'
-      - oxygen:
-          branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
+      - sodium:
+          branch: 'stable/sodium'
+      - neon:
+          branch: 'stable/neon'
+      - fluorine:
+          branch: 'stable/fluorine'
+
     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: >
@@ -35,28 +45,27 @@
     # Used by the release job
     staging-profile-id: a67da0ffbb1ba
 
-- project:
-    name: netvirt-vpp
-    jobs:
-      - gerrit-maven-verify
-
-    stream: vpp
-    project: 'netvirt'
-    project-name: 'netvirt'
-    branch: 'topic/vpp'
-    karaf-version: karaf3
-    distribution_branch: 'master'
-    mvn-settings: 'netvirt-settings'
-    mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m'
-    dependencies:
-    email-upstream: '[netvirt]'
-
 - project:
     name: netvirt-sonar
     jobs:
       - gerrit-maven-sonar
+
     project: 'netvirt'
     project-name: 'netvirt'
     branch: 'master'
     mvn-settings: 'netvirt-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
+
+- project:
+    name: netvirt-csit-view
+    views:
+      - csit-view
+    view-name: netvirt-csit
+    view-description: 'List of netvirt-csit jobs'
+    view-regex: 'netvirt-csit(?!(.*gate)|(.*hwvtep)).*'
+
+- project:
+    name: netvirt-view
+    views:
+      - project-view
+    project-name: netvirt