From a99af710fbfb768745b214f1a4de2f0dd5d40551 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Sun, 6 Oct 2019 10:21:15 +0200 Subject: [PATCH] mariadb_replication / mysql_replication integration tests: conflicts on centos7 (#63171) * Change group of mariadb_replication to avoid mysql_replication conflicts. * Add remarks. --- test/integration/targets/mariadb_replication/aliases | 3 ++- test/integration/targets/mysql_replication/aliases | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/test/integration/targets/mariadb_replication/aliases b/test/integration/targets/mariadb_replication/aliases index 7efb6b37caf..3519e3466cc 100644 --- a/test/integration/targets/mariadb_replication/aliases +++ b/test/integration/targets/mariadb_replication/aliases @@ -1,5 +1,6 @@ destructive -shippable/posix/group4 +shippable/posix/group2 +# Make sure that this test runs in a different group than mysql_replication! mysql_replication skip/osx skip/freebsd diff --git a/test/integration/targets/mysql_replication/aliases b/test/integration/targets/mysql_replication/aliases index 843aa0eafc8..afa573f3e20 100644 --- a/test/integration/targets/mysql_replication/aliases +++ b/test/integration/targets/mysql_replication/aliases @@ -1,5 +1,6 @@ destructive shippable/posix/group4 +# Make sure that this test runs in a different group than mariadb_replication! skip/osx skip/freebsd skip/ubuntu