From patchwork Thu Nov 17 17:25:32 2022 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: 625488 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp1005904pvb; Thu, 17 Nov 2022 09:26:23 -0800 (PST) X-Google-Smtp-Source: AA0mqf7QtoLZVzCX1zN+nJzAmK2tAP6ZwI03oWpL+9UQot+ZLbxdo9y2BVosof3wMG/1snPUzWB4 X-Received: by 2002:a0c:ed4f:0:b0:4bb:d550:d06a with SMTP id v15-20020a0ced4f000000b004bbd550d06amr3269134qvq.131.1668705982857; Thu, 17 Nov 2022 09:26:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668705982; cv=none; d=google.com; s=arc-20160816; b=BbKETDIb2/Ne2IMt1MXEAiessOjyr8jhLBJBueWecjMhaJLWOqrNGI41sloax4IS4c YUZnUCpOzdMRhPBdtiRUVxkzEEzsDxSQbWllICWif7w0PvKvIedknXsTDb3+YPA0ppNL stRZsNpKYFvqiJ1CPOMd3z0HRhmTW0iMOcP7MCefMgkRI4m8lcJZ64536baW16mMdLzL AcAahWbhHzVOmwWTIzwTRPkSLzdTaVQwXgr5Jk4rYe1J6qju/lixMUax1wW78TtpbLLM EBKFQsVAmHg2ly4Sa+dsZLV/ubqLePF4Q+onuwaBdW/yw0rSSIQZHeJUIr67bv+Yx2NG huFg== 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=oMlvtnFEABWg8w92G/8HRIs95GXnsgMR5Vml1n/BCPw=; b=OW3L+km00j3oFH5kE+qCEKpC+fgi2YUjFwbjBDqHL3ehjDT7LTW7OhNa5PIfZIV0oh A0TvVFxaa0kw2jWRLTYxe6Ens59/u6uPZPDlr0wwHYOjy3RTfLqzCzmLkPcoOgnhkhs3 SZICUvqvxCGLFiWwTasFJwyvDTBO3Je9ntpAd+rmklC1a8q5UeX7JCV3dPuD1cGUqPIa EppByIdR5ZX2XEmdSBw86nH5X4WFC9nCvAv4tdWUAA4//nKIeudvYQhK03I1ORJDOKAp iHjQDXohh1a2GaRhsRSQKSejuuTPoyIQ/+gKpFS7/q0pgAdqV8uCoUY12rYT92QJKQfa aPiA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=dWSPr9U1; 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 jm8-20020ad45ec8000000b004bbf5db39e8si744007qvb.259.2022.11.17.09.26.22 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 17 Nov 2022 09:26:22 -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=dWSPr9U1; 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 1ovieG-0006Qy-3N; Thu, 17 Nov 2022 12:26:00 -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 1ovie5-0006Lr-Mx for qemu-devel@nongnu.org; Thu, 17 Nov 2022 12:25:49 -0500 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ovie2-0006FW-Bd for qemu-devel@nongnu.org; Thu, 17 Nov 2022 12:25:49 -0500 Received: by mail-wr1-x42e.google.com with SMTP id v1so4923656wrt.11 for ; Thu, 17 Nov 2022 09:25:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=oMlvtnFEABWg8w92G/8HRIs95GXnsgMR5Vml1n/BCPw=; b=dWSPr9U14LI9Lv3mBmWZtcjDj3ICSFiaSrIZzGqEbWuR0Rk1k/93d2FGzCP+dM7DTs lvhGLGPJKPuUwS31VjeZAfMd0+3TF/CB6Mfn365UZreSGRO9cG2OKsXq0ES2MWdInaAJ Snq9NwSke0nSk0LSuT8olP9rMPaVieTmM3YgiJynOg7972NyERrMfr60CWPETu57ONsr /9UCcj+aRZsEbGlyzn2lTi1cxodkxwRMe6fN0Y/fyPt6hywkVhAVaPYM7cH2ueHpMkqU yzzntf54nPnDt+hAicS5Gs0nIezjyp3grVh8PJcY2jg73boqsLade2GbOva2fkdgdGMg nduw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=oMlvtnFEABWg8w92G/8HRIs95GXnsgMR5Vml1n/BCPw=; b=KDUcbu7mlo0J5COHf2lrxBDCxIJPNBKMbZQIQ6vn4vRCfN0srTZEesNLPb/eLMNv+G K/bAjcseoiSsNzKhbwqNSLnYG8kJyFq8wgMEsu1S6kb5ZMYq1M5ZYB74I15QpKsalmYs Ql3OaWkge/qhCeuvls2aC0WPO9JEK5rN2yrq8ig4/N3DX1Ftu6d1e9ybIHYH3PdDT/QL 0IaqovN6016b0KHn8T39y3HR+bOyMwfUdTgc+3bK8Y3XnQ4WZWJSDkTbIA808hmxMDmL q2knh+iDjMxmXdoSuQttVQfJUO9HlPqcVF/XmdG+zDnpBMKlfrU248+lmIrLXokrk+HU HzLg== X-Gm-Message-State: ANoB5plPMIw+cVon1c4nOabZ0+tNSnFECLSXq/i+/YPzkmSNl2vbQ5k8 06BtVpqCF/YmteQm7hTSyxqLeA== X-Received: by 2002:adf:ff89:0:b0:22e:38b:95ff with SMTP id j9-20020adfff89000000b0022e038b95ffmr2009971wrr.202.1668705942142; Thu, 17 Nov 2022 09:25:42 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id b14-20020a5d4d8e000000b0022cbf4cda62sm1754696wru.27.2022.11.17.09.25.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Nov 2022 09:25:39 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 26A771FFC4; Thu, 17 Nov 2022 17:25:34 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, Thomas Huth , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PATCH v3 13/13] ci: replace x86_64 macos-11 with aarch64 macos-12 Date: Thu, 17 Nov 2022 17:25:32 +0000 Message-Id: <20221117172532.538149-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221117172532.538149-1-alex.bennee@linaro.org> References: <20221117172532.538149-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42e.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 From: Daniel P. Berrangé The Cirrus CI service has announced the intent to discontinue support for x86_64 macOS CI runners. They already have aarch64 runners available and require all projects to switch to these images before Jan 1st 2023. The different architecture is merely determined by the image name requested. For aarch64 they only support macOS 12 onwards. At the same time our support policy only guarantees the most recent 2 major versions, so macOS 12 is already technically our min version. https://cirrus-ci.org/blog/2022/11/08/sunsetting-intel-macos-instances/ Signed-off-by: Daniel P. Berrangé Tested-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20221116175023.80627-1-berrange@redhat.com> Signed-off-by: Alex Bennée --- .gitlab-ci.d/cirrus.yml | 12 ++++++------ .gitlab-ci.d/cirrus/{macos-11.vars => macos-12.vars} | 12 ++++++------ tests/lcitool/libvirt-ci | 2 +- tests/lcitool/refresh | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) rename .gitlab-ci.d/cirrus/{macos-11.vars => macos-12.vars} (74%) diff --git a/.gitlab-ci.d/cirrus.yml b/.gitlab-ci.d/cirrus.yml index d70da61248..634a73a742 100644 --- a/.gitlab-ci.d/cirrus.yml +++ b/.gitlab-ci.d/cirrus.yml @@ -70,19 +70,19 @@ x64-freebsd-13-build: INSTALL_COMMAND: pkg install -y TEST_TARGETS: check -x64-macos-11-base-build: +aarch64-macos-12-base-build: extends: .cirrus_build_job variables: - NAME: macos-11 - CIRRUS_VM_INSTANCE_TYPE: osx_instance + NAME: macos-12 + CIRRUS_VM_INSTANCE_TYPE: macos_instance CIRRUS_VM_IMAGE_SELECTOR: image - CIRRUS_VM_IMAGE_NAME: big-sur-base + CIRRUS_VM_IMAGE_NAME: ghcr.io/cirruslabs/macos-monterey-base:latest CIRRUS_VM_CPUS: 12 CIRRUS_VM_RAM: 24G UPDATE_COMMAND: brew update INSTALL_COMMAND: brew install - PATH_EXTRA: /usr/local/opt/ccache/libexec:/usr/local/opt/gettext/bin - PKG_CONFIG_PATH: /usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/ncurses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig + 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 diff --git a/.gitlab-ci.d/cirrus/macos-11.vars b/.gitlab-ci.d/cirrus/macos-12.vars similarity index 74% rename from .gitlab-ci.d/cirrus/macos-11.vars rename to .gitlab-ci.d/cirrus/macos-12.vars index aee9f50de6..ef9e14b373 100644 --- a/.gitlab-ci.d/cirrus/macos-11.vars +++ b/.gitlab-ci.d/cirrus/macos-12.vars @@ -1,16 +1,16 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool variables macos-11 qemu +# $ lcitool variables macos-12 qemu # # https://gitlab.com/libvirt/libvirt-ci -CCACHE='/usr/local/bin/ccache' +CCACHE='/opt/homebrew/bin/ccache' CPAN_PKGS='' CROSS_PKGS='' -MAKE='/usr/local/bin/gmake' -NINJA='/usr/local/bin/ninja' +MAKE='/opt/homebrew/bin/gmake' +NINJA='/opt/homebrew/bin/ninja' PACKAGING_COMMAND='brew' -PIP3='/usr/local/bin/pip3' +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 ncurses nettle ninja perl pixman pkg-config python3 rpm2cpio sdl2 sdl2_image snappy sparse spice-protocol tesseract texinfo usbredir vde vte3 zlib zstd' PYPI_PKGS='PyYAML numpy pillow sphinx sphinx-rtd-theme' -PYTHON='/usr/local/bin/python3' +PYTHON='/opt/homebrew/bin/python3' diff --git a/tests/lcitool/libvirt-ci b/tests/lcitool/libvirt-ci index d40e203631..e3eb28cf2e 160000 --- a/tests/lcitool/libvirt-ci +++ b/tests/lcitool/libvirt-ci @@ -1 +1 @@ -Subproject commit d40e203631eb3eacee17e8cf8fd20aa5152db62a +Subproject commit e3eb28cf2e17fbcf7fe7e19505ee432b8ec5bbb5 diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index ce0b24c0b1..fa966e4009 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -176,7 +176,7 @@ try: # generate_cirrus("freebsd-12") generate_cirrus("freebsd-13") - generate_cirrus("macos-11") + generate_cirrus("macos-12") sys.exit(0) except Exception as ex: