Merge "Support branch-cutting version bump workflow"

[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 1e89f7efcbd2fb7d0784f816f25ef3b0e61dbde3..f4483c246fa4068957a079448c9556bb567a8bac 100644 (file)
--- a/jjb/aaa/aaa-csit-keystone.yaml
+++ b/jjb/aaa/aaa-csit-keystone.yaml
@@ -2,7 +2,7 @@
 - project:
     name: aaa-csit-keystone
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
       - inttest-csit-verify-1node
 
     # The project name
@@ -13,8 +13,10 @@
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
@@ -29,7 +31,7 @@
     install-features: 'odl-restconf-all'
 
     tools_system_count: '1'
-    tools_system_flavor: 'v1-performance-1'
+    tools_system_flavor: 'v2-highcpu-2'
     tools_system_image: 'ZZCI - CentOS 7 - docker - 20171209-0317'
 
     # Robot custom options