Adjust scripts for common distribution

[releng/builder.git] / jjb / integration / distribution / distribution-jobs.yaml

diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml
index 1792c171ff3217e512f7ef4a402a53ae1473257c..e7fe1697819a9b2d4163d19426b3ab802ebff720 100644 (file)
--- a/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@ -19,7 +19,7 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     email-upstream: '[int/dist]'
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
           karaf-version: odl
           # Self-Managed projects repos and features:
@@ -40,6 +40,27 @@
               odl-tsdr-hsqldb,
               odl-tsdr-elasticsearch,
               odl-unimgr-rest
+      - fluorine:
+          branch: 'stable/fluorine'
+          karaf-version: odl
+          # Self-Managed projects repos and features:
+          sm-repos: >
+              mvn:org.opendaylight.sxp/features-sxp//xml/features,
+              mvn:org.opendaylight.tsdr/features-tsdr//xml/features,
+              mvn:org.opendaylight.unimgr/features4-unimgr//xml/features
+          sm-features: >
+              odl-sxp-routing,
+              odl-tsdr-core,
+              odl-tsdr-openflow-statistics-collector,
+              odl-tsdr-netflow-statistics-collector,
+              odl-tsdr-restconf-collector,
+              odl-tsdr-syslog-collector,
+              odl-tsdr-controller-metrics-collector,
+              odl-tsdr-cassandra,
+              odl-tsdr-hbase,
+              odl-tsdr-hsqldb,
+              odl-tsdr-elasticsearch,
+              odl-unimgr-rest
       - oxygen:
           branch: 'stable/oxygen'
           karaf-version: karaf4
@@ -63,9 +84,10 @@
     profile: '-Pmanaged'
     forbidden-files: 'opendaylight/**'
     karaf-version: karaf4
+    dist-pom: 'distribution/pom.xml'
 
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
           dependencies: >
               aaa-merge-{stream},
@@ -84,6 +106,25 @@
               ovsdb-merge-{stream},
               serviceutils-merge-{stream},
               sfc-merge-{stream}
+      - fluorine:
+          branch: 'stable/fluorine'
+          dependencies: >
+              aaa-merge-{stream},
+              bgpcep-merge-{stream},
+              coe-merge-{stream},
+              controller-merge-{stream},
+              daexim-merge-{stream},
+              genius-merge-{stream},
+              infrautils-merge-{stream},
+              lispflowmapping-merge-{stream},
+              mdsal-merge-{stream},
+              netconf-merge-{stream},
+              netvirt-merge-{stream}
+              neutron-merge-{stream},
+              openflowplugin-merge-{stream},
+              ovsdb-merge-{stream},
+              serviceutils-merge-{stream},
+              sfc-merge-{stream}
 
       - oxygen:
           branch: 'stable/oxygen'
@@ -141,9 +182,10 @@
     profile: '-Punmanaged'
     files: 'opendaylight/**'
     karaf-version: odl
+    dist-pom: 'distribution/opendaylight/pom.xml'
 
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
           karaf-version: odl
           dependencies: >
@@ -151,6 +193,14 @@
               sxp-merge-{stream},
               tsdr-merge-{stream},
               unimgr-merge-{stream}
+      - fluorine:
+          branch: 'stable/fluorine'
+          karaf-version: odl
+          dependencies: >
+              distribution-merge-managed-{stream},
+              sxp-merge-{stream},
+              tsdr-merge-{stream},
+              unimgr-merge-{stream}
 
 - project:
     name: distribution-sonar