MCOL-6022 mtr from package

Author: mariadb-AlekseiBukhalov

build/prepare_test_stage.sh

@@ -118,7 +118,7 @@ echo "Installing columnstore..."
 if [[ "$RESULT" == *rocky* ]]; then
     execInnerDockerWithRetry "$CONTAINER_NAME" 'yum install -y MariaDB-columnstore-engine MariaDB-test'
 else
-    execInnerDockerWithRetry "$CONTAINER_NAME" 'apt update -y && apt install -y mariadb-plugin-columnstore mariadb-test'
+    execInnerDockerWithRetry "$CONTAINER_NAME" 'apt update -y && apt install -y mariadb-plugin-columnstore mariadb-test mariadb-test-data'
 fi
 
 sleep 5

build/run_mtr.sh

@@ -40,8 +40,8 @@ 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}"
+#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}"
@@ -51,17 +51,17 @@ 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}"
+execInnerDocker "systemctl stop 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}"
+    execInnerDocker "cd ${MTR_PATH} && perl ./mtr --vardir=/dev/shm/var --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}"
+    execInnerDocker "cd ${MTR_PATH} && perl ./mtr --vardir=/dev/shm/var --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}"
+    execInnerDocker "cd ${MTR_PATH} && perl ./mtr --vardir=/dev/shm/var --force --print-core=detailed --print-method=gdb --max-test-fail=0 --suite=columnstore/${MTR_SUITE_LIST//,/,columnstore/}" "${CONTAINER_NAME}"
 fi