From patchwork Tue Sep 17 08:50:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 13806020 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 4C5F1C35FF8 for ; Tue, 17 Sep 2024 08:54:52 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sqTvm-0007Mu-PQ; Tue, 17 Sep 2024 04:51:30 -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 1sqTvj-0007MN-NL for qemu-devel@nongnu.org; Tue, 17 Sep 2024 04:51:27 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sqTvT-0008Vt-Fh for qemu-devel@nongnu.org; Tue, 17 Sep 2024 04:51:25 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-42cb7a2e4d6so44547065e9.0 for ; Tue, 17 Sep 2024 01:51:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1726563067; x=1727167867; 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=cSYHu5lBYgP+YuUarCXjaJs9Yl4nMxFLvamP9MQ79yg=; b=QsjtFGM39D8cZcs0OAE25i3TMCyxiBkBSXhKIt72H1d6xBtRUCRODSiklg25t1rbWv FYDtbzHpyWiE51MRY3TNbevKgQmZkpqysTNjIA+8mLh6/bEibTQ66O4etg1q6eA4kHfq W3n29XrcGR4ym+WQOB1YJGC8rLICOprBafQCAWu8Lv1v5opKy0BCBCsnu7+aGyI9x1uz RpV7Aquwq8pktb2wJMn+8Ot3qdxdARtdZEJ3idCnsR8DOG17nmix1YpwGec4V804W1pN QcjGDifwtBTzdLB/3CdrnqX9eeKe2nqqLOakKK+Rp79+Nnkt5WOqPMFFzJf6tvvUYFzK p4GA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726563067; x=1727167867; 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=cSYHu5lBYgP+YuUarCXjaJs9Yl4nMxFLvamP9MQ79yg=; b=npY6yaP0G3qYPtHGMzySe9v2dbbHucjXdPl4uWrZm7yi390WFBMURYBKr+bEaTqFws 3IwKvXovz/UF5CdGkUJ4mzeG6eRhx4/SjI1wyGAW0ZAGR9gZbVl9xcPAWs8xBolQeb8g tVSKBxpyuXDTn3Sb9eFLElh47D4Ry9yldF+rhJD8OkVL7sB6+AGbbaeJ3Gn46CsIkXur nnSikCL9ZbKl4SVOkCQrBjfIDW4TdXyuRl0iJHtALkv33UIyk74UrF6cvDO0vUtSG2hs wedT2HRZGO3Qa/c1jjfN3i7oJ1ONOX3QKEy8ygOtGLDset+MiAkOjjLDFvreIkJAPMez hRgA== X-Gm-Message-State: AOJu0YzVDP7OaVTf2iybYWX7y4Y1mMD9fwuw7ZP7cy+OKgMNLqB5TIgv P6xO5HwWUQCrgKkiGJTehCOwSEPRK+McHw3s0XrFOnrKqwe8lh7nJSYi369wFB/l1yBCNjKfIvD wDHM= X-Google-Smtp-Source: AGHT+IGVgam6pQh1MOtIgKCFNO9doLYN/GbfP6pAXbzFSHjpkWa1yOXld6hwpktMiXmnTDSJZyWkmw== X-Received: by 2002:a05:600c:5121:b0:42c:b377:3f5f with SMTP id 5b1f17b1804b1-42cdb547e96mr135717025e9.14.1726563066903; Tue, 17 Sep 2024 01:51:06 -0700 (PDT) Received: from m1x-phil.lan ([176.176.131.223]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42d9b189986sm129889615e9.29.2024.09.17.01.51.05 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 17 Sep 2024 01:51:06 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?D?= =?utf-8?q?aniel_P=2E_Berrang=C3=A9?= , Wainer dos Santos Moschetta , Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH 1/3] tests/unit: Really build pbkdf test on macOS Date: Tue, 17 Sep 2024 10:50:56 +0200 Message-ID: <20240917085058.1740-2-philmd@linaro.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240917085058.1740-1-philmd@linaro.org> References: <20240917085058.1740-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=philmd@linaro.org; helo=mail-wm1-x330.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, SPF_HELO_NONE=0.001, T_SPF_TEMPERROR=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 Fix a typo to run the pbkdf crypto cipher tests on macOS. $ make check-unit ... 87/102 qemu:unit / test-crypto-pbkdf OK 2.35s 17 subtests passed Fixes: ebe0302ac8 ("tests/unit: build pbkdf test on macOS") Signed-off-by: Philippe Mathieu-Daudé --- tests/unit/test-crypto-pbkdf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/unit/test-crypto-pbkdf.c b/tests/unit/test-crypto-pbkdf.c index b477cf4e4b..12ee808fbc 100644 --- a/tests/unit/test-crypto-pbkdf.c +++ b/tests/unit/test-crypto-pbkdf.c @@ -25,7 +25,7 @@ #include #endif -#if defined(_WIN32) || defined(RUSAGE_THREAD) || defined(CONFIG_DARWNI) +#if defined(_WIN32) || defined(RUSAGE_THREAD) || defined(CONFIG_DARWIN) #include "crypto/pbkdf.h" typedef struct QCryptoPbkdfTestData QCryptoPbkdfTestData; From patchwork Tue Sep 17 08:50:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 13805985 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 2ECA6C35FFB for ; Tue, 17 Sep 2024 08:54:07 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sqTvt-0007aY-W1; Tue, 17 Sep 2024 04:51:38 -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 1sqTvo-0007V6-Vt for qemu-devel@nongnu.org; Tue, 17 Sep 2024 04:51:33 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sqTve-0008WT-3m for qemu-devel@nongnu.org; Tue, 17 Sep 2024 04:51:32 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-42cb60aff1eso53332645e9.0 for ; Tue, 17 Sep 2024 01:51:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1726563072; x=1727167872; 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=I1+M6zkfEBX1OMy70pQcqHZElyhMK4N/jFaUZEQCrcQ=; b=uZ3UjKEVZszzgWUbSekWuTgizkRU/MME7s/NGswsWXKT/ipbypq1Bl8BDdUaSrS4ce 8fHnD46STVmbYSfQiFSa8jO3fholo6wloUvgeA+5in/uCSLQT8JHucrhXbqdFQ+IzBw7 PIAZ5nAYmEUbNBpzSb1XShBuyWbU6FmjpSJJF1miZb7Bm11Bqu+vHaoQJnLmi31Lt4Gl 3orJsNXNG/92aJSbKkmZzH+WomW7MCDGzyhglSH0QzHIN9XFde1/Q2YmHliCTL2ny7Tz 8wiZDn3aaWnImOXBuTjKGVeM2OgmjpUajeFtk1KOfytLa/YgzrIaRgr7PNWtPpnXD7kE DG7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726563072; x=1727167872; 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=I1+M6zkfEBX1OMy70pQcqHZElyhMK4N/jFaUZEQCrcQ=; b=FsBSV5m7S2Oxj3ccxduYWT/RDjWO/SsOBnufcMvFnmsiLi7d9M0v7CCVhr/KEJ+bE8 uKszoqBFLNzpnU2/cnjK9iP5tzIn/iWEFk/f1gb1BJA1AnLBETM7OeLysi78DFU9NhEE tDr0MHkVphgwIdVx5c9eg9AEzETpAItxp6WRshx2RJtX4klZdXzwhuCjOhkB/J9S0P0f 42i9M11OfLne8HzI2yak6J0joqTmsu1a68ogj45KNjlkgA/rUdMJ7C7NQtF8XrTfEL7B PrWbffTTvrVpty6T5nYvLiqMbQA1fjHd/aw9frfdc6pFW5GuOTPMTK2sfMn63wiQ47mS P1+Q== X-Gm-Message-State: AOJu0Yz3718zUwv+aFZyIOUKbwG3QOv6+ILgb874uP2UnIuEIkqGXjvB lCtzd9SZHGU80w5WvGsdQP+C/V9eTBgCQ8sEcKQ88uSYIVpCXaoWpEwnbM6PJJou/L3zT/zMa6c Sw8o= X-Google-Smtp-Source: AGHT+IHpwmGZ5HNwM+opd9KtNIQ0Fndg7C6UtV53Xckwx+8+THHAm2n2pgiVDvRkm2NNhPfSxao0DA== X-Received: by 2002:a05:600c:19c6:b0:426:5fe1:ec7a with SMTP id 5b1f17b1804b1-42cdb5913f2mr118915295e9.31.1726563072186; Tue, 17 Sep 2024 01:51:12 -0700 (PDT) Received: from m1x-phil.lan ([176.176.131.223]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42d9b1947f9sm132235885e9.41.2024.09.17.01.51.11 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 17 Sep 2024 01:51:11 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?D?= =?utf-8?q?aniel_P=2E_Berrang=C3=A9?= , Wainer dos Santos Moschetta , Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH 2/3] .gitlab-ci.d/cirrus: Drop support for macOS 13 (Ventura) Date: Tue, 17 Sep 2024 10:50:57 +0200 Message-ID: <20240917085058.1740-3-philmd@linaro.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240917085058.1740-1-philmd@linaro.org> References: <20240917085058.1740-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=philmd@linaro.org; helo=mail-wm1-x331.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, T_SPF_TEMPERROR=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 macOS 15 "Sequoia" was released on September 16, 2024 [1]. According to QEMU's support policy, we stop supporting the previous major release two years after the the new major release has been published. Time to remove support for macOS 13 (Ventura, released on October 2022, [2]). Promote the macOS 14 job, which was only built manually, to be run by default. [1] https://www.apple.com/newsroom/2024/09/macos-sequoia-is-available-today/ [2] https://www.apple.com/newsroom/2022/10/macos-ventura-is-now-available/ Signed-off-by: Philippe Mathieu-Daudé --- .gitlab-ci.d/cirrus.yml | 17 ----------------- .gitlab-ci.d/cirrus/macos-13.vars | 16 ---------------- tests/lcitool/refresh | 1 - 3 files changed, 34 deletions(-) delete mode 100644 .gitlab-ci.d/cirrus/macos-13.vars diff --git a/.gitlab-ci.d/cirrus.yml b/.gitlab-ci.d/cirrus.yml index 92c97eefc1..f061687f1b 100644 --- a/.gitlab-ci.d/cirrus.yml +++ b/.gitlab-ci.d/cirrus.yml @@ -60,22 +60,6 @@ x64-freebsd-14-build: CONFIGURE_ARGS: --target-list-exclude=arm-softmmu,i386-softmmu,microblaze-softmmu,mips64el-softmmu,mipsel-softmmu,mips-softmmu,ppc-softmmu,sh4eb-softmmu,xtensa-softmmu TEST_TARGETS: check -aarch64-macos-13-base-build: - extends: .cirrus_build_job - variables: - NAME: macos-13 - CIRRUS_VM_INSTANCE_TYPE: macos_instance - CIRRUS_VM_IMAGE_SELECTOR: image - CIRRUS_VM_IMAGE_NAME: ghcr.io/cirruslabs/macos-ventura-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 - CONFIGURE_ARGS: --target-list-exclude=arm-softmmu,i386-softmmu,microblazeel-softmmu,mips64-softmmu,mipsel-softmmu,mips-softmmu,ppc-softmmu,sh4-softmmu,xtensaeb-softmmu - 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: @@ -90,4 +74,3 @@ aarch64-macos-14-base-build: 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 diff --git a/.gitlab-ci.d/cirrus/macos-13.vars b/.gitlab-ci.d/cirrus/macos-13.vars deleted file mode 100644 index ac3fa3a847..0000000000 --- a/.gitlab-ci.d/cirrus/macos-13.vars +++ /dev/null @@ -1,16 +0,0 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool variables macos-13 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 gtk-vnc 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/refresh b/tests/lcitool/refresh index 92381f3c46..d111b01480 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -202,7 +202,6 @@ try: # Cirrus packages lists for GitLab # generate_cirrus("freebsd-14") - generate_cirrus("macos-13") generate_cirrus("macos-14") # From patchwork Tue Sep 17 08:50:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 13805986 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 A3207C35FF8 for ; Tue, 17 Sep 2024 08: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 1sqTw1-0007ky-FC; Tue, 17 Sep 2024 04:51:45 -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 1sqTvz-0007kT-7z for qemu-devel@nongnu.org; Tue, 17 Sep 2024 04:51:43 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sqTvm-00005L-4L for qemu-devel@nongnu.org; Tue, 17 Sep 2024 04:51:41 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-42cbbb1727eso44362235e9.2 for ; Tue, 17 Sep 2024 01:51:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1726563077; x=1727167877; 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=sDwmDwyOhKnQJ0sz4RS/eydK+R6xk885g9EHeZWpZCw=; b=W95BCXmbHltdISrarirnNCG3cN7IMknWA4YsLhbrWVnH8poLFL+o2OutPe7oYe67jw IsoJMTgasioztPvi9dSRGc25LWsw7+cXf6zVjHo7EZmnbilhy2OK07YG/eW1wuNkLOfT ras8Q8AigwxN3wo+h/yA0OPzSdJgvFcqG+mtHdwaCGGfcN/6272TllIA4RtTIa6TKSM6 v1dBQLLnDZssHkS1Nly1fXVLUsYJL8FSe3CUBCB1tNUAQR4Or/vxvs7hhXifjQM4+/HL afUY+X3owCp2rwRZ8ViymY15eWf45lqghF+oPkF7bI5PRrVNqOPdxHhdAODHS8Pz6MBa 5zng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726563077; x=1727167877; 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=sDwmDwyOhKnQJ0sz4RS/eydK+R6xk885g9EHeZWpZCw=; b=JrXv5EPxIbzlEa3AQtKNiz9cvn7yjfHBJuAmmNqJCygvk+8tG6hfuKz8JjVVY1XOSq 2A3PCov0GFmJo9tT/KGoudDwJrNE4m4BqhhMbCRJYoP3ryK0q+N13I5ZbPiTpktVnhQL PfgGOQhh+re3kFt9UOWPzbJ5MMue+Rl35dLOAbTb9S3QZJhjedbrxZzvDJV1QaapTUA8 cDnu47gkugQUCAjUQnBMuL2Lqk2KfKr3jK47hwARC0VnmoQ3pRYjHec2Bsp9+GLM6J/5 hnzZ3MfrAnb2kU6BPta6jJdIb8uULrxzNYZDmUCAkdTBV7Oyh1Lyr25YlNEnM22FxW8a enYg== X-Gm-Message-State: AOJu0Yxo0+9BNqRTfXqITBnlZEJwVnm6+ymBRMnwsUMfxGy2p+eb+pwe SkEghwr8vrc9wDW7Izrxd+3lwJuavzPBAcFpz6ce/92kB/Wg+FW2ff647Q3rcaruiYWiG1YVCjY cXlk= X-Google-Smtp-Source: AGHT+IFIl+BtPfLYnASczDhJ0Vv5aFdE3o7hAAHUHsTgbsgmVBQ7Wffl8OewdmtCj1hlr56YTjVDVA== X-Received: by 2002:a5d:4dc2:0:b0:371:87d4:8f12 with SMTP id ffacd0b85a97d-378c2cfc857mr9370001f8f.17.1726563077490; Tue, 17 Sep 2024 01:51:17 -0700 (PDT) Received: from m1x-phil.lan ([176.176.131.223]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-378e78052e4sm8845073f8f.102.2024.09.17.01.51.16 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 17 Sep 2024 01:51:17 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?D?= =?utf-8?q?aniel_P=2E_Berrang=C3=A9?= , Wainer dos Santos Moschetta , Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH 3/3] .gitlab-ci.d/cirrus: Add manual testing of macOS 15 (Sequoia) Date: Tue, 17 Sep 2024 10:50:58 +0200 Message-ID: <20240917085058.1740-4-philmd@linaro.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240917085058.1740-1-philmd@linaro.org> References: <20240917085058.1740-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=philmd@linaro.org; helo=mail-wm1-x330.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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Upgrade libvirt-ci so it covers macOS 15. Add a manual entry (QEMU_JOB_OPTIONAL: 1) to test on Sequoia release. Refresh the lci-tool generated files. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé --- Pending libvirt-ci MR 501: https://gitlab.com/libvirt/libvirt-ci/-/merge_requests/501 CI job: https://gitlab.com/philmd/qemu/-/jobs/7841560032 --- .gitlab-ci.d/cirrus.yml | 17 +++++++++++++++++ .gitlab-ci.d/cirrus/macos-15.vars | 16 ++++++++++++++++ tests/lcitool/libvirt-ci | 2 +- tests/lcitool/refresh | 1 + 4 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 .gitlab-ci.d/cirrus/macos-15.vars diff --git a/.gitlab-ci.d/cirrus.yml b/.gitlab-ci.d/cirrus.yml index f061687f1b..b84b42cce5 100644 --- a/.gitlab-ci.d/cirrus.yml +++ b/.gitlab-ci.d/cirrus.yml @@ -66,6 +66,22 @@ aarch64-macos-14-base-build: NAME: macos-14 CIRRUS_VM_INSTANCE_TYPE: macos_instance CIRRUS_VM_IMAGE_SELECTOR: image + CIRRUS_VM_IMAGE_NAME: ghcr.io/cirruslabs/macos-ventura-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 + CONFIGURE_ARGS: --target-list-exclude=arm-softmmu,i386-softmmu,microblazeel-softmmu,mips64-softmmu,mipsel-softmmu,mips-softmmu,ppc-softmmu,sh4-softmmu,xtensaeb-softmmu + TEST_TARGETS: check-unit check-block check-qapi-schema check-softfloat check-qtest-x86_64 + +aarch64-macos-15-base-build: + extends: .cirrus_build_job + variables: + NAME: macos-15 + 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 @@ -74,3 +90,4 @@ aarch64-macos-14-base-build: 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 diff --git a/.gitlab-ci.d/cirrus/macos-15.vars b/.gitlab-ci.d/cirrus/macos-15.vars new file mode 100644 index 0000000000..23b2c1d22f --- /dev/null +++ b/.gitlab-ci.d/cirrus/macos-15.vars @@ -0,0 +1,16 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool variables macos-15 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 gtk-vnc 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 789b4601bc..488392b0a8 160000 --- a/tests/lcitool/libvirt-ci +++ b/tests/lcitool/libvirt-ci @@ -1 +1 @@ -Subproject commit 789b4601bce4e01f43fdb6ad4ce5ab4e46674440 +Subproject commit 488392b0a8f4ea91599f3e5b282bcba243f9ae80 diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index d111b01480..06d27f9cf2 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -203,6 +203,7 @@ try: # generate_cirrus("freebsd-14") generate_cirrus("macos-14") + generate_cirrus("macos-15") # # VM packages lists