Clarify return messages from the bot

EESSI · Feb 6, 2024 · 9b6fa73 · 9b6fa73
1 parent 081e2b1
commit 9b6fa73
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 24 deletions.
diff --git a/bot/check-test.sh b/bot/check-test.sh
@@ -64,14 +64,14 @@ fi
 
 echo "[TEST]" > ${job_test_result_file}
 if [[ ${SLURM} -eq 0 ]]; then
-    echo "comment_description = FAILED (job output file not found)" >> ${job_test_result_file}
+    echo "comment_description = :cry: FAILED (job output file not found, cannot check test results)" >> ${job_test_result_file}
 elif [[ ${ERROR} -eq 1 ]]; then
-    echo "comment_description = FAILED (test step failed to execute)" >> ${job_test_result_file}
+    echo "comment_description = :cry: FAILED (EESSI test suite was not run, test step itself failed to execute)" >> ${job_test_result_file}
     echo "status = FAILURE" >> ${job_test_result_file}
 elif [[ ${FAILED} -eq 1 ]]; then
-    echo "comment_description = FAILED (EESSI test suite produced failures)" >> ${job_test_result_file}
+    echo "comment_description = :cry: FAILED (EESSI test suite produced failures)" >> ${job_test_result_file}
 else
-    echo "comment_description = Test step run succesfully" >> ${job_test_result_file}
+    echo "comment_description = :grin: SUCCESS" >> ${job_test_result_file}
     echo "status = SUCCESS" >> ${job_test_result_file}
 fi
 

diff --git a/test_suite.sh b/test_suite.sh
@@ -78,26 +78,9 @@ else
     fatal_error "$EESSI_CVMFS_REPO is not available!"
 fi
 
-# make sure we're in Prefix environment by checking $SHELL
-if [[ ${SHELL} = ${EPREFIX}/bin/bash ]]; then
-    echo_green ">> It looks like we're in a Gentoo Prefix environment, good!"
-else
-    fatal_error "Not running in Gentoo Prefix environment, run '${EPREFIX}/startprefix' first!"
-fi
-
 # avoid that pyc files for EasyBuild are stored in EasyBuild installation directory
 export PYTHONPYCACHEPREFIX=$TMPDIR/pycache
 
-DETECTION_PARAMETERS=''
-GENERIC=0
-EB='eb'
-if [[ "$EASYBUILD_OPTARCH" == "GENERIC" ]]; then
-    echo_yellow ">> GENERIC build/test requested, taking appropriate measures!"
-    DETECTION_PARAMETERS="$DETECTION_PARAMETERS --generic"
-    GENERIC=1
-    EB='eb --optarch=GENERIC'
-fi
-
 echo ">> Determining software subdirectory to use for current build/test host..."
 if [ -z $EESSI_SOFTWARE_SUBDIR_OVERRIDE ]; then
   export EESSI_SOFTWARE_SUBDIR_OVERRIDE=$(python3 $TOPDIR/eessi_software_subdir.py $DETECTION_PARAMETERS)
@@ -129,9 +112,6 @@ else
     fatal_error "Failed to initialize Lmod?! (see output in ${ml_version_out}"
 fi
 
-echo ">> Configuring EasyBuild..."
-source $TOPDIR/configure_easybuild
-
 echo ">> Setting up \$MODULEPATH..."
 # make sure no modules are loaded
 module --force purge