Merge "Update to global-jjb v0.12.1"
[releng/builder.git] / jjb / aaa / aaa-csit-tls.yaml
index 564fbe751cad666518ecd75130bc5d61f96d6327..df3d0d3127d955ef90284fdacd4d1cd63c7305f0 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:
@@ -31,4 +31,4 @@
     robot-options: ''
 
     # mininet image
-    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170808-0158
+    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20171016-0212