MCOL-6022 existing mtr to bash

Author: mariadb-AlekseiBukhalov

.drone.jsonnet

@@ -342,36 +342,13 @@ local Pipeline(branch, platform, event, arch="amd64", server="10.6-enterprise",
     },
     commands: [
       prepareTestStage(getContainerName("mtr"), result, true),
-      "docker cp mysql-test/columnstore mtr$${DRONE_BUILD_NUMBER}:" + mtr_path + "/suite/",
-      execInnerDocker("chown -R mysql:mysql " + mtr_path, getContainerName("mtr")),
-      // disable systemd 'ProtectSystem' (we need to write to /usr/share/)
-      execInnerDocker("bash -c 'sed -i /ProtectSystem/d $(systemctl show --property FragmentPath mariadb | sed s/FragmentPath=//)'", getContainerName("mtr")),
-      execInnerDocker("systemctl daemon-reload", getContainerName("mtr")),
-      execInnerDocker("systemctl start mariadb", getContainerName("mtr")),
-      // Set RAM consumption limits to avoid RAM contention b/w mtr and regression steps.
-      execInnerDocker("/usr/bin/mcsSetConfig SystemConfig CGroup just_no_group_use_local", getContainerName("mtr")),
-      execInnerDocker('mariadb -e "create database if not exists test;"', getContainerName("mtr")),
-      execInnerDocker("systemctl restart mariadb-columnstore", getContainerName("mtr")),
-
-      // delay mtr for manual debugging on live instance
-      "sleep $${MTR_DELAY_SECONDS:-1s}",
       'MTR_SUITE_LIST=$([ "$MTR_FULL_SUITE" == true ] && echo "' + mtr_full_set + '" || echo "$MTR_SUITE_LIST")',
-      if (event == "custom" || event == "cron") then
-        execInnerDocker('bash -c "wget -qO- https://cspkg.s3.amazonaws.com/mtr-test-data.tar.lz4 | lz4 -dc - | tar xf - -C /"',
-                        getContainerName("mtr")),
-      if (event == "custom" || event == "cron") then
-        execInnerDocker('bash -c "cd ' + mtr_path + " && ./mtr --extern socket=" + socket_path + ' --force --print-core=detailed --print-method=gdb --max-test-fail=0 --suite=columnstore/setup"',
-                        getContainerName("mtr")),
-
-      if (event == "cron") then
-        execInnerDocker('bash -c "cd ' + mtr_path + " && ./mtr --extern socket=" + socket_path +
-                        " --force --print-core=detailed --print-method=gdb --max-test-fail=0 --suite="
-                        + std.join(",", std.map(function(x) "columnstore/" + x, std.split(mtr_full_set, ","))),
-                        getContainerName("mtr")) + '"'
-      else
-        execInnerDocker('bash -c "cd ' + mtr_path + " && ./mtr --extern socket=" + socket_path +
-                        ' --force --print-core=detailed --print-method=gdb --max-test-fail=0 --suite=columnstore/$${MTR_SUITE_LIST//,/,columnstore/}"',
-                        getContainerName("mtr")),
+
+      'bash /mdb/' + builddir + '/storage/columnstore/columnstore/build/run_mtr.sh' +
+      ' --container-name ' + getContainerName("mtr") +
+      ' --distro ' + platform +
+      ' --suite $${MTR_SUITE_LIST}' +
+      ' --triggering-event ' + event,
     ],
   },
   mtrlog:: {

build/run_mtr.sh

@@ -0,0 +1,67 @@
+#!/bin/bash
+
+set -eo pipefail
+
+SCRIPT_LOCATION=$(dirname "$0")
+source "$SCRIPT_LOCATION"/utils.sh
+
+optparse.define short=c long=container-name desc="Name of the Docker container where mtr tests will run" variable=CONTAINER_NAME
+optparse.define short=d long=distro desc="Linux distro for which mtr is runned" variable=DISTRO
+optparse.define short=s long=suite-list desc="Comma-separated list of test suites to run" variable=MTR_SUITE_LIST
+optparse.define short=e long=triggering-event desc="Event that triggers testrun" variable=EVENT
+source $(optparse.build)
+
+MTR_FULL_SET="basic,bugfixes,devregression,autopilot,extended,multinode,oracle,1pmonly"
+
+echo "Arguments received: $@"
+
+if [[ "$EUID" -ne 0 ]]; then
+    error "Please run script as root"
+    exit 1
+fi
+
+if [[ -z "${CONTAINER_NAME}" ]]; then
+    echo "Please provide mtr container name as a parameter, e.g. ./run_mtr.sh -c mtr183"
+    exit 1
+fi
+
+if [[ -z $(docker ps -q --filter "name=${CONTAINER_NAME}") ]]; then
+    error "Container '${CONTAINER_NAME}' is not running."
+    exit 1
+fi
+
+if [[ "$DISTRO" == *rocky* ]]; then
+    SOCKET_PATH="/var/lib/mysql/mysql.sock"
+    MTR_PATH="/usr/share/mysql-test"
+else
+    SOCKET_PATH="/run/mysqld/mysqld.sock"
+    MTR_PATH="/usr/share/mysql/mysql-test"
+fi
+
+message "Running mtr tests..."
+
+docker cp mysql-test/columnstore "${CONTAINER_NAME}":"${MTR_PATH}/suite/" #TODO: Tests should be run from package not from sources as it works now
+execInnerDocker "chown -R mysql:mysql ${MTR_PATH}" "${CONTAINER_NAME}"
+
+# disable systemd 'ProtectSystem' (we need to write to /usr/share/)
+execInnerDocker "sed -i /ProtectSystem/d \$(systemctl show --property FragmentPath mariadb | sed s/FragmentPath=//)" "${CONTAINER_NAME}"
+execInnerDocker "systemctl daemon-reload" "${CONTAINER_NAME}"
+execInnerDocker "systemctl start mariadb" "${CONTAINER_NAME}"
+
+# Set RAM consumption limits to avoid RAM contention b/w mtr and regression steps.
+execInnerDocker "/usr/bin/mcsSetConfig SystemConfig CGroup just_no_group_use_local" "${CONTAINER_NAME}"
+execInnerDocker "mariadb -e \"create database if not exists test;\"" "${CONTAINER_NAME}"
+execInnerDocker "systemctl restart mariadb-columnstore" "${CONTAINER_NAME}"
+
+#TODO: should all actions until this point be a part of prepare_test_stage.sh?
+
+if [[ "${EVENT}" == "custom" || "${EVENT}" == "cron" ]]; then
+    execInnerDocker "wget -qO- https://cspkg.s3.amazonaws.com/mtr-test-data.tar.lz4 | lz4 -dc - | tar xf - -C /" "${CONTAINER_NAME}" #TODO: Data for extended tests( out of scope of basic, bugfixes) set should be downloaded and unpacked for extended version only.
+    execInnerDocker "cd ${MTR_PATH} && ./mtr --extern socket=${SOCKET_PATH} --force --print-core=detailed --print-method=gdb --max-test-fail=0 --suite=columnstore/setup" "${CONTAINER_NAME}"
+fi
+
+if [[ "${EVENT}" == "cron" ]]; then
+    execInnerDocker "cd ${MTR_PATH} && ./mtr --extern socket=${SOCKET_PATH} --force --print-core=detailed --print-method=gdb --max-test-fail=0 --suite=columnstore/${MTR_FULL_SET//,/,columnstore/}" "${CONTAINER_NAME}"
+else
+    execInnerDocker "cd ${MTR_PATH} && ./mtr --extern socket=${SOCKET_PATH} --force --print-core=detailed --print-method=gdb --max-test-fail=0 --suite=columnstore/${MTR_SUITE_LIST//,/,columnstore/}" "${CONTAINER_NAME}"
+fi