Merge "Switch all projects to use new maven-merge job"

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

diff --git a/jjb/netvirt/netvirt.yaml b/jjb/netvirt/netvirt.yaml
index 390a7884693deb550ad02b22bf363c940501034c..061d222d80ebec45494f792412f8c56fa4ad67cc 100644 (file)
--- a/jjb/netvirt/netvirt.yaml
+++ b/jjb/netvirt/netvirt.yaml
@@ -6,7 +6,6 @@
       - '{project-name}-integration-{stream}'
       - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
       - gerrit-tox-verify
 
     stream:
@@ -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},
@@ -66,7 +67,7 @@
 - project:
     name: netvirt-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'netvirt'
     project-name: 'netvirt'
     branch: 'master'