test (e2e) : Use pinned version of crc while executing e2e tests (crc…

…-org#4629) Instead of assuming e2e tests would pick up crc binary added by the pipeline, that may or may not work if some user has added a binary in any of the PATH dirs, explicitly specify crc installation dir during test run Signed-off-by: Rohan Kumar <[email protected]>
rohankanojia-forks · Feb 20, 2025 · 617b956 · 617b956
1 parent 20e0dd2
commit 617b956
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/images/build-e2e/lib/darwin/run.sh b/images/build-e2e/lib/darwin/run.sh
@@ -4,6 +4,7 @@
 bundleLocation=""
 e2eTagExpression=""
 crcMemory=""
+crcBinaryDir="/usr/local/bin"
 targetFolder="crc-e2e"
 junitFilename="e2e-junit.xml"
 while [[ $# -gt 0 ]]; do
@@ -34,6 +35,11 @@ while [[ $# -gt 0 ]]; do
         shift 
         shift 
         ;;
+        -crcBinaryDir)
+        crcBinaryDir="$2"
+        shift
+        shift
+        ;;
         *)    # unknown option
         shift 
         ;;
@@ -50,7 +56,7 @@ then
     tags="$tags && $e2eTagExpression"
 fi
 cd $targetFolder/bin
-./e2e.test --bundle-location=$bundleLocation --pull-secret-file="${HOME}/$targetFolder/pull-secret" --cleanup-home=false --crc-memory=$crcMemory --godog.tags="$tags" --godog.format=junit > "${HOME}/$targetFolder/results/e2e.results"
+./e2e.test --bundle-location=$bundleLocation --pull-secret-file="${HOME}/$targetFolder/pull-secret" --crc-binary=$crcBinaryDir --cleanup-home=false --crc-memory=$crcMemory --godog.tags="$tags" --godog.format=junit > "${HOME}/$targetFolder/results/e2e.results"
 
 # Transform results to junit
 cd ..

diff --git a/images/build-e2e/lib/linux/run.sh b/images/build-e2e/lib/linux/run.sh
@@ -4,6 +4,7 @@
 bundleLocation=""
 e2eTagExpression=""
 crcMemory=""
+crcBinaryDir="/usr/local/bin"
 targetFolder="crc-e2e"
 junitFilename="e2e-junit.xml"
 while [[ $# -gt 0 ]]; do
@@ -34,6 +35,11 @@ while [[ $# -gt 0 ]]; do
         shift 
         shift 
         ;;
+        -crcBinaryDir)
+        crcBinaryDir="$2"
+        shift
+        shift
+        ;;
         *)    # unknown option
         shift 
         ;;
@@ -50,7 +56,7 @@ then
     tags="$tags && $e2eTagExpression"
 fi
 cd $targetFolder/bin
-./e2e.test --bundle-location=$bundleLocation --pull-secret-file="${HOME}/$targetFolder/pull-secret" --cleanup-home=false --crc-memory=$crcMemory --godog.tags="$tags" --godog.format=junit > "${HOME}/$targetFolder/results/e2e.results"
+./e2e.test --bundle-location=$bundleLocation --pull-secret-file="${HOME}/$targetFolder/pull-secret" --crc-binary=$crcBinaryDir --cleanup-home=false --crc-memory=$crcMemory --godog.tags="$tags" --godog.format=junit > "${HOME}/$targetFolder/results/e2e.results"
 
 # Transform results to junit
 cd ..

diff --git a/images/build-e2e/lib/windows/run.ps1 b/images/build-e2e/lib/windows/run.ps1
@@ -9,6 +9,8 @@ param(
     $junitFilename="e2e-junit.xml",
     [Parameter(HelpMessage='Customize memory for the cluster to run the tests')]
     $crcMemory=""
+    [Parameter(HelpMessage='Customize crc binary location')]
+    $crcBinaryDir="C:\Program Files\Red Hat OpenShift Local"
 )
 
 # Prepare run e2e
@@ -28,7 +30,7 @@ if ($e2eTagExpression) {
 }
 $dir = "$PWD"
 cd $targetFolder\bin
-e2e.test.exe --bundle-location=$bundleLocation --pull-secret-file=$targetFolderdir\pull-secret --crc-memory=$crcMemory --cleanup-home=false --godog.tags="$tags" --godog.format=junit > $resultsDir\e2e.results
+e2e.test.exe --bundle-location=$bundleLocation --pull-secret-file=$targetFolderdir\pull-secret --crc-binary=$crcBinaryDir --crc-memory=$crcMemory --cleanup-home=false --godog.tags="$tags" --godog.format=junit > $resultsDir\e2e.results
 
 # Transform results to junit
 cd ..