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 81961b4c4fa92974372d51a35d5c03b23880770f..f2e183547dec69e66d29d0ce86c70305148c7134 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
+++ b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
@@ -2,7 +2,8 @@
 - project:
     name: bgpcep-csit-throughpcep
     jobs:
-      - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
+      # FIXME: Rename job to drop -periodic- and unify job definition with -gate- functionality.
 
     # The project name
     project: 'bgpcep'
@@ -12,21 +13,17 @@
 
     # Project branches
     stream:
-      - carbon:
+      - fluorine:
           branch: 'master'
-          jre: 'openjdk8'
-      - boron:
-          branch: 'stable/boron'
-          jre: 'openjdk8'
-          install-features: 'odl-restconf,odl-bgpcep-pcep-all,odl-bgpcep-pcep'
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          install-features: 'odl-restconf,odl-bgpcep-pcep-all,odl-bgpcep-pcep'
+      - oxygen:
+          branch: 'stable/oxygen'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+      - carbon:
+          branch: 'stable/carbon'
+          karaf-version: karaf3
 
     install:
-      - only:
-          scope: 'only'
       - all:
           scope: 'all'
 
@@ -39,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: 8 GB General Purpose v1
+    odl_system_flavor: odl-standard-4