Merge "Update Ubuntu 14.40 image for GBP"

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

diff --git a/jjb/aaa/aaa-csit-keystone.yaml b/jjb/aaa/aaa-csit-keystone.yaml
index 5f898174fb622677be960b459b7967cae9384882..b50de45b9cc87f4caf603e00192378425d70f231 100644 (file)
--- a/jjb/aaa/aaa-csit-keystone.yaml
+++ b/jjb/aaa/aaa-csit-keystone.yaml
@@ -13,13 +13,10 @@
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
+      - oxygen:
+          branch: 'stable/oxygen'
 
     install:
       - all:
@@ -29,8 +26,8 @@
     install-features: 'odl-restconf-all'
 
     tools_system_count: '1'
-    tools_system_flavor: 'v1-performance-1'
-    tools_system_image: 'ZZCI - CentOS 7 - docker - 20171209-0317'
+    tools_system_flavor: 'odl-highcpu-2'
+    tools_system_image: 'ZZCI - CentOS 7 - docker - 20180723-235456.035'
 
     # Robot custom options
     robot-options: ''