Merge "Update RTD tokens and url for alt-datastore jobs"

[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 3233e77826073b340b4e301f6c751b7022aa49ba..e16edb39e3e6708dcd3b3df64f719a0a0384b35f 100644 (file)
--- a/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@ -17,6 +17,8 @@
     mvn-settings: integration-distribution-settings
     mvn-goals: 'clean install dependency:tree -DoutputFile=dependency_tree.txt'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    nexus-iq-namespace: odl-
+    nexus-iq-stage: release
     email-upstream: '[int/dist]'
     stream:
       - sodium:
@@ -24,10 +26,8 @@
           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
@@ -36,32 +36,27 @@
           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
+              mvn:org.opendaylight.telemetry/features-telemetry//xml/features,
+              mvn:org.opendaylight.transportpce/features-transportpce//xml/features
           sm-features: >
-              odl-sxp-routing,
               odl-telemetry-collector,
               odl-telemetry-configurator,
-              odl-telemetry-all
+              odl-telemetry-all,
+              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
-          disable-job: 'true'
-
 - project:
     name: distribution-managed
     jobs:
@@ -142,45 +137,6 @@
               serviceutils-merge-{stream},
               sfc-merge-{stream}
 
-      - oxygen:
-          branch: 'stable/oxygen'
-          disable-job: true
-          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},
-              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}
-
 - project:
     name: distribution-full
     jobs:
@@ -207,29 +163,20 @@
           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},
-              sxp-merge-{stream},
               telemetry-merge-{stream},
-              tsdr-merge-{stream},
-              unimgr-merge-{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
@@ -237,7 +184,7 @@
       - gerrit-maven-stage:
           sign-artifacts: true
           mvn-central: true
-          ossrh-profile-id: 7edbe315063867
+          ossrh-profile-id: 6386ebbbf3a563
 
     project: 'integration/distribution'
     project-name: 'distribution'