From 0f4019b490965bd2ceddaa98158bdc6916de2e3f Mon Sep 17 00:00:00 2001 From: Chris Evich Date: Tue, 7 Nov 2017 11:57:50 -0500 Subject: [PATCH] Improve package-install speed for default config The ``ansible.conf`` file has an option for ``squash_actions`` which affects the package module. It improves performance by bypassing the normal ``with_items`` loop so all the items are installed at once. This vastly improves performance. However (sadly) current origin-ci does not utilize the ``ansible.conf`` file in the repo. Work around this by forming all required packages into a CSV list. Same effect, less magic, and it doesn't depend on any ``ansible.conf`` setting. Signed-off-by: Chris Evich --- contrib/test/integration/system.yml | 105 ++++++++++++++-------------- 1 file changed, 54 insertions(+), 51 deletions(-) diff --git a/contrib/test/integration/system.yml b/contrib/test/integration/system.yml index d07ae0c8..398fb54f 100644 --- a/contrib/test/integration/system.yml +++ b/contrib/test/integration/system.yml @@ -1,59 +1,62 @@ --- +- name: Required packages are buffered so package module can install all at once + set_fact: + required_packages: + - container-selinux + - curl + - device-mapper-devel + - expect + - findutils + - gcc + - git + - glib2-devel + - glibc-devel + - glibc-static + - gpgme-devel + - hostname + - iproute + - iptables + - krb5-workstation + - libassuan-devel + - libffi-devel + - libgpg-error-devel + - libguestfs-tools + - libseccomp-devel + - libvirt-client + - libvirt-python + - libxml2-devel + - libxslt-devel + - make + - mlocate + - nfs-utils + - nmap-ncat + - oci-register-machine + - oci-systemd-hook + - oci-umount + - openssl + - openssl-devel + - ostree-devel + - pkgconfig + - python + - python2-boto + - python2-crypto + - python-devel + - python-virtualenv + - PyYAML + - redhat-rpm-config + - rpcbind + - rsync + - sed + - skopeo-containers + - socat + - tar + - wget + - name: Make sure we have all required packages package: - name: "{{ item }}" + name: "{{ required_packages | join(', ') }}" state: present - with_items: - - container-selinux - - curl - - device-mapper-devel - - expect - - findutils - - gcc - - git - - glib2-devel - - glibc-devel - - glibc-static - - gpgme-devel - - hostname - - iproute - - iptables - - krb5-workstation - - libassuan-devel - - libffi-devel - - libgpg-error-devel - - libguestfs-tools - - libseccomp-devel - - libvirt-client - - libvirt-python - - libxml2-devel - - libxslt-devel - - make - - mlocate - - nfs-utils - - nmap-ncat - - oci-register-machine - - oci-systemd-hook - - oci-umount - - openssl - - openssl-devel - - ostree-devel - - pkgconfig - - python - - python2-boto - - python2-crypto - - python-devel - - python-virtualenv - - PyYAML - - redhat-rpm-config - - rpcbind - - rsync - - sed - - skopeo-containers - - socat - - tar - - wget async: 600 poll: 10