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 447acb67c662587f927833d482bc81d90f8c158d..f462e279f1854b9f52ead069dbe2ee98f41b53db 100644 (file)
--- 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 0b14414017ef9e61dcb57b131af6dd94ac59c535..50d15a8d2fbfee2d104c7c716bd1bab056fe5c91 100644 (file)
--- 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