Merge "Revert "Install odl-mdsal-trace in netvirt oxygen csit""

[releng/builder.git] / jjb / vtn / vtn-csit-coordinator.yaml

diff --git a/jjb/vtn/vtn-csit-coordinator.yaml b/jjb/vtn/vtn-csit-coordinator.yaml
index 838cf6faf997a45fa0fcdf89a3283ff09fe13dd6..e1acbb2de4b73b8f9a89b72eeb5dbaee8180d9dd 100644 (file)
--- a/jjb/vtn/vtn-csit-coordinator.yaml
+++ b/jjb/vtn/vtn-csit-coordinator.yaml
@@ -2,8 +2,8 @@
 - project:
     name: vtn-csit-vtn-coordinator
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'vtn'
@@ -13,19 +13,16 @@
 
     # Project branches
     stream:
-      - nitrogen:
+      - fluorine:
           branch: 'master'
-          jre: 'openjdk8'
+      - oxygen:
+          branch: 'stable/oxygen'
+      - nitrogen:
+          branch: 'stable/nitrogen'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
-          karaf-version: karaf3
-          tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170609-0221
-      - boron:
-          branch: 'stable/boron'
-          jre: 'openjdk8'
           karaf-version: karaf3
-          tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170609-0221
+          tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847
 
     install:
       - only: