Code clean up 3

Author: lameze

runner/main/jobtypes/performance/performance.sh

@@ -102,31 +102,22 @@ function performance_config() {
     export TARGET_FILE="${TARGET_FILE:-storage/performance/${MOODLE_BRANCH}/rundata.json}"
 }
 
-# Performance job type setup.
-function performance_setup() {
-    # If both GOOD_COMMIT and BAD_COMMIT are not set, we are going to run a normal session.
-    # (for bisect sessions we don't have to setup the environment).
-    if [[ -z "${GOOD_COMMIT}" ]] && [[ -z "${BAD_COMMIT}" ]]; then
-        performance_setup_normal
-    fi
-}
-
 # Performance job type setup for normal mode.
-function performance_setup_normal() {
+function performance_setup() {
     # Init the Performance site.
     echo
     echo ">>> startsection Initialising Performance environment at $(date)<<<"
     echo "============================================================================"
+
     local initcmd
-    performance_initcmd initcmd # By nameref.
+    performance_initcmd initcmd
     echo "Running: ${initcmd[*]}"
+    docker exec -t -u www-data "${WEBSERVER}" "${initcmd[@]}"
 
     # Ensure host shared directories exist and are writable so plugin can save files.
     mkdir -p "${SHAREDDIR}/planfiles" "${SHAREDDIR}/output/logs" "${SHAREDDIR}/output/runs"
     chmod -R 2777 "${SHAREDDIR}" || true
 
-    docker exec -t -u www-data "${WEBSERVER}" "${initcmd[@]}"
-
     performance_perftoolcmd perftoolcmd
     docker exec -t -u www-data "${WEBSERVER}" "${perftoolcmd[@]}"
 
@@ -153,11 +144,15 @@ function performance_run() {
     echo "============================================================================"
 
     datestring=`date '+%Y%m%d%H%M'`
+
     # Get the plan file name.
     testplanfile=`ls "${SHAREDDIR}"/*.jmx | head -1 | sed "s@${SHAREDDIR}@/shared@"`
     echo "Using test plan file: ${testplanfile}"
+
+    # Get the users file name.
     testusersfile=`ls "${SHAREDDIR}"/*.csv | head -1 | sed "s@${SHAREDDIR}@/shared@"`
     echo "Using test users file: ${testusersfile}"
+
     group="${MOODLE_BRANCH}"
     description="${GIT_COMMIT}"
     siteversion=""
@@ -171,12 +166,12 @@ function performance_run() {
 
     # Calculate the command to run. The function will return the command in the passed array.
     local jmeterruncmd=
-    performance_main_command jmeterruncmd # By nameref.
+    performance_main_command jmeterruncmd
 
     echo "Running performance command: ${jmeterruncmd[*]}"
     echo ">>> Performance run at $(date) <<<"
     local dockerrunargs=
-    docker-jmeter_run_args dockerrunargs # By nameref
+    docker-jmeter_run_args dockerrunargs
 
     echo "${dockerrunargs[@]}"
     echo docker run ${dockerrunargs[@]} ${jmeterruncmd[@]}