Merge "Migrate sfc to global-jjb Maven jobs"

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

diff --git a/jjb/netvirt/netvirt.yaml b/jjb/netvirt/netvirt.yaml
index 9929fc93085478041c29097218ab7eb22f0b6ca9..904a15387e4e78571a2bf6c4f0e211fe48dbd52d 100644 (file)
--- a/jjb/netvirt/netvirt.yaml
+++ b/jjb/netvirt/netvirt.yaml
@@ -5,9 +5,10 @@
       - '{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:
@@ -19,7 +20,6 @@
           karaf-version: karaf3
     project: 'netvirt'
     project-name: 'netvirt'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -38,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'
@@ -49,7 +52,6 @@
     branch: 'topic/vpp'
     karaf-version: karaf3
     distribution_branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven: