Merge "Add odl-sxp-routing feature to distribution"

diff --combined jjb/integration/distribution/distribution-jobs.yaml
index 5e3708d5aeca166b6bda4c92fab1b05680fe6242,88a7f485e1c339d4e2b905be68fcc27bc7ef6936..ce35b2fa0ca3fac0d99debf0db17b0653e8ee4a1
--- 1/jjb/integration/distribution/distribution-jobs.yaml
--- 2/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@@ -30,7 -30,7 +30,7 @@@
            karaf-version: odl
            # Self-Managed projects repos and features:
            sm-repos: mvn:org.opendaylight.sxp/features-sxp//xml/features
-           sm-features: odl-sxp-controller
+           sm-features: odl-sxp-routing
        - oxygen:
            branch: 'stable/oxygen'
            karaf-version: karaf4
@@@ -390,8 -390,3 +390,8 @@@
        - integration-csit-archive-build
        - lf-infra-publish
  
 +- view:
 +    name: distribution
 +    description: 'List of distribution jobs'
 +    regex: '^(integration-)?distribution-.*'
 +    <<: *releng_view_common