Merge changes I4bb1c7db,Ief5d0401

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

diff --git a/jjb/netconf/netconf-scale.yaml b/jjb/netconf/netconf-scale.yaml
index 9feef79e9c5c95381dcabb6eb2fe41e88ebc19d2..050e557fbb59a66b18040a9127d2126f25e485e6 100644 (file)
--- a/jjb/netconf/netconf-scale.yaml
+++ b/jjb/netconf/netconf-scale.yaml
@@ -21,8 +21,6 @@
       - magnesium:
           branch: "stable/magnesium"
           jre: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     install:
       - only:
@@ -39,7 +37,7 @@
     robot-options: "-v USE_NETCONF_CONNECTOR:False"
 
     # ODL system configuration
-    odl_system_flavor: odl-standard-4
+    odl_system_flavor: v3-standard-4
 
 - project:
     name: netconf-csit-scale-max-devices
@@ -54,13 +52,20 @@
 
     # Project branches
     stream:
-      - aluminium:
+      - silicon:
           branch: "master"
           jre: "openjdk11"
           robot-options:
             "-v USE_NETCONF_CONNECTOR:False -v SCHEMA_MODEL:juniper -v INIT_DEVICE_COUNT:400
             -v MAX_DEVICE_COUNT:3000 -v DEVICE_INCREMENT:200 -v TESTTOOL_BOOT_TIMEOUT:600s
             -v MAX_HEAP:4G --flattenkeywords name:*repeat*keyword*"
+      - aluminium:
+          branch: "stable/aluminium"
+          jre: "openjdk11"
+          robot-options:
+            "-v USE_NETCONF_CONNECTOR:False -v SCHEMA_MODEL:juniper -v INIT_DEVICE_COUNT:1000
+            -v MAX_DEVICE_COUNT:4000 -v DEVICE_INCREMENT:500 -v TESTTOOL_BOOT_TIMEOUT:600s
+            -v MAX_HEAP:4G --flattenkeywords name:*repeat*keyword*"
       - magnesium:
           branch: "stable/magnesium"
           jre: "openjdk11"
@@ -68,12 +73,6 @@
             "-v USE_NETCONF_CONNECTOR:False -v SCHEMA_MODEL:juniper -v INIT_DEVICE_COUNT:250
             -v MAX_DEVICE_COUNT:1000 -v DEVICE_INCREMENT:100 -v TESTTOOL_BOOT_TIMEOUT:600s
             -v MAX_HEAP:4G --flattenkeywords name:*repeat*keyword*"
-      - sodium:
-          branch: "stable/sodium"
-          robot-options:
-            "-v USE_NETCONF_CONNECTOR:False -v SCHEMA_MODEL:juniper -v INIT_DEVICE_COUNT:10
-            -v MAX_DEVICE_COUNT:500 -v DEVICE_INCREMENT:25 -v TESTTOOL_BOOT_TIMEOUT:600s
-            -v MAX_HEAP:4G --flattenkeywords name:*repeat*keyword*"
 
     install:
       - only: