diff --git a/images/build-e2e/lib/darwin/run.sh b/images/build-e2e/lib/darwin/run.sh index 854e534790..17ab7ae701 100755 --- a/images/build-e2e/lib/darwin/run.sh +++ b/images/build-e2e/lib/darwin/run.sh @@ -55,6 +55,11 @@ cd $targetFolder/bin # Transform results to junit cd .. init_line=$(grep -n '' results/e2e.results | awk '{split($0,n,":"); print n[1]}') -tail -n +$init_line results/e2e.results | xsltproc filter.xsl - > results/$junitFilename +if which xsltproc &>/dev/null +then + tail -n +$init_line results/e2e.results | xsltproc filter.xsl - > results/$junitFilename +else + tail -n +$init_line results/e2e.results > results/$junitFilename +fi # Copy logs and diagnose cp -r bin/out/test-results/* results diff --git a/images/build-e2e/lib/linux/run.sh b/images/build-e2e/lib/linux/run.sh index 8c2aa79f68..9003215faa 100755 --- a/images/build-e2e/lib/linux/run.sh +++ b/images/build-e2e/lib/linux/run.sh @@ -55,6 +55,11 @@ cd $targetFolder/bin # Transform results to junit cd .. init_line=$(grep -n '' results/e2e.results | awk '{split($0,n,":"); print n[1]}') -tail -n +$init_line results/e2e.results | xsltproc filter.xsl - > results/$junitFilename +if which xsltproc &>/dev/null +then + tail -n +$init_line results/e2e.results | xsltproc filter.xsl - > results/$junitFilename +else + tail -n +$init_line results/e2e.results > results/$junitFilename +fi # Copy logs and diagnose cp -r bin/out/test-results/* results diff --git a/images/build-integration/lib/darwin/run.sh b/images/build-integration/lib/darwin/run.sh index c254c3edb2..0a9b30afed 100755 --- a/images/build-integration/lib/darwin/run.sh +++ b/images/build-integration/lib/darwin/run.sh @@ -56,4 +56,9 @@ fi # Copy results cd .. cp bin/integration.results results/integration.results -cat bin/out/integration.xml | xsltproc filter.xsl - > results/$junitFilename +if which xsltproc &>/dev/null +then + cat bin/out/integration.xml | xsltproc filter.xsl - > results/$junitFilename +else + mv bin/out/integration.xml results/$junitFilename +fi diff --git a/images/build-integration/lib/linux/run.sh b/images/build-integration/lib/linux/run.sh index 1162a1e923..4ea24ccddc 100755 --- a/images/build-integration/lib/linux/run.sh +++ b/images/build-integration/lib/linux/run.sh @@ -57,4 +57,9 @@ fi # Copy results cd .. cp bin/integration.results results/integration.results -cat bin/out/integration.xml | xsltproc filter.xsl - > results/$junitFilename +if which xsltproc &>/dev/null +then + cat bin/out/integration.xml | xsltproc filter.xsl - > results/$junitFilename +else + mv bin/out/integration.xml results/$junitFilename +fi