ansible test: re-enable mysql tests with fix (#50430)
This commit is contained in:
parent
63e454a4b2
commit
6620facd19
5 changed files with 22 additions and 7 deletions
|
@ -1,4 +1,3 @@
|
||||||
unstable
|
|
||||||
destructive
|
destructive
|
||||||
shippable/posix/group1
|
shippable/posix/group1
|
||||||
skip/osx
|
skip/osx
|
||||||
|
|
|
@ -2,4 +2,3 @@ destructive
|
||||||
shippable/posix/group1
|
shippable/posix/group1
|
||||||
skip/osx
|
skip/osx
|
||||||
skip/freebsd
|
skip/freebsd
|
||||||
disabled
|
|
||||||
|
|
|
@ -2,4 +2,3 @@ destructive
|
||||||
shippable/posix/group1
|
shippable/posix/group1
|
||||||
skip/osx
|
skip/osx
|
||||||
skip/freebsd
|
skip/freebsd
|
||||||
disabled
|
|
||||||
|
|
|
@ -43,9 +43,28 @@
|
||||||
with_items: "{{mysql_packages}}"
|
with_items: "{{mysql_packages}}"
|
||||||
when: ansible_pkg_mgr == 'yum'
|
when: ansible_pkg_mgr == 'yum'
|
||||||
|
|
||||||
- name: install mysqldb_test rpm dependencies
|
- block:
|
||||||
dnf: name={{ item }} state=latest
|
# This is required as mariadb-server has a weak dependency on Python 2 which causes the test to break on Py3 hosts
|
||||||
|
- name: create test dnf.conf file to ignore weak dependencies
|
||||||
|
copy:
|
||||||
|
content: |
|
||||||
|
[main]
|
||||||
|
install_weak_deps=False
|
||||||
|
dest: '{{ output_dir }}/dnf.conf'
|
||||||
|
register: test_dnf_conf_copy
|
||||||
|
|
||||||
|
- name: install mysqldb_test rpm dependencies
|
||||||
|
dnf:
|
||||||
|
name: '{{ item }}'
|
||||||
|
state: latest
|
||||||
|
conf_file: '{{ test_dnf_conf_copy.dest }}'
|
||||||
with_items: "{{mysql_packages}}"
|
with_items: "{{mysql_packages}}"
|
||||||
|
|
||||||
|
always:
|
||||||
|
- name: remove test dnf.conf file
|
||||||
|
file:
|
||||||
|
path: '{{ test_dnf_conf_copy.dest }}'
|
||||||
|
state: absent
|
||||||
when: ansible_pkg_mgr == 'dnf'
|
when: ansible_pkg_mgr == 'dnf'
|
||||||
|
|
||||||
- name: install mysqldb_test debian dependencies
|
- name: install mysqldb_test debian dependencies
|
||||||
|
|
|
@ -3,4 +3,3 @@ shippable/posix/group1
|
||||||
skip/osx
|
skip/osx
|
||||||
skip/freebsd
|
skip/freebsd
|
||||||
skip/rhel
|
skip/rhel
|
||||||
disabled
|
|
||||||
|
|
Loading…
Reference in a new issue