[QE] check postprocess program availability

crc-org · Nov 11, 2024 · fa7add1 · fa7add1
1 parent e22465a
commit fa7add1
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 4 deletions.
diff --git 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 '<?xml version="1.0" encoding="UTF-8"?>' 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
@@ -55,6 +55,11 @@ cd $targetFolder/bin
 # Transform results to junit
 cd ..
 init_line=$(grep -n '<?xml version="1.0" encoding="UTF-8"?>' 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
@@ -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
@@ -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