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 217f441964a9ad8fb125157c88cacbf4f162ab8e..846501688c4bcbe947a96b765cbd2b7803039be5 100644 (file)
--- a/jjb/netvirt/netvirt.yaml
+++ b/jjb/netvirt/netvirt.yaml
@@ -4,10 +4,9 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
       - gerrit-tox-verify
+      - odl-maven-jobs
 
     stream:
       - oxygen:
@@ -27,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},