Merge "Update SFC netvirt CSIT with fluorine and queens"

[releng/builder.git] / jjb / bgpcep / bgpcep-csit-throughpcep.yaml

diff --git a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
index c0fc3a7a886c18f2a9e8e02955b76cd3b0abf9c1..f2e183547dec69e66d29d0ce86c70305148c7134 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
+++ b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
@@ -2,7 +2,7 @@
 - project:
     name: bgpcep-csit-throughpcep
     jobs:
-      - inttest-csit-1node-periodic
+      - inttest-csit-1node
       # FIXME: Rename job to drop -periodic- and unify job definition with -gate- functionality.
 
     # The project name
@@ -13,8 +13,10 @@
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
@@ -34,9 +36,9 @@
     # Robot custom options:
     robot-options: >
         -v USE_NETCONF_CONNECTOR:False
-        -v PCEP_READY_VERIFY_TIMEOUT:5
+        -v PCEP_READY_VERIFY_TIMEOUT:180
         -v RESTCONF_REUSE:False
-        -v UPDATER_TIMEOUT:600
+        -v UPDATER_TIMEOUT:900
 
     # Controller configuration
-    odl_system_flavor: v2-standard-4
+    odl_system_flavor: odl-standard-4