X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fbgpcep%2Fbgpcep-csit-throughpcep.yaml;h=9a7c9ba39a4c44251c6b85248f23cee598c49920;hb=refs%2Fchanges%2F80%2F80180%2F2;hp=5e4743647b0042a5d4f38959a10c704322590691;hpb=aed631e0a5e2b00228e0da17175b8a835f0e2ccb;p=releng%2Fbuilder.git

diff --git a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
index 5e4743647..9a7c9ba39 100644
--- a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
+++ b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
@@ -2,70 +2,27 @@
 - project:
     name: bgpcep-csit-throughpcep
     jobs:
-      - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'bgpcep'
 
     # The functionality under test
-    functionality: 'throughpcep'
+    functionality:
+      - throughpcep
+      - gate-throughpcep
 
     # Project branches
     stream:
-      - oxygen:
+      - sodium:
           branch: 'master'
-          jre: 'openjdk8'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-          jre: 'openjdk8'
-      - carbon:
-          branch: 'stable/carbon'
-          jre: 'openjdk8'
-          karaf-version: karaf3
-
-    install:
-      - all:
-          scope: 'all'
-
-    # Features to install
-    install-features: 'odl-restconf,odl-bgpcep-pcep'
-
-    # Readiness check timeout is lowered from the suite's high default value.
-    # The other options are workarounds for Sandbox not being as performant
-    # as the private lab where this suite was developed.
-    # Robot custom options:
-    robot-options: >
-        -v USE_NETCONF_CONNECTOR:False
-        -v PCEP_READY_VERIFY_TIMEOUT:5
-        -v RESTCONF_REUSE:False
-        -v UPDATER_TIMEOUT:600
-
-    # Controller configuration
-    odl_system_flavor: 8 GB General Purpose v1
-
-- project:
-    name: bgpcep-csit-gate-throughpcep
-    jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'bgpcep'
-
-    # The functionality under test
-    functionality: 'gate-throughpcep'
-
-    # Project branches
-    stream:
+      - neon:
+          branch: 'stable/neon'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
-          branch: 'master'
-          jre: 'openjdk8'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-          jre: 'openjdk8'
-      - carbon:
-          branch: 'stable/carbon'
-          jre: 'openjdk8'
-          karaf-version: karaf3
+          branch: 'stable/oxygen'
+          disable-job: 'true'
 
     install:
       - all:
@@ -80,9 +37,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