Merge changes from topic 'cleanup-maven'

[releng/builder.git] / jjb / netvirt / netvirt-full-integration.yaml

diff --git a/jjb/netvirt/netvirt-full-integration.yaml b/jjb/netvirt/netvirt-full-integration.yaml
index 53d543e81f300e38fe53c641fcd67381d939b532..043b62f1231ec341418a5727f557e5ac43098902 100644 (file)
--- a/jjb/netvirt/netvirt-full-integration.yaml
+++ b/jjb/netvirt/netvirt-full-integration.yaml
@@ -7,15 +7,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jdk: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jdk: openjdk8
-          jdks:
-            - openjdk8
           karaf-version: karaf3
 
     project: 'netvirt'
@@ -141,7 +136,7 @@
     name: 'netvirt-daily-full-integration-{stream}'
 
     project-type: freestyle
-    node: centos7-docker-2c-4g
+    node: centos7-docker-1c-4g
     concurrent: true
     jdk: '{jdk}'
     description: >
@@ -172,7 +167,7 @@
 
     triggers:
       - gerrit:
-          server-name: '{server-name}'
+          server-name: '{gerrit-server-name}'
           trigger-on:
             - comment-added-contains-event:
                 comment-contains-value: 'runit'