From patchwork Wed Nov 15 20:55:34 2023 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: 743989 Delivered-To: patch@linaro.org Received: by 2002:a5d:67cf:0:b0:32d:baff:b0ca with SMTP id n15csp2966514wrw; Wed, 15 Nov 2023 12:57:19 -0800 (PST) X-Google-Smtp-Source: AGHT+IF+O6T+YN+t7A0J43jcZYi2qRVJtLDvfoksKqAscTiPqEUz3WyhjLt/k1zfIIO+BfumZ++p X-Received: by 2002:ac8:7f50:0:b0:403:a262:7751 with SMTP id g16-20020ac87f50000000b00403a2627751mr9383312qtk.12.1700081839064; Wed, 15 Nov 2023 12:57:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700081839; cv=none; d=google.com; s=arc-20160816; b=zOevhZ0ir2uoVCCuP69jyMdJa/pJuWmzkvllswenQzZFApQ7TNOHMosA01cSVxLPlK 7chXAq31AFExnmaamWqOsJVvQ4+S992Z34n/dd2GVrEAoJhL+weWwJcVHUOgO7IpwbX3 o12//h2iXN9ne7Dutvgzl/VjXdTe9TrzBZ/u4CIduqNfY8XuYAjyt+fXkFbOHm9j/Tih h+ojEfwUM0AXOxaHRsTpnSTSAsana7guCsDQRCYEkoEKNws2REXuf7F4emXIIqPjft68 IyyS9hvvzVWJSylh0vaGurvP2LRNNm7UROcm5cQig/P2H1RAfSdIZTuva759y7WKXOO7 YXSA== 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=YWoiSiUm6iXSwHJIP4SnJtrzbg+5jh5ZVQXK2gBfc2c=; fh=k9NS7Thoe5thZ+1/6QjG/eI4jlBsRRFCoMWZrxJ4Xm8=; b=qD2S9zkLJG1hRwmXdGMJLqWoe/efOHTfMeDgJjPxa+HTpuLnQqeUWhTV0uzKvqDWz1 w14Sd3xM4UGAcwB7GBLMAWL9j4olQFpMCbrnyJRdBWWxaGyat1D0CJFeXqlJofSlurft lb9mSe2uxSECH7sSTGgzd83E2AVSJHlUK0//byEWtO7pVEu2GtDy1pNfqCYPe02yG64V 1nX2RSlTzhjhcmXcr2XvbaBsu/OW5KhER2988e0+JJgijZoQyFK5fV74kgos/sbbTNiy nAFNYqTCKc3U/CQxGzxl1ti0Hl46Lb6BeJXGzsJl0HeqI3kUlhf1gGxT9kYJ53S2EaSn 5sjw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=E13MFcdd; 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 r8-20020ac85c88000000b004214ed3cd79si9414161qta.399.2023.11.15.12.57.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 15 Nov 2023 12:57:19 -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=@linaro.org header.s=google header.b=E13MFcdd; 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 1r3MvV-0004mP-Cr; Wed, 15 Nov 2023 15:55:57 -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 1r3MvP-0004lZ-4x for qemu-devel@nongnu.org; Wed, 15 Nov 2023 15:55:51 -0500 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r3MvK-00088w-QL for qemu-devel@nongnu.org; Wed, 15 Nov 2023 15:55:49 -0500 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-4083f61312eso416845e9.3 for ; Wed, 15 Nov 2023 12:55:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1700081743; x=1700686543; 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=YWoiSiUm6iXSwHJIP4SnJtrzbg+5jh5ZVQXK2gBfc2c=; b=E13MFcddCMe4zVl37hof2xzTGekFHag1ckcvXLayNm31VRZMtA9Vfl5/Ok4tOH2q4r oenTpd6Lq9yXGiB5KypstawKpbJWL7TAwN5ExoGnLsL/39rgZAI/bxk4XgxzZrKHP9w5 L6cZXbwsDMFuY9hfKWwhnZDuw9eli8+CI6kHsPeB4rBLOHD8B+lt5roq5o5YYV6DyEfN wzYtlV4lbtUdO4CRz85tVuwfpTFEGZT9iez9hkf/OnHGYQqPJaiDat+CvKF8tgM7pyuQ IkU5nCpcOGsR0iYo1uC41f3958+4JveiHw14AKlDrdlx/W7khs3gE8fpRaQi4GSur2GU 2m0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700081743; x=1700686543; 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=YWoiSiUm6iXSwHJIP4SnJtrzbg+5jh5ZVQXK2gBfc2c=; b=ZQPuAFR2wZvZ9HqciWqZBo9Uw86RXJYjPyZ683L7heDXY6t2KV1kGRAmw+AU2PvUKR Olcli6lLzMZ7W3s3+gasqauovdjqq2FVpC2QswNHkx0d9qNLmK/GI0da6G9+3QV67XXz w4gum1JEv4KRPzl23gL29Qttj21VcLTDYTJ08cCDSepfN6uS2dtgqYDAeFBYZfRdJ7gK Rr1PrscmFCTzV1ykfbJKM5nByj1f8Bhg6syPVSp7e1oOHt5WBLSjd2gYVz2rfJvLdK69 hafD8B5YigQMJT/NEk21i7MlFOtjevLixLN/2xB4iY1JfXwe0wJz01b+0IBkmY97tQ/F hMkw== X-Gm-Message-State: AOJu0YwlVN4PeTjommUxjy7oA//SWHDs/tzXNLGM0zYVtxYGAhkRoFAF ogOAz+a0Gjwdnpwk0rgWGj42Ag== X-Received: by 2002:a05:600c:3143:b0:3fb:feb0:6f40 with SMTP id h3-20020a05600c314300b003fbfeb06f40mr11721890wmo.11.1700081743645; Wed, 15 Nov 2023 12:55:43 -0800 (PST) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id fb11-20020a05600c520b00b004076f522058sm909879wmb.0.2023.11.15.12.55.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Nov 2023 12:55:43 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id E5A635F7B0; Wed, 15 Nov 2023 20:55:42 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Thomas Huth , Peter Maydell , Beraldo Leal , Mahmoud Mandour , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , qemu-arm@nongnu.org, Alexandre Iooss , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= Subject: [PATCH 02/10] .gitlab-ci.d/cirrus: Upgrade macOS to 13 (Ventura) Date: Wed, 15 Nov 2023 20:55:34 +0000 Message-Id: <20231115205542.3092038-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231115205542.3092038-1-alex.bennee@linaro.org> References: <20231115205542.3092038-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x332.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé macOS 14 "Sonoma" was released on September 2023 [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. Replace the macOS 12 (Monterey) testing by macOS 13 (Ventura, released on October 2022, [2]). Refresh the generated files by running: $ make lcitool-refresh [1] https://www.apple.com/newsroom/2023/09/macos-sonoma-is-available-today/ [2] https://www.apple.com/newsroom/2022/10/macos-ventura-is-now-available/ Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé Message-Id: <20231108162022.76189-1-philmd@linaro.org> Signed-off-by: Alex Bennée --- .gitlab-ci.d/cirrus.yml | 6 +++--- .gitlab-ci.d/cirrus/{macos-12.vars => macos-13.vars} | 2 +- tests/lcitool/refresh | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) rename .gitlab-ci.d/cirrus/{macos-12.vars => macos-13.vars} (95%) diff --git a/.gitlab-ci.d/cirrus.yml b/.gitlab-ci.d/cirrus.yml index e7f1f83c2c..07dc6edae1 100644 --- a/.gitlab-ci.d/cirrus.yml +++ b/.gitlab-ci.d/cirrus.yml @@ -59,13 +59,13 @@ x64-freebsd-13-build: INSTALL_COMMAND: pkg install -y TEST_TARGETS: check -aarch64-macos-12-base-build: +aarch64-macos-13-base-build: extends: .cirrus_build_job variables: - NAME: macos-12 + NAME: macos-13 CIRRUS_VM_INSTANCE_TYPE: macos_instance CIRRUS_VM_IMAGE_SELECTOR: image - CIRRUS_VM_IMAGE_NAME: ghcr.io/cirruslabs/macos-monterey-base:latest + CIRRUS_VM_IMAGE_NAME: ghcr.io/cirruslabs/macos-ventura-base:latest CIRRUS_VM_CPUS: 12 CIRRUS_VM_RAM: 24G UPDATE_COMMAND: brew update diff --git a/.gitlab-ci.d/cirrus/macos-12.vars b/.gitlab-ci.d/cirrus/macos-13.vars similarity index 95% rename from .gitlab-ci.d/cirrus/macos-12.vars rename to .gitlab-ci.d/cirrus/macos-13.vars index 5f3fb346d1..534f029956 100644 --- a/.gitlab-ci.d/cirrus/macos-12.vars +++ b/.gitlab-ci.d/cirrus/macos-13.vars @@ -1,6 +1,6 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool variables macos-12 qemu +# $ lcitool variables macos-13 qemu # # https://gitlab.com/libvirt/libvirt-ci diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index 10c54a377c..7c211eba2e 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -203,7 +203,7 @@ try: # Cirrus packages lists for GitLab # generate_cirrus("freebsd-13") - generate_cirrus("macos-12") + generate_cirrus("macos-13") # # VM packages lists