Merge "Disable odlparent 3.2 jobs"

[releng/builder.git] / jjb / tsdr / tsdr-csit-hsqldb.yaml

diff --git a/jjb/tsdr/tsdr-csit-hsqldb.yaml b/jjb/tsdr/tsdr-csit-hsqldb.yaml
index 8c251df84db80e82624852ccaac0c84a21fb6048..cf00cd88636d3b1fdde25ba7807fbf4de5367849 100644 (file)
--- a/jjb/tsdr/tsdr-csit-hsqldb.yaml
+++ b/jjb/tsdr/tsdr-csit-hsqldb.yaml
@@ -13,15 +13,20 @@
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+          trigger-jobs: '{project}-merge-{stream}'
+          karaf-version: 'odl'
+          # yamllint disable-line rule:line-length
+          repo-url: 'mvn:org.opendaylight.tsdr/features-tsdr//xml/features'
+      - fluorine:
+          branch: 'stable/fluorine'
+          trigger-jobs: '{project}-merge-{stream}'
+          karaf-version: 'odl'
+          # yamllint disable-line rule:line-length
+          repo-url: 'mvn:org.opendaylight.tsdr/features-tsdr//xml/features'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all: