Skip to content

Commit a1b3b49

Browse files
committed
Update runner to install performancetool using PLUGINSTOINSTALL
1 parent 8daa21c commit a1b3b49

File tree

1 file changed

+1
-17
lines changed

1 file changed

+1
-17
lines changed

runner/main/jobtypes/performance/performance.sh

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -121,28 +121,12 @@ function performance_setup_normal() {
121121
performance_initcmd initcmd # By nameref.
122122
echo "Running: ${initcmd[*]}"
123123

124-
plugin_repo="https://github.com/moodlehq/moodle-local_performancetool"
125-
dest="/var/www/html/local/performancetool"
126-
127-
echo "Installing moodle-local_performancetool plugin into ${dest}"
128-
129124
# Ensure host shared directories exist and are writable so plugin can save files.
130125
mkdir -p "${SHAREDDIR}/planfiles" "${SHAREDDIR}/output/logs" "${SHAREDDIR}/output/runs"
131126
chmod -R 2777 "${SHAREDDIR}" || true
132127

133-
# Clone the performance data generator plugin inside the container.
134-
docker exec "${WEBSERVER}" sh -c "git clone --depth 1 ${plugin_repo} ${dest}"
135-
136128
docker exec -t -u www-data "${WEBSERVER}" "${initcmd[@]}"
137129

138-
# Execute the script inside the container as www-data
139-
docker exec -t -u www-data "${WEBSERVER}" php "${dest}"
140-
exec_status=$?
141-
142-
if [[ $exec_status -ne 0 ]]; then
143-
echo "Error: php returned exit ${exec_status} when executing ${dest}"
144-
exit $exec_status
145-
fi
146130
performance_perftoolcmd perftoolcmd
147131
docker exec -t -u www-data "${WEBSERVER}" "${perftoolcmd[@]}"
148132

@@ -188,7 +172,7 @@ function performance_perftoolcmd() {
188172

189173
# Build the complete init command.
190174
cmd=(
191-
php local/performancetool/generate_test_data.php \
175+
php public/local/performancetool/generate_test_data.php \
192176
--size="${SITESIZE}" \
193177
--planfilespath="/shared" \
194178
--quiet="false"

0 commit comments

Comments
 (0)