Merge "Configure tep-ip for genius auto tunnels"

[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 ab8f5c76294d12c747a0f12604f8fd2e86868647..c81a46d14baaeb865b28ee19fc84c53391981a26 100644 (file)
--- a/jjb/netvirt/netvirt-full-integration.yaml
+++ b/jjb/netvirt/netvirt-full-integration.yaml
@@ -7,21 +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
-      - boron:
-          branch: 'stable/boron'
-          jdk: openjdk8
-          jdks:
-            - openjdk8
           karaf-version: karaf3
 
     project: 'netvirt'
@@ -178,7 +167,7 @@
 
     triggers:
       - gerrit:
-          server-name: '{server-name}'
+          server-name: '{gerrit-server-name}'
           trigger-on:
             - comment-added-contains-event:
                 comment-contains-value: 'runit'