From: "Alex Bennée" <alex.bennee@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Alex Bennée" <alex.bennee@linaro.org>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Thomas Huth" <thuth@redhat.com>,
"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
"Beraldo Leal" <bleal@redhat.com>
Subject: [PULL 12/12] scripts/ci: drive ubuntu/build-environment.yml from lcitool
Date: Thu, 6 Jun 2024 12:50:47 +0100 [thread overview]
Message-ID: <20240606115047.421045-13-alex.bennee@linaro.org> (raw)
In-Reply-To: <20240606115047.421045-1-alex.bennee@linaro.org>
Now lcitool can write the package list for us we no longer need to
duplicate the information directly in build-environment.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20240603175328.3823123-13-alex.bennee@linaro.org>
diff --git a/scripts/ci/setup/ubuntu/build-environment.yml b/scripts/ci/setup/ubuntu/build-environment.yml
index e82097b465..edf1900b3e 100644
--- a/scripts/ci/setup/ubuntu/build-environment.yml
+++ b/scripts/ci/setup/ubuntu/build-environment.yml
@@ -32,135 +32,18 @@
when:
- ansible_facts['distribution'] == 'Ubuntu'
- # lcitool variables -f json ubuntu-2204 qemu | jq -r '.pkgs[]' | xargs -n 1 echo "-"
- - name: Install basic packages to build QEMU on Ubuntu 22.04
- package:
- name:
- - bash
- - bc
- - bison
- - bsdextrautils
- - bzip2
- - ca-certificates
- - ccache
- - clang
- - dbus
- - debianutils
- - diffutils
- - exuberant-ctags
- - findutils
- - flex
- - g++
- - gcc
- - gcovr
- - genisoimage
- - gettext
- - git
- - hostname
- - libaio-dev
- - libasan5
- - libasound2-dev
- - libattr1-dev
- - libbpf-dev
- - libbrlapi-dev
- - libbz2-dev
- - libc6-dev
- - libcacard-dev
- - libcap-ng-dev
- - libcapstone-dev
- - libcmocka-dev
- - libcurl4-gnutls-dev
- - libdaxctl-dev
- - libdrm-dev
- - libepoxy-dev
- - libfdt-dev
- - libffi-dev
- - libgbm-dev
- - libgcrypt20-dev
- - libglib2.0-dev
- - libglusterfs-dev
- - libgnutls28-dev
- - libgtk-3-dev
- - libibumad-dev
- - libibverbs-dev
- - libiscsi-dev
- - libjemalloc-dev
- - libjpeg-turbo8-dev
- - libjson-c-dev
- - liblttng-ust-dev
- - liblzo2-dev
- - libncursesw5-dev
- - libnfs-dev
- - libnuma-dev
- - libpam0g-dev
- - libpcre2-dev
- - libpixman-1-dev
- - libpng-dev
- - libpulse-dev
- - librbd-dev
- - librdmacm-dev
- - libsasl2-dev
- - libsdl2-dev
- - libsdl2-image-dev
- - libseccomp-dev
- - libslirp-dev
- - libsnappy-dev
- - libspice-protocol-dev
- - libssh-dev
- - libsystemd-dev
- - libtasn1-6-dev
- - libubsan1
- - libudev-dev
- - liburing-dev
- - libusb-1.0-0-dev
- - libusbredirhost-dev
- - libvdeplug-dev
- - libvirglrenderer-dev
- - libvte-2.91-dev
- - libxml2-dev
- - libzstd-dev
- - llvm
- - locales
- - make
- - meson
- - multipath-tools
- - ncat
- - nettle-dev
- - ninja-build
- - openssh-client
- - pkgconf
- - python3
- - python3-numpy
- - python3-opencv
- - python3-pillow
- - python3-pip
- - python3-sphinx
- - python3-sphinx-rtd-theme
- - python3-venv
- - python3-yaml
- - rpm2cpio
- - sed
- - sparse
- - systemtap-sdt-dev
- - tar
- - tesseract-ocr
- - tesseract-ocr-eng
- - texinfo
- - xfslibs-dev
- - zlib1g-dev
- state: present
+ # the package lists are updated by "make lcitool-refresh"
+ - name: Include package lists based on OS and architecture
+ include_vars:
+ file: "ubuntu-2204-{{ ansible_facts['architecture'] }}.yaml"
when:
- ansible_facts['distribution'] == 'Ubuntu'
- ansible_facts['distribution_version'] == '22.04'
+ - ansible_facts['architecture'] == 'aarch64' or ansible_facts['architecture'] == 'x86_64'
- # not all packages are available for all architectures
- - name: Install additional packages to build QEMU on Ubuntu 22.04
+ - name: Install packages for QEMU on Ubuntu 22.04
package:
- name:
- - libpmem-dev
- - libspice-server-dev
- - libxen-dev
- state: present
+ name: "{{ packages }}"
when:
- ansible_facts['distribution'] == 'Ubuntu'
- ansible_facts['distribution_version'] == '22.04'
--
2.39.2
next prev parent reply other threads:[~2024-06-06 11:51 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-06 11:50 [PULL 00/12] testing cleanups (ci, vm, lcitool, ansible) Alex Bennée
2024-06-06 11:50 ` [PULL 01/12] ci: remove centos-steam-8 customer runner Alex Bennée
2024-06-06 11:50 ` [PULL 02/12] docs/devel: update references to centos to non-versioned container Alex Bennée
2024-06-06 11:50 ` [PULL 03/12] tests/vm: update centos.aarch64 image to 9 Alex Bennée
2024-06-06 11:50 ` [PULL 04/12] tests/vm: remove plain centos image Alex Bennée
2024-06-06 11:50 ` [PULL 05/12] scripts/ci: remove CentOS bits from common build-environment Alex Bennée
2024-06-06 11:50 ` [PULL 06/12] docs/ci: clean-up references for consistency Alex Bennée
2024-06-06 11:50 ` [PULL 07/12] tests/lcitool: Delete obsolete centos-stream-8.yml file Alex Bennée
2024-06-06 11:50 ` [PULL 08/12] .gitlab-ci.d/buildtest.yml: Use -fno-sanitize=function in the clang-system job Alex Bennée
2024-06-06 11:50 ` [PULL 09/12] tests/lcitool: Bump to latest libvirt-ci and update Fedora and Alpine version Alex Bennée
2024-06-06 11:50 ` [PULL 10/12] tests/lcitool: Install mingw-w64-tools for the Windows cross-builds Alex Bennée
2024-06-06 11:50 ` [PULL 11/12] tests/lcitool: generate package lists for ansible Alex Bennée
2024-06-06 11:50 ` Alex Bennée [this message]
2024-06-06 18:54 ` [PULL 00/12] testing cleanups (ci, vm, lcitool, ansible) Richard Henderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240606115047.421045-13-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=bleal@redhat.com \
--cc=philmd@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
--cc=wainersm@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).