Merge "Add a prefix variable to defaults as blank"

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

diff --git a/jjb/netvirt/netvirt.yaml b/jjb/netvirt/netvirt.yaml
index f9802b39713d698e8d8aca543c79e428acfe6281..846501688c4bcbe947a96b765cbd2b7803039be5 100644 (file)
--- a/jjb/netvirt/netvirt.yaml
+++ b/jjb/netvirt/netvirt.yaml
@@ -2,14 +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-javadoc-jobs'
-      - gerrit-maven-verify-dependencies
+      - gerrit-tox-verify
+      - odl-maven-jobs
 
     stream:
       - oxygen:
@@ -29,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},
@@ -39,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'
@@ -65,7 +67,7 @@
 - project:
     name: netvirt-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'netvirt'
     project-name: 'netvirt'
     branch: 'master'