MXS-2900 Move MariaDB-Monitor tests

maxscale-system-test/CMakeLists.txt

@@ -209,77 +209,8 @@ add_test_executable(mxs2355_wrong_auth.cpp mxs2355_wrong_auth maxctrl LABELS REP
 # Configures 'keepalived' on two Maxscale machines and tried failover
 #add_test_executable(keepalived_masterdown.cpp keepalived_masterdown keepalived_masterdown LABELS REPL_BACKEND SECOND_MAXSCALE)
 
-# MySQL Monitor with Multi-master configurations
-add_test_executable(mysqlmon_multimaster.cpp mysqlmon_multimaster mysqlmon_multimaster LABELS mysqlmon REPL_BACKEND BREAKS_REPL)
-
-# MySQL Monitor with Multi-master configurations (assume_unique_hostnames=OFF)
-add_test_derived(mysqlmon_multimaster_serverid mysqlmon_multimaster mysqlmon_multimaster_serverid LABELS mysqlmon REPL_BACKEND BREAKS_REPL)
-
-# MySQL Monitor Failover Test
-add_test_executable(mysqlmon_detect_standalone_master.cpp mysqlmon_detect_standalone_master mysqlmon_detect_standalone_master LABELS mysqlmon REPL_BACKEND)
-
-# MySQL Monitor Failover (automatic) Test
-add_test_executable(mysqlmon_failover_auto.cpp mysqlmon_failover_auto mysqlmon_failover_auto LABELS mysqlmon REPL_BACKEND)
-
-# MySQL Monitor Failover (manual) Test
-add_test_executable(mysqlmon_failover_manual.cpp mysqlmon_failover_manual mysqlmon_failover_manual LABELS mysqlmon REPL_BACKEND)
-
-# MySQL Monitor manual failover with many valid candidates
-add_test_executable(mysqlmon_failover_manual2.cpp mysqlmon_failover_manual2_4 mysqlmon_failover_manual2_4 LABELS mysqlmon REPL_BACKEND)
-add_test_executable(mysqlmon_failover_manual2.cpp mysqlmon_failover_manual2_3 mysqlmon_failover_manual2_3 LABELS mysqlmon REPL_BACKEND)
-add_test_executable(mysqlmon_failover_manual2.cpp mysqlmon_failover_manual2_2 mysqlmon_failover_manual2_2 LABELS mysqlmon REPL_BACKEND)
-
 add_subdirectory(mariadbmonitor)
 
-# MySQL Monitor switchover with bad master
-add_test_executable(mysqlmon_switchover_bad_master.cpp mysqlmon_switchover_bad_master mysqlmon_switchover_bad_master LABELS mysqlmon REPL_BACKEND)
-
-# MySQL Monitor manual failover with no valid slaves, uses config of mysqlmon_failover_auto. Also MXS-2652.
-add_test_executable(mysqlmon_failover_no_slaves.cpp mysqlmon_failover_no_slaves mysqlmon_failover_auto LABELS mysqlmon REPL_BACKEND)
-
-# MySQL Monitor Rejoin (good) Test
-add_test_executable(mysqlmon_rejoin_good.cpp mysqlmon_rejoin_good mysqlmon_rejoin_good LABELS mysqlmon REPL_BACKEND)
-
-# MySQL Monitor Rejoin (bad) Test, use template for Rejoin (good)
-add_test_executable(mysqlmon_rejoin_bad.cpp mysqlmon_rejoin_bad mysqlmon_rejoin_good LABELS mysqlmon REPL_BACKEND)
-
-# MySQL Monitor Rejoin (bad2) Test, use template for Rejoin (good)
-add_test_executable(mysqlmon_rejoin_bad2.cpp mysqlmon_rejoin_bad2 mysqlmon_rejoin_good LABELS mysqlmon REPL_BACKEND)
-
-# MySQL Monitor Rejoin tests
-add_test_executable(mysqlmon_rejoin_manual.cpp mysqlmon_rejoin_manual mysqlmon_rejoin_manual LABELS mysqlmon REPL_BACKEND)
-add_test_executable(mysqlmon_rejoin_manual2.cpp mysqlmon_rejoin_manual2 mysqlmon_rejoin_manual LABELS mysqlmon REPL_BACKEND)
-
-# MySQL Monitor rolling master
-add_test_executable(mysqlmon_failover_rolling_master.cpp mysqlmon_failover_rolling_master mysqlmon_failover_rolling_master LABELS mysqlmon REPL_BACKEND)
-
-# MySQL Monitor rejoin old slave
-add_test_executable(mysqlmon_failover_rejoin_old_slave.cpp mysqlmon_failover_rejoin_old_slave mysqlmon_failover_rejoin_old_slave LABELS mysqlmon REPL_BACKEND)
-
-# MySQL Monitor rolling restart slaves
-add_test_executable(mysqlmon_failover_rolling_restart_slaves.cpp mysqlmon_failover_rolling_restart_slaves mysqlmon_failover_rolling_restart_slaves LABELS mysqlmon REPL_BACKEND)
-
-# MySQL Monitor failover stress
-add_test_executable(mysqlmon_failover_stress.cpp mysqlmon_failover_stress mysqlmon_failover_stress LABELS mysqlmon REPL_BACKEND)
-
-# MySQL Monitor switchover stress
-add_test_executable(mysqlmon_switchover_stress.cpp mysqlmon_switchover_stress mysqlmon_switchover_stress LABELS mysqlmon REPL_BACKEND)
-
-# Check monitoring and failover when ignore_external_masters is enabled
-add_test_executable(mysqlmon_external_master.cpp mysqlmon_external_master mysqlmon_external_master LABELS mysqlmon REPL_BACKEND)
-
-# Check failover, switchover and rejoin with scheduled server events, uses config of mysqlmon_rejoin_good
-add_test_executable(mysqlmon_fail_switch_events.cpp mysqlmon_fail_switch_events mysqlmon_rejoin_good LABELS mysqlmon REPL_BACKEND)
-
-# MySQL Monitor reset-replication test, use template for Rejoin (good)
-add_test_executable(mysqlmon_reset_replication.cpp mysqlmon_reset_replication mysqlmon_rejoin_good LABELS mysqlmon REPL_BACKEND)
-
-# MySQL Monitor low disk switchover
-add_test_executable(mysqlmon_switchover_auto.cpp mysqlmon_switchover_auto mysqlmon_switchover_auto LABELS mysqlmon REPL_BACKEND)
-
-# MySQL Monitor series of failovers and rejoins
-add_test_executable(mysqlmon_failover_readonly.cpp mysqlmon_failover_readonly mysqlmon_failover_readonly LABELS mysqlmon REPL_BACKEND)
-
 # MXS-1506: Delayed query retry
 # https://jira.mariadb.org/browse/MXS-1506
 add_test_executable(mxs1506_delayed_retry.cpp mxs1506_delayed_retry mxs1506_delayed_retry LABELS readwritesplit REPL_BACKEND)
@@ -316,10 +247,6 @@ add_test_executable(mxs1778_causal_reads.cpp mxs1778_causal_reads mxs1778_causal
 # https://jira.mariadb.org/browse/MXS-1961
 add_test_executable(mxs1961_standalone_rejoin.cpp mxs1961_standalone_rejoin mxs1961_standalone_rejoin LABELS REPL_BACKEND)
 
-# MXS-1493: Use replication heartbeat in mysqlmon
-# https://jira.mariadb.org/browse/MXS-1493
-add_test_executable(verify_master_failure.cpp verify_master_failure verify_master_failure LABELS mysqlmon REPL_BACKEND)
-
 ############################################
 # END: Tests that require GTID             #
 ############################################

maxscale-system-test/mariadbmonitor/CMakeLists.txt

@@ -1,3 +1,101 @@
+# MySQL Monitor with Multi-master configurations
+add_test_executable_ex(NAME mysqlmon_multimaster SOURCE mysqlmon_multimaster.cpp
+        CONFIG mysqlmon_multimaster.cnf VMS repl_backend LABELS mysqlmon BREAKS_REPL)
+
+# MySQL Monitor with Multi-master configurations (assume_unique_hostnames=OFF)
+add_test_executable_ex(NAME mysqlmon_multimaster_serverid SOURCE mysqlmon_multimaster.cpp
+        CONFIG mysqlmon_multimaster_serverid.cnf VMS repl_backend LABELS mysqlmon BREAKS_REPL)
+
+# MySQL Monitor Failover Test
+add_test_executable_ex(NAME mysqlmon_detect_standalone_master SOURCE mysqlmon_detect_standalone_master.cpp
+        CONFIG mysqlmon_detect_standalone_master.cnf VMS repl_backend LABELS mysqlmon)
+
+# MySQL Monitor Failover (automatic) Test
+add_test_executable_ex(NAME mysqlmon_failover_auto SOURCE mysqlmon_failover_auto.cpp
+        CONFIG mysqlmon_failover_auto.cnf VMS repl_backend LABELS mysqlmon)
+
+# MySQL Monitor Failover (manual) Test
+add_test_executable_ex(NAME mysqlmon_failover_manual SOURCE mysqlmon_failover_manual.cpp
+        CONFIG mysqlmon_failover_manual.cnf VMS repl_backend LABELS mysqlmon)
+
+# MySQL Monitor manual failover with many valid candidates
+add_test_executable_ex(NAME mysqlmon_failover_manual2_4 SOURCE mysqlmon_failover_manual2.cpp
+        CONFIG mysqlmon_failover_manual2_4.cnf VMS repl_backend LABELS mysqlmon)
+add_test_executable_ex(NAME mysqlmon_failover_manual2_3 SOURCE mysqlmon_failover_manual2.cpp
+        CONFIG mysqlmon_failover_manual2_3.cnf VMS repl_backend LABELS mysqlmon)
+add_test_executable_ex(NAME mysqlmon_failover_manual2_2 SOURCE mysqlmon_failover_manual2.cpp
+        CONFIG mysqlmon_failover_manual2_2.cnf VMS repl_backend LABELS mysqlmon)
+
 # MySQL Monitor switchover
 add_test_executable_ex(NAME mysqlmon_switchover SOURCE mysqlmon_switchover.cpp CONFIG mysqlmon_switchover.cnf
-        VMS repl_backend LABELS switchover)
+        VMS repl_backend LABELS mysqlmon switchover)
+
+# MySQL Monitor switchover with bad master
+add_test_executable_ex(NAME mysqlmon_switchover_bad_master SOURCE mysqlmon_switchover_bad_master.cpp
+        CONFIG mysqlmon_switchover_bad_master.cnf VMS repl_backend LABELS mysqlmon switchover)
+
+# MySQL Monitor manual failover with no valid slaves, uses config of mysqlmon_failover_auto. Also MXS-2652.
+add_test_executable_ex(NAME mysqlmon_failover_no_slaves SOURCE mysqlmon_failover_no_slaves.cpp
+        CONFIG mysqlmon_failover_auto.cnf VMS repl_backend LABELS mysqlmon failover)
+
+# MySQL Monitor Rejoin (good) Test
+add_test_executable_ex(NAME mysqlmon_rejoin_good SOURCE mysqlmon_rejoin_good.cpp
+        CONFIG mysqlmon_rejoin_good.cnf VMS repl_backend LABELS mysqlmon)
+
+# MySQL Monitor Rejoin (bad) Test, use template for Rejoin (good)
+add_test_executable_ex(NAME mysqlmon_rejoin_bad SOURCE mysqlmon_rejoin_bad.cpp CONFIG mysqlmon_rejoin_good.cnf
+        VMS repl_backend LABELS mysqlmon)
+
+# MySQL Monitor Rejoin (bad2) Test, use template for Rejoin (good)
+add_test_executable_ex(NAME mysqlmon_rejoin_bad2 SOURCE mysqlmon_rejoin_bad2.cpp CONFIG mysqlmon_rejoin_good.cnf
+        VMS repl_backend LABELS mysqlmon)
+
+# MySQL Monitor Rejoin tests
+add_test_executable_ex(NAME mysqlmon_rejoin_manual SOURCE mysqlmon_rejoin_manual.cpp CONFIG mysqlmon_rejoin_manual.cnf
+        VMS repl_backend LABELS mysqlmon)
+add_test_executable_ex(NAME mysqlmon_rejoin_manual2 SOURCE mysqlmon_rejoin_manual2.cpp CONFIG mysqlmon_rejoin_manual.cnf
+        VMS repl_backend LABELS mysqlmon)
+
+# MySQL Monitor rolling master
+add_test_executable_ex(NAME mysqlmon_failover_rolling_master SOURCE mysqlmon_failover_rolling_master.cpp
+        CONFIG mysqlmon_failover_rolling_master.cnf VMS repl_backend LABELS mysqlmon)
+
+# MySQL Monitor rejoin old slave
+add_test_executable_ex(NAME mysqlmon_failover_rejoin_old_slave SOURCE mysqlmon_failover_rejoin_old_slave.cpp
+        CONFIG mysqlmon_failover_rejoin_old_slave.cnf VMS repl_backend LABELS mysqlmon)
+
+# MySQL Monitor rolling restart slaves
+add_test_executable_ex(NAME mysqlmon_failover_rolling_restart_slaves SOURCE mysqlmon_failover_rolling_restart_slaves.cpp
+        CONFIG mysqlmon_failover_rolling_restart_slaves.cnf VMS repl_backend LABELS mysqlmon)
+
+# MySQL Monitor failover stress
+add_test_executable_ex(NAME mysqlmon_failover_stress SOURCE mysqlmon_failover_stress.cpp
+        CONFIG mysqlmon_failover_stress.cnf VMS repl_backend LABELS mysqlmon)
+
+# MySQL Monitor switchover stress
+add_test_executable_ex(NAME mysqlmon_switchover_stress SOURCE mysqlmon_switchover_stress.cpp
+        CONFIG mysqlmon_switchover_stress.cnf VMS repl_backend LABELS mysqlmon)
+
+# Check monitoring and failover when ignore_external_masters is enabled
+add_test_executable_ex(NAME mysqlmon_external_master SOURCE mysqlmon_external_master.cpp
+        CONFIG mysqlmon_external_master.cnf VMS repl_backend LABELS mysqlmon)
+
+# Check failover, switchover and rejoin with scheduled server events, uses config of mysqlmon_rejoin_good
+add_test_executable_ex(NAME mysqlmon_fail_switch_events SOURCE mysqlmon_fail_switch_events.cpp
+        CONFIG mysqlmon_rejoin_good.cnf VMS repl_backend LABELS mysqlmon)
+
+# MySQL Monitor reset-replication test, use template for Rejoin (good)
+add_test_executable_ex(NAME mysqlmon_reset_replication SOURCE mysqlmon_reset_replication.cpp
+        CONFIG mysqlmon_rejoin_good.cnf VMS repl_backend LABELS mysqlmon)
+
+# MySQL Monitor low disk switchover
+add_test_executable_ex(NAME mysqlmon_switchover_auto SOURCE mysqlmon_switchover_auto.cpp
+        CONFIG mysqlmon_switchover_auto.cnf VMS repl_backend LABELS mysqlmon)
+
+# MySQL Monitor series of failovers and rejoins
+add_test_executable_ex(NAME mysqlmon_failover_readonly SOURCE mysqlmon_failover_readonly.cpp
+        CONFIG mysqlmon_failover_readonly.cnf VMS repl_backend LABELS mysqlmon)
+
+# MXS-1493: Use replication heartbeat in mysqlmon https://jira.mariadb.org/browse/MXS-1493
+add_test_executable_ex(NAME verify_master_failure SOURCE verify_master_failure.cpp
+        CONFIG verify_master_failure.cnf VMS repl_backend LABELS mysqlmon)