diff options
author | Jordan Borean <jborean93@gmail.com> | 2019-01-05 02:37:59 +1000 |
---|---|---|
committer | ansibot <ansibot@users.noreply.github.com> | 2019-01-04 11:37:59 -0500 |
commit | b967f4dcc1ef80ffbe4f411e82bf76e6ada6e972 (patch) | |
tree | bf2f5e0b6218da1a1641011a3b87e4339b3fd124 /test/integration/targets/setup_mysql_db | |
parent | 555732f8bb9d492b6382baa81478eb21d98c913a (diff) | |
download | ansible-b967f4dcc1ef80ffbe4f411e82bf76e6ada6e972.tar.gz |
dnf/yum - added install_weak_deps option (#50525)
* dnf/yum - added install_weak_deps option
* skip creating weak dep packages if rpm doesn't support it
* fix rpm check for older hosts
Diffstat (limited to 'test/integration/targets/setup_mysql_db')
-rw-r--r-- | test/integration/targets/setup_mysql_db/tasks/main.yml | 28 |
1 files changed, 6 insertions, 22 deletions
diff --git a/test/integration/targets/setup_mysql_db/tasks/main.yml b/test/integration/targets/setup_mysql_db/tasks/main.yml index ee7e03872d..5d4ae3c8df 100644 --- a/test/integration/targets/setup_mysql_db/tasks/main.yml +++ b/test/integration/targets/setup_mysql_db/tasks/main.yml @@ -43,28 +43,12 @@ with_items: "{{mysql_packages}}" when: ansible_pkg_mgr == 'yum' -- block: - # 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}}" - - always: - - name: remove test dnf.conf file - file: - path: '{{ test_dnf_conf_copy.dest }}' - state: absent +- name: install mysqldb_test rpm dependencies + dnf: + name: '{{ item }}' + state: latest + install_weak_deps: False # mariadb-server has a weak dep on python2 which break Python 3 test environments + with_items: "{{mysql_packages}}" when: ansible_pkg_mgr == 'dnf' - name: install mysqldb_test debian dependencies |