Update sonar jobs to global-jjb

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

diff --git a/jjb/netvirt/netvirt.yaml b/jjb/netvirt/netvirt.yaml
index 2abfff063e99f62feef4432b977bf63201d51324..217f441964a9ad8fb125157c88cacbf4f162ab8e 100644 (file)
--- a/jjb/netvirt/netvirt.yaml
+++ b/jjb/netvirt/netvirt.yaml
@@ -2,12 +2,12 @@
 - project:
     name: netvirt
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
+      - '{project-name}-maven-javadoc-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-      - '{project-name}-verify-tox-{stream}'
+      - gerrit-tox-verify
 
     stream:
       - oxygen:
@@ -17,12 +17,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:
@@ -41,10 +37,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 +51,6 @@
     branch: 'topic/vpp'
     karaf-version: karaf3
     distribution_branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -68,7 +66,7 @@
 - project:
     name: netvirt-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'netvirt'
     project-name: 'netvirt'
     branch: 'master'