Merge "Add controller ready detect to int/dist jobs"

[releng/builder.git] / jjb / netconf / netconf-scale.yaml

diff --git a/jjb/netconf/netconf-scale.yaml b/jjb/netconf/netconf-scale.yaml
index 298c32fbe1e1c46b5999aa04115f32fb78c642b0..e081c45d26910bb0eeb5976b0a3a47d71a156d43 100644 (file)
--- a/jjb/netconf/netconf-scale.yaml
+++ b/jjb/netconf/netconf-scale.yaml
@@ -2,7 +2,7 @@
 - project:
     name: netconf-csit-scale
     jobs:
-      - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'netconf'
@@ -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:
@@ -38,4 +37,4 @@
     robot-options: '-v USE_NETCONF_CONNECTOR:False'
 
     # ODL system configuration
-    odl_system_flavor: 8 GB General Purpose v1
+    odl_system_flavor: v2-standard-4