From ea2b0114ea2971509c78c776e67a37c8025f2bc2 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Wed, 5 Dec 2018 16:57:44 -0600 Subject: [PATCH] enable mysql related integration tests for rhel8 beta (#49163) Signed-off-by: Adam Miller --- test/integration/targets/mysql_db/aliases | 1 - test/integration/targets/mysql_user/aliases | 1 - test/integration/targets/mysql_variables/aliases | 1 - test/integration/targets/setup_mysql_db/tasks/main.yml | 1 + test/integration/targets/setup_mysql_db/vars/RedHat-8.yml | 6 ++++++ 5 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 test/integration/targets/setup_mysql_db/vars/RedHat-8.yml diff --git a/test/integration/targets/mysql_db/aliases b/test/integration/targets/mysql_db/aliases index 44bf0ba4ec..5eb727b09b 100644 --- a/test/integration/targets/mysql_db/aliases +++ b/test/integration/targets/mysql_db/aliases @@ -2,4 +2,3 @@ destructive shippable/posix/group1 skip/osx skip/freebsd -skip/rhel8.0 diff --git a/test/integration/targets/mysql_user/aliases b/test/integration/targets/mysql_user/aliases index 44bf0ba4ec..5eb727b09b 100644 --- a/test/integration/targets/mysql_user/aliases +++ b/test/integration/targets/mysql_user/aliases @@ -2,4 +2,3 @@ destructive shippable/posix/group1 skip/osx skip/freebsd -skip/rhel8.0 diff --git a/test/integration/targets/mysql_variables/aliases b/test/integration/targets/mysql_variables/aliases index 44bf0ba4ec..5eb727b09b 100644 --- a/test/integration/targets/mysql_variables/aliases +++ b/test/integration/targets/mysql_variables/aliases @@ -2,4 +2,3 @@ destructive shippable/posix/group1 skip/osx skip/freebsd -skip/rhel8.0 diff --git a/test/integration/targets/setup_mysql_db/tasks/main.yml b/test/integration/targets/setup_mysql_db/tasks/main.yml index 8a667d9e0f..6c935aa03f 100644 --- a/test/integration/targets/setup_mysql_db/tasks/main.yml +++ b/test/integration/targets/setup_mysql_db/tasks/main.yml @@ -31,6 +31,7 @@ with_first_found: - files: - '{{ ansible_distribution }}-{{ ansible_distribution_major_version }}{{ python_suffix }}.yml' + - '{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml' - '{{ ansible_os_family }}-{{ ansible_distribution_major_version }}{{ python_suffix }}.yml' - '{{ ansible_distribution }}{{ python_suffix }}.yml' - '{{ ansible_os_family }}{{ python_suffix }}.yml' diff --git a/test/integration/targets/setup_mysql_db/vars/RedHat-8.yml b/test/integration/targets/setup_mysql_db/vars/RedHat-8.yml new file mode 100644 index 0000000000..fa7d06e52a --- /dev/null +++ b/test/integration/targets/setup_mysql_db/vars/RedHat-8.yml @@ -0,0 +1,6 @@ +mysql_service: 'mariadb' + +mysql_packages: + - mariadb-server + - python3-PyMySQL + - bzip2