Update to global-jjb v0.24.1

[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 55089c71299ce8817ad0cfe79657e2f2a1100df7..30cfc318aa8ff8b17510854ad2c97e0081b9bcf5 100644 (file)
--- a/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@ -26,6 +26,7 @@
           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,
@@ -38,15 +39,27 @@
               odl-tsdr-hbase,
               odl-tsdr-hsqldb,
               odl-tsdr-elasticsearch,
+              odl-unimgr,
+              odl-unimgr-template-driver,
+              odl-unimgr-cisco-xr-driver,
+              odl-unimgr-ovs-driver,
       - fluorine:
           branch: 'stable/fluorine'
           karaf-version: odl
           # Self-Managed projects repos and features:
           sm-repos: >
+              mvn:org.opendaylight.snmp4sdn/features-snmp4sdn//xml/features,
               mvn:org.opendaylight.sxp/features-sxp//xml/features,
+              mvn:org.opendaylight.transportpce/features-transportpce//xml/features,
               mvn:org.opendaylight.tsdr/features-tsdr//xml/features,
+              mvn:org.opendaylight.unimgr/features4-unimgr//xml/features,
           sm-features: >
+              odl-snmp4sdn-snmp4sdn
               odl-sxp-routing,
+              odl-transportpce,
+              odl-transportpce-api,
+              odl-transportpce-ordmodels,
+              odl-transportpce-stubmodels,
               odl-tsdr-core,
               odl-tsdr-openflow-statistics-collector,
               odl-tsdr-netflow-statistics-collector,
@@ -57,6 +70,10 @@
               odl-tsdr-hbase,
               odl-tsdr-hsqldb,
               odl-tsdr-elasticsearch,
+              odl-unimgr,
+              odl-unimgr-template-driver,
+              odl-unimgr-cisco-xr-driver,
+              odl-unimgr-ovs-driver,
       - oxygen:
           branch: 'stable/oxygen'
           karaf-version: karaf4
@@ -188,13 +205,39 @@
               distribution-merge-managed-{stream},
               sxp-merge-{stream},
               tsdr-merge-{stream},
+              unimgr-merge-{stream},
       - fluorine:
           branch: 'stable/fluorine'
           karaf-version: odl
           dependencies: >
               distribution-merge-managed-{stream},
+              snmp4sdn-merge-{stream},
               sxp-merge-{stream},
+              transportpce-merge-{stream},
               tsdr-merge-{stream},
+              unimgr-merge-{stream},
+
+- project:
+    name: distribution-release
+    jobs:
+      - gerrit-maven-stage
+
+    project: 'integration/distribution'
+    project-name: 'distribution'
+    mvn-goals: 'clean deploy -f opendaylight/pom.xml'
+    mvn-settings: 'integration-distribution-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    email-upstream: '[int/dist]'
+
+    # Used by the release job
+    staging-profile-id: 2af042ed81d5e2
+
+    stream:
+      - neon:
+          branch: 'master'
+
+      - fluorine:
+          branch: 'stable/fluorine'
 
 - project:
     name: distribution-sonar