CI!: Rm silicon jobs from Jenkins

[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 62d90dfef4b1e934c1ec0c68276758b6749d2404..d886bb9de34968e1347a7aa90c54cba9a28ea466 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
+++ b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
@@ -3,42 +3,45 @@
     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
+      - chlorine:
+          branch: "master"
+          jre: "openjdk11"
+      - sulfur:
+          branch: "stable/sulfur"
+          jre: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
+
+    karaf-version: bgpcep
 
     install:
       - all:
-          scope: 'all'
+          scope: "all"
 
     # Features to install
-    install-features: 'odl-restconf,odl-bgpcep-pcep'
+    install-features: "odl-restconf,odl-bgpcep-pcep,odl-restconf-nb-bierman02"
 
     # 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: v2-standard-4
+    odl_system_flavor: v3-standard-4