From: Vratko Polak <vrpolak@cisco.com>
Date: Tue, 12 Jan 2016 17:37:36 +0000 (+0100)
Subject: Remove spaces and newline from ACTUALFEATURES
X-Git-Tag: release/beryllium~191^2
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=3bce3bb7065c5e04babe521c142f7625dfb4d39b;hp=109c212e73777c5a03d5b7f97aba5e973b8ef56d;p=releng%2Fbuilder.git

Remove spaces and newline from ACTUALFEATURES

Some jenkins-job-builder versions may be adding spaces and a newline.
This allows CSIT jobs to work correcly.

Change-Id: I1a01dee90b8c6f057403b2c90940b02550a7bc71
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
---

diff --git a/jjb/integration/include-raw-integration-deploy-controller-run-test.sh b/jjb/integration/include-raw-integration-deploy-controller-run-test.sh
index 447acb67c..f462e279f 100644
--- a/jjb/integration/include-raw-integration-deploy-controller-run-test.sh
+++ b/jjb/integration/include-raw-integration-deploy-controller-run-test.sh
@@ -12,6 +12,9 @@ if [ ${CONTROLLERSCOPE} == 'all' ]; then
 else
     ACTUALFEATURES="${CONTROLLERFEATURES}"
 fi
+# Some versions of jenkins job builder result in feature list containing spaces
+# and ending in newline. Remove all that.
+ACTUALFEATURES=`echo "${ACTUALFEATURES}" | tr -d '\n \r'`
 
 if [ -f ${WORKSPACE}/test/csit/scriptplans/${TESTPLAN} ]; then
     echo "scriptplan exists!!!"
diff --git a/jjb/integration/include-raw-integration-deploy-controller.sh b/jjb/integration/include-raw-integration-deploy-controller.sh
index 0b1441401..50d15a8d2 100644
--- a/jjb/integration/include-raw-integration-deploy-controller.sh
+++ b/jjb/integration/include-raw-integration-deploy-controller.sh
@@ -10,6 +10,9 @@ if [ ${CONTROLLERSCOPE} == 'all' ]; then
 else
     ACTUALFEATURES="${CONTROLLERFEATURES}"
 fi
+# Some versions of jenkins job builder result in feature list containing spaces
+# and ending in newline. Remove all that.
+ACTUALFEATURES=`echo "${ACTUALFEATURES}" | tr -d '\n \r'`
 
 cat > ${WORKSPACE}/deploy-controller-script.sh <<EOF