X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fnetvirt%2Fnetvirt.yaml;h=061d222d80ebec45494f792412f8c56fa4ad67cc;hb=63ecbdec7e9b945d75d5a4476571dba63a832590;hp=2abfff063e99f62feef4432b977bf63201d51324;hpb=b10daf87328b83aa8f99e560d462b78c0a841751;p=releng%2Fbuilder.git

diff --git a/jjb/netvirt/netvirt.yaml b/jjb/netvirt/netvirt.yaml
index 2abfff063..061d222d8 100644
--- a/jjb/netvirt/netvirt.yaml
+++ b/jjb/netvirt/netvirt.yaml
@@ -2,12 +2,11 @@
 - project:
     name: netvirt
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-      - '{project-name}-verify-tox-{stream}'
+      - '{project-name}-maven-jobs'
+      - '{project-name}-maven-javadoc-jobs'
+      - gerrit-tox-verify
 
     stream:
       - oxygen:
@@ -17,12 +16,8 @@
       - carbon:
           branch: 'stable/carbon'
           karaf-version: karaf3
-      - boron:
-          branch: 'stable/boron'
-          karaf-version: karaf3
     project: 'netvirt'
     project-name: 'netvirt'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -31,6 +26,8 @@
     mvn-settings: 'netvirt-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m'
+    build-timeout: 90
+    build-node: centos7-builder-4c-16g
     dependencies: >
         genius-merge-{stream},
         neutron-merge-{stream},
@@ -41,10 +38,13 @@
     email-upstream: '[genius] [netvirt] [neutron] [openflowjava] [openflowplugin] [ovsdb] [sfc]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a67da0ffbb1ba
+
 - project:
     name: netvirt-vpp
     jobs:
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - gerrit-maven-verify
 
     stream: vpp
     project: 'netvirt'
@@ -52,7 +52,6 @@
     branch: 'topic/vpp'
     karaf-version: karaf3
     distribution_branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -68,7 +67,7 @@
 - project:
     name: netvirt-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'netvirt'
     project-name: 'netvirt'
     branch: 'master'