Merge "Update branch cutting script"

[releng/builder.git] / jjb / controller / controller-csit-periodic-dsbenchmark-cluster.yaml

diff --git a/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml b/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml
index f0b6656cb2c98a0fe320870090444d441786b8d7..43a9f55b8a397f5076c93ac8fa35bd7f97c40447 100644 (file)
--- a/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml
+++ b/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml
@@ -2,7 +2,7 @@
 - project:
     name: mdsal-csit-periodic-dsbenchmark-cluster
     jobs:
-      - '{project}-csit-3node-periodic-{functionality}-{install}-{stream}'
+      - inttest-csit-3node-periodic
 
     # The project name
     project: 'controller'
@@ -12,15 +12,14 @@
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
-          jre: 'openjdk8'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:
@@ -37,7 +36,7 @@
 
     # ODL system image to use
     # The job uses scriptplan to set heap to 4GB, so 4GB RAM is not enough.
-    odl_system_flavor: '8 GB General Purpose v1'
+    odl_system_flavor: 'v2-standard-4'
 
     build-timeout: '480'