Merge "Revert "Install odl-mdsal-trace in netvirt oxygen csit""

[releng/builder.git] / jjb / bgpcep / bgpcep-patch-test.yaml

diff --git a/jjb/bgpcep/bgpcep-patch-test.yaml b/jjb/bgpcep/bgpcep-patch-test.yaml
index d96356f3fbaac85f2413487dd2b15ce7d341dfd3..f1e6f274ae7b108e1d5c10b7b35384578e0f039b 100644 (file)
--- a/jjb/bgpcep/bgpcep-patch-test.yaml
+++ b/jjb/bgpcep/bgpcep-patch-test.yaml
@@ -2,35 +2,30 @@
 - project:
     name: bgpcep-patch-test
     jobs:
-      - '{project}-patch-test-{feature}-{stream}'
+      - inttest-patch-test
 
     # The project name
     project: 'bgpcep'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
-          jdk: 'openjdk8'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jdk: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jdk: 'openjdk8'
-          karaf-version: karaf3
-      - boron:
-          branch: 'stable/boron'
-          jdk: 'openjdk8'
           karaf-version: karaf3
 
     feature:
       - bgp:
           csit-list: >
-              bgpcep-csit-1node-gate-userfeatures-only-{stream},
-              bgpcep-csit-1node-gate-bgp-ingest-mixed-only-{stream}
+              bgpcep-csit-1node-gate-userfeatures-all-{stream},
+              bgpcep-csit-1node-gate-bgp-ingest-mixed-all-{stream}
 
       - pcep:
           csit-list: >
-              bgpcep-csit-1node-gate-userfeatures-only-{stream},
-              bgpcep-csit-1node-gate-throughpcep-only-{stream}
+              bgpcep-csit-1node-gate-userfeatures-all-{stream},
+              bgpcep-csit-1node-gate-throughpcep-all-{stream}