Merge "Purge ODL Sodium jobs from builder"

[releng/builder.git] / jjb / bgpcep / bgpcep-csit-userfeatures.yaml

diff --git a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
index f615b9628d7feb2f8a87dfb5595dcc8614b11aa9..247e94d53315aea75312489ce453b7fbe81ec2ba 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
+++ b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
@@ -2,11 +2,10 @@
 - project:
     name: bgpcep-csit-userfeatures
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
 
     # The project name
-    project: 'bgpcep'
+    project: "bgpcep"
 
     # The functionality under test
     functionality:
@@ -15,45 +14,29 @@
 
     # Project branches
     stream:
-      - oxygen:
-          branch: 'master'
-          jre: 'openjdk8'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-          jre: 'openjdk8'
-      - carbon:
-          branch: 'stable/carbon'
-          jre: 'openjdk8'
-          karaf-version: karaf3
-      - boron:
-          branch: 'stable/boron'
-          jre: 'openjdk8'
-          karaf-version: karaf3
-          install-features: >
-              odl-restconf,
-              odl-bgpcep-pcep-all,
-              odl-bgpcep-bgp-all,
-              odl-bgpcep-bgp,
-              odl-bgpcep-pcep,
-              odl-netconf-connector-all,
-              odl-bgpcep-bmp,
-              odl-jolokia
-          robot-options: '-v USE_NETCONF_CONNECTOR:True'
+      - silicon:
+          branch: "master"
+          jre: "openjdk11"
+      - aluminium:
+          branch: "stable/aluminium"
+          jre: "openjdk11"
+      - magnesium:
+          branch: "stable/magnesium"
+          jre: "openjdk11"
 
     install:
-      - only:
-          scope: 'only'
       - all:
-          scope: 'all'
+          scope: "all"
 
     # Features to install
-    # *-all is for Beryllium and Boron, without -all is for Boron and Carbon.
     install-features: >
-        odl-restconf,
-        odl-bgpcep-pcep,
-        odl-bgpcep-bgp,
-        odl-bgpcep-bmp,
-        odl-jolokia
+      odl-restconf,
+      odl-bgpcep-pcep,
+      odl-bgpcep-bgp,
+      odl-bgpcep-bgp-config-example,
+      odl-bgpcep-bmp,
+      odl-bgpcep-bmp-config-example,
+      odl-jolokia
 
     # Robot custom options
-    robot-options: '-v USE_NETCONF_CONNECTOR:False'
+    robot-options: "-v USE_NETCONF_CONNECTOR:False"