Fix distribution-sanity-fluorine

It looks like when there is a single element in yaml list, jjb adds
a line feed after the parameter, this was failing the job.

Change-Id: Icecfce01c0b7191ee59f0e4121544e0166d8fd15
Signed-off-by: Luis Gomez <ecelgp@gmail.com>

diff --git a/jjb/integration/distribution/distribution-check-bootup.sh b/jjb/integration/distribution/distribution-check-bootup.sh
index 7547109446da8185e9d404c8004a05d6d322e546..be617ee034b32c326d9572170b0104cff52c12c2 100644 (file)
--- a/jjb/integration/distribution/distribution-check-bootup.sh
+++ b/jjb/integration/distribution/distribution-check-bootup.sh
@@ -28,14 +28,14 @@ if [[ "$KARAF_VERSION" == "karaf3" ]]; then
     FEATURE_TEST_STRING="features-integration-test"
 fi
 
-sed -ie "s%\(featuresRepositories=\|featuresRepositories =\)%featuresRepositories = mvn:org.opendaylight.integration/${FEATURE_TEST_STRING}/${BUNDLE_VERSION}/xml/features,%g" ${FEATURESCONF}
+sed -ie "s%\(featuresRepositories= \|featuresRepositories = \)%featuresRepositories = mvn:org.opendaylight.integration/${FEATURE_TEST_STRING}/${BUNDLE_VERSION}/xml/features,%g" ${FEATURESCONF}
 
 if [[ ! -z "${REPO_URL}" ]]; then
-   sed -ie "s%featuresRepositories =%featuresRepositories = ${REPO_URL},%g" ${FEATURESCONF}
+   sed -ie "s%featuresRepositories = %featuresRepositories = ${REPO_URL},%g" ${FEATURESCONF}
 fi
 
 # Add actual boot features.
-sed -ie "s/\(featuresBoot=\|featuresBoot =\)/featuresBoot = ${ACTUALFEATURES},/g" "${FEATURESCONF}"
+sed -ie "s/\(featuresBoot= \|featuresBoot = \)/featuresBoot = ${ACTUALFEATURES},/g" "${FEATURESCONF}"
 cat "${FEATURESCONF}"
 
 echo "Configuring the log..."

diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml
index 5caeead33c15e8c9f20a8d7b5b6c4a7ffc045ca0..c543d65d670b7dd17b25fbed865837f2092165f7 100644 (file)
--- a/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@ -28,10 +28,8 @@
           branch: 'master'
           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-repos: mvn:org.opendaylight.sxp/features-sxp//xml/features
+          sm-features: odl-sxp-controller
       - oxygen:
           branch: 'stable/oxygen'
           karaf-version: karaf4