Merge pull request #982

Adapt Percona xtrabackup test

CHANGELOG.md

@@ -56,6 +56,7 @@ and since Bareos version 20 this project adheres to [Semantic Versioning](https:
 - Fixed all compiler warnings (on our default warning level) [PR #948]
 - Log LDAP info error (e.g. expired SSL cert error) [PR #956]
 - Fix occassional "NULL volume name" error when non-busy, but blocked drive is unloaded [PR #973]
+- Adapt percona-xtrabackup test to work on updated test environment [PR #982]
 
 ### Added
 - systemtests: make database credentials configurable [PR #950]

core/cmake/BareosFindPrograms.cmake

@@ -65,12 +65,15 @@ find_program(S3CMD s3cmd)
 find_program(MINIO minio)
 
 find_program(MYSQL mysql)
-find_program(MYSQLD mysqld)
+find_program(MYSQLD mysqld PATH /opt/mysql/bin)
 find_program(MYSQL_INSTALL_DB mysql_install_db)
 
 if(POLICY CMP0109)
   cmake_policy(SET CMP0109 NEW)
   find_program(SUDO sudo)
 else()
-  set(SUDO "/usr/bin/sudo" PARENT_SCOPE)
+  set(SUDO
+      "/usr/bin/sudo"
+      PARENT_SCOPE
+  )
 endif(POLICY CMP0109)

systemtests/tests/py2plug-fd-percona-xtrabackup/testrunner

@@ -23,8 +23,9 @@ JobName=backup-bareos-fd
 "${rscripts}"/setup
 
 shutdown_mysql_server(){
-[ -f "mysql/mysqld.pid" ] && kill "$(cat mysql/mysqld.pid)" || :
-[ -f "mysql/data/${HOSTNAME}.pid" ] && kill "$(cat mysql/data/${HOSTNAME}.pid)" || :
+  [ -f "mysql/data/${HOSTNAME}.pid" ] && kill "$(cat mysql/data/${HOSTNAME}.pid)" || :
+# kill running mysqld instance listening on our port
+sudo fuser "${test_db_port}"/tcp -k || :
 }
 
 
@@ -42,13 +43,9 @@ mkdir -p ${dbHost}
 
 # initialize mysql db
 
-if [ "${MYSQL_INSTALL_DB}" = "MYSQL_INSTALL_DB-NOTFOUND" ]; then
-	mysqld --defaults-file=mysqldefaults --initialize-insecure --user="$USER" > mysql/mysql_init.log
-else
-	mysql_install_db --user="$USER" --defaults-file=mysqldefaults > mysql/mysql_init.log
-fi
+${MYSQLD} --defaults-file=mysqldefaults --initialize-insecure --user="$USER" > mysql/mysql_init.log
 # start mysql server
-mysqld --defaults-file=mysqldefaults >mysql/mysql.log 2>&1 &
+${MYSQLD} --defaults-file=mysqldefaults >mysql/mysql.log 2>&1 &
 
 tries=60
 echo "waiting for mysql server to start"