Merge "Clean L2GW CSIT, use same VMs as NetVirt"

[releng/builder.git] / jjb / vtn / vtn-csit-3node-manager.yaml

diff --git a/jjb/vtn/vtn-csit-3node-manager.yaml b/jjb/vtn/vtn-csit-3node-manager.yaml
index cc057faac5298a71067d8b91ed0eb3a6581b970a..9c3efd1403c7763aaa83e52c73fbe1a5585d1f69 100644 (file)
--- a/jjb/vtn/vtn-csit-3node-manager.yaml
+++ b/jjb/vtn/vtn-csit-3node-manager.yaml
@@ -2,8 +2,8 @@
 - project:
     name: vtn-csit-3node-manager
     jobs:
-      - '{project}-csit-3node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-3node-{functionality}'
+      - inttest-csit-3node
+      - inttest-csit-verify-3node
 
     # The project name
     project: 'vtn'
@@ -15,17 +15,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
-          karaf-version: karaf3
-      - boron:
-          branch: 'stable/boron'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:
@@ -38,4 +31,4 @@
     # Robot custom options
     robot-options: ''
 
-    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-25 - 20170808-0158'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847'