Merge "Add apex csit job to be triggered on distro-check"

[releng/builder.git] / jjb / netvirt / netvirt.yaml

diff --git a/jjb/netvirt/netvirt.yaml b/jjb/netvirt/netvirt.yaml
index 6f83a6b8131b20b2739e126bbf05aa222dded35f..104af96941c508b26704bafb0fb1fbe48db63455 100644 (file)
--- a/jjb/netvirt/netvirt.yaml
+++ b/jjb/netvirt/netvirt.yaml
@@ -13,13 +13,16 @@
       - gerrit-tox-verify
       - odl-maven-jobs
 
+    csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
+    block_on_csit: false
+
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     project: 'netvirt'
     project-name: 'netvirt'
@@ -39,22 +42,6 @@
     # 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:
@@ -64,3 +51,15 @@
     branch: 'master'
     mvn-settings: 'netvirt-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- view:
+    name: netvirt
+    description: 'List of netvirt jobs'
+    regex: '^netvirt-.*'
+    <<: *releng_view_common
+
+- view:
+    name: netvirt-csit
+    description: 'List of netvirt-csit jobs'
+    regex: 'netvirt-csit(?!(.*gate)|(.*hwvtep)).*'
+    <<: *integration_view_csit