From: Sam Hague <shague@redhat.com>
Date: Fri, 6 Jul 2018 12:40:34 +0000 (+0000)
Subject: Merge "Add odl-sxp-routing feature to distribution"
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=f4b9f7257925bb9a3da2a9fedda0dfe4fbc5b2db;hp=-c;p=releng%2Fbuilder.git

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

f4b9f7257925bb9a3da2a9fedda0dfe4fbc5b2db
diff --combined jjb/integration/distribution/distribution-jobs.yaml
index 5e3708d5a,88a7f485e..ce35b2fa0
--- a/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