diff --git a/README.md b/README.md index 724ed16..90cd887 100755 --- a/README.md +++ b/README.md @@ -5,6 +5,6 @@ Parallel Install Test for rpms For testing parallel install ability of legacy RH builds. ## How to run -User needs to first export BUILD_OS_VERSION (number) and BUILD_OS_NAME (el or f) for the test to work. +User needs to first export BUILD_OS_VERSION (number), BUILD_OS_NAME (el or f) and JDK_VERSION (just the numeric value of major version) for the test to work. Execution requires two arguments for two folders of rpms we want to install. The get installed in the order of the arguments. Running the test should then be just a simple execution of the shell script. User can also influence where the produced logs will be stored by exporting TMPRESULTS variable. diff --git a/parallel_install_test.sh b/parallel_install_test.sh index 4f9cba1..ebe4bcf 100755 --- a/parallel_install_test.sh +++ b/parallel_install_test.sh @@ -61,10 +61,21 @@ function run_parallel_test { RUNNING=false -if [[ ( x${BUILD_OS_NAME} == xel && ${BUILD_OS_VERSION} > 6 ) || x${BUILD_OS_NAME} == xf ]]; then +# parallel install is on el7-9 +if [[ x${BUILD_OS_NAME} == xel && ${BUILD_OS_VERSION} -gt 6 && ${BUILD_OS_VERSION} -lt 10 ]]; then RUNNING=true fi +# not on el10 for ojdk21 +if [[ ${BUILD_OS_VERSION} -ge 10 && ${JDK_VERSION} -ge 21 ]]; then + RUNNING=false +fi + +# not on ojdk25 at all +if [[ ${JDK_VERSION} -ge 25 ]]; then + RUNNING=false +fi + FAILED=0 PASSED=0 IGNORED=0 @@ -86,7 +97,7 @@ fi echo "" > $TMPRESULTS/parallel_install_log.txt let "PASSED+=1" -echo "Appending dummy test, so there is at elast one test always running in suite" >> $TMPRESULTS/parallel_install_log.txt +echo "Appending dummy test, so there is at least one test always running in suite" >> $TMPRESULTS/parallel_install_log.txt TEST=$(printXmlTest "tps" "dummyTestToPrventTotalFailure" "0" "" "") BODY+="$TEST " # new line to improve clarity, also is used in TPS/tesultsToJtregs.sh