X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fdistribution%2Fdistribution-jobs.yaml;h=3f7646034f2741660a9a36e5f837b208523d89e6;hb=73db6e3816a507f0c12edede5d8951c488800bda;hp=004b1e79622dca93cd68567ff4266a5fa4045ea4;hpb=49efb6213e9c677f9ef74be0fcf41443757d13cb;p=releng%2Fbuilder.git

diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml
index 004b1e796..3f7646034 100644
--- a/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@ -19,36 +19,38 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     email-upstream: '[int/dist]'
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
           karaf-version: odl
           # Self-Managed projects repos and features:
           sm-repos: >
-              mvn:org.opendaylight.sxp/features-sxp//xml/features,
               mvn:org.opendaylight.telemetry/features-telemetry//xml/features
           sm-features: >
-              odl-sxp-routing,
               odl-telemetry-collector,
               odl-telemetry-configurator,
               odl-telemetry-all
+      - neon:
+          branch: 'stable/neon'
+          karaf-version: odl
+          # Self-Managed projects repos and features:
+          sm-repos: >
+              mvn:org.opendaylight.transportpce/features-transportpce//xml/features
+          sm-features: >
+              odl-transportpce,
+              odl-transportpce-api,
+              odl-transportpce-ordmodels
       - 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.transportpce/features-transportpce//xml/features
           sm-features: >
-              odl-sxp-routing,
               odl-transportpce,
               odl-transportpce-api,
               odl-transportpce-ordmodels,
               odl-transportpce-stubmodels
 
-      - oxygen:
-          branch: 'stable/oxygen'
-          karaf-version: karaf4
-
 - project:
     name: distribution-managed
     jobs:
@@ -71,7 +73,7 @@
     dist-pom: 'distribution/pom.xml'
 
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
           dependencies: >
               aaa-merge-{stream},
@@ -90,8 +92,8 @@
               ovsdb-merge-{stream},
               serviceutils-merge-{stream},
               sfc-merge-{stream}
-      - fluorine:
-          branch: 'stable/fluorine'
+      - neon:
+          branch: 'stable/neon'
           dependencies: >
               aaa-merge-{stream},
               bgpcep-merge-{stream},
@@ -109,44 +111,25 @@
               ovsdb-merge-{stream},
               serviceutils-merge-{stream},
               sfc-merge-{stream}
-
-      - oxygen:
-          branch: 'stable/oxygen'
+      - fluorine:
+          branch: 'stable/fluorine'
           dependencies: >
               aaa-merge-{stream},
-              alto-merge-{stream},
               bgpcep-merge-{stream},
-              bier-merge-{stream},
               coe-merge-{stream},
               controller-merge-{stream},
               daexim-merge-{stream},
-              dluxapps-merge-{stream},
-              dlux-merge-{stream},
-              faas-merge-{stream},
               genius-merge-{stream},
-              groupbasedpolicy-merge-{stream},
               infrautils-merge-{stream},
-              jsonrpc-merge-{stream},
-              l2switch-merge-{stream},
               lispflowmapping-merge-{stream},
               mdsal-merge-{stream},
-              nemo-merge-{stream},
               netconf-merge-{stream},
-              netvirt-merge-{stream},
+              netvirt-merge-{stream}
               neutron-merge-{stream},
-              of-config-merge-{stream},
               openflowplugin-merge-{stream},
               ovsdb-merge-{stream},
-              p4plugin-merge-{stream},
-              packetcable-merge-{stream},
               serviceutils-merge-{stream},
-              sfc-merge-{stream},
-              snmp4sdn-merge-{stream},
-              snmp-merge-{stream},
-              sxp-merge-{stream},
-              tsdr-merge-{stream},
-              usc-merge-{stream},
-              vbd-merge-{stream}
+              sfc-merge-{stream}
 
 - project:
     name: distribution-full
@@ -169,25 +152,24 @@
     dist-pom: 'distribution/opendaylight/pom.xml'
 
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
           karaf-version: odl
           dependencies: >
               distribution-merge-managed-{stream},
-              sxp-merge-{stream},
-              telemetry-merge-{stream},
-              tsdr-merge-{stream},
-              unimgr-merge-{stream}
+              telemetry-merge-{stream}
+      - neon:
+          branch: 'stable/neon'
+          karaf-version: odl
+          dependencies: >
+              distribution-merge-managed-{stream},
+              transportpce-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}
+              transportpce-merge-{stream}
 
 - project:
     name: distribution-release
@@ -195,7 +177,7 @@
       - gerrit-maven-stage:
           sign-artifacts: true
           mvn-central: true
-          ossrh-profile-id: 7edbe315063867
+          ossrh-profile-id: 6386ebbbf3a563
 
     project: 'integration/distribution'
     project-name: 'distribution'
@@ -208,9 +190,12 @@
     staging-profile-id: 2af042ed81d5e2
 
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
 
+      - neon:
+          branch: 'stable/neon'
+
       - fluorine:
           branch: 'stable/fluorine'