From patchwork Mon Jun 3 17:53:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 13684021 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 064D3C25B75 for ; Mon, 3 Jun 2024 17:56:00 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sEBsQ-00074E-VR; Mon, 03 Jun 2024 13:53:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sEBsI-0006zd-VQ for qemu-devel@nongnu.org; Mon, 03 Jun 2024 13:53:40 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sEBsD-00007z-Q0 for qemu-devel@nongnu.org; Mon, 03 Jun 2024 13:53:38 -0400 Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-35e573c0334so880158f8f.1 for ; Mon, 03 Jun 2024 10:53:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1717437211; x=1718042011; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+a6OiIjMDLJAUXNx2bzGpjI+Dh3marBei/mColihV4o=; b=gwA6iuTAFp3vnwg4Z2uqSBWC1TZQMHS0pF3cuGn6gXLLAwhZLQVm4EnabD3O4nl+TI VMVZKwM5NdboMq9wD+uXtyt2Ngwv8ouXpVejYFqjW7bSH6QG+0v1aKWQ2OuSqHYQJYwB aMR1QqzjgEJEsg/EQlcfwoauRUjKih0c80SaM9OcAU7TXgcBlkrwp/6upADmU+T7mo57 4M7WoknBRVCF8Rh/MMIhYcxwBnI6NA/CybEmsf/IoA2yzNT1D76xUjqAGduq5hfQ5lbG IP5nri0OVraV9LjbOXnc9uI19nNQzWkQA0M0YSQUwIQDDpnQ+JoaxZXO3tZvmsEPUbcH /t0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717437211; x=1718042011; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+a6OiIjMDLJAUXNx2bzGpjI+Dh3marBei/mColihV4o=; b=UNIwHfO8Qm487z7Dyx00crwtIqyreUA5VodGiGbdUFjiASVW0VHaHfn8fe0JH7lCMW 9az5jiaay6SlZ/3yxDqhnzRSdGWlI9U1A+M/JAqK4x6qzm93gLaZRIf/Ykol7P7+/f82 EZVl78hQVNF3PCgeheT9yb8BLiUpoKXQf+Hp0rTHhWmJIYwLcYE94Ph6ODUcaEAHhAqp kYTjZacyaArcWA6F/1UvEW8wRqpOkaZPnsQNPOZb2Ej8IUcE5wYEK9HxBi5FQ7ubi4EQ qX19NlQmZ39j385vWF4bi8thHFiyspV0WNlr8Zmp0dP+pzFxmjSGYNvXZ7HD94gJIkLV njyQ== X-Gm-Message-State: AOJu0YwYSgxVNatE8KINdJcUmTB3xy/TdI6v5GKvRJcECCQZ6mJp3sw2 Idufvf5koL+vlnExiCKBcV+Ws/vyMw/6Glu7u+51lf3Zx1rBCvkw33BFaRhTrtE= X-Google-Smtp-Source: AGHT+IE0dTVoSx2nEcSSwSovc7u8KCcrL9ir3n+wy6bc734Iccz3FB8j6wmsfETQu8L8J7FWgvDXUQ== X-Received: by 2002:a5d:6b0d:0:b0:35d:c1d9:147b with SMTP id ffacd0b85a97d-35e7c5607e2mr283256f8f.20.1717437210664; Mon, 03 Jun 2024 10:53:30 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-35dd04d943esm9298647f8f.47.2024.06.03.10.53.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Jun 2024 10:53:29 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 94E335F8BC; Mon, 3 Jun 2024 18:53:28 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Markus Armbruster , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Richard Henderson , John Snow , Mark Cave-Ayland , Peter Maydell , Laurent Vivier , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Paolo Bonzini , qemu-arm@nongnu.org, Joel Stanley , Thomas Huth , =?utf-8?q?Da?= =?utf-8?q?niel_P=2E_Berrang=C3=A9?= , Marcin Juszkiewicz , Aurelien Jarno , Pavel Dovgalyuk , Wainer dos Santos Moschetta , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , Cleber Rosa , Leif Lindholm , qemu-s390x@nongnu.org, Beraldo Leal , Jiaxun Yang , Radoslaw Biernacki Subject: [PATCH v3 01/12] ci: remove centos-steam-8 customer runner Date: Mon, 3 Jun 2024 18:53:17 +0100 Message-Id: <20240603175328.3823123-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240603175328.3823123-1-alex.bennee@linaro.org> References: <20240603175328.3823123-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org This broke since eef0bae3a7 (migration: Remove block migration) but even after that was addressed it still fails to complete. As it will shortly be EOL lets to remove the runner definition and the related ansible setup bits. We still have centos9 docker images build and test. Reviewed-by: Richard Henderson Message-Id: <20240521125314.1255403-2-alex.bennee@linaro.org> Signed-off-by: Alex Bennée Message-Id: <20240529160934.982373-2-alex.bennee@linaro.org> --- docs/devel/ci-jobs.rst.inc | 7 - .gitlab-ci.d/custom-runners.yml | 1 - .../custom-runners/centos-stream-8-x86_64.yml | 24 --- .../org.centos/stream/8/build-environment.yml | 82 -------- .../ci/org.centos/stream/8/x86_64/configure | 198 ------------------ .../org.centos/stream/8/x86_64/test-avocado | 65 ------ scripts/ci/org.centos/stream/README | 17 -- 7 files changed, 394 deletions(-) delete mode 100644 .gitlab-ci.d/custom-runners/centos-stream-8-x86_64.yml delete mode 100644 scripts/ci/org.centos/stream/8/build-environment.yml delete mode 100755 scripts/ci/org.centos/stream/8/x86_64/configure delete mode 100755 scripts/ci/org.centos/stream/8/x86_64/test-avocado delete mode 100644 scripts/ci/org.centos/stream/README diff --git a/docs/devel/ci-jobs.rst.inc b/docs/devel/ci-jobs.rst.inc index be06322279..3756bbe355 100644 --- a/docs/devel/ci-jobs.rst.inc +++ b/docs/devel/ci-jobs.rst.inc @@ -182,13 +182,6 @@ If you've got access to an IBM Z host that can be used as a gitlab-CI runner, you can set this variable to enable the tests that require this kind of host. The runner should be tagged with "s390x". -CENTOS_STREAM_8_x86_64_RUNNER_AVAILABLE -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -If you've got access to a CentOS Stream 8 x86_64 host that can be -used as a gitlab-CI runner, you can set this variable to enable the -tests that require this kind of host. The runner should be tagged with -both "centos_stream_8" and "x86_64". - CCACHE_DISABLE ~~~~~~~~~~~~~~ The jobs are configured to use "ccache" by default since this typically diff --git a/.gitlab-ci.d/custom-runners.yml b/.gitlab-ci.d/custom-runners.yml index 29e52df283..1aa3c60efe 100644 --- a/.gitlab-ci.d/custom-runners.yml +++ b/.gitlab-ci.d/custom-runners.yml @@ -32,4 +32,3 @@ include: - local: '/.gitlab-ci.d/custom-runners/ubuntu-22.04-s390x.yml' - local: '/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml' - local: '/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch32.yml' - - local: '/.gitlab-ci.d/custom-runners/centos-stream-8-x86_64.yml' diff --git a/.gitlab-ci.d/custom-runners/centos-stream-8-x86_64.yml b/.gitlab-ci.d/custom-runners/centos-stream-8-x86_64.yml deleted file mode 100644 index 367424db78..0000000000 --- a/.gitlab-ci.d/custom-runners/centos-stream-8-x86_64.yml +++ /dev/null @@ -1,24 +0,0 @@ -# All centos-stream-8 jobs should run successfully in an environment -# setup by the scripts/ci/setup/stream/8/build-environment.yml task -# "Installation of extra packages to build QEMU" - -centos-stream-8-x86_64: - extends: .custom_runner_template - allow_failure: true - needs: [] - stage: build - tags: - - centos_stream_8 - - x86_64 - rules: - - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' - - if: "$CENTOS_STREAM_8_x86_64_RUNNER_AVAILABLE" - before_script: - - JOBS=$(expr $(nproc) + 1) - script: - - mkdir build - - cd build - - ../scripts/ci/org.centos/stream/8/x86_64/configure - || { cat config.log meson-logs/meson-log.txt; exit 1; } - - make -j"$JOBS" - - make NINJA=":" check check-avocado diff --git a/scripts/ci/org.centos/stream/8/build-environment.yml b/scripts/ci/org.centos/stream/8/build-environment.yml deleted file mode 100644 index 1ead77e2cb..0000000000 --- a/scripts/ci/org.centos/stream/8/build-environment.yml +++ /dev/null @@ -1,82 +0,0 @@ ---- -- name: Installation of extra packages to build QEMU - hosts: all - tasks: - - name: Extra check for CentOS Stream 8 - lineinfile: - path: /etc/redhat-release - line: CentOS Stream release 8 - state: present - check_mode: yes - register: centos_stream_8 - - - name: Enable EPEL repo on CentOS Stream 8 - dnf: - name: - - epel-release - state: present - when: - - centos_stream_8 - - - name: Enable PowerTools repo on CentOS Stream 8 - ini_file: - path: /etc/yum.repos.d/CentOS-Stream-PowerTools.repo - section: powertools - option: enabled - value: "1" - when: - - centos_stream_8 - - - name: Install basic packages to build QEMU on CentOS Stream 8 - dnf: - name: - - bzip2 - - bzip2-devel - - capstone-devel - - dbus-daemon - - device-mapper-multipath-devel - - diffutils - - gcc - - gcc-c++ - - genisoimage - - gettext - - git - - glib2-devel - - glusterfs-api-devel - - gnutls-devel - - libaio-devel - - libcap-ng-devel - - libcurl-devel - - libepoxy-devel - - libfdt-devel - - libgcrypt-devel - - libiscsi-devel - - libpmem-devel - - librados-devel - - librbd-devel - - libseccomp-devel - - libslirp-devel - - libssh-devel - - libxkbcommon-devel - - lzo-devel - - make - - mesa-libEGL-devel - - nettle-devel - - ninja-build - - nmap-ncat - - numactl-devel - - pixman-devel - - python38 - - python3-sphinx - - rdma-core-devel - - redhat-rpm-config - - snappy-devel - - spice-glib-devel - - spice-server-devel - - systemd-devel - - systemtap-sdt-devel - - tar - - zlib-devel - state: present - when: - - centos_stream_8 diff --git a/scripts/ci/org.centos/stream/8/x86_64/configure b/scripts/ci/org.centos/stream/8/x86_64/configure deleted file mode 100755 index 868db665f6..0000000000 --- a/scripts/ci/org.centos/stream/8/x86_64/configure +++ /dev/null @@ -1,198 +0,0 @@ -#!/bin/sh -e -# -# Configuration for QEMU based on CentOS Stream 8 x86_64 builds -# -# The "configure" command line is based on: -# -# https://git.centos.org/rpms/qemu-kvm/blob/c8s-stream-rhel/f/SPECS/qemu-kvm.spec -# -# But, because the SPEC file contains a number of conditionals and -# variable and expansions only available at RPM build time, this version -# was initially generated from an actual RPM build on an x86_64 platform. -# -# From that initial version, options that are required or are a -# consequence of non-upstream patches have been adapted. One example -# is "--without-default-devices" which is *not* present here, given -# that patches adding downstream specific devices are not available. -# -../configure \ ---python=/usr/bin/python3.8 \ ---prefix="/usr" \ ---libdir="/usr/lib64" \ ---datadir="/usr/share" \ ---sysconfdir="/etc" \ ---interp-prefix=/usr/qemu-%M \ ---localstatedir="/var" \ ---docdir="/usr/share/doc" \ ---libexecdir="/usr/libexec" \ ---extra-ldflags="-Wl,--build-id -Wl,-z,relro -Wl,-z,now" \ ---extra-cflags="-O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fexceptions -fstack-protector-strong -grecord-gcc-switches -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection" \ ---with-suffix="qemu-kvm" \ ---firmwarepath=/usr/share/qemu-firmware \ ---target-list="x86_64-softmmu" \ ---block-drv-rw-whitelist="qcow2,raw,file,host_device,nbd,iscsi,rbd,blkdebug,luks,null-co,nvme,copy-on-read,throttle,gluster" \ ---audio-drv-list="" \ ---block-drv-ro-whitelist="vmdk,vhdx,vpc,https,ssh" \ ---with-coroutine=ucontext \ ---tls-priority=@QEMU,SYSTEM \ ---disable-af-xdp \ ---disable-attr \ ---disable-auth-pam \ ---disable-avx2 \ ---disable-avx512f \ ---disable-bochs \ ---disable-bpf \ ---disable-brlapi \ ---disable-bsd-user \ ---disable-bzip2 \ ---disable-cap-ng \ ---disable-capstone \ ---disable-cfi \ ---disable-cfi-debug \ ---disable-cloop \ ---disable-cocoa \ ---disable-coroutine-pool \ ---disable-crypto-afalg \ ---disable-curl \ ---disable-curses \ ---disable-debug-info \ ---disable-debug-mutex \ ---disable-debug-tcg \ ---disable-dmg \ ---disable-docs \ ---disable-fuse \ ---disable-fuse-lseek \ ---disable-gcrypt \ ---disable-gio \ ---disable-glusterfs \ ---disable-gnutls \ ---disable-gtk \ ---disable-guest-agent \ ---disable-guest-agent-msi \ ---disable-hvf \ ---disable-iconv \ ---disable-kvm \ ---disable-libdaxctl \ ---disable-libiscsi \ ---disable-libnfs \ ---disable-libpmem \ ---disable-libssh \ ---disable-libudev \ ---disable-libusb \ ---disable-linux-aio \ ---disable-linux-io-uring \ ---disable-linux-user \ ---disable-live-block-migration \ ---disable-lto \ ---disable-lzfse \ ---disable-lzo \ ---disable-malloc-trim \ ---disable-membarrier \ ---disable-modules \ ---disable-module-upgrades \ ---disable-mpath \ ---disable-multiprocess \ ---disable-netmap \ ---disable-nettle \ ---disable-numa \ ---disable-nvmm \ ---disable-opengl \ ---disable-parallels \ ---disable-pie \ ---disable-qcow1 \ ---disable-qed \ ---disable-qom-cast-debug \ ---disable-rbd \ ---disable-rdma \ ---disable-replication \ ---disable-rng-none \ ---disable-safe-stack \ ---disable-sanitizers \ ---disable-sdl \ ---disable-sdl-image \ ---disable-seccomp \ ---disable-slirp-smbd \ ---disable-smartcard \ ---disable-snappy \ ---disable-sparse \ ---disable-spice \ ---disable-strip \ ---disable-system \ ---disable-tcg \ ---disable-tools \ ---disable-tpm \ ---disable-u2f \ ---disable-usb-redir \ ---disable-user \ ---disable-vde \ ---disable-vdi \ ---disable-vhost-crypto \ ---disable-vhost-kernel \ ---disable-vhost-net \ ---disable-vhost-user \ ---disable-vhost-user-blk-server \ ---disable-vhost-vdpa \ ---disable-virglrenderer \ ---disable-virtfs \ ---disable-vnc \ ---disable-vnc-jpeg \ ---disable-png \ ---disable-vnc-sasl \ ---disable-vte \ ---disable-vvfat \ ---disable-werror \ ---disable-whpx \ ---disable-xen \ ---disable-xen-pci-passthrough \ ---disable-xkbcommon \ ---disable-zstd \ ---enable-attr \ ---enable-avx2 \ ---enable-cap-ng \ ---enable-capstone \ ---enable-coroutine-pool \ ---enable-curl \ ---enable-debug-info \ ---enable-docs \ ---enable-fdt \ ---enable-gcrypt \ ---enable-glusterfs \ ---enable-gnutls \ ---enable-guest-agent \ ---enable-iconv \ ---enable-kvm \ ---enable-libiscsi \ ---enable-libpmem \ ---enable-libssh \ ---enable-libusb \ ---enable-libudev \ ---enable-linux-aio \ ---enable-lzo \ ---enable-malloc-trim \ ---enable-modules \ ---enable-mpath \ ---enable-numa \ ---enable-opengl \ ---enable-pie \ ---enable-rbd \ ---enable-rdma \ ---enable-seccomp \ ---enable-snappy \ ---enable-smartcard \ ---enable-spice \ ---enable-system \ ---enable-tcg \ ---enable-tools \ ---enable-tpm \ ---enable-trace-backends=dtrace \ ---enable-usb-redir \ ---enable-vhost-kernel \ ---enable-vhost-net \ ---enable-vhost-user \ ---enable-vhost-user-blk-server \ ---enable-vhost-vdpa \ ---enable-vnc \ ---enable-png \ ---enable-vnc-sasl \ ---enable-werror \ ---enable-xkbcommon diff --git a/scripts/ci/org.centos/stream/8/x86_64/test-avocado b/scripts/ci/org.centos/stream/8/x86_64/test-avocado deleted file mode 100755 index 73e7a1a312..0000000000 --- a/scripts/ci/org.centos/stream/8/x86_64/test-avocado +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/sh -e -# -# Runs a previously vetted list of tests, either marked explicitly for -# KVM and x86_64, or tests that are generic enough to be valid for all -# targets. Such a test list can be generated with: -# -# ./pyvenv/bin/avocado list --filter-by-tags-include-empty \ -# --filter-by-tags-include-empty-key -t accel:kvm,arch:x86_64 \ -# tests/avocado/ -# -# This is almost the complete list of avocado based tests available at -# the time this was compile, with the following exceptions: -# -# * Require machine type "x-remote": -# - tests/avocado/multiprocess.py:Multiprocess.test_multiprocess_x86_64 -# -# * Requires display type "egl-headless": -# - tests/avocado/virtio-gpu.py:VirtioGPUx86.test_virtio_vga_virgl -# - tests/avocado/virtio-gpu.py:VirtioGPUx86.test_vhost_user_vga_virgl -# -# * Test is marked (unconditionally) to be skipped: -# - tests/avocado/virtio_check_params.py:VirtioMaxSegSettingsCheck.test_machine_types -# -make get-vm-images -./pyvenv/bin/avocado run \ - --job-results-dir=tests/results/ \ - tests/avocado/boot_linux.py:BootLinuxX8664.test_pc_i440fx_kvm \ - tests/avocado/boot_linux.py:BootLinuxX8664.test_pc_q35_kvm \ - tests/avocado/boot_linux_console.py:BootLinuxConsole.test_x86_64_pc \ - tests/avocado/cpu_queries.py:QueryCPUModelExpansion.test \ - tests/avocado/empty_cpu_model.py:EmptyCPUModel.test \ - tests/avocado/hotplug_cpu.py:HotPlugCPU.test \ - tests/avocado/netdev-ethtool.py:NetDevEthtool.test_igb \ - tests/avocado/netdev-ethtool.py:NetDevEthtool.test_igb_nomsi \ - tests/avocado/info_usernet.py:InfoUsernet.test_hostfwd \ - tests/avocado/intel_iommu.py:IntelIOMMU.test_intel_iommu \ - tests/avocado/intel_iommu.py:IntelIOMMU.test_intel_iommu_pt \ - tests/avocado/intel_iommu.py:IntelIOMMU.test_intel_iommu_strict \ - tests/avocado/intel_iommu.py:IntelIOMMU.test_intel_iommu_strict_cm \ - tests/avocado/linux_initrd.py:LinuxInitrd.test_with_2gib_file_should_exit_error_msg_with_linux_v3_6 \ - tests/avocado/linux_initrd.py:LinuxInitrd.test_with_2gib_file_should_work_with_linux_v4_16 \ - tests/avocado/migration.py:Migration.test_migration_with_exec \ - tests/avocado/migration.py:Migration.test_migration_with_tcp_localhost \ - tests/avocado/migration.py:Migration.test_migration_with_unix \ - tests/avocado/pc_cpu_hotplug_props.py:OmittedCPUProps.test_no_die_id \ - tests/avocado/replay_kernel.py:ReplayKernelNormal.test_x86_64_pc \ - tests/avocado/reverse_debugging.py:ReverseDebugging_X86_64.test_x86_64_pc \ - tests/avocado/version.py:Version.test_qmp_human_info_version \ - tests/avocado/virtio_version.py:VirtioVersionCheck.test_conventional_devs \ - tests/avocado/virtio_version.py:VirtioVersionCheck.test_modern_only_devs \ - tests/avocado/vnc.py:Vnc.test_change_password \ - tests/avocado/vnc.py:Vnc.test_change_password_requires_a_password \ - tests/avocado/vnc.py:Vnc.test_no_vnc \ - tests/avocado/vnc.py:Vnc.test_no_vnc_change_password \ - tests/avocado/x86_cpu_model_versions.py:CascadelakeArchCapabilities.test_4_0 \ - tests/avocado/x86_cpu_model_versions.py:CascadelakeArchCapabilities.test_4_1 \ - tests/avocado/x86_cpu_model_versions.py:CascadelakeArchCapabilities.test_set_4_0 \ - tests/avocado/x86_cpu_model_versions.py:CascadelakeArchCapabilities.test_unset_4_1 \ - tests/avocado/x86_cpu_model_versions.py:CascadelakeArchCapabilities.test_v1_4_0 \ - tests/avocado/x86_cpu_model_versions.py:CascadelakeArchCapabilities.test_v1_set_4_0 \ - tests/avocado/x86_cpu_model_versions.py:CascadelakeArchCapabilities.test_v2_4_0 \ - tests/avocado/x86_cpu_model_versions.py:CascadelakeArchCapabilities.test_v2_unset_4_1 \ - tests/avocado/x86_cpu_model_versions.py:X86CPUModelAliases.test_4_0_alias_compatibility \ - tests/avocado/x86_cpu_model_versions.py:X86CPUModelAliases.test_4_1_alias \ - tests/avocado/x86_cpu_model_versions.py:X86CPUModelAliases.test_none_alias diff --git a/scripts/ci/org.centos/stream/README b/scripts/ci/org.centos/stream/README deleted file mode 100644 index e3eadfe3ea..0000000000 --- a/scripts/ci/org.centos/stream/README +++ /dev/null @@ -1,17 +0,0 @@ -This directory contains scripts for generating a build of QEMU that -closely matches the CentOS Stream[1] builds of the qemu-kvm package. - -To have the environment ready to configure, build QEMU and run tests, -please start with a CentOS Stream machine and: - - * apply the generic "build-environment.yml" playbook located at - scripts/ci/setup - - * apply the "build-environment.yml" in the directory following the - CentOS Stream version (such as "8"). - -This currently only covers CentOS Stream 8 environments and -packages[2]. - -[1] https://www.centos.org/centos-stream/ -[2] https://git.centos.org/rpms/qemu-kvm/commits/c8s-stream-rhel From patchwork Mon Jun 3 17:53:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 13684013 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8554CC25B76 for ; Mon, 3 Jun 2024 17:54:14 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sEBsH-0006yH-8p; Mon, 03 Jun 2024 13:53:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sEBsD-0006xN-HN for qemu-devel@nongnu.org; Mon, 03 Jun 2024 13:53:33 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sEBsB-00007b-9m for qemu-devel@nongnu.org; Mon, 03 Jun 2024 13:53:32 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-421208c97a2so40499485e9.1 for ; Mon, 03 Jun 2024 10:53:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1717437210; x=1718042010; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=dS1wHb51U0tVZQjhFJevCxPL30JQW4gCH0ItBvKNOkM=; b=QrB/TD6gQOy6azwGTZxmWEdyeb8G7WpjB1K1w5Nm35XPqIgMqmk3lgJKxhssUoi98S iW9rkQznFzpsNp+xnRmET85LoHqkOHFsJMcaxyWZuo9zlSJ7hnx6Foft1g0rQCkox3CR TrqK+Ctt5c/G1KblzavvMYtG3ak6BqsQYfgiMVMGxCKaqA48JpAbRWZ8xws4QeOYtEPg PtOQcq8r3mZg5rgkIT4wsvBBFVgO2UJ5jdJgsCUitIlJIaQnSsL86igZuTGpKbZyz3Tw wScL1q1cD0Ir+ZapwqGHlYgsF4Ctun+ucGBAV9eZH+yeB7jSOQP+tALSnwqxNewfb+Cr V5+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717437210; x=1718042010; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dS1wHb51U0tVZQjhFJevCxPL30JQW4gCH0ItBvKNOkM=; b=vdEvs70Vg0JPG1OawaeV2EGj5qD65Gpm9jCcdD5XRtoy12E0LDVItn+7I9LAJT8hpS s3q2yt5mCAxNM6alvcc8ZTOSMcf/u0F41lzn5iMNbcQYjotfgloBU1IyIBe6xuvbzBoe TrWoi0gur/x89FqFctjprekcSPlyeGcz012U2BEeTl3EOT1+LKdktqc0YB8SvsnQ/k9M VrF1LoyXkvCyJenMCsA+JRHL7bYeehYqBiOcgCckbHrxkRJNmC/KG4nWsTLSVlOQ7Kg0 EwDSxGawzREUGqJ0+MHS2joFHE9N2PPpW0r7Pl1m5khHWYx+csvIlvNv73k5tG9bU82p 1cWA== X-Gm-Message-State: AOJu0YxtZOA04eWZmHUrOkyBGTnD9OovMrX/6J7EV9Pi59sC5FRlICeY xePtMP6YyY5fSwC3VOUn4MDv31Kp1HpjK2p8Ydr3hlztyXo8S+d6D4HMLuQUO1E= X-Google-Smtp-Source: AGHT+IEtct6vC0Sy2O3e64G5sDT8x4gJXTdHmqUBCLpeMcQN/KKiSuc5wL/N43BCmAU1tbgvZigF7g== X-Received: by 2002:a05:600c:4454:b0:421:c8a:424e with SMTP id 5b1f17b1804b1-4212e04982fmr95839145e9.10.1717437209676; Mon, 03 Jun 2024 10:53:29 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4213ab7ca26sm59434535e9.25.2024.06.03.10.53.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Jun 2024 10:53:29 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id AAD925F8F7; Mon, 3 Jun 2024 18:53:28 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Markus Armbruster , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Richard Henderson , John Snow , Mark Cave-Ayland , Peter Maydell , Laurent Vivier , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Paolo Bonzini , qemu-arm@nongnu.org, Joel Stanley , Thomas Huth , =?utf-8?q?Da?= =?utf-8?q?niel_P=2E_Berrang=C3=A9?= , Marcin Juszkiewicz , Aurelien Jarno , Pavel Dovgalyuk , Wainer dos Santos Moschetta , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , Cleber Rosa , Leif Lindholm , qemu-s390x@nongnu.org, Beraldo Leal , Jiaxun Yang , Radoslaw Biernacki Subject: [PATCH v3 02/12] docs/devel: update references to centos to non-versioned container Date: Mon, 3 Jun 2024 18:53:18 +0100 Message-Id: <20240603175328.3823123-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240603175328.3823123-1-alex.bennee@linaro.org> References: <20240603175328.3823123-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x335.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org >From the website: "After May 31, 2024, CentOS Stream 8 will be archived and no further updates will be provided." We have updated a few bits but there are still references that need fixing. Rather than bump I've replaced them with references to the Debian image so we don't have to bump at the next update. Reviewed-by: Richard Henderson Message-Id: <20240521125314.1255403-3-alex.bennee@linaro.org> Reviewed-by: Thomas Huth Signed-off-by: Alex Bennée Message-Id: <20240529160934.982373-3-alex.bennee@linaro.org> --- docs/devel/testing.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/devel/testing.rst b/docs/devel/testing.rst index fa28e3ecb2..23d3f44f52 100644 --- a/docs/devel/testing.rst +++ b/docs/devel/testing.rst @@ -387,9 +387,9 @@ make target): .. code:: - make docker-test-build@centos8 + make docker-test-build@debian -This will create a container instance using the ``centos8`` image (the image +This will create a container instance using the ``debian`` image (the image is downloaded and initialized automatically), in which the ``test-build`` job is executed. @@ -410,8 +410,8 @@ locally by using the ``NOCACHE`` build option: Images ~~~~~~ -Along with many other images, the ``centos8`` image is defined in a Dockerfile -in ``tests/docker/dockerfiles/``, called ``centos8.docker``. ``make docker-help`` +Along with many other images, the ``debian`` image is defined in a Dockerfile +in ``tests/docker/dockerfiles/``, called ``debian.docker``. ``make docker-help`` command will list all the available images. A ``.pre`` script can be added beside the ``.docker`` file, which will be From patchwork Mon Jun 3 17:53:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 13684024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6CD8AC25B76 for ; Mon, 3 Jun 2024 17:56:34 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sEBsa-00078E-BK; Mon, 03 Jun 2024 13:53:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sEBsH-0006yk-HH for qemu-devel@nongnu.org; Mon, 03 Jun 2024 13:53:37 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sEBsD-000082-Q3 for qemu-devel@nongnu.org; Mon, 03 Jun 2024 13:53:37 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-42134bb9677so30891995e9.2 for ; Mon, 03 Jun 2024 10:53:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1717437211; x=1718042011; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=w8/BJyXyrU77noN4L93DWeN1oQ/59GUmwfEPrUYZCUU=; b=f2II2XO8HgHaNZq4UMojs/6smd4EqcAuvoe/qgrocubgkrBKyCC6oSpzYkJMLb4W0o FcykFkqFgCH3ScXSzIoOM9oGO1PmwlKpMDdVl+1KR2h7TwcnI+RbVlVU9HAkguj8NXe8 tNC/chHKucIGtn8yuou9bmpuiG+M4V0VkijLXu6cxjIzMKH49orUA/j7I+A9f9AK10Tf OWoDI9RjlC74/ZD20ODC8xnYW1SN7loMTBDtOSHBchJCDIKcGzYtvcqn3t3B6sSCyhsf r+ooZ9XF9kaL7NM6mHZog6z6VGaCvEx31Q2G0fDjCVvXy/pSxgaODH0D9iiRANvsPSkt BzXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717437211; x=1718042011; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=w8/BJyXyrU77noN4L93DWeN1oQ/59GUmwfEPrUYZCUU=; b=B0HfzcM+/wl9iCyENaxY8vio2gmtBoGfu9cjRGKrNy5u/zG+tF+LEiJF6aOrtH+hSI UL4sd3i2F0Qh/k2FpgzrNqHoynl28rKP7gn0HgfPIyy7wHwiRUosS/j/Ijs4bCSwoSLr tcOtjlgYYB65m7IrmTKjpOthOkgkUrkCxr5MtAkJIUafPUAPrff4fEoifW71sas/cLPJ 99izzoULe+20WnBBNzNnK7ijhqsq0CGEV9t32rFNLhS90M8nZ7edwvBz5tkIw6xXXxUc BEMNsP1a07PBkBojCY4dG9VAhkHLtSJbtUfd+omhRNdhOMFCKefuqknJUzVTqD3zK84R sEKA== X-Gm-Message-State: AOJu0YxdVRfmIGa2bhsMpBU5oATSnlouqkCE9UAfne4R3FcKeL+IGm7V Hm9kupDc1oj6ums71aeLh+Yo3nUBe1Wuzj4zBHlluQQlTEdosLqi7IGkbxRexGQ= X-Google-Smtp-Source: AGHT+IG15AeO1aPjVnU9qyxTMBNIMtIAMWvRDUW2vwFY1/R5hr0KrpEJY0PbI2uHtzG7N7HQM5qFLw== X-Received: by 2002:a05:600c:4595:b0:421:1717:2cf0 with SMTP id 5b1f17b1804b1-4212e08b5f9mr101285805e9.24.1717437211033; Mon, 03 Jun 2024 10:53:31 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-35dd04ca9b0sm9261489f8f.26.2024.06.03.10.53.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Jun 2024 10:53:29 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id C3EAD5F8F9; Mon, 3 Jun 2024 18:53:28 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Markus Armbruster , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Richard Henderson , John Snow , Mark Cave-Ayland , Peter Maydell , Laurent Vivier , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Paolo Bonzini , qemu-arm@nongnu.org, Joel Stanley , Thomas Huth , =?utf-8?q?Da?= =?utf-8?q?niel_P=2E_Berrang=C3=A9?= , Marcin Juszkiewicz , Aurelien Jarno , Pavel Dovgalyuk , Wainer dos Santos Moschetta , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , Cleber Rosa , Leif Lindholm , qemu-s390x@nongnu.org, Beraldo Leal , Jiaxun Yang , Radoslaw Biernacki Subject: [PATCH v3 03/12] tests/vm: update centos.aarch64 image to 9 Date: Mon, 3 Jun 2024 18:53:19 +0100 Message-Id: <20240603175328.3823123-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240603175328.3823123-1-alex.bennee@linaro.org> References: <20240603175328.3823123-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x329.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org As Centos Stream 8 goes out of support we need to update. To do this powertools is replaced by crb and we don't over specify the python3 we want. Reviewed-by: Richard Henderson Reviewed-by: Thomas Huth Message-Id: <20240521125314.1255403-4-alex.bennee@linaro.org> Signed-off-by: Alex Bennée Message-Id: <20240529160934.982373-4-alex.bennee@linaro.org> --- tests/vm/centos.aarch64 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/vm/centos.aarch64 b/tests/vm/centos.aarch64 index 3f58de1e64..fcf9e08c87 100755 --- a/tests/vm/centos.aarch64 +++ b/tests/vm/centos.aarch64 @@ -25,9 +25,9 @@ DEFAULT_CONFIG = { 'cpu' : "max", 'machine' : "virt,gic-version=max", 'install_cmds' : ( - "dnf config-manager --set-enabled powertools, " + "dnf config-manager --enable crb, " "dnf config-manager --add-repo=https://download.docker.com/linux/centos/docker-ce.repo, " - "dnf install -y make ninja-build git python38 gcc gcc-c++ flex bison "\ + "dnf install -y make ninja-build git python3 gcc gcc-c++ flex bison "\ "glib2-devel pixman-devel zlib-devel docker-ce.aarch64, " "systemctl enable docker, " ), @@ -38,10 +38,10 @@ DEFAULT_CONFIG = { class CentosAarch64VM(basevm.BaseVM): - name = "centos8.aarch64" + name = "centos9.aarch64" arch = "aarch64" - image_name = "CentOS-Stream-GenericCloud-8-20220125.1.aarch64.qcow2" - image_link = "https://cloud.centos.org/centos/8-stream/aarch64/images/" + image_name = "CentOS-Stream-GenericCloud-9-20230501.0.aarch64.qcow2" + image_link = "https://cloud.centos.org/centos/9-stream/aarch64/images/" image_link += image_name BUILD_SCRIPT = """ set -e; From patchwork Mon Jun 3 17:53:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 13684025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id F2394C25B75 for ; Mon, 3 Jun 2024 17:56:36 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sEBsd-0007C2-79; Mon, 03 Jun 2024 13:54:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sEBsI-0006zb-U8 for qemu-devel@nongnu.org; Mon, 03 Jun 2024 13:53:40 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sEBsF-00008W-1S for qemu-devel@nongnu.org; Mon, 03 Jun 2024 13:53:38 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-4213870aafdso15695265e9.2 for ; Mon, 03 Jun 2024 10:53:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1717437212; x=1718042012; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=MEDsayo7NSvvEmt4K5zlu3UsH8icNWfLL5qp5044iow=; b=nj7sF3JzL0BFceZH0kRhx/XBoBSJq2pG5//Kb+3pbUvo0VYLmCsz00NKVYFXSSUF1M eup6zQHjMZwLWAWb3XmcirKteypoLUdbNhoqTmV+rvZHiVAfNQ3oPhnQ8WlYw+krPwqr cqjwxHGEHv4dY0EXdWBz9yGLqj2VPCgbS6CI/MwKcF+x6QRpSE6AjWUvMl14ZTwM0h3r t8uiNBTGxS+UZtWaHGHDbP2eitbefhbjU8inCPQaHV6/PQamrc4nYpd4xePaVo7tiZZ3 JcGDysM7E/e7sio3FuHqakz73XDtaRyDD2XUsikIO4MZJiawNVHpNlpmhPedGGpwp2sm mUGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717437212; x=1718042012; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MEDsayo7NSvvEmt4K5zlu3UsH8icNWfLL5qp5044iow=; b=NJnCf3VjhcxvjsO8qopSlXir0btK3hjtPWbDFNhj8+2qdjVbpnwv0mtLbj+miVjldp V9S/DFU2c49JH6oS2f+HMAfaCdOhuPc82RszJUspNKIxzW2jFRBdRVggJCMXt7NhOOWn CUgo8vUNn+fx48oxxtW94U09gAak9JeVzlUPcsvKACRPhPzIKdjRIQbvAfbJuKOBhnf7 gfxPLn2skVInLjTjDhfzXz3BL65RRRxpsDYsa3sWPB8i6Q7QBLvkI3TGSVLq4DiamdQn ksEur6b7a6RbztmuP/KbkkdQQxB5JN73oq0oItfzIe0yW2QM+8sKOidA07v9CR5ODp9o infg== X-Gm-Message-State: AOJu0Yw+LBgSPWzWxcIAXEOanSp9+Tt8RCFcy9VcKUppygxDPkIZksQb VUKSc7s7QJKF3i8LVHCOVzrz7ue8+eirZW9vg8LewiBXUJvRfY1D662kIb3L/Cs= X-Google-Smtp-Source: AGHT+IERiTSdG3H7X3KPmYK5n8quAaVjMbWuBd7ihGPz7tNBugwkl5/nbcKxFODqOKlo1KVSfO2XXw== X-Received: by 2002:a05:600c:190b:b0:41f:e2c5:6618 with SMTP id 5b1f17b1804b1-4212e0a5330mr81922565e9.32.1717437212379; Mon, 03 Jun 2024 10:53:32 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4212b858424sm126070505e9.21.2024.06.03.10.53.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Jun 2024 10:53:30 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id DC60B5F9F3; Mon, 3 Jun 2024 18:53:28 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Markus Armbruster , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Richard Henderson , John Snow , Mark Cave-Ayland , Peter Maydell , Laurent Vivier , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Paolo Bonzini , qemu-arm@nongnu.org, Joel Stanley , Thomas Huth , =?utf-8?q?Da?= =?utf-8?q?niel_P=2E_Berrang=C3=A9?= , Marcin Juszkiewicz , Aurelien Jarno , Pavel Dovgalyuk , Wainer dos Santos Moschetta , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , Cleber Rosa , Leif Lindholm , qemu-s390x@nongnu.org, Beraldo Leal , Jiaxun Yang , Radoslaw Biernacki Subject: [PATCH v3 04/12] tests/vm: remove plain centos image Date: Mon, 3 Jun 2024 18:53:20 +0100 Message-Id: <20240603175328.3823123-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240603175328.3823123-1-alex.bennee@linaro.org> References: <20240603175328.3823123-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x329.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org This isn't really used and we have lighter weight docker containers for testing this stuff directly. Reviewed-by: Thomas Huth Reviewed-by: Richard Henderson Message-Id: <20240521125314.1255403-5-alex.bennee@linaro.org> Signed-off-by: Alex Bennée Message-Id: <20240529160934.982373-5-alex.bennee@linaro.org> --- tests/vm/Makefile.include | 1 - tests/vm/centos | 51 --------------------------------------- 2 files changed, 52 deletions(-) delete mode 100755 tests/vm/centos diff --git a/tests/vm/Makefile.include b/tests/vm/Makefile.include index ac56824a87..13ed80f72d 100644 --- a/tests/vm/Makefile.include +++ b/tests/vm/Makefile.include @@ -45,7 +45,6 @@ vm-help vm-test: @echo " vm-build-netbsd - Build QEMU in NetBSD VM" @echo " vm-build-openbsd - Build QEMU in OpenBSD VM" ifneq ($(GENISOIMAGE),) - @echo " vm-build-centos - Build QEMU in CentOS VM, with Docker" ifneq ($(EFI_AARCH64),) @echo " vm-build-ubuntu.aarch64 - Build QEMU in ubuntu aarch64 VM" @echo " vm-build-centos.aarch64 - Build QEMU in CentOS aarch64 VM" diff --git a/tests/vm/centos b/tests/vm/centos deleted file mode 100755 index d25c8f8b5b..0000000000 --- a/tests/vm/centos +++ /dev/null @@ -1,51 +0,0 @@ -#!/usr/bin/env python3 -# -# CentOS 8 Stream image -# -# Copyright 2018, 2022 Red Hat Inc. -# -# Authors: -# Fam Zheng -# -# This code is licensed under the GPL version 2 or later. See -# the COPYING file in the top-level directory. -# - -import os -import sys -import subprocess -import basevm -import time - -class CentosVM(basevm.BaseVM): - name = "centos" - arch = "x86_64" - BUILD_SCRIPT = """ - set -e; - cd $(mktemp -d); - export SRC_ARCHIVE=/dev/vdb; - sudo chmod a+r $SRC_ARCHIVE; - tar -xf $SRC_ARCHIVE; - make docker-test-block@centos9 {verbose} J={jobs} NETWORK=1; - make docker-test-quick@centos9 {verbose} J={jobs} NETWORK=1; - """ - - def build_image(self, img): - cimg = self._download_with_cache("https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20220125.1.x86_64.qcow2") - img_tmp = img + ".tmp" - subprocess.check_call(['cp', '-f', cimg, img_tmp]) - self.exec_qemu_img("resize", img_tmp, "50G") - self.boot(img_tmp, extra_args = ["-cdrom", self.gen_cloud_init_iso()]) - self.wait_ssh() - self.ssh_root_check("touch /etc/cloud/cloud-init.disabled") - self.ssh_root_check("dnf update -y") - self.ssh_root_check("dnf install -y dnf-plugins-core") - self.ssh_root_check("dnf config-manager --set-enabled powertools") - self.ssh_root_check("dnf install -y podman make ninja-build git python3") - self.ssh_root("poweroff") - self.wait() - os.rename(img_tmp, img) - return 0 - -if __name__ == "__main__": - sys.exit(basevm.main(CentosVM)) From patchwork Mon Jun 3 17:53:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 13684019 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 32265C41513 for ; Mon, 3 Jun 2024 17:55:49 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sEBsZ-00077a-Fb; Mon, 03 Jun 2024 13:53:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sEBsL-000705-4M for qemu-devel@nongnu.org; Mon, 03 Jun 2024 13:53:41 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sEBsG-00009b-JC for qemu-devel@nongnu.org; Mon, 03 Jun 2024 13:53:40 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-4210aa00c94so41514825e9.1 for ; Mon, 03 Jun 2024 10:53:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1717437214; x=1718042014; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=z5yTiW/q6L2Y5+9xKegtFmhr3gYrS8eAtYlk7YpU4Hg=; b=dwOy2DhGhm358ZPC3ixduSxJtJwpPDfVyG5gkrSmy4V5HfJENTKQBtsrnPW/kW0ebH FpSuUmI6eooMTSq7y7NSr8amdQ3wDxjx7FdZf09rQH8ULF0u3VoPtVN4IKPgQBDuzfv0 oJxqlwRRwuH4KXb4z6yu+ou1EIOtgrA3oIdhNHNZP9owuJEVHmoFrpwhfG2NIHp9E7uk po2198Qi03WkEbUsgH9ER7ssRfcvClJrsuXuH8wbhTFFfNuiS5orQ3C1ngL9+LWqTLSJ A3ISzXCXQHDomPyvIN3es7GE5fMsOlZcGBegut/QiyVtSY07hGfdOMmui+VL2Ln7bUQM nDuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717437214; x=1718042014; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=z5yTiW/q6L2Y5+9xKegtFmhr3gYrS8eAtYlk7YpU4Hg=; b=Gx20mj/1qz/MgntPMtlCi2Mv0ChCN96L9l8XHl/PMUWHffDJ8ZyvEP2K++JKLuUZp/ Ss8c+bV7O3gwoEPDIs9g+oqjQE8fEytNXJbp1WSaVl6XN9SHLN2tTOwWBASMW9enyjEM UI12bhT85Ia4cn5b4102CIDXlKKVqe9+fwkyRlsrphbU6FIUa2oriZuMP9tRDWGPp64z jmEBaEsssDSdTDlu5Qgx2G5hzPvBE1gFBZhhGv6VQ/AgS/7JBdpckwUjqTRoOT0Xzvar 2UODabYAJVB9vhI+hRo50G+n/Vqz5Y/e7n7d/NgPvAEGcJnjdupeKAGu9HdzJObJ/u/c 85DQ== X-Gm-Message-State: AOJu0YwVYVbBuZSmKDMIC/YGEek5G5F+3Tl5V455A8IiqCiHvBw0yVfA hUhQxw8yQiZhtcVUbBauyhEkGwg3Sl69qiZSGc7ARAJJFu56EmhWLOnOxfEQE6c= X-Google-Smtp-Source: AGHT+IFYPjC9GNDwaenBfWpzyHfu6l1S2cX3DZjw9jgZLDYESoxjMB/FEmKa7Uh6CAWhJ1+74oy5KQ== X-Received: by 2002:a05:600c:4705:b0:421:ad:f104 with SMTP id 5b1f17b1804b1-4212e0502dcmr93390755e9.10.1717437214623; Mon, 03 Jun 2024 10:53:34 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4212f9b9ef1sm114083595e9.9.2024.06.03.10.53.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Jun 2024 10:53:31 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id F2F595F9F4; Mon, 3 Jun 2024 18:53:28 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Markus Armbruster , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Richard Henderson , John Snow , Mark Cave-Ayland , Peter Maydell , Laurent Vivier , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Paolo Bonzini , qemu-arm@nongnu.org, Joel Stanley , Thomas Huth , =?utf-8?q?Da?= =?utf-8?q?niel_P=2E_Berrang=C3=A9?= , Marcin Juszkiewicz , Aurelien Jarno , Pavel Dovgalyuk , Wainer dos Santos Moschetta , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , Cleber Rosa , Leif Lindholm , qemu-s390x@nongnu.org, Beraldo Leal , Jiaxun Yang , Radoslaw Biernacki Subject: [PATCH v3 05/12] scripts/ci: remove CentOS bits from common build-environment Date: Mon, 3 Jun 2024 18:53:21 +0100 Message-Id: <20240603175328.3823123-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240603175328.3823123-1-alex.bennee@linaro.org> References: <20240603175328.3823123-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Although I've just removed the CentOS specific build-environment its probably a bit too confusing to have multiple distros mixed up in one place. Prior to moving clean-up what will be just for ubuntu. Signed-off-by: Alex Bennée Message-Id: <20240529160934.982373-6-alex.bennee@linaro.org> Reviewed-by: Richard Henderson --- scripts/ci/setup/build-environment.yml | 98 -------------------------- 1 file changed, 98 deletions(-) diff --git a/scripts/ci/setup/build-environment.yml b/scripts/ci/setup/build-environment.yml index de0d866a1e..e82097b465 100644 --- a/scripts/ci/setup/build-environment.yml +++ b/scripts/ci/setup/build-environment.yml @@ -184,101 +184,3 @@ - ansible_facts['distribution_version'] == '22.04' - ansible_facts['architecture'] == 'aarch64' - - name: Enable EPEL repo on EL8 - dnf: - name: - - epel-release - state: present - when: - - ansible_facts['distribution_file_variety'] in ['RedHat', 'CentOS'] - - ansible_facts['distribution_major_version'] == '8' - - - name: Enable PowerTools repo on CentOS 8 - ini_file: - path: /etc/yum.repos.d/CentOS-Stream-PowerTools.repo - section: powertools - option: enabled - value: "1" - when: - - ansible_facts['distribution_file_variety'] == 'CentOS' - - ansible_facts['distribution_major_version'] == '8' - - - name: Install basic packages to build QEMU on EL8 - dnf: - # This list of packages start with tests/docker/dockerfiles/centos8.docker - # but only include files that are common to all distro variants and present - # in the standard repos (no add-ons) - name: - - bzip2 - - bzip2-devel - - capstone-devel - - dbus-daemon - - device-mapper-multipath-devel - - diffutils - - gcc - - gcc-c++ - - genisoimage - - gettext - - git - - glib2-devel - - glusterfs-api-devel - - gnutls-devel - - libaio-devel - - libcap-ng-devel - - libcurl-devel - - libepoxy-devel - - libfdt-devel - - libgcrypt-devel - - libiscsi-devel - - libpmem-devel - - librados-devel - - librbd-devel - - libseccomp-devel - - libssh-devel - - libxkbcommon-devel - - lzo-devel - - make - - mesa-libEGL-devel - - nettle-devel - - ninja-build - - nmap-ncat - - numactl-devel - - pixman-devel - - python38 - - python3-sphinx - - rdma-core-devel - - redhat-rpm-config - - snappy-devel - - spice-glib-devel - - systemd-devel - - systemtap-sdt-devel - - tar - - zlib-devel - state: present - when: - - ansible_facts['distribution_file_variety'] in ['RedHat', 'CentOS'] - - ansible_facts['distribution_version'] == '8' - - - name: Install packages only available on x86 and aarch64 - dnf: - # Spice server not available in ppc64le - name: - - spice-server - - spice-server-devel - state: present - when: - - ansible_facts['distribution_file_variety'] in ['RedHat', 'CentOS'] - - ansible_facts['distribution_version'] == '8' - - ansible_facts['architecture'] == 'aarch64' or ansible_facts['architecture'] == 'x86_64' - - - name: Check whether the Python runtime version is managed by alternatives - stat: - path: /etc/alternatives/python3 - register: python3 - - - name: Set default Python runtime to 3.8 on EL8 - command: alternatives --set python3 /usr/bin/python3.8 - when: - - ansible_facts['distribution_file_variety'] in ['RedHat', 'CentOS'] - - ansible_facts['distribution_version'] == '8' - - python3.stat.islnk and python3.stat.lnk_target != '/usr/bin/python3.8' From patchwork Mon Jun 3 17:53:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 13684017 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E8947C25B75 for ; Mon, 3 Jun 2024 17:55:46 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sEBsb-0007A1-Ra; Mon, 03 Jun 2024 13:53:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sEBsI-0006zc-Ui for qemu-devel@nongnu.org; Mon, 03 Jun 2024 13:53:40 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sEBsF-00008c-2j for qemu-devel@nongnu.org; Mon, 03 Jun 2024 13:53:38 -0400 Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-35dc9cef36dso3806445f8f.3 for ; Mon, 03 Jun 2024 10:53:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1717437212; x=1718042012; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=nwO5Xk/JBsiCE4LMX0EusCkO9JTloZRZc0GlJ2FQNxg=; b=S6JV52Q4deEVTgCgnFc0zBWfQA32ss4/k6GSiy5q4dkeBN4nSq07UOqhEMZZoZBgd2 QgxCWPDGS23/izh0EakrOUf2/I52ZAYn5vyEhDxQMYUIwR51FxUM2t2IeohvlfZmWWbx XU6VQGMFhg+4QuKma7faYE50nZ+u7afJjXIuvIlk641mxQkyaKTSsSd19stLmuquGsUY n/fHC1lQbExp0lpeYIuto8wjluyzgZdRHN+2IkQGRYbK4Vnfgy0jr7MomSoIziAvKcHx iF+4oFnHJfSxMxqFvHO38YbUqjc9M8LO7NMoV+qeRR5HZonfcDJzz1Q0vyvm1281TP9S BmBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717437212; x=1718042012; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=nwO5Xk/JBsiCE4LMX0EusCkO9JTloZRZc0GlJ2FQNxg=; b=CALDIrlO/fJpgDQrow3eoeP5M4BkC/PiuHMGIw84wYB680uv+4E1hfyZEQ4rcCfm+A fElyg9dTcUvN5g9392fmo6CiCM+xB+x2PzogpTtH72PQ+dsIVfiqoq1wXZi4XtaMhIV2 SltIufNQalIvNWwt0lbe+r9vTRmjm/zM1FRWr29NWm/9WPfkBZj+ppO2ybnx5u2MDeEn NO9IGAIEx6MtbUROupIIk6sqfF1WHkXf+ScR416PCxYfSgAJwBT/AxeTVEzzA+yoCXO8 +wHDWzxHo1WP3bvaJ4ViSkX0kApQnV9zpy0PqJGBisz/2m/BIvJEKYqX824oiSxa4Vtk m5xA== X-Gm-Message-State: AOJu0YywnQ/7M5sFguzLPeoSi0g0Q/AL+KX+7Lgpp/0epblWpCfIA04P ER71LDvIBHJl9oAmYXxMwBy6ouUuHdQRlATeVSdIMvWhGeNpWpXEAgCJkCTUQlI= X-Google-Smtp-Source: AGHT+IF1PCBb2CO9/Ha0W0kFzU945k4om4tTwmp9tb4scoZqYEgQk/JoA5gdXNQKPLn7IBQz8Mqlwg== X-Received: by 2002:a05:6000:1282:b0:354:f944:11de with SMTP id ffacd0b85a97d-35e0f2869f4mr6834901f8f.28.1717437212642; Mon, 03 Jun 2024 10:53:32 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-35dd064bbb1sm9295671f8f.101.2024.06.03.10.53.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Jun 2024 10:53:31 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 1C8CB5F9FB; Mon, 3 Jun 2024 18:53:29 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Markus Armbruster , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Richard Henderson , John Snow , Mark Cave-Ayland , Peter Maydell , Laurent Vivier , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Paolo Bonzini , qemu-arm@nongnu.org, Joel Stanley , Thomas Huth , =?utf-8?q?Da?= =?utf-8?q?niel_P=2E_Berrang=C3=A9?= , Marcin Juszkiewicz , Aurelien Jarno , Pavel Dovgalyuk , Wainer dos Santos Moschetta , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , Cleber Rosa , Leif Lindholm , qemu-s390x@nongnu.org, Beraldo Leal , Jiaxun Yang , Radoslaw Biernacki Subject: [PATCH v3 06/12] docs/ci: clean-up references for consistency Date: Mon, 3 Jun 2024 18:53:22 +0100 Message-Id: <20240603175328.3823123-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240603175328.3823123-1-alex.bennee@linaro.org> References: <20240603175328.3823123-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x431.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Document we have split up build-environment by distro and update the references that exist in the code base to be correct. Signed-off-by: Alex Bennée Message-Id: <20240529160934.982373-7-alex.bennee@linaro.org> Reviewed-by: Richard Henderson --- docs/devel/ci-runners.rst.inc | 13 ++++++------- .../custom-runners/ubuntu-22.04-aarch32.yml | 2 +- .../custom-runners/ubuntu-22.04-aarch64.yml | 2 +- .gitlab-ci.d/custom-runners/ubuntu-22.04-s390x.yml | 2 +- scripts/ci/setup/{ => ubuntu}/build-environment.yml | 0 5 files changed, 9 insertions(+), 10 deletions(-) rename scripts/ci/setup/{ => ubuntu}/build-environment.yml (100%) diff --git a/docs/devel/ci-runners.rst.inc b/docs/devel/ci-runners.rst.inc index 7817001fb2..67b23d3719 100644 --- a/docs/devel/ci-runners.rst.inc +++ b/docs/devel/ci-runners.rst.inc @@ -41,19 +41,18 @@ those hosts. This would look like:: Build environment ~~~~~~~~~~~~~~~~~ -The ``scripts/ci/setup/build-environment.yml`` Ansible playbook will -set up machines with the environment needed to perform builds and run -QEMU tests. This playbook consists on the installation of various -required packages (and a general package update while at it). It -currently covers a number of different Linux distributions, but it can -be expanded to cover other systems. +The ``scripts/ci/setup/$DISTRO/build-environment.yml`` Ansible +playbook will set up machines with the environment needed to perform +builds and run QEMU tests. This playbook consists on the installation +of various required packages (and a general package update while at +it). The minimum required version of Ansible successfully tested in this playbook is 2.8.0 (a version check is embedded within the playbook itself). To run the playbook, execute:: cd scripts/ci/setup - ansible-playbook -i inventory build-environment.yml + ansible-playbook -i inventory $DISTRO/build-environment.yml Please note that most of the tasks in the playbook require superuser privileges, such as those from the ``root`` account or those obtained diff --git a/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch32.yml b/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch32.yml index b8a0d75162..8727687e2b 100644 --- a/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch32.yml +++ b/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch32.yml @@ -1,5 +1,5 @@ # All ubuntu-22.04 jobs should run successfully in an environment -# setup by the scripts/ci/setup/qemu/build-environment.yml task +# setup by the scripts/ci/setup/ubuntu/build-environment.yml task # "Install basic packages to build QEMU on Ubuntu 22.04" ubuntu-22.04-aarch32-all: diff --git a/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml b/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml index 374b0956c3..263a3c2140 100644 --- a/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml +++ b/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml @@ -1,5 +1,5 @@ # All ubuntu-22.04 jobs should run successfully in an environment -# setup by the scripts/ci/setup/qemu/build-environment.yml task +# setup by the scripts/ci/setup/ubuntu/build-environment.yml task # "Install basic packages to build QEMU on Ubuntu 22.04" ubuntu-22.04-aarch64-all-linux-static: diff --git a/.gitlab-ci.d/custom-runners/ubuntu-22.04-s390x.yml b/.gitlab-ci.d/custom-runners/ubuntu-22.04-s390x.yml index 25935048e2..69ddd3e7d5 100644 --- a/.gitlab-ci.d/custom-runners/ubuntu-22.04-s390x.yml +++ b/.gitlab-ci.d/custom-runners/ubuntu-22.04-s390x.yml @@ -1,5 +1,5 @@ # All ubuntu-22.04 jobs should run successfully in an environment -# setup by the scripts/ci/setup/build-environment.yml task +# setup by the scripts/ci/setup/ubuntu/build-environment.yml task # "Install basic packages to build QEMU on Ubuntu 22.04" ubuntu-22.04-s390x-all-linux: diff --git a/scripts/ci/setup/build-environment.yml b/scripts/ci/setup/ubuntu/build-environment.yml similarity index 100% rename from scripts/ci/setup/build-environment.yml rename to scripts/ci/setup/ubuntu/build-environment.yml From patchwork Mon Jun 3 17:53:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 13684023 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B2A3CC25B75 for ; Mon, 3 Jun 2024 17:56:15 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sEBse-0007DT-Uq; Mon, 03 Jun 2024 13:54:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sEBsJ-0006zf-Hd for qemu-devel@nongnu.org; Mon, 03 Jun 2024 13:53:40 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sEBsF-00008n-2z for qemu-devel@nongnu.org; Mon, 03 Jun 2024 13:53:39 -0400 Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-35dca73095aso3880319f8f.0 for ; Mon, 03 Jun 2024 10:53:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1717437213; x=1718042013; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=WgDjv/yNA+r/3CuM/gO8/vu8/drYzlHihSkbPO1TE7o=; b=t5753XUMbTFw+hSKdA4HaNFXFx3KYwt4ytY3SDbC55yma5FCRVUSZQ0ZBCAPGorkpR g4hdMCxeg4BwD18sYzVDrl1nuwnOYzLfS5oss2CQ+M5S3tK2L5v0kedz+byletTRpr65 SsgcK1xKwMyRfufqdY/rvPVnlx82oWD6cugWnbWTV/QmN2cZ0A0XColf0ECw0oYPrL/e gyJNvLOFOmLDr9euv80MbOE9W7Xv65keG5H2Y5J04SNJSbraLzLFK76Xhq0vAt4iFIco 4AV7gLcK0q7u+mHYU/sz5+lgqNHXgpsKlfdhNezFUUep7HQqWo/88N92VJSCTkaXiPAa im7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717437213; x=1718042013; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WgDjv/yNA+r/3CuM/gO8/vu8/drYzlHihSkbPO1TE7o=; b=OJIbRU+qauaJOUCc5QKPPtF4iX3H26D/+4ZkcnVr/7nu29H6HcfY2qCQb3cbmGwxfo JyiQRIzwSViOp0h9CK7dsBzVg5FwpVt73gug98GfpfKUFS3HVco5TPhGRJYHh7kypwaO 2MdurtybrVFmmQgEAcrm4gWDPJL0KNioTUF5Rv+pVxqd1vPmJHtI8kVaUB0nkWsPmTnY o/bZduvkM1pBLkdojwTGwsOMrNTN0x54S/qGsrbjxa6UL7ftqoKi9CtniEYrNAl/788v JL9mOAbI5md8AnHtLKNkrqciL8QkMmU8yTCxKr0lq7/sjFYSbAKSGzR7iLrGNSJDuIxH k5/g== X-Gm-Message-State: AOJu0YzxLK+ckVxnkC2brC7Y4huJttT62It+McqPuvT6Uf7fNqlruCmE r2R8TX2ndp3Pt7sDTY5xFmka4iEdnVnZnUHZj4gBT+V88D28bIPQmAlH0f1GsiM= X-Google-Smtp-Source: AGHT+IFPMVOs0cZxyUpMZWaqXcWqMLE7CRhMxhhqYX/DOQFE7h+Us9X/uZj47qK5TckI4QVw4nXhDQ== X-Received: by 2002:a05:600c:4753:b0:41a:9fc2:a6b1 with SMTP id 5b1f17b1804b1-4212e075ed3mr85037035e9.22.1717437212889; Mon, 03 Jun 2024 10:53:32 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4212278b24dsm85913135e9.0.2024.06.03.10.53.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Jun 2024 10:53:31 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 327DB5F9FF; Mon, 3 Jun 2024 18:53:29 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Markus Armbruster , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Richard Henderson , John Snow , Mark Cave-Ayland , Peter Maydell , Laurent Vivier , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Paolo Bonzini , qemu-arm@nongnu.org, Joel Stanley , Thomas Huth , =?utf-8?q?Da?= =?utf-8?q?niel_P=2E_Berrang=C3=A9?= , Marcin Juszkiewicz , Aurelien Jarno , Pavel Dovgalyuk , Wainer dos Santos Moschetta , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , Cleber Rosa , Leif Lindholm , qemu-s390x@nongnu.org, Beraldo Leal , Jiaxun Yang , Radoslaw Biernacki Subject: [PATCH v3 07/12] tests/lcitool: Delete obsolete centos-stream-8.yml file Date: Mon, 3 Jun 2024 18:53:23 +0100 Message-Id: <20240603175328.3823123-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240603175328.3823123-1-alex.bennee@linaro.org> References: <20240603175328.3823123-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x430.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Thomas Huth We've missed to delete this file when removing support for CentOS 8. Since the current upstream version of the lcitool removed support for CentOS 8 now, too, we have to remove the file before updating. Signed-off-by: Thomas Huth Reviewed-by: Daniel P. Berrangé Signed-off-by: Alex Bennée Message-Id: <20240601070543.37786-2-thuth@redhat.com> --- tests/lcitool/targets/centos-stream-8.yml | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 tests/lcitool/targets/centos-stream-8.yml diff --git a/tests/lcitool/targets/centos-stream-8.yml b/tests/lcitool/targets/centos-stream-8.yml deleted file mode 100644 index 6b11160fd1..0000000000 --- a/tests/lcitool/targets/centos-stream-8.yml +++ /dev/null @@ -1,3 +0,0 @@ -paths: - pip3: /usr/bin/pip3.8 - python: /usr/bin/python3.8 From patchwork Mon Jun 3 17:53:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 13684022 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 65185C27C50 for ; Mon, 3 Jun 2024 17:56:04 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sEBsc-0007B9-On; Mon, 03 Jun 2024 13:53:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sEBsL-00070M-Vl for qemu-devel@nongnu.org; Mon, 03 Jun 2024 13:53:42 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sEBsH-00009t-7g for qemu-devel@nongnu.org; Mon, 03 Jun 2024 13:53:41 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-42121d27861so1167275e9.0 for ; Mon, 03 Jun 2024 10:53:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1717437215; x=1718042015; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=8KRfXE/oVtlnzDt4+VcBXOC8p+C9OfeddYY4ThUlh64=; b=BB6MK6n1YqKqv9uB5WscHGQ0SaLj/vATi5ZC24gilyxpSrDC6NiV/hN2WWZeqw+h0A F9Pw038Cw39oE+2NrXoNjJlRgCQFqkldjUlgyLhSyEy79D0kiAmhvnm0kRI2tpF7p9fh asUXLrqmJpLTfSKuSzMBw01lkzaqQzy/KtRH+jNERnLKCIJ0/AgFvyyVjOCFgUk4nkb0 0fhqCUV3ZFLUwYgWe+Urd0MYK8P0KwSiDjwe/t2G5kF75CGyvsqR7Ep3IrH08TcIT/6k EtpBl93egESRnDTwNddw3blDNtfj7/pXHyhCW5rJ7fuKD0F+CKR6ishbkKOdM5oh+gcc Up9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717437215; x=1718042015; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8KRfXE/oVtlnzDt4+VcBXOC8p+C9OfeddYY4ThUlh64=; b=nUfHdl5DjoJkWt140jAii7V6GTjMv+86Uiw8dkER3ZhKnzsX8xmvOBn02UYsqeA5W5 Auqac9zKYr8J3TFcAadwGC3UYScm4MGo763/1fvVZlGmx8T/k25v1BRW1+KrPXaiovS/ XhV1Svtn9cDfF9MSNVx5SPvWvHMwgG5knG3eGlHk56bkgduEQXEuGfhXh1e9P4ojeN65 f7ZcceRxwMBGKmbM1jMvuRNgfNBO+QRvJb2cNDRE9MUpiD9mxNHl9RUuxpXtg7xDLnbd OuUJufqsfPq7IrPVb94cZV5FNbq1psOiGKl5Mgj7ulqk97s2vDYUX8vG/VbL/UuMm5CC m4gA== X-Gm-Message-State: AOJu0YyWbM5OIOrHWi7pS2DQRxqv5qAtvoK8I14SbK8+kc1VOoWzhDej RmzzAUePWrXvMI0JN8g3j8kQnIYeKic9loDVovnAFurBOctA9fTW/zeQU12L7Mc= X-Google-Smtp-Source: AGHT+IGyZdIQEfHdp9u5swINaBBzgo8dcyRSI6VfEevC4uMYiFPOA4JifExa5rRMj86gHWFySSotOg== X-Received: by 2002:a05:600c:474a:b0:41b:285:8417 with SMTP id 5b1f17b1804b1-4212e0be702mr69738275e9.40.1717437215050; Mon, 03 Jun 2024 10:53:35 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4212b85c628sm125954845e9.25.2024.06.03.10.53.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Jun 2024 10:53:31 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 47C145FA01; Mon, 3 Jun 2024 18:53:29 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Markus Armbruster , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Richard Henderson , John Snow , Mark Cave-Ayland , Peter Maydell , Laurent Vivier , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Paolo Bonzini , qemu-arm@nongnu.org, Joel Stanley , Thomas Huth , =?utf-8?q?Da?= =?utf-8?q?niel_P=2E_Berrang=C3=A9?= , Marcin Juszkiewicz , Aurelien Jarno , Pavel Dovgalyuk , Wainer dos Santos Moschetta , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , Cleber Rosa , Leif Lindholm , qemu-s390x@nongnu.org, Beraldo Leal , Jiaxun Yang , Radoslaw Biernacki Subject: [PATCH v3 08/12] .gitlab-ci.d/buildtest.yml: Use -fno-sanitize=function in the clang-system job Date: Mon, 3 Jun 2024 18:53:24 +0100 Message-Id: <20240603175328.3823123-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240603175328.3823123-1-alex.bennee@linaro.org> References: <20240603175328.3823123-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x329.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Thomas Huth The latest version of Clang (version 18 from Fedora 40) now reports bad function pointer casts as undefined behavior. Unfortunately, we are still doing this in quite a lot of places in the QEMU code and some of them are not easy to fix. So for the time being, temporarily switch this off in the failing clang-system job until all spots in the QEMU sources have been tackled. Signed-off-by: Thomas Huth Reviewed-by: Daniel P. Berrangé Message-Id: <20240601070543.37786-4-thuth@redhat.com> Signed-off-by: Alex Bennée --- .gitlab-ci.d/buildtest.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index 91c57efded..0eec570310 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -432,6 +432,7 @@ clang-system: IMAGE: fedora CONFIGURE_ARGS: --cc=clang --cxx=clang++ --extra-cflags=-fsanitize=undefined --extra-cflags=-fno-sanitize-recover=undefined + --extra-cflags=-fno-sanitize=function TARGETS: alpha-softmmu arm-softmmu m68k-softmmu mips64-softmmu s390x-softmmu MAKE_CHECK_ARGS: check-qtest check-tcg From patchwork Mon Jun 3 17:53:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 13684020 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 09C04C27C52 for ; Mon, 3 Jun 2024 17:55:49 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sEBsg-0007EV-Ks; Mon, 03 Jun 2024 13:54:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sEBsN-00072p-RC for qemu-devel@nongnu.org; Mon, 03 Jun 2024 13:53:44 -0400 Received: from mail-lj1-x234.google.com ([2a00:1450:4864:20::234]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sEBsH-0000AT-SY for qemu-devel@nongnu.org; Mon, 03 Jun 2024 13:53:43 -0400 Received: by mail-lj1-x234.google.com with SMTP id 38308e7fff4ca-2eaa794eb9fso29804011fa.2 for ; Mon, 03 Jun 2024 10:53:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1717437216; x=1718042016; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=evivfxd//u248pB/wuxxX0v0kMcuc3vdhqbsfwPCZNI=; b=RyXIO6Y5e8KhEzltBeuuoMCmSYoE9Mcpemgqc9teOOt6z6Mr9ioGH8nOnl42JieRfe fIZNEb1gQJ1LwvcRv4wDxam/aVvIj27ufdV2TMwr71igV0F9bIgayhD3J+abXx6QwVMy uVFAtxEVmcQ/HFJUODFwMTd0tL6/WQfdOkeUKST7oA/3DGBlFxdhHtC70AEsBPskUa4P Drj8gC1/CAc4+wkc3czi8lNwwe1xjE7mRoxE5L8rv/TDzzZDfgBDB8xAV+kCqA5U9K39 vibq8h7/3wnPWQHyaL3Ih/JQolNbHifNdXgdu7zNDjRkxQ5VufGYqFoHv8NzB9Kbn2OJ hMnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717437216; x=1718042016; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=evivfxd//u248pB/wuxxX0v0kMcuc3vdhqbsfwPCZNI=; b=U+R1BVHI98I7+2690t01Xs8f8ZNQ3R5fAm72C5krwsA8heXaPMZpj0MGZtnVXc5hVF wxd1uVTlFiNM/vgodSsr5YHw5EX9oMuuVnnUGAa+5hKnUF2ylQXWi3h2bpyIATZwUnDD NSg2a88BSTiNhShbLAE0OSFTbOSM1BxbeomDoq6P+cUFNil7K+tn56Za9LjMQC2/MWTT W+oBVtAD5b+PjscsRc0bdew0ojrhlciTbf6EcvU3SnVza7+CdzWFHqRYcXX0gBcVAxpv USh+EQig+Dg4BERMPYKFl82zOntKQg+61q8WV8FIy+gR20/rZRZBQ6zwrM2YEphTICwT iLAg== X-Gm-Message-State: AOJu0YwU1d4jZhNAh+hQeQd0LZASN8wzMbMkw5NYFFV0zecU5CISEa3W ZbZWHJgbCXYwv0fMJYdVPiqW4bzky/QVm4NdShL+n9ZYxyOfWSnHR7zHBZa03bA= X-Google-Smtp-Source: AGHT+IFEIfuFuMp1xHbLpdG8zfFz9rbX1l/B55wAXshfTwRuhblQvD4KXsTwkty8ro1cRvZSpevneA== X-Received: by 2002:a05:651c:1504:b0:2ea:b956:db2b with SMTP id 38308e7fff4ca-2eab956e51amr10220441fa.7.1717437215945; Mon, 03 Jun 2024 10:53:35 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-35dd04d943esm9298741f8f.47.2024.06.03.10.53.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Jun 2024 10:53:34 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 67B055FA03; Mon, 3 Jun 2024 18:53:29 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Markus Armbruster , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Richard Henderson , John Snow , Mark Cave-Ayland , Peter Maydell , Laurent Vivier , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Paolo Bonzini , qemu-arm@nongnu.org, Joel Stanley , Thomas Huth , =?utf-8?q?Da?= =?utf-8?q?niel_P=2E_Berrang=C3=A9?= , Marcin Juszkiewicz , Aurelien Jarno , Pavel Dovgalyuk , Wainer dos Santos Moschetta , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , Cleber Rosa , Leif Lindholm , qemu-s390x@nongnu.org, Beraldo Leal , Jiaxun Yang , Radoslaw Biernacki Subject: [PATCH v3 09/12] tests/lcitool: Bump to latest libvirt-ci and update Fedora and Alpine version Date: Mon, 3 Jun 2024 18:53:25 +0100 Message-Id: <20240603175328.3823123-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240603175328.3823123-1-alex.bennee@linaro.org> References: <20240603175328.3823123-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::234; envelope-from=alex.bennee@linaro.org; helo=mail-lj1-x234.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Thomas Huth Update to the latest version of lcitool. It dropped support for Fedora 38 and Alpine 3.18, so we have to update these to newer versions here, too. Python 3.12 dropped the "imp" module which we still need for running Avocado. Fortunately Fedora 40 still ships with a work-around package that we can use until somebody updates our Avocado to a newer version. Signed-off-by: Thomas Huth Message-Id: <20240601070543.37786-3-thuth@redhat.com> [AJB: regen on rebase] Signed-off-by: Alex Bennée Reviewed-by: Daniel P. Berrangé --- tests/docker/dockerfiles/alpine.docker | 4 ++-- tests/docker/dockerfiles/fedora-win64-cross.docker | 5 +++-- tests/docker/dockerfiles/fedora.docker | 5 +++-- tests/lcitool/libvirt-ci | 2 +- tests/lcitool/projects/qemu.yml | 1 + tests/lcitool/refresh | 6 +++--- 6 files changed, 13 insertions(+), 10 deletions(-) diff --git a/tests/docker/dockerfiles/alpine.docker b/tests/docker/dockerfiles/alpine.docker index 554464f31e..b079a83fe2 100644 --- a/tests/docker/dockerfiles/alpine.docker +++ b/tests/docker/dockerfiles/alpine.docker @@ -1,10 +1,10 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile --layers all alpine-318 qemu +# $ lcitool dockerfile --layers all alpine-319 qemu # # https://gitlab.com/libvirt/libvirt-ci -FROM docker.io/library/alpine:3.18 +FROM docker.io/library/alpine:3.19 RUN apk update && \ apk upgrade && \ diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker b/tests/docker/dockerfiles/fedora-win64-cross.docker index 0f78711876..fef846d5a6 100644 --- a/tests/docker/dockerfiles/fedora-win64-cross.docker +++ b/tests/docker/dockerfiles/fedora-win64-cross.docker @@ -1,10 +1,10 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile --layers all --cross-arch mingw64 fedora-38 qemu,qemu-win-installer +# $ lcitool dockerfile --layers all --cross-arch mingw64 fedora-40 qemu,qemu-win-installer # # https://gitlab.com/libvirt/libvirt-ci -FROM registry.fedoraproject.org/fedora:38 +FROM registry.fedoraproject.org/fedora:40 RUN dnf install -y nosync && \ printf '#!/bin/sh\n\ @@ -51,6 +51,7 @@ exec "$@"\n' > /usr/bin/nosync && \ python3-pip \ python3-sphinx \ python3-sphinx_rtd_theme \ + python3-zombie-imp \ sed \ socat \ sparse \ diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker index 098c894d10..44f239c088 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -1,10 +1,10 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile --layers all fedora-38 qemu +# $ lcitool dockerfile --layers all fedora-40 qemu # # https://gitlab.com/libvirt/libvirt-ci -FROM registry.fedoraproject.org/fedora:38 +FROM registry.fedoraproject.org/fedora:40 RUN dnf install -y nosync && \ printf '#!/bin/sh\n\ @@ -110,6 +110,7 @@ exec "$@"\n' > /usr/bin/nosync && \ python3-pip \ python3-sphinx \ python3-sphinx_rtd_theme \ + python3-zombie-imp \ rdma-core-devel \ sed \ snappy-devel \ diff --git a/tests/lcitool/libvirt-ci b/tests/lcitool/libvirt-ci index cec6703971..0e9490cebc 160000 --- a/tests/lcitool/libvirt-ci +++ b/tests/lcitool/libvirt-ci @@ -1 +1 @@ -Subproject commit cec67039719becbfbab866f9c23574f389cf9559 +Subproject commit 0e9490cebc726ef772b6c9e27dac32e7ae99f9b2 diff --git a/tests/lcitool/projects/qemu.yml b/tests/lcitool/projects/qemu.yml index 7511ec7ccb..070d7f4706 100644 --- a/tests/lcitool/projects/qemu.yml +++ b/tests/lcitool/projects/qemu.yml @@ -89,6 +89,7 @@ packages: - pkg-config - pulseaudio - python3 + - python3-imp - python3-numpy - python3-opencv - python3-pillow diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index 789acefb75..9d8e9c6a4a 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -124,11 +124,11 @@ try: # # Standard native builds # - generate_dockerfile("alpine", "alpine-318") + generate_dockerfile("alpine", "alpine-319") generate_dockerfile("centos9", "centos-stream-9") generate_dockerfile("debian", "debian-12", trailer="".join(debian12_extras)) - generate_dockerfile("fedora", "fedora-38") + generate_dockerfile("fedora", "fedora-40") generate_dockerfile("opensuse-leap", "opensuse-leap-15") generate_dockerfile("ubuntu2204", "ubuntu-2204") @@ -191,7 +191,7 @@ try: trailer=cross_build("s390x-linux-gnu-", "s390x-softmmu,s390x-linux-user")) - generate_dockerfile("fedora-win64-cross", "fedora-38", + generate_dockerfile("fedora-win64-cross", "fedora-40", project='qemu,qemu-win-installer', cross="mingw64", trailer=cross_build("x86_64-w64-mingw32-", From patchwork Mon Jun 3 17:53:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 13684015 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0C474C25B75 for ; Mon, 3 Jun 2024 17:55:27 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sEBsj-0007Fx-2L; Mon, 03 Jun 2024 13:54:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sEBsM-00071s-Hc for qemu-devel@nongnu.org; Mon, 03 Jun 2024 13:53:43 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sEBsH-0000AZ-OD for qemu-devel@nongnu.org; Mon, 03 Jun 2024 13:53:42 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-4213870aafdso15695975e9.2 for ; Mon, 03 Jun 2024 10:53:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1717437216; x=1718042016; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=AFaKUTfBSK0eVS/N0Uc1O+6+nD/libyZ4Mtl7cP6jYI=; b=ZbDQSmzQtzbfiZsrk+INYd3TcAf5+tdri73YD79dD6cOhXRZzI3yPYr+Fx4/SxWS7S VCLwjjDny2T4Dwn55/3WhXrFoYpUkvEY6YJ6EUSa8IV2fNAM58syjWzCgd2/02xDk7x3 crMMm/zQ9YXMeeSaJjIzWO/di7iXVnlLxcN32/2sKQq5A2bpYWc9EerwjCIgghszP4b9 hCy08R57lL0mBDyb6U6R8hbqoWK18a6kIe8EP7ikbFuS3AsKZd4NMFpijiaStIHh32NM bmIZ1iCsukwHVvOO0ubyxnk7L26WHO7hHHAA3lRd5mNXIzflN+u/bp/Q3quOYckcullU 58+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717437216; x=1718042016; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=AFaKUTfBSK0eVS/N0Uc1O+6+nD/libyZ4Mtl7cP6jYI=; b=DO5BOOF6cB7YDBWJKi6Jb7aaUu88fmuk6UT8BVDoZUkYgODlMaDM442TVHXpTADdd8 +Io0CSya2/MLi7g4sBorhDWkBFctpBconW6oX59JWAYR/IVubvt+o+q36suu1jQS6NTU cx5igNLBMpESNxNLKvNPXxBICXAQQwgs5Y2eMFu4QAo6txcSzsp1MXOb1904oIavAvOI PpG0jqoV9J/3WcElg0iYR2ylWJ/6JwVfiGvTUFIcFfdSEH9WIpedn5crIgxVja7hzaSS 7//kCuSqdDf97CMsOcwXpSd6zRvamtVd5UlybDHUnJPprgZq9qIhVcUCvVz7560xqRNh YJ8A== X-Gm-Message-State: AOJu0Yz2DQGVzitcAgzpR0lXX/daai+f7ZPgBEZmmAO+xM0A7CLD/xAE BEESdCX0lUeMdh0bUhzEsSYoa1ccmhFQH0rorrCBaDU5VNwhRkyDerseabl7W3s= X-Google-Smtp-Source: AGHT+IGJ3d3VfeM+Is02YniLVEFdmHcxCkWqQZJ6ljo9qo6IZphHJypRuEp9FZJCkdKTwUQCkAMQcQ== X-Received: by 2002:a05:600c:34d2:b0:420:177f:c2a6 with SMTP id 5b1f17b1804b1-4212e049938mr98414825e9.10.1717437216208; Mon, 03 Jun 2024 10:53:36 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4212f05157esm113652885e9.20.2024.06.03.10.53.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Jun 2024 10:53:35 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 86CAA5FA06; Mon, 3 Jun 2024 18:53:29 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Markus Armbruster , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Richard Henderson , John Snow , Mark Cave-Ayland , Peter Maydell , Laurent Vivier , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Paolo Bonzini , qemu-arm@nongnu.org, Joel Stanley , Thomas Huth , =?utf-8?q?Da?= =?utf-8?q?niel_P=2E_Berrang=C3=A9?= , Marcin Juszkiewicz , Aurelien Jarno , Pavel Dovgalyuk , Wainer dos Santos Moschetta , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , Cleber Rosa , Leif Lindholm , qemu-s390x@nongnu.org, Beraldo Leal , Jiaxun Yang , Radoslaw Biernacki Subject: [PATCH v3 10/12] tests/lcitool: Install mingw-w64-tools for the Windows cross-builds Date: Mon, 3 Jun 2024 18:53:26 +0100 Message-Id: <20240603175328.3823123-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240603175328.3823123-1-alex.bennee@linaro.org> References: <20240603175328.3823123-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Thomas Huth Beside g++ we also need the mingw-w64-tools for properly building the code in qga/vss-win32/ , so let's install that package now, too. Signed-off-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé Message-Id: <20240601070543.37786-5-thuth@redhat.com> Signed-off-by: Alex Bennée --- tests/docker/dockerfiles/fedora-win64-cross.docker | 1 + tests/lcitool/projects/qemu-win-installer.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker b/tests/docker/dockerfiles/fedora-win64-cross.docker index fef846d5a6..007e1574bd 100644 --- a/tests/docker/dockerfiles/fedora-win64-cross.docker +++ b/tests/docker/dockerfiles/fedora-win64-cross.docker @@ -75,6 +75,7 @@ ENV NINJA "/usr/bin/ninja" ENV PYTHON "/usr/bin/python3" RUN nosync dnf install -y \ + mingw-w64-tools \ mingw32-nsis \ mingw64-SDL2 \ mingw64-SDL2_image \ diff --git a/tests/lcitool/projects/qemu-win-installer.yml b/tests/lcitool/projects/qemu-win-installer.yml index 86aa22297c..f3663ba030 100644 --- a/tests/lcitool/projects/qemu-win-installer.yml +++ b/tests/lcitool/projects/qemu-win-installer.yml @@ -2,3 +2,4 @@ --- packages: - g++ + - mingw-w64-tools From patchwork Mon Jun 3 17:53:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 13684014 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 172BDC25B75 for ; Mon, 3 Jun 2024 17:54:59 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sEBsl-0007GA-Dl; Mon, 03 Jun 2024 13:54:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sEBsO-00073N-CY for qemu-devel@nongnu.org; Mon, 03 Jun 2024 13:53:44 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sEBsI-0000Ah-My for qemu-devel@nongnu.org; Mon, 03 Jun 2024 13:53:44 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-4213be171f7so11872165e9.1 for ; Mon, 03 Jun 2024 10:53:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1717437216; x=1718042016; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=HIzCyX4xIjrq6sBxyigWjJ7BCO7E5yzjy9rsvsoeno4=; b=HF1cvBGiX2cLU04n3PFQKz6W/HnMPbEByumjQRUBLQyu0cX2vI7xnascXH4q5ryLni I92cSxsJ0a8XZokrWEZ4d8iTOnQOaI8rYHGQpPzWfyNvazSUcjRQ1e8ep9gq5otEWoCd KnfuEREX5RAyLrUyxI/oH5QGfL+ze1XLUm618F0JRhbfWWorAqcIYhJP2aQ+09O9Gg2v d/PUBkJFDmSvsekD/acH3DH/+FeqB51QnjppVM/4JjfHRlS+tJ1rXUkRI4FM73EoI6V4 RIqjE7N8jJPUI7mGJZGCjessxZNJsZDYpOSMWfgflpClOWY9D2156UrM6VKTFBbBhyFG bFZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717437216; x=1718042016; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=HIzCyX4xIjrq6sBxyigWjJ7BCO7E5yzjy9rsvsoeno4=; b=N5euOZaBncg6nUCQV5s8PwwjfXFL83oLWjcc/JHp8i9937S/mWFvonyQlltJOdrVN8 RCPYkWcuixCKFp/INwviyZgQ5jjfKjjarrWjey75iZ+Qi95QxuRRFzsQSjKkRUqKaUHV MUZeUHDidZAwCRzslxHM55Nx8j4O9uUVsPSCtzN2ND8CFJC1aIcCcXAG1sArKz2O2m6Y 7lbmDjmyDw3I1H6Vf6DoT/+jFoAd3fL17NkuU3X/sup3BwekDe+fnSbOyOto4YuVz03n 1J38lM/yO+Gzgc4Wz1r/PqI+IYPY7cUJc6PjVBVcByIwkPFQwLrdPdX/Ckq05ND4ms8f jdmQ== X-Gm-Message-State: AOJu0YxoJRqI80o1wodMom24xU3pUBne99c+qMx7XCL520X7oj3WVN4w f72eztzUm2OuFhgTWdg9BiE3Yn8lgt+DxHNSkRxoElenZFcjjkLSurxKV2+niPc= X-Google-Smtp-Source: AGHT+IGeiq+yI1U1Qmg3quyk2xcq1qfdn6t34VX2RF18OBybD/GzNnBRb9pt+SlgOKOxfrGzoPi+ow== X-Received: by 2002:adf:ef11:0:b0:35d:bf85:6c23 with SMTP id ffacd0b85a97d-35e0f30a565mr6048827f8f.43.1717437216449; Mon, 03 Jun 2024 10:53:36 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-35dd04d954fsm9279647f8f.52.2024.06.03.10.53.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Jun 2024 10:53:35 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id A5FD55F860; Mon, 3 Jun 2024 18:53:29 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Markus Armbruster , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Richard Henderson , John Snow , Mark Cave-Ayland , Peter Maydell , Laurent Vivier , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Paolo Bonzini , qemu-arm@nongnu.org, Joel Stanley , Thomas Huth , =?utf-8?q?Da?= =?utf-8?q?niel_P=2E_Berrang=C3=A9?= , Marcin Juszkiewicz , Aurelien Jarno , Pavel Dovgalyuk , Wainer dos Santos Moschetta , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , Cleber Rosa , Leif Lindholm , qemu-s390x@nongnu.org, Beraldo Leal , Jiaxun Yang , Radoslaw Biernacki Subject: [PATCH v3 11/12] tests/lcitool: generate package lists for ansible Date: Mon, 3 Jun 2024 18:53:27 +0100 Message-Id: <20240603175328.3823123-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240603175328.3823123-1-alex.bennee@linaro.org> References: <20240603175328.3823123-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org With the new ability to output YAML we can build the package list for our ansible setup scripts. We will integrate them in the next commit. Signed-off-by: Alex Bennée Message-Id: <20240529160934.982373-9-alex.bennee@linaro.org> --- v2 - MR now merged into libvirt-ci --- .../ci/setup/ubuntu/ubuntu-2204-aarch64.yaml | 127 ++++++++++++++++++ .../setup/ubuntu/ubuntu-2204-armhf-cross.yml | 127 ++++++++++++++++++ .../ci/setup/ubuntu/ubuntu-2204-s390x.yaml | 125 +++++++++++++++++ tests/lcitool/refresh | 16 ++- 4 files changed, 394 insertions(+), 1 deletion(-) create mode 100644 scripts/ci/setup/ubuntu/ubuntu-2204-aarch64.yaml create mode 100644 scripts/ci/setup/ubuntu/ubuntu-2204-armhf-cross.yml create mode 100644 scripts/ci/setup/ubuntu/ubuntu-2204-s390x.yaml diff --git a/scripts/ci/setup/ubuntu/ubuntu-2204-aarch64.yaml b/scripts/ci/setup/ubuntu/ubuntu-2204-aarch64.yaml new file mode 100644 index 0000000000..8d7d8725fb --- /dev/null +++ b/scripts/ci/setup/ubuntu/ubuntu-2204-aarch64.yaml @@ -0,0 +1,127 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool variables --host-arch aarch64 ubuntu-2204 qemu +# +# https://gitlab.com/libvirt/libvirt-ci + +packages: + - bash + - bc + - bison + - bsdextrautils + - bzip2 + - ca-certificates + - ccache + - clang + - dbus + - debianutils + - diffutils + - exuberant-ctags + - findutils + - flex + - gcc + - gcovr + - gettext + - git + - hostname + - libaio-dev + - libasan6 + - 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 + - libfuse3-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 + - libpipewire-0.3-dev + - libpixman-1-dev + - libpng-dev + - libpulse-dev + - librbd-dev + - librdmacm-dev + - libsasl2-dev + - libsdl2-dev + - libsdl2-image-dev + - libseccomp-dev + - libselinux1-dev + - libslirp-dev + - libsnappy-dev + - libsndio-dev + - libspice-protocol-dev + - libspice-server-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 + - libxen-dev + - libzstd-dev + - llvm + - locales + - make + - meson + - mtools + - 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-tomli + - python3-venv + - python3-yaml + - rpm2cpio + - sed + - socat + - sparse + - swtpm + - systemtap-sdt-dev + - tar + - tesseract-ocr + - tesseract-ocr-eng + - xorriso + - zlib1g-dev + - zstd + diff --git a/scripts/ci/setup/ubuntu/ubuntu-2204-armhf-cross.yml b/scripts/ci/setup/ubuntu/ubuntu-2204-armhf-cross.yml new file mode 100644 index 0000000000..0cc34cd10b --- /dev/null +++ b/scripts/ci/setup/ubuntu/ubuntu-2204-armhf-cross.yml @@ -0,0 +1,127 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool variables --cross-arch armv7l ubuntu-2204 qemu +# +# https://gitlab.com/libvirt/libvirt-ci + +packages: + - bash + - bc + - bison + - bsdextrautils + - bzip2 + - ca-certificates + - ccache + - dbus + - debianutils + - diffutils + - exuberant-ctags + - findutils + - flex + - gcc + - gcovr + - gettext + - git + - hostname + - libglib2.0-dev + - libpcre2-dev + - libsndio-dev + - libspice-protocol-dev + - llvm + - locales + - make + - meson + - mtools + - ncat + - ninja-build + - openssh-client + - pkgconf + - python3 + - python3-numpy + - python3-opencv + - python3-pillow + - python3-pip + - python3-sphinx + - python3-sphinx-rtd-theme + - python3-tomli + - python3-venv + - python3-yaml + - rpm2cpio + - sed + - socat + - sparse + - swtpm + - tar + - tesseract-ocr + - tesseract-ocr-eng + - xorriso + - zstd + - gcc-arm-linux-gnueabihf + - libaio-dev:armhf + - libasan6:armhf + - libasound2-dev:armhf + - libattr1-dev:armhf + - libbpf-dev:armhf + - libbrlapi-dev:armhf + - libbz2-dev:armhf + - libc6-dev:armhf + - libcacard-dev:armhf + - libcap-ng-dev:armhf + - libcapstone-dev:armhf + - libcmocka-dev:armhf + - libcurl4-gnutls-dev:armhf + - libdaxctl-dev:armhf + - libdrm-dev:armhf + - libepoxy-dev:armhf + - libfdt-dev:armhf + - libffi-dev:armhf + - libfuse3-dev:armhf + - libgbm-dev:armhf + - libgcrypt20-dev:armhf + - libglib2.0-dev:armhf + - libglusterfs-dev:armhf + - libgnutls28-dev:armhf + - libgtk-3-dev:armhf + - libibumad-dev:armhf + - libibverbs-dev:armhf + - libiscsi-dev:armhf + - libjemalloc-dev:armhf + - libjpeg-turbo8-dev:armhf + - libjson-c-dev:armhf + - liblttng-ust-dev:armhf + - liblzo2-dev:armhf + - libncursesw5-dev:armhf + - libnfs-dev:armhf + - libnuma-dev:armhf + - libpam0g-dev:armhf + - libpipewire-0.3-dev:armhf + - libpixman-1-dev:armhf + - libpng-dev:armhf + - libpulse-dev:armhf + - librbd-dev:armhf + - librdmacm-dev:armhf + - libsasl2-dev:armhf + - libsdl2-dev:armhf + - libsdl2-image-dev:armhf + - libseccomp-dev:armhf + - libselinux1-dev:armhf + - libslirp-dev:armhf + - libsnappy-dev:armhf + - libspice-server-dev:armhf + - libssh-dev:armhf + - libsystemd-dev:armhf + - libtasn1-6-dev:armhf + - libubsan1:armhf + - libudev-dev:armhf + - liburing-dev:armhf + - libusb-1.0-0-dev:armhf + - libusbredirhost-dev:armhf + - libvdeplug-dev:armhf + - libvirglrenderer-dev:armhf + - libvte-2.91-dev:armhf + - libxen-dev:armhf + - libzstd-dev:armhf + - nettle-dev:armhf + - systemtap-sdt-dev:armhf + - zlib1g-dev:armhf + diff --git a/scripts/ci/setup/ubuntu/ubuntu-2204-s390x.yaml b/scripts/ci/setup/ubuntu/ubuntu-2204-s390x.yaml new file mode 100644 index 0000000000..16050a5058 --- /dev/null +++ b/scripts/ci/setup/ubuntu/ubuntu-2204-s390x.yaml @@ -0,0 +1,125 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool variables --host-arch s390x ubuntu-2204 qemu +# +# https://gitlab.com/libvirt/libvirt-ci + +packages: + - bash + - bc + - bison + - bsdextrautils + - bzip2 + - ca-certificates + - ccache + - clang + - dbus + - debianutils + - diffutils + - exuberant-ctags + - findutils + - flex + - gcc + - gcovr + - gettext + - git + - hostname + - libaio-dev + - libasan6 + - 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 + - libfuse3-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 + - libpipewire-0.3-dev + - libpixman-1-dev + - libpng-dev + - libpulse-dev + - librbd-dev + - librdmacm-dev + - libsasl2-dev + - libsdl2-dev + - libsdl2-image-dev + - libseccomp-dev + - libselinux1-dev + - libslirp-dev + - libsnappy-dev + - libsndio-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 + - libzstd-dev + - llvm + - locales + - make + - meson + - mtools + - 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-tomli + - python3-venv + - python3-yaml + - rpm2cpio + - sed + - socat + - sparse + - swtpm + - systemtap-sdt-dev + - tar + - tesseract-ocr + - tesseract-ocr-eng + - xorriso + - zlib1g-dev + - zstd + diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index 9d8e9c6a4a..b25e3ac4dd 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -80,7 +80,7 @@ def generate_dockerfile(host, target, project="qemu", cross=None, trailer=None): def generate_cirrus(target, trailer=None): filename = Path(src_dir, ".gitlab-ci.d", "cirrus", target + ".vars") - cmd = lcitool_cmd + ["variables", target, "qemu"] + cmd = lcitool_cmd + ["variables", "--format", "shell", target, "qemu"] generate(filename, cmd, trailer) @@ -90,6 +90,13 @@ def generate_pkglist(vm, target): generate(filename, cmd, None) +def generate_yaml(os, target, arch, trailer=None): + filename = Path(src_dir, "scripts", "ci", "setup", os, f"{target}-{arch}.yaml") + cmd = lcitool_cmd + ["variables", "--format", "yaml", "-a", + arch, target, "qemu"] + generate(filename, cmd, trailer) + + # Netmap still needs to be manually built as it is yet to be packaged # into a distro. We also add cscope and gtags which are used in the CI # test @@ -209,6 +216,13 @@ try: # generate_pkglist("freebsd", "freebsd-13") + # + # Ansible package lists + # + generate_yaml("ubuntu", "ubuntu-2204", "aarch64") + generate_yaml("ubuntu", "ubuntu-2204", "s390x") + + sys.exit(0) except Exception as ex: print(str(ex), file=sys.stderr) From patchwork Mon Jun 3 17:53:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 13684018 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1442DC27C50 for ; Mon, 3 Jun 2024 17:55:49 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sEBse-0007DE-Tv; Mon, 03 Jun 2024 13:54:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sEBsQ-00074K-7O for qemu-devel@nongnu.org; Mon, 03 Jun 2024 13:53:46 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sEBsK-0000CF-87 for qemu-devel@nongnu.org; Mon, 03 Jun 2024 13:53:45 -0400 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-4212f0444efso1036005e9.1 for ; Mon, 03 Jun 2024 10:53:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1717437219; x=1718042019; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=eyETGJ7FAfbleq050QORjF2RnGfBN+QWuLIy+JDRMVY=; b=B9WqJp7T5qewCUqi19y/YaV+ywFqQWyX3UK/Blp0V676VWR02k+sPCvlYgAsXu0fHs vkAhawMpk4gY7RM1Y9IKESfbTVR3eXFJgguv3EHJ4RLkFTXrFu6mbi6RNp5XMDv25y1C hBVgvQaVfpP/iGQ3Qllg6duSlWfJ2OyFSI7VmfGSBRr6+FZ2TpgKYmjHAqe/9oy15NM6 LtJ7PFmfWt4plzEeYBEY/zYujxFfF/gg20NDaip2EQ3NBAwtkOzQTgr4RRCh2xPv1Hhh CRBRvhbAUHn+jBraVsqbi1Lgf4JDTDTukQ00pniVGknuc1zKoYrIa4riMG/0UrbBXCYq /J7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717437219; x=1718042019; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=eyETGJ7FAfbleq050QORjF2RnGfBN+QWuLIy+JDRMVY=; b=Iiv3+PvodorO3BSRJCLLwsyhOebfD/f2afPCpf360dfBUSni6HR6i6xVNs3+zDURbe mK7B4Xd94U0Q4m2FDEBx5U9N1s579bW0CVXD5uhHpQFZM0F0O7+FyRfsheH+8HhKGzU7 FI4x1WtHgTnXL9Mby0K7MULTFvpYFZZa+D0hv0EBMNRY0tBi2X9ffxo6AmQ97sPOZGWB G/+xJSV79AdkLVDEkcBRHtiBTTP4JP730yGEKeGdFe+he28UEZLx0/KucpXcGQjznRwe xbQn1VJhufuUhI/cSE2lWtYZyWKbAeBSPFx9qML3o0uBoEakZYCb/horCb+qbqvcuKGL er8A== X-Gm-Message-State: AOJu0Yx5HVrW0kNvIfNp3jk8uoPOqQ+LzhpQjQ1YtActAQKzEWUbFjjp i8YScEvubQP9plGsBNNfWoCACcw+16eJikN1Vq9T7pzDDBNhrv/F9B9cHL2HwNs= X-Google-Smtp-Source: AGHT+IEyp+ZrDRNNl/KP8P+0KowrfxCqSN2VJeEl+AQYVMYb3ZClGVFJFksOCYAbPlWBeetPd4V1Rw== X-Received: by 2002:a5d:68cf:0:b0:354:f92f:fd00 with SMTP id ffacd0b85a97d-35e0f30c6b5mr6594420f8f.52.1717437218915; Mon, 03 Jun 2024 10:53:38 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-35dd04d9c89sm9324185f8f.60.2024.06.03.10.53.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Jun 2024 10:53:35 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id C10975FA08; Mon, 3 Jun 2024 18:53:29 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Markus Armbruster , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Richard Henderson , John Snow , Mark Cave-Ayland , Peter Maydell , Laurent Vivier , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Paolo Bonzini , qemu-arm@nongnu.org, Joel Stanley , Thomas Huth , =?utf-8?q?Da?= =?utf-8?q?niel_P=2E_Berrang=C3=A9?= , Marcin Juszkiewicz , Aurelien Jarno , Pavel Dovgalyuk , Wainer dos Santos Moschetta , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , Cleber Rosa , Leif Lindholm , qemu-s390x@nongnu.org, Beraldo Leal , Jiaxun Yang , Radoslaw Biernacki Subject: [PATCH v3 12/12] scripts/ci: drive ubuntu/build-environment.yml from lcitool Date: Mon, 3 Jun 2024 18:53:28 +0100 Message-Id: <20240603175328.3823123-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240603175328.3823123-1-alex.bennee@linaro.org> References: <20240603175328.3823123-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x336.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.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 Message-Id: <20240529160934.982373-10-alex.bennee@linaro.org> --- scripts/ci/setup/ubuntu/build-environment.yml | 131 +----------------- 1 file changed, 7 insertions(+), 124 deletions(-) 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'