[libvirt PATCH 1/3] cirrus: Tweak configurations

Andrea Bolognani abologna at redhat.com
Mon Jun 29 13:58:42 UTC 2020


Store the list of packages to install in an environment variable.
This will make it easier to review the changes that are coming
next.

Signed-off-by: Andrea Bolognani <abologna at redhat.com>
---
 ci/cirrus/freebsd-12.yml.j2 | 54 ++-----------------------------------
 ci/cirrus/macos-1015.yml.j2 | 17 ++----------
 2 files changed, 4 insertions(+), 67 deletions(-)

diff --git a/ci/cirrus/freebsd-12.yml.j2 b/ci/cirrus/freebsd-12.yml.j2
index a653996850..a93f94ee2a 100644
--- a/ci/cirrus/freebsd-12.yml.j2
+++ b/ci/cirrus/freebsd-12.yml.j2
@@ -5,61 +5,11 @@ env:
   CI_REPOSITORY_URL: {{ CI_REPOSITORY_URL }}
   CI_COMMIT_REF_NAME: {{ CI_COMMIT_REF_NAME }}
   CI_COMMIT_SHA: {{ CI_COMMIT_SHA }}
+  PKGS: augeas autoconf automake avahi bash bash-completion ca_root_nss ccache chrony cppi curl cyrus-sasl dbus diskscrub dnsmasq fusefs-libs gdb gettext gettext-tools git glib gmake gnutls hal libpcap libpciaccess libssh libssh2 libtool libxml2 libxslt lsof meson ncurses ninja patch perl5 pkgconf polkit py37-docutils py37-flake8 py37-setuptools py37-wheel python3 qemu-utils radvd readline screen sudo vim yajl
 
 freebsd_12_task:
   install_script:
-    - pkg install -y
-          augeas
-          autoconf
-          automake
-          avahi
-          bash
-          bash-completion
-          ca_root_nss
-          ccache
-          chrony
-          cppi
-          curl
-          cyrus-sasl
-          dbus
-          diskscrub
-          dnsmasq
-          fusefs-libs
-          gdb
-          gettext
-          gettext-tools
-          git
-          glib
-          gmake
-          gnutls
-          hal
-          libpcap
-          libpciaccess
-          libssh
-          libssh2
-          libtool
-          libxml2
-          libxslt
-          lsof
-          meson
-          ncurses
-          ninja
-          patch
-          perl5
-          pkgconf
-          polkit
-          py37-docutils
-          py37-flake8
-          py37-setuptools
-          py37-wheel
-          python3
-          qemu-utils
-          radvd
-          readline
-          screen
-          sudo
-          vim
-          yajl
+    - pkg install -y $PKGS
   clone_script:
     - git clone --depth 100 "$CI_REPOSITORY_URL" .
     - git fetch origin "$CI_COMMIT_REF_NAME"
diff --git a/ci/cirrus/macos-1015.yml.j2 b/ci/cirrus/macos-1015.yml.j2
index d8aa9715d6..0d3d54a97a 100644
--- a/ci/cirrus/macos-1015.yml.j2
+++ b/ci/cirrus/macos-1015.yml.j2
@@ -7,24 +7,11 @@ env:
   CI_COMMIT_SHA: {{ CI_COMMIT_SHA }}
   PATH: /usr/local/opt/gettext/bin:/usr/local/opt/ccache/libexec:/usr/local/opt/rpcgen/bin:$PATH
   PKG_CONFIG_PATH: /usr/local/opt/libxml2/lib/pkgconfig
+  PKGS: autoconf automake ccache docutils glib gnutls libtool libxml2 make pkg-config python rpcgen xz yajl
 
 macos_1015_task:
   install_script:
-    - brew install
-           autoconf
-           automake
-           ccache
-           docutils
-           glib
-           gnutls
-           libtool
-           libxml2
-           make
-           pkg-config
-           python
-           rpcgen
-           xz
-           yajl
+    - brew install $PKGS
   clone_script:
     - git clone --depth 100 "$CI_REPOSITORY_URL" .
     - git fetch origin "$CI_COMMIT_REF_NAME"
-- 
2.25.4




More information about the libvir-list mailing list