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

diff --git a/jjb/netvirt/netvirt.yaml b/jjb/netvirt/netvirt.yaml
index aea918ec7..061d222d8 100644
--- a/jjb/netvirt/netvirt.yaml
+++ b/jjb/netvirt/netvirt.yaml
@@ -1,20 +1,23 @@
 ---
 - project:
-    name: netvirt-nitrogen
+    name: netvirt
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-maven-jobs'
+      - '{project-name}-maven-javadoc-jobs'
+      - gerrit-tox-verify
 
-    stream: nitrogen
+    stream:
+      - oxygen:
+          branch: 'master'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+      - carbon:
+          branch: 'stable/carbon'
+          karaf-version: karaf3
     project: 'netvirt'
     project-name: 'netvirt'
-    branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -23,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},
@@ -33,56 +38,20 @@
     email-upstream: '[genius] [netvirt] [neutron] [openflowjava] [openflowplugin] [ovsdb] [sfc]'
     archive-artifacts: ''
 
-- project:
-    name: netvirt-carbon
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: carbon
-    project: 'netvirt'
-    project-name: 'netvirt'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    jdk: openjdk8
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'netvirt-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m'
-    dependencies: >
-        genius-merge-{stream},
-        neutron-merge-{stream},
-        openflowjava-merge-{stream},
-        openflowplugin-merge-{stream},
-        ovsdb-merge-{stream},
-        sfc-merge-{stream}
-    email-upstream: '[genius] [netvirt] [neutron] [openflowjava] [openflowplugin] [ovsdb] [sfc]'
-    archive-artifacts: ''
+    # Used by the release job
+    staging-profile-id: a67da0ffbb1ba
 
 - project:
-    name: netvirt-boron
+    name: netvirt-vpp
     jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - gerrit-maven-verify
 
-    stream: boron
+    stream: vpp
     project: 'netvirt'
     project-name: 'netvirt'
-    branch: 'stable/boron'
+    branch: 'topic/vpp'
     karaf-version: karaf3
-    jdk: openjdk8
+    distribution_branch: 'master'
     jdks:
       - openjdk8
     maven:
@@ -91,36 +60,17 @@
     mvn-settings: 'netvirt-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m'
-    dependencies: >
-        genius-merge-{stream},
-        neutron-merge-{stream},
-        openflowjava-merge-{stream},
-        openflowplugin-merge-{stream},
-        ovsdb-merge-{stream},
-        sfc-merge-{stream}
-    email-upstream: '[genius] [netvirt] [neutron] [openflowjava] [openflowplugin] [ovsdb] [sfc]'
+    dependencies:
+    email-upstream: '[netvirt]'
     archive-artifacts: ''
 
 - project:
-    name: netvirt-vpp
+    name: netvirt-sonar
     jobs:
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: vpp
+      - gerrit-maven-sonar
     project: 'netvirt'
     project-name: 'netvirt'
-    branch: 'topic/vpp'
-    karaf-version: karaf3
-    distribution_branch: 'master'
-    jdk: openjdk8
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'master'
     mvn-settings: 'netvirt-settings'
     mvn-goals: 'clean install'
-    mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m'
-    dependencies:
-    email-upstream: '[netvirt]'
-    archive-artifacts: ''
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'