Merge "simplify netvirt openstack yaml"

[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 d1df4c7311c694ea82d261ff20f66f0e5d7b1101..e1668090ced7627b95ffe022855b3145a5f550d7 100644 (file)
--- a/jjb/vtn/vtn-csit-coordinator.yaml
+++ b/jjb/vtn/vtn-csit-coordinator.yaml
@@ -13,20 +13,14 @@
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
-          tools_system_image: Ubuntu 14.04 - mininet-ovs-25 - 20170210-0300
-      - boron:
-          branch: 'stable/boron'
-          jre: 'openjdk8'
-          tools_system_image: Ubuntu 14.04 - mininet-ovs-25 - 20170210-0300
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
+          karaf-version: karaf3
+          tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20171016-0212
 
     install:
       - only: