summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
109c212)
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>
else
ACTUALFEATURES="${CONTROLLERFEATURES}"
fi
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!!!"
if [ -f ${WORKSPACE}/test/csit/scriptplans/${TESTPLAN} ]; then
echo "scriptplan exists!!!"
else
ACTUALFEATURES="${CONTROLLERFEATURES}"
fi
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
cat > ${WORKSPACE}/deploy-controller-script.sh <<EOF