From nobody Sun May 19 14:36:22 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1714146044; cv=none; d=zohomail.com; s=zohoarc; b=D4u8O1XdgRk3ohWAwbBTQwZOT90/cpLbfTQheRWltE1SXrUjxiYShWR6Mdot+DIVLyPseQV2tN0WRRb9jepL7CXbi0+kND+IKtbYnUMjPI1k/BiFBJZPRqd1AVrHp6GFjIrJ6dml42FqejK0+ZvI5B/Gt9pnOt6/RWoIRWrJ5wI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1714146044; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=A1Ykyp8MSDEaXJw36chiMW0ZSsAFqE5MPorR7vu6DxU=; b=izOU8f2NHEaKbBVR5XZYmPIE+wXJJQfxEVkZRls/eF6CQSz6u5iUutz1SZUe3jdioC+revbAgR5iQzNO+8Xe3VtFQs0XlC7uERzaDFP6Br+WJl5VoRMMlvy4U/oaqU2R+TuIgxpdKuRuJJBl07v9avMfJxFhl8kX2Cq5J49ZoXA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1714146044343999.7246522293699; Fri, 26 Apr 2024 08:40:44 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s0Nfw-0001pI-EF; Fri, 26 Apr 2024 11:39:48 -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 1s0Nft-0001nT-L5 for qemu-devel@nongnu.org; Fri, 26 Apr 2024 11:39:45 -0400 Received: from mail-ed1-x52f.google.com ([2a00:1450:4864:20::52f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s0Nfq-0003n6-J3 for qemu-devel@nongnu.org; Fri, 26 Apr 2024 11:39:45 -0400 Received: by mail-ed1-x52f.google.com with SMTP id 4fb4d7f45d1cf-56e6a1edecfso3616372a12.1 for ; Fri, 26 Apr 2024 08:39:41 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id y43-20020a50bb2e000000b0057000a2cb5bsm10547038ede.18.2024.04.26.08.39.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Apr 2024 08:39:39 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 0670E5F8A9; Fri, 26 Apr 2024 16:39:39 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1714145980; x=1714750780; 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=A1Ykyp8MSDEaXJw36chiMW0ZSsAFqE5MPorR7vu6DxU=; b=g92x21ZfL9Ij7Uh2MaCE/tq6GNuRnwcL8UBrSSuvSMYKWmTwgeOZEtA82Fg/Pz7V+c zi+M+lDAOO07sr+amFA1OVr3uPKcdSvb2MBqKQERBubLBU9MKV2N+zDemci+pKyeS0er bsCxQA7Ly0jYod4vPDPDztXvKNXuAE7+nfk+tEjNpL33+7VNuUmJsEEeiDRUBho0eZ3c FhNRNZ/T8dCgOST86xGQGdu9BW3+FJwO7QBHiRSlMqG+s91vyxjDm/5WzHGWGWFCd2YO TZOQjJY+/KRue+/IK9eAMApTINiXEqjRxCb7gs7JWkV33Fd28rx2lBPJtmCC7OrVoL9G 9hQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714145980; x=1714750780; 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=A1Ykyp8MSDEaXJw36chiMW0ZSsAFqE5MPorR7vu6DxU=; b=uqLgUuNdAOHUzBgRYylErUnMNE3+PzDFAAoCGdWUdsa18ez3cmYdXVISycQlZ9NWwG 9hryu+YmAU4/mOUHQbNPkoIXVsNm8ng5HnyrMqf5nnfPZB9cAgzgsUAdWpGY/cgVRp9x qASh+C6qAVfDBoikspsr4Su1HsClpcNdipuCjMw5xMuxd62AMblnWFFH/aMbSAGXCJ8E 2wU54p+XSwEhUuqcd1LtLiffLkgnGCFfKuW2YbWXe4j0oMLABBtrb63Akn50RNldbWJX sx2/RU2wmfHKSNbvzTLQM2VzswM1wbwGW2Sb35dc1D7nlTHSI7bI5IplgyHTGlceHXET 7hmQ== X-Gm-Message-State: AOJu0YwRgdg7fRkIHSuextNieFRVfFrrSL+dAmrkzxG3Ws5xLeQHcHmU uMnDh8yCMtnEeWBddvQCoL5lum685aE2fcSpQLNlGYeuahTZoURxhey7cqScaV4= X-Google-Smtp-Source: AGHT+IH4k5ZHvgxBJYawDbPpnBYAR3qOl92dQCgAEsfhVNRvExBHYtw1LwD1Bwdm+0bY29aGG3hqdQ== X-Received: by 2002:a50:8d1e:0:b0:56c:3b7a:632b with SMTP id s30-20020a508d1e000000b0056c3b7a632bmr2203670eds.29.1714145979910; Fri, 26 Apr 2024 08:39:39 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Beraldo Leal , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Wainer dos Santos Moschetta , Peter Maydell , Mark Cave-Ayland , Joel Stanley , qemu-s390x@nongnu.org, qemu-arm@nongnu.org, Pavel Dovgalyuk , Cleber Rosa , Thomas Huth , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Laurent Vivier , =?UTF-8?q?Alex=20Benn=C3=A9e?= , John Snow , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Aurelien Jarno , Jiaxun Yang , Markus Armbruster Subject: [PATCH 1/3] build-environment: make some packages optional Date: Fri, 26 Apr 2024 16:39:36 +0100 Message-Id: <20240426153938.1707723-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240426153938.1707723-1-alex.bennee@linaro.org> References: <20240426153938.1707723-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::52f; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x52f.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+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1714146047136100003 Upgrading the s390x runner exposed some packages are not available for it. Add an additional optional stage we only enable for arm64/x86_64 for now. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Thomas Huth --- scripts/ci/setup/build-environment.yml | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/scripts/ci/setup/build-environment.yml b/scripts/ci/setup/buil= d-environment.yml index f344d1a850..de0d866a1e 100644 --- a/scripts/ci/setup/build-environment.yml +++ b/scripts/ci/setup/build-environment.yml @@ -95,7 +95,6 @@ - libpam0g-dev - libpcre2-dev - libpixman-1-dev - - libpmem-dev - libpng-dev - libpulse-dev - librbd-dev @@ -107,7 +106,6 @@ - libslirp-dev - libsnappy-dev - libspice-protocol-dev - - libspice-server-dev - libssh-dev - libsystemd-dev - libtasn1-6-dev @@ -119,7 +117,6 @@ - libvdeplug-dev - libvirglrenderer-dev - libvte-2.91-dev - - libxen-dev - libxml2-dev - libzstd-dev - llvm @@ -156,6 +153,19 @@ - ansible_facts['distribution'] =3D=3D 'Ubuntu' - ansible_facts['distribution_version'] =3D=3D '22.04' =20 + # not all packages are available for all architectures + - name: Install additional packages to build QEMU on Ubuntu 22.04 + package: + name: + - libpmem-dev + - libspice-server-dev + - libxen-dev + state: present + when: + - ansible_facts['distribution'] =3D=3D 'Ubuntu' + - ansible_facts['distribution_version'] =3D=3D '22.04' + - ansible_facts['architecture'] =3D=3D 'aarch64' or ansible_facts[= 'architecture'] =3D=3D 'x86_64' + - name: Install armhf cross-compile packages to build QEMU on AArch64 = Ubuntu 22.04 package: name: --=20 2.39.2 From nobody Sun May 19 14:36:22 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1714146084; cv=none; d=zohomail.com; s=zohoarc; b=kzHMe8Mch2nfLIC70+ieu6mSbO6plqzcM+NydbFOqX/W5VzBGZmKN3nGA4nj1x5StKXuKWZWcygI8KJ7JpK2NK9RGmGDTXr+FVqqAOgNXpOib2Rwt36CzUVJiYG1i+lTa6t2Te4VGe0t79TCaXG8a9UzIqVtl2ZlHfLuaWrlehA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1714146084; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=BQVnWso8WX9bz1gOeDbAO6szOCXlSFLVqMyjg5rVeaw=; b=DZjtGsZ2nOo50ekjTQ4dviy2Ko4FRXevyA6zfvm44xZJmcci5w145930EIv9Vm7LljBipJZ+tHc7hlucr6hoJb6KFKAAbNnrq2OVWKztK4bcMB2tsFEH5iU+XUtFkJ/yNBs1ddDPq6ZfXpmDmy7VZTfpnjg1cULQkNS3T+VCd80= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1714146084526319.68139507204546; Fri, 26 Apr 2024 08:41:24 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s0Nfy-0001qm-KR; Fri, 26 Apr 2024 11:39:50 -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 1s0Nft-0001mm-8w for qemu-devel@nongnu.org; Fri, 26 Apr 2024 11:39:45 -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 1s0Nfq-0003nB-KH for qemu-devel@nongnu.org; Fri, 26 Apr 2024 11:39:44 -0400 Received: by mail-ej1-x62d.google.com with SMTP id a640c23a62f3a-a559b919303so298168966b.1 for ; Fri, 26 Apr 2024 08:39:42 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id u14-20020a1709063b8e00b00a58de9434ecsm33716ejf.108.2024.04.26.08.39.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Apr 2024 08:39:39 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 1C85E5F94B; Fri, 26 Apr 2024 16:39:39 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1714145980; x=1714750780; 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=BQVnWso8WX9bz1gOeDbAO6szOCXlSFLVqMyjg5rVeaw=; b=Ze8/OlkpJC5pNgAXu4Iwb2n87Z3t2Ap5EmFmTwaJoZjzIAZ6LoEFXPHDb9Lr278KYB Y0L134ieafv8IWbKv/dosRFe4g4MtrGoOvZDngDM0MXRJgmdN6TfDsCcFoQha6p9DI0t lDAFPwhj8bwPmFLq55yZEZa/0IHdsmY1cZZsUl7qqGY303pPTWD3pn+wtitI68j6wQbe RrTrgYxZbGW+UOvCB4yrPr9I0HElgLJJOZg8E9kMxQWgSkgr5fW/CjfNXTyo/MeXgbGl x8nLexUeIDC8Ofr8Y9+HXe9XJyJ0qE/zX403RkDXQWk1nHEsNID23dfnrwGvrNgxchgz pR7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714145980; x=1714750780; 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=BQVnWso8WX9bz1gOeDbAO6szOCXlSFLVqMyjg5rVeaw=; b=U3Xg+eKJBMgJdIKATCFTDni5y3qdijKG1M+SMYHnLljudmjNwzPYngxi9nMDqdEKCB p9cscJf6Lft4+C5OTlQKNbofyUbs9LROHuNk5RaOWvmeANTtrnfGu4WhdqpSWbnBQIYw CvbkP7Rv5OXBNg7+HpvnOReInQIZKxIJJJOX9ZVz/OjahSUzcNxlPV3DVBLMwXRidzfv dBAIWWvgIfBTocCT/bZQcNdJi89AVRVqJpk2up+1/peWNoYq8N9Cj8y++F820dsuFwNk 8DbqMJf0Ep5wG5JN/1HYisBtraV70MhvTLVTNRbVX4uaFgRz7rmrgMZCcKmGov10lYY2 dBIw== X-Gm-Message-State: AOJu0Ywj7V0Z3ZXVlHo0Y9K5LoiwqFTPg4yd399QZ4f7aaBR2beNVIFQ iJK+eojFts1AUTX1I7HRwJMMqcQ5RMG6H1BJy2Lr/GPD7Fbo6xjEKiCLTgMGJCc= X-Google-Smtp-Source: AGHT+IEMyD2P1lpAJ3X+JkD3KFAIJt1AH9wyJZYLRbGjxiCpenmkej3vs4PybaxLaf/MG92cKXkzKA== X-Received: by 2002:a17:906:3bd5:b0:a55:3488:f730 with SMTP id v21-20020a1709063bd500b00a553488f730mr2243165ejf.31.1714145980106; Fri, 26 Apr 2024 08:39:40 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Beraldo Leal , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Wainer dos Santos Moschetta , Peter Maydell , Mark Cave-Ayland , Joel Stanley , qemu-s390x@nongnu.org, qemu-arm@nongnu.org, Pavel Dovgalyuk , Cleber Rosa , Thomas Huth , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Laurent Vivier , =?UTF-8?q?Alex=20Benn=C3=A9e?= , John Snow , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Aurelien Jarno , Jiaxun Yang , Markus Armbruster Subject: [PATCH 2/3] gitlab: migrate the s390x custom machine to 22.04 Date: Fri, 26 Apr 2024 16:39:37 +0100 Message-Id: <20240426153938.1707723-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240426153938.1707723-1-alex.bennee@linaro.org> References: <20240426153938.1707723-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; 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+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1714146086583100001 20.04 is dead (from QEMU's point of view), long live 22.04! Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Thomas Huth --- .gitlab-ci.d/custom-runners.yml | 2 +- ...20.04-s390x.yml =3D> ubuntu-22.04-s390x.yml} | 28 +++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-) rename .gitlab-ci.d/custom-runners/{ubuntu-20.04-s390x.yml =3D> ubuntu-22.= 04-s390x.yml} (88%) diff --git a/.gitlab-ci.d/custom-runners.yml b/.gitlab-ci.d/custom-runners.= yml index a0e79acd39..29e52df283 100644 --- a/.gitlab-ci.d/custom-runners.yml +++ b/.gitlab-ci.d/custom-runners.yml @@ -29,7 +29,7 @@ junit: build/meson-logs/testlog.junit.xml =20 include: - - local: '/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml' + - 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/ubuntu-20.04-s390x.yml b/.gitlab-c= i.d/custom-runners/ubuntu-22.04-s390x.yml similarity index 88% rename from .gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml rename to .gitlab-ci.d/custom-runners/ubuntu-22.04-s390x.yml index cdae6c5212..85e2809573 100644 --- a/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml +++ b/.gitlab-ci.d/custom-runners/ubuntu-22.04-s390x.yml @@ -1,13 +1,13 @@ -# All ubuntu-20.04 jobs should run successfully in an environment +# All ubuntu-22.04 jobs should run successfully in an environment # setup by the scripts/ci/setup/build-environment.yml task -# "Install basic packages to build QEMU on Ubuntu 20.04/20.04" +# "Install basic packages to build QEMU on Ubuntu 22.04" =20 -ubuntu-20.04-s390x-all-linux-static: +ubuntu-22.04-s390x-all-linux-static: extends: .custom_runner_template needs: [] stage: build tags: - - ubuntu_20.04 + - ubuntu_22.04 - s390x rules: - if: '$CI_PROJECT_NAMESPACE =3D=3D "qemu-project" && $CI_COMMIT_BRANCH = =3D~ /^staging/' @@ -23,12 +23,12 @@ ubuntu-20.04-s390x-all-linux-static: - make --output-sync check-tcg - make --output-sync -j`nproc` check =20 -ubuntu-20.04-s390x-all: +ubuntu-22.04-s390x-all: extends: .custom_runner_template needs: [] stage: build tags: - - ubuntu_20.04 + - ubuntu_22.04 - s390x timeout: 75m rules: @@ -42,12 +42,12 @@ ubuntu-20.04-s390x-all: - make --output-sync -j`nproc` - make --output-sync -j`nproc` check =20 -ubuntu-20.04-s390x-alldbg: +ubuntu-22.04-s390x-alldbg: extends: .custom_runner_template needs: [] stage: build tags: - - ubuntu_20.04 + - ubuntu_22.04 - s390x rules: - if: '$CI_PROJECT_NAMESPACE =3D=3D "qemu-project" && $CI_COMMIT_BRANCH = =3D~ /^staging/' @@ -65,12 +65,12 @@ ubuntu-20.04-s390x-alldbg: - make --output-sync -j`nproc` - make --output-sync -j`nproc` check =20 -ubuntu-20.04-s390x-clang: +ubuntu-22.04-s390x-clang: extends: .custom_runner_template needs: [] stage: build tags: - - ubuntu_20.04 + - ubuntu_22.04 - s390x rules: - if: '$CI_PROJECT_NAMESPACE =3D=3D "qemu-project" && $CI_COMMIT_BRANCH = =3D~ /^staging/' @@ -87,11 +87,11 @@ ubuntu-20.04-s390x-clang: - make --output-sync -j`nproc` - make --output-sync -j`nproc` check =20 -ubuntu-20.04-s390x-tci: +ubuntu-22.04-s390x-tci: needs: [] stage: build tags: - - ubuntu_20.04 + - ubuntu_22.04 - s390x rules: - if: '$CI_PROJECT_NAMESPACE =3D=3D "qemu-project" && $CI_COMMIT_BRANCH = =3D~ /^staging/' @@ -107,12 +107,12 @@ ubuntu-20.04-s390x-tci: || { cat config.log meson-logs/meson-log.txt; exit 1; } - make --output-sync -j`nproc` =20 -ubuntu-20.04-s390x-notcg: +ubuntu-22.04-s390x-notcg: extends: .custom_runner_template needs: [] stage: build tags: - - ubuntu_20.04 + - ubuntu_22.04 - s390x rules: - if: '$CI_PROJECT_NAMESPACE =3D=3D "qemu-project" && $CI_COMMIT_BRANCH = =3D~ /^staging/' --=20 2.39.2 From nobody Sun May 19 14:36:22 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1714146094; cv=none; d=zohomail.com; s=zohoarc; b=THPDj+Y09uhbldNevXEXYHfT1PHKu0C/qo3O9CTflTnt/7cOKAU+DIStQsAi9pBJkPG9yHPkp+Gfv39OEZ5Vce5DtQgaxlZt8U3zsVr5q8uMCUEN+AgnmL/MH9DCL3IpIp1H9bym2HW9gMTyMJyhx3IA+FD5Be6q80XpitykTtM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1714146094; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=2t8caeHG/hvE4xW05s4K/jE+OqOrT7ireK4cX6BKhYk=; b=nHFJhbDPuZHkvnnOKnlb/sn7X5DE+VqK0RlOxChfiVYQX2V4WHIl0MnPq7HMZHVYqeYX9OHAQaA/CanbCRJ9fW3ATOzeIDakNK2ygadvFB6UZbzHPtNJz1B/C6kmg5XuElTMJ8HIgr5RwwtYSFlZC10gYuLbST+eM9+SujMXwW0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1714146094001779.888176461103; Fri, 26 Apr 2024 08:41:34 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s0Nfy-0001qk-69; Fri, 26 Apr 2024 11:39:50 -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 1s0Nfu-0001oK-Vb for qemu-devel@nongnu.org; Fri, 26 Apr 2024 11:39:46 -0400 Received: from mail-ed1-x534.google.com ([2a00:1450:4864:20::534]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s0Nfs-0003na-6C for qemu-devel@nongnu.org; Fri, 26 Apr 2024 11:39:46 -0400 Received: by mail-ed1-x534.google.com with SMTP id 4fb4d7f45d1cf-571ba432477so2523911a12.1 for ; Fri, 26 Apr 2024 08:39:42 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id u7-20020a509507000000b005722d871e4csm3542662eda.90.2024.04.26.08.39.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Apr 2024 08:39:40 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 3238B5F94C; Fri, 26 Apr 2024 16:39:39 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1714145982; x=1714750782; 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=2t8caeHG/hvE4xW05s4K/jE+OqOrT7ireK4cX6BKhYk=; b=vqoUEd+znWzEVmIOC2UUSIWuwglx7jhyWTaTj9+0c6Vlra6VNSHWBRb4XUfX7M4why chYlsl6dUTLm64QcGhxJ5L189o2a+DQYysWNjjh7ME4WyDqPs93F7uUfiFhTQgd9Lmze vYsQ+WaTgzm127hspPFm6O+9bVNCQD+HEUsyqtw8jvaksGw2OYEwki0hagE8tdaG0VL3 pUwah4eM3zbssf6eqzguJkMNe9W6yLIKSsy/9vCYsrFfTto77WssHGr25QAvF3w2i7kS a1IuWJoXflZKQfLSnXD6q1MW84nKn+0Ex0CldpbuM2jH/xEtyzMuCji2fdmDMwQFJPJs WoZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714145982; x=1714750782; 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=2t8caeHG/hvE4xW05s4K/jE+OqOrT7ireK4cX6BKhYk=; b=A1aG67XT2rZmGullmlWDM/PwiDvGPHBXgqlpQLpRHnYOOyoU8EGjnUoBp3FQkR48f6 WVCyYBjnIjkVeU3XTvFUuFtwgKFzaCFPeiDexhF8qXYKI67hSSuhuJNgN9AvnscqWxtN +jVlwj+Au2JMRdjg7GtztwJMeTTku6nXV8L5wEcCX3IdFPrmi0m57sI63PtyD+Lrnik6 zckEr6mWDtC5dvvy9aHhf0a1Oi2A+/+IfkBrMTpMgcxDTIcYVrHmc0x0L3H8bBXwnCgf 7yj5GZBeabeBM6RzCBH6PABMqUIs+AwVLdRD+WgjcxJmHBn2dhTb/mjdulLMjIhUMywP apoA== X-Gm-Message-State: AOJu0YzcB2rswV6npx3x4ZHCZSlZvpRdfRgRLkTuem0R3fxWw/lrSTUE ZaOKLrXsoPJirQSzCOIBczCqDi4SF3OOFRMC3l8/XXhZlkNA+bqxis/ZsXuaueo= X-Google-Smtp-Source: AGHT+IFDld2HDYWcjx121NV2ZWCF0PgImU9WsM4NLtfO+T4utCsthW/wgNEphd0r2DXC1HLg4z18og== X-Received: by 2002:a50:cd15:0:b0:56d:c40d:b921 with SMTP id z21-20020a50cd15000000b0056dc40db921mr2091875edi.20.1714145982028; Fri, 26 Apr 2024 08:39:42 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Beraldo Leal , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Wainer dos Santos Moschetta , Peter Maydell , Mark Cave-Ayland , Joel Stanley , qemu-s390x@nongnu.org, qemu-arm@nongnu.org, Pavel Dovgalyuk , Cleber Rosa , Thomas Huth , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Laurent Vivier , =?UTF-8?q?Alex=20Benn=C3=A9e?= , John Snow , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Aurelien Jarno , Jiaxun Yang , Markus Armbruster Subject: [PATCH 3/3] gitlab: remove stale s390x-all-linux-static conf hacks Date: Fri, 26 Apr 2024 16:39:38 +0100 Message-Id: <20240426153938.1707723-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240426153938.1707723-1-alex.bennee@linaro.org> References: <20240426153938.1707723-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::534; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x534.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+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1714146094620100001 The libssh bug references 18.04 which we are no longer running. We don't need to disable glusterfs because a linux-user build shouldn't be trying to link to it anyway. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Thomas Huth --- .gitlab-ci.d/custom-runners/ubuntu-22.04-s390x.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.gitlab-ci.d/custom-runners/ubuntu-22.04-s390x.yml b/.gitlab-c= i.d/custom-runners/ubuntu-22.04-s390x.yml index 85e2809573..105981879f 100644 --- a/.gitlab-ci.d/custom-runners/ubuntu-22.04-s390x.yml +++ b/.gitlab-ci.d/custom-runners/ubuntu-22.04-s390x.yml @@ -13,11 +13,9 @@ ubuntu-22.04-s390x-all-linux-static: - if: '$CI_PROJECT_NAMESPACE =3D=3D "qemu-project" && $CI_COMMIT_BRANCH = =3D~ /^staging/' - if: "$S390X_RUNNER_AVAILABLE" script: - # --disable-libssh is needed because of https://bugs.launchpad.net/qemu/+= bug/1838763 - # --disable-glusterfs is needed because there's no static version of thos= e libs in distro supplied packages - mkdir build - cd build - - ../configure --enable-debug --static --disable-system --disable-gluster= fs --disable-libssh + - ../configure --enable-debug --static --disable-system || { cat config.log meson-logs/meson-log.txt; exit 1; } - make --output-sync -j`nproc` - make --output-sync check-tcg --=20 2.39.2