Merge "Update Ubuntu 14.04 image"

[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 f4483c246fa4068957a079448c9556bb567a8bac..8d0f33daf96e684b39b40b754d7cb623f05da58d 100644 (file)
--- a/jjb/aaa/aaa-csit-keystone.yaml
+++ b/jjb/aaa/aaa-csit-keystone.yaml
@@ -19,9 +19,6 @@
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
@@ -31,8 +28,8 @@
     install-features: 'odl-restconf-all'
 
     tools_system_count: '1'
-    tools_system_flavor: 'v2-highcpu-2'
-    tools_system_image: 'ZZCI - CentOS 7 - docker - 20171209-0317'
+    tools_system_flavor: 'odl-highcpu-2'
+    tools_system_image: 'ZZCI - CentOS 7 - docker - 20180417-0311'
 
     # Robot custom options
     robot-options: ''