From mboxrd@z Thu Jan 1 00:00:00 1970 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 8B051CCF9E0 for ; Mon, 27 Oct 2025 11:07:38 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vDL2I-0001Y4-P8; Mon, 27 Oct 2025 07:05:15 -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 1vDL20-00012B-2F for qemu-arm@nongnu.org; Mon, 27 Oct 2025 07:04:56 -0400 Received: from mail-ed1-x52d.google.com ([2a00:1450:4864:20::52d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vDL1S-0005b6-Bg for qemu-arm@nongnu.org; Mon, 27 Oct 2025 07:04:55 -0400 Received: by mail-ed1-x52d.google.com with SMTP id 4fb4d7f45d1cf-63c0eb94ac3so7997588a12.2 for ; Mon, 27 Oct 2025 04:03:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761563028; x=1762167828; 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=XBaCUU+RDMe8Fm+rMDPlvgrTnuTfYc8fUoPcpfBGUms=; b=ZDl8/9Qt7Y+doaQTj+12ng6xydqfPt/krMdiLGH2c8sRHW2/MR1d6UTHR+Cw1U3zgs ytFzHernRvt56Q1+3L4GfLVrV+biOnyJc+IDJ0e+Vus4wl5nKcCmgkph6qq5cZk8Za0x QJ7rIe9MUw9sR3hKbh+Recs+jIu3lkRmixHU6n/XGgg0kMMAIIrc+khWrC+Je3dKfVVy Xm/0NKmCoQB4WRDxMtPJtRfAoyJCXE7o0c32zfGTXJVUKnBuDOvwyebuAwPubIwOHWoa hcsAaA3Ca4oYkmqryKkUVk1LMnw7+5xnyJscPWQRUHplnSTox51jdVGmyILpRUUzFY6D vw5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761563028; x=1762167828; 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=XBaCUU+RDMe8Fm+rMDPlvgrTnuTfYc8fUoPcpfBGUms=; b=izTe8ulppOPYEjKQPiJs2LjxJQioZWPiL6+MW6A3VpM+mB3qSymFF8eXmIuknBJVAO nFCl2sPCMwptrskZxPeif9TzDJER2OAUxg8cK8zxj34TnSZIwBTlqSoKX3EcLmOZBesj MJ1CfehAcOH+u6yqwt0UryVy9CWO7wVihsvj8mO6cfTZoSp6IElspNVUuxYjE0TAKPFy mG5+gRKhngk4SORi+ftaFuOhutYlVMnpsKf/jwPWcV4DahbcXVu10WfyIk7A57gr2W2N cQb/LPDlueWkzeMF+P/05gR0+29+jsrxKk9CGDY/qfgnYc6meWTva0F6kNo09H+v0XhZ j7Rw== X-Forwarded-Encrypted: i=1; AJvYcCU7wGH+mMtXrebOBsEW5QDKO99ww9HJEOnWveJkSX36N1HhH8xcDUjQNGZMk4V5wSKVsUa9X3tDrQ==@nongnu.org X-Gm-Message-State: AOJu0Yxto1oSaq0Nz7bLoWYnLTzLsvQJJOxu9pnjfGRdOXEjKbb11nUE CLPuXVZ1wRNIWG2zvLCmLORrpVE7L3ib5h1yrOlXtJTlawS1yhHVwZZPYqtsW2JeMEo= X-Gm-Gg: ASbGncu/lGNQAglmc/9/fdbUJR87EGK+ZTiVio5XvEQydUccEXqML6MuQhzkXc+iYWY kHhnN4N+dKteY8bJxh6Xku7FiTXHc8QNizFoEk2jGXwyl7fIfdjwLJsIc3VH8Ht8hpOb3Y+Dugx 964ozoVIL4TphVEaURPDmryKnP5rf4BSrTCjwktExo4ZAUGvqszfcWuyPHufFHRt3SGEX1QcS4m VKghYtdQ0I7skz/cQS3WkTsnRcKdeTta0YDtrMZ1OLBKcBfkDtlETVqWERrF/hb+tUO855op7xK 6NgG7E/H6qCcTmnsoB5z9cmF9gRECer73Ywc7Pzcy2aJVHMWWPhPEkX/QDvNWXmmYLJ16TGvUkr Q7U/I9ccHwy3iCxaoV52qigxEvYgABKfZTwXDrgQJAYgfBR7JZb9hUqrA04dNEpl8ZEWzWuXhaJ hSzmYGcxo75lY= X-Google-Smtp-Source: AGHT+IFkfptHR6PlFDi2agbOhG8NdwOZDW+TmaYBSdpTlkdykfX5dwUJ7HJhZgUkUyvlt6G3flbptw== X-Received: by 2002:a50:c88b:0:b0:63c:ea6:5608 with SMTP id 4fb4d7f45d1cf-63c1f6dfc77mr24049039a12.36.1761563027728; Mon, 27 Oct 2025 04:03:47 -0700 (PDT) Received: from draig.lan ([185.126.160.19]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-63e7efb97cbsm6176732a12.26.2025.10.27.04.03.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Oct 2025 04:03:45 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 62C4F5F92F; Mon, 27 Oct 2025 11:03:44 +0000 (GMT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Liu Zhiwei , Alexandre Iooss , Chinmay Rath , qemu-arm@nongnu.org, Peter Maydell , Nicholas Piggin , Ilya Leoshkevich , David Hildenbrand , qemu-ppc@nongnu.org, Paolo Bonzini , qemu-s390x@nongnu.org, Pierrick Bouvier , Bastian Koppelmann , Helge Deller , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Stafford Horne , Mahmoud Mandour , Artyom Tarasenko , Eduardo Habkost , Palmer Dabbelt , Alistair Francis , Laurent Vivier , Weiwei Li , Daniel Henrique Barboza , Mark Cave-Ayland , Yoshinori Sato , "Edgar E. Iglesias" , Aurelien Jarno , Richard Henderson , Thomas Huth , Max Filippov , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Jiaxun Yang , Michael Rolnik , Song Gao , qemu-riscv@nongnu.org, Aleksandar Rikalo Subject: [PATCH 03/35] scripts/ci: move build-environment.yaml up a level Date: Mon, 27 Oct 2025 11:03:10 +0000 Message-ID: <20251027110344.2289945-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251027110344.2289945-1-alex.bennee@linaro.org> References: <20251027110344.2289945-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::52d; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x52d.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-arm@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-arm-bounces+qemu-arm=archiver.kernel.org@nongnu.org Sender: qemu-arm-bounces+qemu-arm=archiver.kernel.org@nongnu.org We can share the setup of the build environment with multiple operating systems as we just need to check the YAML for each env is present in the directory structure. Signed-off-by: Alex Bennée --- .../ci/setup/{ubuntu => }/build-environment.yml | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) rename scripts/ci/setup/{ubuntu => }/build-environment.yml (81%) diff --git a/scripts/ci/setup/ubuntu/build-environment.yml b/scripts/ci/setup/build-environment.yml similarity index 81% rename from scripts/ci/setup/ubuntu/build-environment.yml rename to scripts/ci/setup/build-environment.yml index 1c517c74f74..66bde188755 100644 --- a/scripts/ci/setup/ubuntu/build-environment.yml +++ b/scripts/ci/setup/build-environment.yml @@ -27,18 +27,24 @@ - ansible_facts['distribution'] == 'Ubuntu' # the package lists are updated by "make lcitool-refresh" - - name: Include package lists based on OS and architecture - include_vars: - file: "ubuntu-2404-{{ ansible_facts['architecture'] }}.yaml" + - name: Define package list file path + set_fact: + package_file: "ubuntu/ubuntu-2404-{{ ansible_facts['architecture'] }}.yaml" when: - ansible_facts['distribution'] == 'Ubuntu' - ansible_facts['distribution_version'] == '24.04' + - name: Include package lists based on OS and architecture + include_vars: + file: "{{ package_file }}" + when: + - package_file is exists + - name: Install packages for QEMU on Ubuntu 24.04 package: name: "{{ packages }}" when: - - ansible_facts['distribution'] == 'Ubuntu' - - ansible_facts['distribution_version'] == '24.04' + - package_file is exists + - packages is defined -- 2.47.3