From 38eefcc9b8bd1adcbad0507a4f321ae1ffeef706 Mon Sep 17 00:00:00 2001 From: Markos Chandras Date: Thu, 8 Mar 2018 15:35:16 +0000 Subject: [PATCH] test-prepare-host: Switch package state to 'present' on openSUSE Similar to the CentOS case, we should use 'present' instead of 'latest' for the package state so we don't spend time resolving dependencies, querying repos etc. The 'present' state can be further improved either in the zypper itself or in the Ansible module. Change-Id: I44fae44030af1c9ee88dcc26c6b55c91a2531926 Link: https://github.com/ansible/ansible/pull/37191 Link: https://bugzilla.opensuse.org/show_bug.cgi?id=1084525 (cherry picked from commit 1f2ab6798796fdb4f4ecfe82d2d34a287f0ab837) --- test-prepare-host.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test-prepare-host.yml b/test-prepare-host.yml index 767b3201..1d755a95 100644 --- a/test-prepare-host.yml +++ b/test-prepare-host.yml @@ -42,12 +42,12 @@ with_items: - "91.189.91.21 images.linuxcontainers.org us.images.linuxcontainers.org" - "91.189.88.37 images.linuxcontainers.org uk.images.linuxcontainers.org" - # NOTE(mhayden): Using package_state=present on CentOS 7 should allow for + # NOTE(mhayden): Using package_state=present on CentOS or openSUSE should allow for # more gate jobs to complete properly and expose more problems that can # be fixed (instead of timeouts). - - name: Use present for package_state on CentOS 7 + - name: Use present for package_state on CentOS and openSUSE set_fact: - package_state: "{{ (ansible_os_family == 'RedHat') | ternary('present', 'latest') }}" + package_state: "{{ (ansible_pkg_mgr in ['dnf', 'yum', 'zypper']) | ternary('present', 'latest') }}" - include: test-install-openstack-hosts.yml