Merge "Remove messaging4transport carbon jobs"

[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 c5d3acd66c6bc3e9e59ca900f27df91a8d0c0154..8d0f33daf96e684b39b40b754d7cb623f05da58d 100644 (file)
--- a/jjb/aaa/aaa-csit-keystone.yaml
+++ b/jjb/aaa/aaa-csit-keystone.yaml
@@ -2,8 +2,8 @@
 - project:
     name: aaa-csit-keystone
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'aaa'
@@ -13,17 +13,14 @@
 
     # Project branches
     stream:
-      - nitrogen:
+      - fluorine:
           branch: 'master'
-          jre: 'openjdk8'
-      - carbon:
-          branch: 'stable/carbon'
-          jre: 'openjdk8'
-          karaf-version: karaf3
+      - oxygen:
+          branch: 'stable/oxygen'
+      - nitrogen:
+          branch: 'stable/nitrogen'
 
     install:
-      - only:
-          scope: 'only'
       - all:
           scope: 'all'
 
@@ -31,8 +28,8 @@
     install-features: 'odl-restconf-all'
 
     tools_system_count: '1'
-    tools_system_flavor: '4 GB General Purpose v1'
-    tools_system_image: 'CentOS 7 - docker - 20170609-0220'
+    tools_system_flavor: 'odl-highcpu-2'
+    tools_system_image: 'ZZCI - CentOS 7 - docker - 20180417-0311'
 
     # Robot custom options
     robot-options: ''