X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fnetvirt%2Fnetvirt.yaml;h=a3b511dae4eca5e255a7dc24ac1aad8bbad368cb;hb=f5611e3768895d4b4ca20c7719a2bd9fe5652fca;hp=dae6114bfe0f2aa57965e3d38290107ec881fb3c;hpb=06c41721530a81dd8369d73e3435a826a5131a7e;p=releng%2Fbuilder.git

diff --git a/jjb/netvirt/netvirt.yaml b/jjb/netvirt/netvirt.yaml
index dae6114bf..f172ba17f 100644
--- a/jjb/netvirt/netvirt.yaml
+++ b/jjb/netvirt/netvirt.yaml
@@ -1,27 +1,26 @@
 ---
 - project:
-    name: netvirt-nitrogen
+    name: netvirt
     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: nitrogen
+      - '{project-name}-maven-javadoc-jobs'
+      - gerrit-tox-verify
+      - odl-maven-jobs
+
+    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:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'netvirt-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m'
+    build-timeout: 90
+    build-node: centos7-builder-8c-8g
     dependencies: >
         genius-merge-{stream},
         neutron-merge-{stream},
@@ -30,126 +29,32 @@
         ovsdb-merge-{stream},
         sfc-merge-{stream}
     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'
-    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: ''
-
-- project:
-    name: netvirt-boron
-    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: boron
-    project: 'netvirt'
-    project-name: 'netvirt'
-    branch: 'stable/boron'
-    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: ''
-
-- project:
-    name: netvirt-beryllium
-    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: beryllium
-    project: 'netvirt'
-    project-name: 'netvirt'
-    branch: 'stable/beryllium'
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'netvirt-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m'
-    dependencies: >
-        neutron-merge-{stream},
-        openflowjava-merge-{stream},
-        openflowplugin-merge-{stream},
-        ovsdb-merge-{stream},
-        sfc-merge-{stream}
-    email-upstream: '[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'
     project-name: 'netvirt'
     branch: 'topic/vpp'
+    karaf-version: karaf3
     distribution_branch: 'master'
-    jdk: openjdk8
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'netvirt-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m'
     dependencies:
     email-upstream: '[netvirt]'
-    archive-artifacts: ''
+
+- 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'