From patchwork Sat Nov 11 15:29:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 743087 Delivered-To: patch@linaro.org Received: by 2002:a5d:67cf:0:b0:32d:baff:b0ca with SMTP id n15csp819069wrw; Sat, 11 Nov 2023 07:30:05 -0800 (PST) X-Google-Smtp-Source: AGHT+IGa6g8JeSNk0IF0SSSxPgar4lGasElr2G6zJAPq/hh3oMEuPh4WTK3osBlkGqpWSOc0r4oh X-Received: by 2002:a05:6902:1541:b0:da0:caba:9017 with SMTP id r1-20020a056902154100b00da0caba9017mr2559814ybu.16.1699716604846; Sat, 11 Nov 2023 07:30:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699716604; cv=none; d=google.com; s=arc-20160816; b=Y1JqhxRpdEWdFtuzl9s4lW1XeJuTTqPJjbaFZbRC8YS/eQSTfAbo0ALtej638kGMuv cujR5hSaUXXY3O8I6hffTSv1nj1KgTzp+9PxaAZueor7dlkE8dJXek4wfYBszuAHvl5J 5vCVI8SQHzw15VwVE+qUxYbkk54VsFZExk1vrxADorIDql09stctPUNqtsKnqCsCVPL5 RenvPYaMdyLf4goqJY67X1NOThh07R3u+ZcMn9k4CK/3XEyTB4tNb1t/pAojcnrnEBll AFcxluuJ6LqhA0xnLD4tkjrYrhGyGKqV6BE0mCg3nAJ+s6ZhxmZZxiTpeomDQDAtfRm4 XzsA== 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=Kh8hHoHBgX/fTehaZ1B5Sfw7yk3YdWsOqVB7Mq6gH8Q=; fh=kQadAhxV42GJ3cd2VUw1RyURv/zJQGvmUdF7iLEVTtc=; b=Y5w5SgEzxUtgg8QAc9iRnCtbqdBvFuJk16eCR6n/9Non1BdS6rLmj2bF+8GrQ5HIpl TxxZRDzOeSB85BsGuYyx1ld2Oh3ejRo+zkAmTFANI8BWg0TB67N1IwvS1Cz4v7izjlVR v3wI/4QjZw9UDppNJY/+VYLcYDK48zcc1V20/th/aHdZ5nmNXYcprHb06b/dNXKfHUD8 I7dgOAqgZt2+QKK4b0HR2jb1NceWpyuALVvb1CJSyL8nfmekC0ZMnfVRZHlhdnOY1PTz Is2S0vb7vGJVWleEsHl3JhlT+hs3qh3z7KJqnHoY5kiMxeaig2RT7nZz8CQMOXiZu/1l bzsQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=e3sk4AAf; 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=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id i10-20020a056214020a00b0066d02306e80si1633174qvt.184.2023.11.11.07.30.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 11 Nov 2023 07:30:04 -0800 (PST) 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=@redhat.com header.s=mimecast20190719 header.b=e3sk4AAf; 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=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r1pve-0003yf-39; Sat, 11 Nov 2023 10:29:46 -0500 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 1r1pvd-0003yS-A9 for qemu-devel@nongnu.org; Sat, 11 Nov 2023 10:29:45 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r1pvb-0008KO-I7 for qemu-devel@nongnu.org; Sat, 11 Nov 2023 10:29:45 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1699716582; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Kh8hHoHBgX/fTehaZ1B5Sfw7yk3YdWsOqVB7Mq6gH8Q=; b=e3sk4AAf0elZQjLXOpTQWH+IEvaXjjnePH9mfUeXhMhQyIi04rlhEgp5avqIkK3yGGaRu3 WO6ZQwd48XKHViBkCEp5ovrW2cPHblHemI/QbQCMUSOp83kdUoGdNWeI0kUFbxLVnr0QTH 1SGG+dA7y/UIyqNNmEhxBeHhqwqBgI4= Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-673-agDX8IXDM5KOylrViluFRA-1; Sat, 11 Nov 2023 10:29:41 -0500 X-MC-Unique: agDX8IXDM5KOylrViluFRA-1 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-9e293cd8269so227221266b.0 for ; Sat, 11 Nov 2023 07:29:40 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699716579; x=1700321379; 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=Kh8hHoHBgX/fTehaZ1B5Sfw7yk3YdWsOqVB7Mq6gH8Q=; b=fD3GLLQ4/N/iQRG8hfyMHKYNxLF6i6j7tYjhR54dhtCKn9SvmKbkXTtaN/dqei5ZWZ I4DArwfcmvDOmUZOGL5rraU2tcgM0kj7QIHFpXCaOIVyQvvCIKxIGIT8N/q/1w3xkIQT GHm8LkMImWsXlpa816nzTeoY4SeM+Hc3GgkPtjjArXNwDosa/Vtr6TKC9Z7sLkBzv5MF OYkoCUADKEVOu+UEFXLLfqPOI7ay2BzJY72Cz/xtfkCkT2hHDV6y8uWjJXy8Msl+H7uh 1Q5hUPBHzcVTWnlACA9jArAKECoprpsf6cmVosQh/+XnBFLNyyzoEj9iJ6ryf/j5uLm5 4doQ== X-Gm-Message-State: AOJu0YwkVRFAjvkU51tUyL5zSxzL5m8HtHKgBnqbLGrvDDQHFpQHSnv2 S6P0SB294uk64wH1v1Xri9iy4BH1pwdek41WwKylWLNMAZJezx84701DEVPqAtAj73sP3Yfh+q8 m5lfZAdPWNVd3IsC+8gRyJuc/DG9kfjhiAETuWuBn41YR69hbP4gltWW9E/rnGkCbcWSuH7YJ2T k= X-Received: by 2002:a17:906:4147:b0:9e6:59d5:71c4 with SMTP id l7-20020a170906414700b009e659d571c4mr1412389ejk.16.1699716579461; Sat, 11 Nov 2023 07:29:39 -0800 (PST) X-Received: by 2002:a17:906:4147:b0:9e6:59d5:71c4 with SMTP id l7-20020a170906414700b009e659d571c4mr1412378ejk.16.1699716579127; Sat, 11 Nov 2023 07:29:39 -0800 (PST) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id l22-20020a170906a41600b0099d798a6bb5sm1209620ejz.67.2023.11.11.07.29.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Nov 2023 07:29:37 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 6/6] .gitlab-ci.d/cirrus: Add manual testing of macOS 14 (Sonoma) Date: Sat, 11 Nov 2023 16:29:23 +0100 Message-ID: <20231111152923.966998-7-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231111152923.966998-1-pbonzini@redhat.com> References: <20231111152923.966998-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé Upgrade libvirt-ci so it covers macOS 14. Add a manual entry (QEMU_JOB_OPTIONAL: 1) to test on Sonoma release. Refresh the lci-tool generated files. Signed-off-by: Philippe Mathieu-Daudé Message-ID: <20231109160504.93677-3-philmd@linaro.org> Signed-off-by: Paolo Bonzini --- .gitlab-ci.d/cirrus.yml | 16 ++++++++++++++++ .gitlab-ci.d/cirrus/macos-14.vars | 16 ++++++++++++++++ tests/lcitool/libvirt-ci | 2 +- tests/lcitool/refresh | 1 + 4 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 .gitlab-ci.d/cirrus/macos-14.vars diff --git a/.gitlab-ci.d/cirrus.yml b/.gitlab-ci.d/cirrus.yml index 07dc6edae1c..64f2e25afab 100644 --- a/.gitlab-ci.d/cirrus.yml +++ b/.gitlab-ci.d/cirrus.yml @@ -74,6 +74,22 @@ aarch64-macos-13-base-build: PKG_CONFIG_PATH: /opt/homebrew/curl/lib/pkgconfig:/opt/homebrew/ncurses/lib/pkgconfig:/opt/homebrew/readline/lib/pkgconfig TEST_TARGETS: check-unit check-block check-qapi-schema check-softfloat check-qtest-x86_64 +aarch64-macos-14-base-build: + extends: .cirrus_build_job + variables: + NAME: macos-14 + CIRRUS_VM_INSTANCE_TYPE: macos_instance + CIRRUS_VM_IMAGE_SELECTOR: image + CIRRUS_VM_IMAGE_NAME: ghcr.io/cirruslabs/macos-sonoma-base:latest + CIRRUS_VM_CPUS: 12 + CIRRUS_VM_RAM: 24G + UPDATE_COMMAND: brew update + INSTALL_COMMAND: brew install + PATH_EXTRA: /opt/homebrew/ccache/libexec:/opt/homebrew/gettext/bin + PKG_CONFIG_PATH: /opt/homebrew/curl/lib/pkgconfig:/opt/homebrew/ncurses/lib/pkgconfig:/opt/homebrew/readline/lib/pkgconfig + TEST_TARGETS: check-unit check-block check-qapi-schema check-softfloat check-qtest-x86_64 + QEMU_JOB_OPTIONAL: 1 + # The following jobs run VM-based tests via KVM on a Linux-based Cirrus-CI job .cirrus_kvm_job: diff --git a/.gitlab-ci.d/cirrus/macos-14.vars b/.gitlab-ci.d/cirrus/macos-14.vars new file mode 100644 index 00000000000..43070f4a265 --- /dev/null +++ b/.gitlab-ci.d/cirrus/macos-14.vars @@ -0,0 +1,16 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool variables macos-14 qemu +# +# https://gitlab.com/libvirt/libvirt-ci + +CCACHE='/opt/homebrew/bin/ccache' +CPAN_PKGS='' +CROSS_PKGS='' +MAKE='/opt/homebrew/bin/gmake' +NINJA='/opt/homebrew/bin/ninja' +PACKAGING_COMMAND='brew' +PIP3='/opt/homebrew/bin/pip3' +PKGS='bash bc bison bzip2 capstone ccache cmocka ctags curl dbus diffutils dtc flex gcovr gettext git glib gnu-sed gnutls gtk+3 jemalloc jpeg-turbo json-c libepoxy libffi libgcrypt libiscsi libnfs libpng libslirp libssh libtasn1 libusb llvm lzo make meson mtools ncurses nettle ninja pixman pkg-config python3 rpm2cpio sdl2 sdl2_image snappy socat sparse spice-protocol swtpm tesseract usbredir vde vte3 xorriso zlib zstd' +PYPI_PKGS='PyYAML numpy pillow sphinx sphinx-rtd-theme tomli' +PYTHON='/opt/homebrew/bin/python3' diff --git a/tests/lcitool/libvirt-ci b/tests/lcitool/libvirt-ci index 36bc517161c..77c800186f3 160000 --- a/tests/lcitool/libvirt-ci +++ b/tests/lcitool/libvirt-ci @@ -1 +1 @@ -Subproject commit 36bc517161c45ead20224d47f2dc4fa428af6724 +Subproject commit 77c800186f34b21be7660750577cc5582a914deb diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index 2259f131b48..e11d0ba381f 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -197,6 +197,7 @@ try: # generate_cirrus("freebsd-13") generate_cirrus("macos-13") + generate_cirrus("macos-14") # # VM packages lists