From patchwork Tue May 21 12:53:11 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: 797962 Delivered-To: patch@linaro.org Received: by 2002:adf:e68e:0:b0:351:d90a:5487 with SMTP id r14csp2369737wrm; Tue, 21 May 2024 05:54:16 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWOs0qbZRdaCam/wakAmILOpeodOFuYxIHMVt36GKoMuCFL5txbL9UNNm5hcK/J1SrdHZECABuJ3a6IFPpSard6 X-Google-Smtp-Source: AGHT+IFru4Zj81epJ32ba8ZGBhK+2gwVnJ/hnsfEgVdgwB8p6P79m1+ZWm986zzRedVA6bsxfrBi X-Received: by 2002:a05:600c:2d53:b0:41b:dabe:8633 with SMTP id 5b1f17b1804b1-41feab40bc9mr228717245e9.21.1716296056344; Tue, 21 May 2024 05:54:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716296056; cv=none; d=google.com; s=arc-20160816; b=EROnsBX/lnb6iU7OZNLX7WsDSPj+UgJZq6lM6rYJAYAp8Yi7z6rC4RIXTr+19yMPnt t+8InJqMdSZpr/ynANXZyjZNsVVqJWubSU9/qn6bSdE1l0qCefpZIKkcn6rKCdYRgGGr SRVI3jN2qJSq/+hWrmSL0IOoRYYoTsjGk5LPXqkX3Pl8x85+sOp1NF4ryfHtViwZUNE7 MoVE6ncHARyKBOoOaCWV5Y708+zzqVY4sOMClEe8ZkHfSBY7SXWO3xsbZ+XWtPvM7aNk 7qtsKSXi6v1sMP3xJjD5K/5cs8RqCfPBzVG/4UFYy6iR1Kzv0w/8LFVpA5b9kP+MOi/d 5MIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=V7n3YG0qJC2xSNumPLN9zfxMTnYfcmsxH46t8pmIEAk=; fh=Sm3B6Awc5bWDNAygkjJ2sjGyDLOZMWwtyqnVD1ZryiQ=; b=WpNEfau34GsXPolHoQlrXAZZfVWyw885frDmNJ1RajWow9LKfE8WEedpmdwP/RZucj RhRe40G43ySA2EgdLBQo1ZjeGRxK3KkXHk3IW+2ywj1PBRTewPOpjdTBjjSC+qYH+tZw Nf9OWAlOCcyvYQbhwvhNylt0eYQ/TVzjYElsnOayivcFTUaTta8ZcEg5lZBe7XwoxhwJ HGQl3eXmu4bTACF6SxgNS6PIQxd9HHoFQq645qW4bmCTWWVf38rilbH77ZNaM+/fqe+i L7YAPCZ2cNR8iocErrcf9LQWzd4pzLAnp2PMCsv4X3KIDIhIjRqfOWPd5yqPkoCgiiPK nxBQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=azdk8CfP; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 5b1f17b1804b1-4202d7f7986si63110935e9.234.2024.05.21.05.54.16 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 21 May 2024 05:54:16 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=azdk8CfP; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s9Ozk-0003IS-5k; Tue, 21 May 2024 08:53:32 -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 1s9Ozc-00035l-Rt for qemu-devel@nongnu.org; Tue, 21 May 2024 08:53:24 -0400 Received: from mail-ej1-x62d.google.com ([2a00:1450:4864:20::62d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s9OzY-0005ge-OD for qemu-devel@nongnu.org; Tue, 21 May 2024 08:53:24 -0400 Received: by mail-ej1-x62d.google.com with SMTP id a640c23a62f3a-a5a88339780so834504466b.0 for ; Tue, 21 May 2024 05:53:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1716295998; x=1716900798; 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=V7n3YG0qJC2xSNumPLN9zfxMTnYfcmsxH46t8pmIEAk=; b=azdk8CfPYUpLXI6D8+d1IOL23gf3L+3Di/eLBNEVt4Gq+qEvP8aRUJZRwsKRdQAXQi UMcrQhsKcl6batGANRHg5dAQMV6hYZ5G/cFBHAbx1BhHGlOCDQpyME2SQxI6MGZ+l0k/ fwXFRztdQOYkXNSnGfCjIF7MYSwraqz34shyp0ANdxugmHMR6RpjBrk4ldIgPZGkd0pq dr+GhXIEdr96RgtUzXKVi2Q9/B40uYcVj6qBZ8MAdEfIuHrugj+E9CnwX1w7xZHvV4ak Fj3p0IDK9U7GHbpRBCEbXDrvIG7ydZtVj9NwyPJDRhLR9GsIl/b7djRmitz2ewNkYDly l+aA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716295998; x=1716900798; 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=V7n3YG0qJC2xSNumPLN9zfxMTnYfcmsxH46t8pmIEAk=; b=B22jiLy85m6lveTwW3BzVY9o+JPxB8ljClIjcvFKhMDhggEzk+H6RInGgnFGgpBpJq l4tMxYJBAAtUrjckuXi3omVPdvIliSh2FpmOiVv1h9FQZwQyMaxPPM0kbB2swy4EZ2qM xPexwO4BYEDzbWdjkmYDHYHxLSaxmAIICXWj95q1dHpdSdtu4Y/IlFxzkKkEI+7abwak eHlaNy59DX4TrrCSNNH0OguHXVngamG53j9/+T9Xg93/XOM5ujoVGKEr5JxDRq4MPq5V vPJ+j9XDmDtznd8hWHaK2SCkZgvmbhGtxzZaSeiA09yRcLgUlmxLAxOlGOI8QSWwNF1W tjDw== X-Gm-Message-State: AOJu0Yy/dKmt23NYbAXyo5BCG77TAD6kqTZUhPOndS/O6zMYPSvFGTKU YWD1fsfmhqjhAe7ROqZfm+5eZeUXb2qQr6os8xX8QcOm5yIAULePBnxFu/t5ACs= X-Received: by 2002:a17:906:a41:b0:a5d:edb:6d59 with SMTP id a640c23a62f3a-a5d0edb7945mr739034266b.73.1716295997970; Tue, 21 May 2024 05:53:17 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a5a17894da1sm1613800966b.89.2024.05.21.05.53.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 May 2024 05:53:15 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id D87F35FA17; Tue, 21 May 2024 13:53:14 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Pavel Dovgalyuk , Beraldo Leal , qemu-s390x@nongnu.org, John Snow , =?utf-8?q?Daniel_P=2E_?= =?utf-8?q?Berrang=C3=A9?= , Richard Henderson , Paolo Bonzini , qemu-arm@nongnu.org, Peter Maydell , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Jiaxun Yang , Joel Stanley , Wainer dos Santos Moschetta , Mark Cave-Ayland , Aurelien Jarno , Thomas Huth , Cleber Rosa , Markus Armbruster , Laurent Vivier , =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH 1/4] ci: remove centos-steam-8 customer runner Date: Tue, 21 May 2024 13:53:11 +0100 Message-Id: <20240521125314.1255403-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240521125314.1255403-1-alex.bennee@linaro.org> References: <20240521125314.1255403-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::62d; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x62d.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 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.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. Signed-off-by: Alex Bennée --- 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 Tue May 21 12:53:12 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: 797964 Delivered-To: patch@linaro.org Received: by 2002:adf:e68e:0:b0:351:d90a:5487 with SMTP id r14csp2370013wrm; Tue, 21 May 2024 05:55:01 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUz78J3nBC656JvSxzfeOYcftJKGJuVz4GD4afW7rvYMYk75Ah+BOh1fakT/sivGTJsvY/mF99kVYX12GO1zQ51 X-Google-Smtp-Source: AGHT+IHBD8GQObGAtw1Ia2OBaH8g2751ElvbaHvYeBPaToWXE02K+ThOxAtcQRG9s00swjBYHALJ X-Received: by 2002:a05:600c:21a:b0:41a:7c1d:3326 with SMTP id 5b1f17b1804b1-420e19d5c14mr72628255e9.8.1716296101205; Tue, 21 May 2024 05:55:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716296101; cv=none; d=google.com; s=arc-20160816; b=NqRzYzqmt4yiZjD8LpYyINyxtzavRaGAYlHhIiorQSWLeMSp6I+SYKbh5orJ+vhXwB pHWMqAXiczW+z2rzrIw52Yg1e7Y8z/g5E3IYRB2mGBG2/SWBnyCnDtmJ6UJDkN6G59E+ sRebkhCX3SzKJByiZQgn/EFUFBrd18QK7Ry+T0LyklRA/sDtDuMdF5JRE/0zxPi5W/m3 DXwJCtpPkuu9YZHISF37Gq3yyTYxBcKc9oGmpsFmEqWRnbjLIyhzCZUwCr3XRIcaSeja tCY8nHgwoCrvRIjHFDdRIvonirC2oIFymqNawKk5Pc2vE223aZQVGYDMrm/ARH8PAo7T lvXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=k+bJBrU/UvktmlKrRsArKDtPesIqm0X6BS1JPvuMDaY=; fh=Sm3B6Awc5bWDNAygkjJ2sjGyDLOZMWwtyqnVD1ZryiQ=; b=sEh3XFXWQygOv4iLpaxV6Nmx9/KVUTMWdD0hvGaOjsj9kI7zXj6mKL8iOkroLNPh7D JNyf6QTUYDvVuBVsNQkq5omXLBTYeFxNMVmv5OKRRHNnXC1MVwgrEe+5oBBkVXCXkOY9 lSfWefV8v5FEcL7FQtfQv9A5NyjfCywSqjib+80oNw4N8XJCZAcJAkdV1UNkUu6USUx8 HXD0pDspwb5PFNtsrGD08ph2tcPOUd9b0C5TFNYMW3/h9biMhIp7GFpjGUkOs8hwMbVh LGMveoQv3ZtPy+Ljk5dc4BMiPtcMEbbfpeGQgfNSiQNKeiNyqGkFcgECNoVm3HAD35qt KQ1w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ZVrAEO+f; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id ffacd0b85a97d-3502bbe1446si15547860f8f.657.2024.05.21.05.55.01 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 21 May 2024 05:55:01 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ZVrAEO+f; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s9Ozg-0003CW-AT; Tue, 21 May 2024 08:53:28 -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 1s9Oza-00031w-8E for qemu-devel@nongnu.org; Tue, 21 May 2024 08:53:22 -0400 Received: from mail-ed1-x532.google.com ([2a00:1450:4864:20::532]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s9OzV-0005g9-Ll for qemu-devel@nongnu.org; Tue, 21 May 2024 08:53:21 -0400 Received: by mail-ed1-x532.google.com with SMTP id 4fb4d7f45d1cf-574f7c0bab4so11269572a12.0 for ; Tue, 21 May 2024 05:53:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1716295996; x=1716900796; 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=k+bJBrU/UvktmlKrRsArKDtPesIqm0X6BS1JPvuMDaY=; b=ZVrAEO+fgg1c83xGhUC+kNlTGzJIVbfMRFufyE9No0hG1JDpr+r/kvghLwIyQQLp/F 9x8HFlOEC2osRX7tcl6GrJ16GLDeL7Iv0FKjLugS3XKccaYD6i5Om8WwLvFjOlg40XDr rHReSh0zcFKbgpzKjVyQp2OC8iWMncRySsvljWWyfzAfHXKb/J9O2vyIxAj+O9Op7zY+ Lpqh1tyujEvoq0H1AgBEFzULaxwmebLg6/Jz5x/NafpWzc5FRUdUH9pqDW9Hf68ddRKF O0m7rwpxOiqJT8ybz7Lt7SP5KqpEGV5MJe1KqIh92ZYeWdCvAr8uvisP4uL9asFWpKsI E46A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716295996; x=1716900796; 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=k+bJBrU/UvktmlKrRsArKDtPesIqm0X6BS1JPvuMDaY=; b=Si8nrs+DsJMgYlZ9faUn0yzZBkBicXsy0Dq2VtkM+s+xc6sF1uiVSwquYXI5n0ohaX rXNmqNUvDPOae+sFjrJ3ViyNnMGEer45gO4DFcIzyoIPk6eglFG0Rp983pYtI6tWQM4F uVyeB1ChwdXksjr0DohoYV+Jkr4Xi2zzHvaaDx9uko2wCjykemdTPZ0WSv/XFwbKtbNo c8ofeZsAmViQAgDAqWz0BeJ7cmjJJWbI9/1cys3gP/+pBfWXPe+oqDkQd46vY8BkjQCj f591iGKE8d16gr8sStYmMMEcL7Q4Jeuizt3YEHVKqSnLHjIVABvRdTF9cbrKDJSuAGWU sQtQ== X-Gm-Message-State: AOJu0Ywh92DHqgZK2KWwWVoUyeP4tENWiiPZMPjUQyppqRMtr8gF/jpg aM8+7PXkTnhhBcqpfuS3NwAqkt79eROn3o6EkXlVyE3J0/7VMMJGU9fvXkSzjnA= X-Received: by 2002:a17:906:6b85:b0:a5a:3e00:6317 with SMTP id a640c23a62f3a-a5d5fd58d23mr662951566b.31.1716295996176; Tue, 21 May 2024 05:53:16 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a5a1781cd7asm1630614266b.10.2024.05.21.05.53.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 May 2024 05:53:15 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id EE37F5FA1A; Tue, 21 May 2024 13:53:14 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Pavel Dovgalyuk , Beraldo Leal , qemu-s390x@nongnu.org, John Snow , =?utf-8?q?Daniel_P=2E_?= =?utf-8?q?Berrang=C3=A9?= , Richard Henderson , Paolo Bonzini , qemu-arm@nongnu.org, Peter Maydell , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Jiaxun Yang , Joel Stanley , Wainer dos Santos Moschetta , Mark Cave-Ayland , Aurelien Jarno , Thomas Huth , Cleber Rosa , Markus Armbruster , Laurent Vivier , =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH 2/4] docs/devel: update references to centos to later version Date: Tue, 21 May 2024 13:53:12 +0100 Message-Id: <20240521125314.1255403-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240521125314.1255403-1-alex.bennee@linaro.org> References: <20240521125314.1255403-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::532; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x532.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 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.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. Signed-off-by: Alex Bennée --- 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..c312465fa7 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@centos9 -This will create a container instance using the ``centos8`` image (the image +This will create a container instance using the ``centos9`` 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 ``centos9`` image is defined in a Dockerfile +in ``tests/docker/dockerfiles/``, called ``centos9.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 Tue May 21 12:53:13 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: 797963 Delivered-To: patch@linaro.org Received: by 2002:adf:e68e:0:b0:351:d90a:5487 with SMTP id r14csp2369758wrm; Tue, 21 May 2024 05:54:20 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUEBZ99nLPF+ElZwgJArH0Hc2aY5Ai3RSBQ+yDBi0TI/vWfI4Com+hNAmc80zY9RKbxcJ1EamLX0cYkr6k3zSev X-Google-Smtp-Source: AGHT+IHClRSA2ECHOZTIxcHr0fNS8De87ii6tSTKyQIsDlPQ3h462S+Zb66Dh33yHrQMuz+v32Cc X-Received: by 2002:adf:e049:0:b0:351:c2c1:3682 with SMTP id ffacd0b85a97d-351c2c136f4mr16212445f8f.62.1716296060046; Tue, 21 May 2024 05:54:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716296060; cv=none; d=google.com; s=arc-20160816; b=fH31RqdIMG9V/UliC/y2TEYp/fjJhT8JkTcCWAvngx5xmPC1Z/TXx+XoT2zvDcCU5X 4ziCtEY/FQZPDa1wJsArWc6PjxmrOQsflycKHbD1b4A7NGV6tlHGpDrMItzmyoivtfjk jw2VNBpPLGVQ0aCAeQy1OaZtNpiVYlZheRHPb0jfgUDqRa1JIt8bOVzcMTpajsQpbvJq WPfWjqnOh8kN4EPy6jL9NwLmkqKCyT7cvPHRURymm8Cup93uY5pJR+Dzi4+N/bOWshrg v1b7PRkDK04vRdQlxUMD6/Sy26Vg7gJw7tz4w0Wl/82I7IH+2giAOlyekPu79IczTVgI KTcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=+KJSPsg/3w1SFfOVwaOmt9sT3HJOmlmBmCmncyWEza4=; fh=Sm3B6Awc5bWDNAygkjJ2sjGyDLOZMWwtyqnVD1ZryiQ=; b=IcMTPaXn2unrtrzMYH2c3/1xDc4l/bomSwZlTw4XMHKMdxHZTGqOxLwqJu9bn6NHSi mRARfsA6IF/qUlBmjZk19W6j+U082AwLR7HVd6vEyFlpEKMVF+yece9H/sw3Nd73vEqt HkP8BDAzw3NHh/fZM10v5uzcjd3YWXuNqQVMuJqKWUoOWURvvaQ6KQsF164m/5I20hsr KjnkDKeNO8jyOksEAY+TLNyVDWrmeF7GTMzwayMJ172tLshu6yaJ2CsU5pEwmrSs7L/z 3fLG/mTKpSsd2CXqNXdfaAU2J39HqQbvtcQaEE2eywIKeH9LUQJ3ijY28sa0pSuZApbl 6A4Q==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="T5b/1X+4"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id ffacd0b85a97d-354c370c7ebsi2926257f8f.117.2024.05.21.05.54.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 21 May 2024 05:54:20 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="T5b/1X+4"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s9Oza-00032g-Jm; Tue, 21 May 2024 08:53:22 -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 1s9OzX-0002yV-Ka for qemu-devel@nongnu.org; Tue, 21 May 2024 08:53:19 -0400 Received: from mail-ed1-x536.google.com ([2a00:1450:4864:20::536]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s9OzV-0005g5-JI for qemu-devel@nongnu.org; Tue, 21 May 2024 08:53:19 -0400 Received: by mail-ed1-x536.google.com with SMTP id 4fb4d7f45d1cf-56e56ee8d5cso9774766a12.2 for ; Tue, 21 May 2024 05:53:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1716295996; x=1716900796; 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=+KJSPsg/3w1SFfOVwaOmt9sT3HJOmlmBmCmncyWEza4=; b=T5b/1X+4lat4zwgYphnvEg3Ke7grWp0oniZe4uU+aBP5qNdofJww/G9Ne0nJAaYrkq osIg2ZXGDl/E/7R67N1hngCreXlkPpky9MIXyvvs1THfTr+GRSCTpOBQALb9cxy0vtVo 5jFWb38xAoH3m7rfp+9AoLveQDMav820rc2hb6ElPMmdrvK0+M5dZ9sgkyy6U1MQ65UH HLlv2Asl603ifxVJLhwR/4H+nCROLVrwqWOQCq8otJl93NpxPPYo2PE8cJdrkSAHRu/y GQkiFVi3y2Av+bScaMn55wjKfmpHtmqRxlxh0RQuU4trqWTZ3R2kMioQhzDyp16j08T5 jrfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716295996; x=1716900796; 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=+KJSPsg/3w1SFfOVwaOmt9sT3HJOmlmBmCmncyWEza4=; b=Vm/er6ThH+boiDbAhhRFMUVQDY0TEiZxelqwscGWgx5mvDWp4DxpJjufk1NjhWT/Ws oDXgn25Aid1choIGbNcMUzgMD6HWAI1o5zqoGydvzq4i/MLX9KVgLfCdOnA8kjsAan4l S/OmJzW8XmQtq81+Vnj+FYgZIIoohA9Oxeu9WZUoG4RzDhRR8eP7DRe4ptIbHT4IGQ9Q mMMXRfEH4FV9gTF72xp47dJ1rp9xUx1eKyGH016S125EG0EGGn8pub8KxidLRtY4Q+FH 3w5R5facx1MWxJ6xNwS3yuOGoOxm/HdSnQTI+P8sfXLGsrT8ixKQgUkh99oDCSGX+aFr n8SQ== X-Gm-Message-State: AOJu0Yxci2o0rHQmJyDridrS1Ut0I9lCraSSV408RJbRmSQxNn7nN6pM 9EF15lDemxN3RtcQ39V85uJSk+GR+cEAGKN81ldWq5xACnvZZcJdm+Bxdz43/YM= X-Received: by 2002:a50:ab55:0:b0:572:7b95:7d14 with SMTP id 4fb4d7f45d1cf-576f5c09715mr4900634a12.27.1716295995759; Tue, 21 May 2024 05:53:15 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5733c2c7d3esm16607686a12.73.2024.05.21.05.53.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 May 2024 05:53:15 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 0ED4A5FA1B; Tue, 21 May 2024 13:53:15 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Pavel Dovgalyuk , Beraldo Leal , qemu-s390x@nongnu.org, John Snow , =?utf-8?q?Daniel_P=2E_?= =?utf-8?q?Berrang=C3=A9?= , Richard Henderson , Paolo Bonzini , qemu-arm@nongnu.org, Peter Maydell , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Jiaxun Yang , Joel Stanley , Wainer dos Santos Moschetta , Mark Cave-Ayland , Aurelien Jarno , Thomas Huth , Cleber Rosa , Markus Armbruster , Laurent Vivier , =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH 3/4] tests/vm: update centos.aarch64 image to 9 Date: Tue, 21 May 2024 13:53:13 +0100 Message-Id: <20240521125314.1255403-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240521125314.1255403-1-alex.bennee@linaro.org> References: <20240521125314.1255403-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::536; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x536.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 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.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. Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth --- 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 Tue May 21 12:53:14 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: 797961 Delivered-To: patch@linaro.org Received: by 2002:adf:e68e:0:b0:351:d90a:5487 with SMTP id r14csp2369634wrm; Tue, 21 May 2024 05:54:02 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWzKZ0BGIC5FozsP7+bEGZL7UuHK52z6JFw5XogVzmYWMtrmwwrsgD/9bD3TQ/YSv4fHsIQCiJnYZy54nmNutmd X-Google-Smtp-Source: AGHT+IGSBMHsEAssadv1dxlUIf3B4q9sPB4mtpc8fSIN7+RctjWwEO4QUvj2JYECFx/hFyDPSUV5 X-Received: by 2002:a05:600c:22c4:b0:41c:7bd:5a84 with SMTP id 5b1f17b1804b1-41feab38ef2mr279486655e9.17.1716296041840; Tue, 21 May 2024 05:54:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716296041; cv=none; d=google.com; s=arc-20160816; b=tuicJb7PH2woPcuSvUWc6or+ygixqMQeNzm1hukOiZJSbbLJn/SdyySkFg0Byerlu5 AI1+zk9nWweobJl+riaebNr1wjeunkrmAYhJtj2Zo49J4xsCPJbsekELl6TDt6ov+IFx QWWhrUhH11rcwiIXKnDWaU7Bur1Ha2FGZl7/uQaYiNiRp9e/uc/diej6LPuaJUaHqD7L bJae0v+Jcs/e7EH//tN30bNr5Lx14lFOP+MnYLnI2VsYGgMTznndIOWm8KjZa7Sas5EW 17lJdVHPFS5eqH6LKBt5WnXHYcwIEspN9fjjnykU7gVue8Y7aYxEIArGXiLaEdFSpqe2 3+JA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=64oTeEEknftWnlD1tjCfqHLFzBsR/ZQm2nBN/sHWoTM=; fh=Sm3B6Awc5bWDNAygkjJ2sjGyDLOZMWwtyqnVD1ZryiQ=; b=vLf442OzqzMqeUPRGiuNy8D8abQfgIggrQGuWB5HcYUXQLMFReKdNlLD+4178dFrGB 8izprP0tvsLD5iBS3FtdDKJ/5fDFD9WzMNwjLTIQ0oIGI020+EVR4SVbIbxh/Prn3QXw wFZFCJrc5mwS7JWRnfTjqKcfDrBvZW2eG7NDdnJNfEC1XRQUeaUbe7/FKJlvr8qNvJdt /5b93xu2ypBgMdnGL+pBwlJ5DZU31UEtiCwhY5mdNwSlbDoUQNR/Cha9BJo7+WVZ3okB f0jN2FBazG9ItXrwK/GAq4Ky2CutA23Kky5NjjKdVd9ezd9ATYwi3MUJqFdG/O8ej+MI DbuQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=F5wDs+9f; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 5b1f17b1804b1-4202a784fecsi67704595e9.130.2024.05.21.05.54.01 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 21 May 2024 05:54:01 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=F5wDs+9f; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s9Ozf-0003Aq-Sm; Tue, 21 May 2024 08:53:27 -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 1s9Oza-000345-QG for qemu-devel@nongnu.org; Tue, 21 May 2024 08:53:24 -0400 Received: from mail-ej1-x62d.google.com ([2a00:1450:4864:20::62d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s9OzY-0005gl-Mh for qemu-devel@nongnu.org; Tue, 21 May 2024 08:53:22 -0400 Received: by mail-ej1-x62d.google.com with SMTP id a640c23a62f3a-a59cf8140d0so698156366b.3 for ; Tue, 21 May 2024 05:53:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1716295998; x=1716900798; 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=64oTeEEknftWnlD1tjCfqHLFzBsR/ZQm2nBN/sHWoTM=; b=F5wDs+9fr7+H+FH0u5HrxWwwpurmSUpjdzIiIS+kt/ohu34vGBJhnExqFZFgPD3YWB 68hM1g2dagHH3lgIk7+GU6hco+M6/kcfX++33tlTEF3dzBL2ZUePHYz+kFt+6RqzW/Wk FaDeM/xSgGG9n8AWi1LzRIEVdiIBwlo9GT3CbmRFXwYAVmqrV3bpBw9Tl6wwyq5xGUKx 0Gggp1Bn81JiL2JkFXUQ/2EM9DuUhCObTs8Sy2X6i4g9eRVyiKH6fSmtqKVh9j9oKrIe wRmm9oEm6JftSedWk1yoUqMxyLcNta0ko13dL3SW8GCPLNeb11+arSgkEsmfY9H0qmbS u1ZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716295998; x=1716900798; 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=64oTeEEknftWnlD1tjCfqHLFzBsR/ZQm2nBN/sHWoTM=; b=fLTwpAxL4qPdbhJ5vHDq7WZO2ic7nvDo+LUxcpRzT/nJU8fv+SdJkA/Qkeik4cWro6 kqznPBR3i7S/iEfa9L+g2XTTCNNcbXC6/QENp8b3tnOOwtZMkj9GjTaZyDsxfcozjkzy 0X4I3sxbhdfDjqVXH2TSB8rZKqJcMdAciyofrfXrYMjaD8Mhr0/12dOA8hNBLqpll+pk kozU5qOPIGqlMYccUtPam/jJJNfL6TdZJATY2WLD3nn6/nrqQ873FmGFmbmEYWa9hq3q k7iu3ko3Q3VMxOErB+quJ0FVgeqoOJUrndZy29cHgiCvwA36m9bqePW+6m+3TowECWNs EnCg== X-Gm-Message-State: AOJu0Yx1U56NRP3k5NA6+ghd2UqerRmkOyZgs0yEXQRukzK5pEFiQhMW O4o+UtbN7rSKBRoXlsF5alqNvYQMzXYgt6O8q3genKv3MEk5To9Qt+KJpw+90hk= X-Received: by 2002:a17:906:fa1b:b0:a5a:8b8c:6203 with SMTP id a640c23a62f3a-a5a8b8c6341mr1332386766b.45.1716295998202; Tue, 21 May 2024 05:53:18 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a5d10b3ef82sm539034466b.158.2024.05.21.05.53.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 May 2024 05:53:16 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 256335FA1C; Tue, 21 May 2024 13:53:15 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Pavel Dovgalyuk , Beraldo Leal , qemu-s390x@nongnu.org, John Snow , =?utf-8?q?Daniel_P=2E_?= =?utf-8?q?Berrang=C3=A9?= , Richard Henderson , Paolo Bonzini , qemu-arm@nongnu.org, Peter Maydell , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Jiaxun Yang , Joel Stanley , Wainer dos Santos Moschetta , Mark Cave-Ayland , Aurelien Jarno , Thomas Huth , Cleber Rosa , Markus Armbruster , Laurent Vivier , =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH 4/4] tests/vm: remove plain centos image Date: Tue, 21 May 2024 13:53:14 +0100 Message-Id: <20240521125314.1255403-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240521125314.1255403-1-alex.bennee@linaro.org> References: <20240521125314.1255403-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::62d; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x62d.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 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org This isn't really used and we have lighter weight docker containers for testing this stuff directly. Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth --- 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))