Create Neon jobs and bump fluorine branch

[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 0eca8dc68df57172bb3afaec0964ad940c03221e..534b08f25b4e6a101d88d25b967590e5cbff00f0 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
+++ b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
@@ -2,26 +2,24 @@
 - project:
     name: bgpcep-csit-throughpcep
     jobs:
-      - inttest-csit-1node-periodic
-      # FIXME: Rename job to drop -periodic- and unify job definition with -gate- functionality.
+      - inttest-csit-1node
 
     # The project name
     project: 'bgpcep'
 
     # The functionality under test
-    functionality: 'throughpcep'
+    functionality:
+      - throughpcep
+      - gate-throughpcep
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
@@ -36,9 +34,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