systemtests: python-fd-percona-xtrabackup-test: removed mariadb for now

bareos · Jan 24, 2020 · 33fe1ed · 33fe1ed
1 parent 3a18cea
commit 33fe1ed
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 13 deletions.
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
@@ -1,6 +1,6 @@
 #   BAREOS® - Backup Archiving REcovery Open Sourced
 #
-#   Copyright (C) 2017-2019 Bareos GmbH & Co. KG
+#   Copyright (C) 2017-2020 Bareos GmbH & Co. KG
 #
 #   This program is Free Software; you can redistribute it and/or
 #   modify it under the terms of version three of the GNU Affero General Public
@@ -923,7 +923,6 @@ message("   GAWK:                         ${GAWK}")
 message("   RPCGEN:                       ${RPCGEN}")
 message("   MTX:                          ${MTX}")
 message("   XTRABACKUP:                   ${XTRABACKUP}")
-message("   MARIABACKUP:                  ${MARIABACKUP}")
 message("   DEVELOPER:                    ${developer}")
 message("   LocalBuildDefinitionsFile:    ${BareosLocalBuildDefinitionsFile}")
 message("   HAVE_IS_TRIVIALLY_COPYABLE:   ${HAVE_IS_TRIVIALLY_COPYABLE}")

diff --git a/core/cmake/BareosFindPrograms.cmake b/core/cmake/BareosFindPrograms.cmake
@@ -1,6 +1,6 @@
 #   BAREOS® - Backup Archiving REcovery Open Sourced
 #
-#   Copyright (C) 2017-2019 Bareos GmbH & Co. KG
+#   Copyright (C) 2017-2020 Bareos GmbH & Co. KG
 #
 #   This program is Free Software; you can redistribute it and/or
 #   modify it under the terms of version three of the GNU Affero General Public
@@ -39,4 +39,3 @@ find_program(GDB gdb)
 find_program(DBX dbx)
 find_program(MDB mdb)
 find_program(XTRABACKUP xtrabackup)
-find_program(MARIABACKUP mariabackup)
diff --git a/systemtests/CMakeLists.txt b/systemtests/CMakeLists.txt
@@ -593,19 +593,14 @@ endif()
 if(TARGET python-fd AND ovirt_server)
   list(APPEND SYSTEM_TESTS "python-fd-ovirt-plugin-test")
 else()
+  message(STATUS "disabling python-fd-ovirt-plugin-test as ovirt_server is not set")
   list(APPEND SYSTEM_TESTS_DISABLED "python-fd-ovirt-plugin-test")
 endif()
 
-if(XTRABACKUP)
-  set(XTRABACKUP_OR_MARIABACKUP ${XTRABACKUP})
-endif()
-if(MARIABACKUP)
-  set(XTRABACKUP_OR_MARIABACKUP ${MARIABACKUP})
-  set(extradumpoptions "--user=root")
-endif()
-if(TARGET python-fd AND XTRABACKUP_OR_MARIABACKUP)
+if(TARGET python-fd AND XTRABACKUP)
   list(APPEND SYSTEM_TESTS "python-fd-percona-xtrabackup-plugin-test")
 else()
+  message(STATUS "disabling python-fd-percona-xtrabackup-plugin-test as XTRABACKUP was not found")
   list(APPEND SYSTEM_TESTS_DISABLED "python-fd-percona-xtrabackup-plugin-test")
 endif()
 

diff --git a/...cona-xtrabackup-plugin-test/etc/bareos/bareos-dir.d/fileset/PerconaXtraBackupTest.conf.in b/...cona-xtrabackup-plugin-test/etc/bareos/bareos-dir.d/fileset/PerconaXtraBackupTest.conf.in
@@ -5,6 +5,6 @@ FileSet {
     Options {
       signature = MD5
     }
-    Plugin = "python:module_path=@python_plugin_module_src_test_dir@:module_name=bareos-fd-percona-xtrabackup:dumpbinary=@XTRABACKUP_OR_MARIABACKUP@:extradumpoptions=@extradumpoptions@"
+    Plugin = "python:module_path=@python_plugin_module_src_test_dir@:module_name=bareos-fd-percona-xtrabackup:dumpbinary=@XTRABACKUP@:extradumpoptions=@extradumpoptions@"
   }
 }