Merge "Update to global-jjb v0.12.1"

[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 cf1bfc1c6486a7b3ebb46778e20499fa604a517f..f23bf7909ed362a02223f70baaaa862b0ea4fd4e 100644 (file)
--- a/jjb/aaa/aaa-csit-keystone.yaml
+++ b/jjb/aaa/aaa-csit-keystone.yaml
@@ -13,13 +13,15 @@
 
     # Project branches
     stream:
-      - carbon:
+      - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+      - carbon:
+          branch: 'stable/carbon'
+          karaf-version: karaf3
 
     install:
-      - only:
-          scope: 'only'
       - all:
           scope: 'all'
 
@@ -28,7 +30,7 @@
 
     tools_system_count: '1'
     tools_system_flavor: '4 GB General Purpose v1'
-    tools_system_image: 'CentOS 7 - docker - 20170120-1434'
+    tools_system_image: 'CentOS 7 - docker - 20171016-0023'
 
     # Robot custom options
     robot-options: ''