Merge "Switch the csit-verify-3node to use job prefix"

[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 a808296a5f4a9a397e9a7b3053b6f6c24e2c0279..5ea5cc3dcde318993b62cf858a04f246c5133280 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
+++ b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
@@ -1,7 +1,9 @@
+---
 - project:
     name: bgpcep-csit-throughpcep
     jobs:
-        - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
+      - inttest-csit-1node-periodic
+      # FIXME: Rename job to drop -periodic- and unify job definition with -gate- functionality.
 
     # The project name
     project: 'bgpcep'
@@ -11,23 +13,17 @@
 
     # Project branches
     stream:
-        - carbon:
-            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: 'master'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+      - carbon:
+          branch: 'stable/carbon'
+          karaf-version: karaf3
 
     install:
-        - only:
-            scope: 'only'
-        - all:
-            scope: 'all'
+      - all:
+          scope: 'all'
 
     # Features to install
     install-features: 'odl-restconf,odl-bgpcep-pcep'
@@ -36,7 +32,11 @@
     # 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'
+    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
+    odl_system_flavor: v1-performance-4