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

[releng/builder.git] / jjb / aaa / aaa-csit-tls.yaml

diff --git a/jjb/aaa/aaa-csit-tls.yaml b/jjb/aaa/aaa-csit-tls.yaml
index 0baa3cf48cba73b360c8001f224dab3f6a0e5c51..c557db0bb4ab501d5aeeae1352e0985184365399 100644 (file)
--- a/jjb/aaa/aaa-csit-tls.yaml
+++ b/jjb/aaa/aaa-csit-tls.yaml
@@ -2,7 +2,7 @@
 - project:
     name: aaa-csit-tls
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'aaa'
@@ -12,8 +12,10 @@
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
@@ -31,4 +33,4 @@
     robot-options: ''
 
     # mininet image
-    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20171014-0208
+    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847