Merge "Minimize CSIT dependencis in mininet-ovs-2.8 image"

[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 f2e183547dec69e66d29d0ce86c70305148c7134..878165f7ef13e13132f72675e6f8b7f67e0220d3 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
+++ b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
@@ -3,42 +3,43 @@
     name: bgpcep-csit-throughpcep
     jobs:
       - inttest-csit-1node
-      # FIXME: Rename job to drop -periodic- and unify job definition with -gate- functionality.
 
     # The project name
-    project: 'bgpcep'
+    project: "bgpcep"
 
     # The functionality under test
-    functionality: 'throughpcep'
+    functionality:
+      - throughpcep
+      - gate-throughpcep
 
     # Project branches
     stream:
-      - fluorine:
-          branch: 'master'
-      - oxygen:
-          branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
+      - silicon:
+          branch: "master"
+          jre: "openjdk11"
+      - aluminium:
+          branch: "stable/aluminium"
+          jre: "openjdk11"
+      - magnesium:
+          branch: "stable/magnesium"
+          jre: "openjdk11"
 
     install:
       - all:
-          scope: 'all'
+          scope: "all"
 
     # Features to install
-    install-features: 'odl-restconf,odl-bgpcep-pcep'
+    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:180
-        -v RESTCONF_REUSE:False
-        -v UPDATER_TIMEOUT:900
+      -v USE_NETCONF_CONNECTOR:False
+      -v PCEP_READY_VERIFY_TIMEOUT:180
+      -v RESTCONF_REUSE:False
+      -v UPDATER_TIMEOUT:900
 
     # Controller configuration
     odl_system_flavor: odl-standard-4