From nobody Sun May 19 07:16:12 2024 Delivered-To: importer@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+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1673947036; cv=none; d=zohomail.com; s=zohoarc; b=bAWv0LbqT/G0TjIdVXpYNQStOheu7YhnlId/9mX+k5jCtn4D6E7ES1a5T8zw180YdMsVWe9kbwBaQAny/JBk0kvnnYh8MXYS+D1TVO8IQED7wv0xHEuE4LoL7LcWF2Vve/xxmC1zd9oBVTsgtqdxYoH2aDYU6ugxDQBqpasWzMA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1673947036; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0nPIxge9VAV8+Lb4s7NDa+nmmH+Cyiqzn/4/7OyoCi8=; b=V/EbuYSjuyC7vokERG/m54bI5J0kXKUXuZIqLLKcYjM3mi27Basd60F963GLvnv/Ng0DtvZF1WRsrSREAKJQLikCxE095CvsQVZg4MwlYUNW9bGd48IkLtAxccSNW3iXGjwpFW9gq66QMsq1tjZJOI+s4a3nPanKopbxUsfQOPs= 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+importer=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 1673947036938219.40267783583374; Tue, 17 Jan 2023 01:17:16 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pHi5I-0004jD-Ly; Tue, 17 Jan 2023 04:16:48 -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 1pHi5H-0004gR-UI for qemu-devel@nongnu.org; Tue, 17 Jan 2023 04:16:47 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pHi5G-0005f6-ER for qemu-devel@nongnu.org; Tue, 17 Jan 2023 04:16:47 -0500 Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-29-MJD2E8kmNxKQxAB1-_n75Q-1; Tue, 17 Jan 2023 04:16:44 -0500 Received: by mail-ej1-f69.google.com with SMTP id sa32-20020a1709076d2000b0084d4593797eso17860631ejc.16 for ; Tue, 17 Jan 2023 01:16:44 -0800 (PST) Received: from avogadro.local ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id e6-20020a170906314600b00781be3e7badsm12925654eje.53.2023.01.17.01.16.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Jan 2023 01:16:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1673947005; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0nPIxge9VAV8+Lb4s7NDa+nmmH+Cyiqzn/4/7OyoCi8=; b=Jny+1S6QTQJvjJdr9yV2ct0EFJn65L2yIrkYC9t4afcN9dRQybs+P93FWjji3nTUm0jVuc 5MoXJyHkAwSGcAx5MPmR3JIzIXpwN0vbsEVcl7ZUOZnN6F3CyDJE/6uyjE7y+Autrsq9GE BFkm71dDaWvp4pRmRVLmMjxWO5CJViw= X-MC-Unique: MJD2E8kmNxKQxAB1-_n75Q-1 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=0nPIxge9VAV8+Lb4s7NDa+nmmH+Cyiqzn/4/7OyoCi8=; b=1gjziWwxWqPzskfyXKWeYSPIRsUitc65mfRnqhbEhIF9OvxKRIX2eC5/fYNMIq/Jt2 hfBJMZY+pu58h9YTdf+caoAiNjgYb5Z7hw47rx5zPb52a7+rXmofNqAoGkaNRJh8dRMi cHMFtLoXn5vz3T+OUv2VKmCCuyjTGHX8XdIfnTtvvkDEXZhoiPJK68ysP81yW2ye5ntE W7wR/McQQ0GCubMaZmByjvt7WnQcRbvPDidXKsjx2C8uBKYOc62aKdlFFgE87mVsFO1f LHhBRqn//LG7Pwssniuh1HQObeYERbYdplEiArkrmEoIPkglToaBWPMda6M8XX4HxOsz GU1Q== X-Gm-Message-State: AFqh2kr5xp/zlXxV+Ks4fSCZX/97tF/pMqDMjbyDFBWlemz4ZiCAKhxs hYrequcpRk/dF00V6MtE8dRJ1Wlq+x5ckkK8ZrxPR3iYirYqboSZ+uYXEYjJB3D5OaKPSSWgpC/ SPQMWDtVEQO4WOxyueLZCPq9KjRXmPPlWYB+2wIOv0crFEImkXu3zp/fKuAS1/eddonM= X-Received: by 2002:a17:906:6844:b0:86e:f478:f598 with SMTP id a4-20020a170906684400b0086ef478f598mr1980027ejs.44.1673947002708; Tue, 17 Jan 2023 01:16:42 -0800 (PST) X-Google-Smtp-Source: AMrXdXsbqdu2u8SFYOWsWfVu81VX4KQyuiZMTsa5YdB6EzjasQRnFX/D+oQwHY5uAZF2QqzwI8OAhQ== X-Received: by 2002:a17:906:6844:b0:86e:f478:f598 with SMTP id a4-20020a170906684400b0086ef478f598mr1980008ejs.44.1673947002481; Tue, 17 Jan 2023 01:16:42 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: alex.bennee@linaro.org, berrange@redhat.com Subject: [RFC PATCH 1/4] lcitool: update submodule Date: Tue, 17 Jan 2023 10:16:35 +0100 Message-Id: <20230117091638.50523-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230117091638.50523-1-pbonzini@redhat.com> References: <20230117091638.50523-1-pbonzini@redhat.com> MIME-Version: 1.0 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+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1673947039324100003 Content-Type: text/plain; charset="utf-8" Update lcitool to the latest submodule, which has improvements that allow usage as a library. Signed-off-by: Paolo Bonzini --- tests/lcitool/libvirt-ci | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/lcitool/libvirt-ci b/tests/lcitool/libvirt-ci index a29b1c9925ed..d1456dd96183 160000 --- a/tests/lcitool/libvirt-ci +++ b/tests/lcitool/libvirt-ci @@ -1 +1 @@ -Subproject commit a29b1c9925ed8549b2a9e83374a8aa5ebe16bc71 +Subproject commit 40589eed1c56f040d0f07fc354c242a0e0d83185 --=20 2.38.1 From nobody Sun May 19 07:16:12 2024 Delivered-To: importer@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+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1673947052; cv=none; d=zohomail.com; s=zohoarc; b=WBJuc0wDjzraMz3ZiIRLiXh5zYTvuMNKN4MXF0Jp85txj2n6H9aa80MQkQaMzIvfaUYbiZhszVCPYWY7BfDtDvcfRDptrgfpDnggmiaQ5kLeiQEjXvQZ8QMvElVK57+Y68qI0vnOPICt4DDm7ahVi1bkmKOj/dDMfzwEqB4tZQg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1673947052; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=QB4PUAYRScqFK02Rkaov1sFhtVMsAMc+bIu9gsoecTM=; b=VD4yXebe9au1cXsSRfF4GxJGHbYjDixMdB8UZiZ7GekcmvrtOhYjh7exOEovZntauJQ65TLVmlfjvHwE/WM2IigrcesNKiegKEkrHRWd4+GB6TCr6aKgkseJHnCm0U0r34D6TtF+jS7GdGRuspcHAvqT9ySuBlJ+U2KeDaDiAQc= 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+importer=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 167394705268629.226351404881598; Tue, 17 Jan 2023 01:17:32 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pHi5N-0004k2-Hr; Tue, 17 Jan 2023 04:16:53 -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 1pHi5L-0004jm-Uv for qemu-devel@nongnu.org; Tue, 17 Jan 2023 04:16:51 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pHi5J-0005gW-Fp for qemu-devel@nongnu.org; Tue, 17 Jan 2023 04:16:51 -0500 Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-664-6CCwUdEJPH6JoKk05Vcl4A-1; Tue, 17 Jan 2023 04:16:47 -0500 Received: by mail-ed1-f69.google.com with SMTP id e6-20020a056402190600b0048ee2e45daaso20626527edz.4 for ; Tue, 17 Jan 2023 01:16:47 -0800 (PST) Received: from avogadro.local ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id l4-20020a056402344400b004822681a671sm12505266edc.37.2023.01.17.01.16.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Jan 2023 01:16:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1673947008; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QB4PUAYRScqFK02Rkaov1sFhtVMsAMc+bIu9gsoecTM=; b=imJCGYV8tUuqOWwmh6FlhFRftPlTeiulovOZo12RhGeT14n6jQ4l6S0WRC9/nX4TaAumGO S1rM1Dcugm1JK5QdMnQ4c2AlDM2q2ie+4qHavxr4Ak38RZXpH1AL7SvKnWTvA9I+rcOyCw VyfsqK7LXkoQNaAe4Li2POLzf6g7vqE= X-MC-Unique: 6CCwUdEJPH6JoKk05Vcl4A-1 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=QB4PUAYRScqFK02Rkaov1sFhtVMsAMc+bIu9gsoecTM=; b=X0siLyN8g/o6pQl+sJGs88PGmqLabaFqvbeegt36xu0RvdW8G4evpfGaiKWQgEerr9 o9YeOsjby7tDwmycMyN0jU2g7G2+jjyl+VxzEWgP5IHrl7fJC0/hIn/8J9vLL6E64xtM imzbkZbc2nMt7tFK87PJM3SYOpINO1KbCG1sK0fApJYgHxFabDb9BjkM5kgbUZ0iPYwR E0s4yUTMpV7eP3zdQU2HsYfUNbL00JavltRA7pORW1hhoj8HgfIrfUrnP+ZeNKC2gpRf KkgqTUaWxKzELb9pGKIik/ahAG9zBf0v+AkRt5w3JhKefxi3EqT+rAxRj1ufjxTG7+A9 yMcg== X-Gm-Message-State: AFqh2koaFwfvwFx7KJIUaFfFIIuFI3YyCs4ynjaUerYAba7hO7ejPrmo zmFLHSyP566GpKZJIev9lBucAWtZeAoMuaKW5ogZp6+f+e/3hzD2MB5N3UnWDzd4wXkelWFxHAP T/SGm5g9zqT4KfQ+okVoigq1qzq/LnYd1mxsel3hIF98Bn3aIy9AUUG8j7nU3IBczPxA= X-Received: by 2002:a05:6402:1770:b0:48e:9afd:de66 with SMTP id da16-20020a056402177000b0048e9afdde66mr2172479edb.34.1673947005565; Tue, 17 Jan 2023 01:16:45 -0800 (PST) X-Google-Smtp-Source: AMrXdXu/AGq3QltvOoAiP8E433x2Or6HYl2bApEu+qrH/VXwLohAA/TmjGDZGJ5aHoDd+RCFS0Z2Ew== X-Received: by 2002:a05:6402:1770:b0:48e:9afd:de66 with SMTP id da16-20020a056402177000b0048e9afdde66mr2172458edb.34.1673947005171; Tue, 17 Jan 2023 01:16:45 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: alex.bennee@linaro.org, berrange@redhat.com Subject: [RFC PATCH 2/4] lcitool: use libvirt-ci as library Date: Tue, 17 Jan 2023 10:16:36 +0100 Message-Id: <20230117091638.50523-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230117091638.50523-1-pbonzini@redhat.com> References: <20230117091638.50523-1-pbonzini@redhat.com> MIME-Version: 1.0 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+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1673947053278100001 Content-Type: text/plain; charset="utf-8" Using the lcitool package as a library will make it possible to customize more of the process, for example by introducing custom mappings. Signed-off-by: Paolo Bonzini --- .gitlab-ci.d/cirrus/freebsd-12.vars | 6 +- .gitlab-ci.d/cirrus/freebsd-13.vars | 6 +- .gitlab-ci.d/cirrus/macos-12.vars | 6 +- tests/docker/dockerfiles/alpine.docker | 6 +- tests/docker/dockerfiles/centos8.docker | 6 +- .../dockerfiles/debian-amd64-cross.docker | 6 +- tests/docker/dockerfiles/debian-amd64.docker | 6 +- .../dockerfiles/debian-arm64-cross.docker | 6 +- .../dockerfiles/debian-armel-cross.docker | 6 +- .../dockerfiles/debian-armhf-cross.docker | 6 +- .../dockerfiles/debian-mips64el-cross.docker | 6 +- .../dockerfiles/debian-mipsel-cross.docker | 6 +- .../dockerfiles/debian-ppc64el-cross.docker | 6 +- .../dockerfiles/debian-s390x-cross.docker | 6 +- .../dockerfiles/fedora-win32-cross.docker | 6 +- .../dockerfiles/fedora-win64-cross.docker | 6 +- tests/docker/dockerfiles/fedora.docker | 6 +- tests/docker/dockerfiles/opensuse-leap.docker | 6 +- tests/docker/dockerfiles/ubuntu2004.docker | 6 +- tests/lcitool/refresh | 83 ++++++++++++------- 20 files changed, 70 insertions(+), 127 deletions(-) diff --git a/.gitlab-ci.d/cirrus/freebsd-12.vars b/.gitlab-ci.d/cirrus/free= bsd-12.vars index e3fc3235b93e..f395e56fc833 100644 --- a/.gitlab-ci.d/cirrus/freebsd-12.vars +++ b/.gitlab-ci.d/cirrus/freebsd-12.vars @@ -1,8 +1,4 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool variables freebsd-12 qemu -# -# https://gitlab.com/libvirt/libvirt-ci +# THIS FILE WAS AUTO-GENERATED BY tests/lcitool/refresh =20 CCACHE=3D'/usr/local/bin/ccache' CPAN_PKGS=3D'' diff --git a/.gitlab-ci.d/cirrus/freebsd-13.vars b/.gitlab-ci.d/cirrus/free= bsd-13.vars index 9f56babd9ca7..f395e56fc833 100644 --- a/.gitlab-ci.d/cirrus/freebsd-13.vars +++ b/.gitlab-ci.d/cirrus/freebsd-13.vars @@ -1,8 +1,4 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool variables freebsd-13 qemu -# -# https://gitlab.com/libvirt/libvirt-ci +# THIS FILE WAS AUTO-GENERATED BY tests/lcitool/refresh =20 CCACHE=3D'/usr/local/bin/ccache' CPAN_PKGS=3D'' diff --git a/.gitlab-ci.d/cirrus/macos-12.vars b/.gitlab-ci.d/cirrus/macos-= 12.vars index ef9e14b373f0..7fb182f93e16 100644 --- a/.gitlab-ci.d/cirrus/macos-12.vars +++ b/.gitlab-ci.d/cirrus/macos-12.vars @@ -1,8 +1,4 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool variables macos-12 qemu -# -# https://gitlab.com/libvirt/libvirt-ci +# THIS FILE WAS AUTO-GENERATED BY tests/lcitool/refresh =20 CCACHE=3D'/opt/homebrew/bin/ccache' CPAN_PKGS=3D'' diff --git a/tests/docker/dockerfiles/alpine.docker b/tests/docker/dockerfi= les/alpine.docker index 094f66f4eb05..10f68f4e1e6d 100644 --- a/tests/docker/dockerfiles/alpine.docker +++ b/tests/docker/dockerfiles/alpine.docker @@ -1,8 +1,4 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool dockerfile --layers all alpine-316 qemu -# -# https://gitlab.com/libvirt/libvirt-ci +# THIS FILE WAS AUTO-GENERATED BY tests/lcitool/refresh =20 FROM docker.io/library/alpine:3.16 =20 diff --git a/tests/docker/dockerfiles/centos8.docker b/tests/docker/dockerf= iles/centos8.docker index 1f70d41aeb31..2318a95e9255 100644 --- a/tests/docker/dockerfiles/centos8.docker +++ b/tests/docker/dockerfiles/centos8.docker @@ -1,8 +1,4 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool dockerfile --layers all centos-stream-8 qemu -# -# https://gitlab.com/libvirt/libvirt-ci +# THIS FILE WAS AUTO-GENERATED BY tests/lcitool/refresh =20 FROM quay.io/centos/centos:stream8 =20 diff --git a/tests/docker/dockerfiles/debian-amd64-cross.docker b/tests/doc= ker/dockerfiles/debian-amd64-cross.docker index 5e57309361b6..bfa88dc7285f 100644 --- a/tests/docker/dockerfiles/debian-amd64-cross.docker +++ b/tests/docker/dockerfiles/debian-amd64-cross.docker @@ -1,8 +1,4 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool dockerfile --layers all --cross x86_64 debian-11 qemu -# -# https://gitlab.com/libvirt/libvirt-ci +# THIS FILE WAS AUTO-GENERATED BY tests/lcitool/refresh =20 FROM docker.io/library/debian:11-slim =20 diff --git a/tests/docker/dockerfiles/debian-amd64.docker b/tests/docker/do= ckerfiles/debian-amd64.docker index bfeab01ee3e2..e09118c83b2f 100644 --- a/tests/docker/dockerfiles/debian-amd64.docker +++ b/tests/docker/dockerfiles/debian-amd64.docker @@ -1,8 +1,4 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool dockerfile --layers all debian-11 qemu -# -# https://gitlab.com/libvirt/libvirt-ci +# THIS FILE WAS AUTO-GENERATED BY tests/lcitool/refresh =20 FROM docker.io/library/debian:11-slim =20 diff --git a/tests/docker/dockerfiles/debian-arm64-cross.docker b/tests/doc= ker/dockerfiles/debian-arm64-cross.docker index 98885bd0eedf..b20197d5b710 100644 --- a/tests/docker/dockerfiles/debian-arm64-cross.docker +++ b/tests/docker/dockerfiles/debian-arm64-cross.docker @@ -1,8 +1,4 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool dockerfile --layers all --cross aarch64 debian-11 qemu -# -# https://gitlab.com/libvirt/libvirt-ci +# THIS FILE WAS AUTO-GENERATED BY tests/lcitool/refresh =20 FROM docker.io/library/debian:11-slim =20 diff --git a/tests/docker/dockerfiles/debian-armel-cross.docker b/tests/doc= ker/dockerfiles/debian-armel-cross.docker index d5c08714e4de..792e098f273c 100644 --- a/tests/docker/dockerfiles/debian-armel-cross.docker +++ b/tests/docker/dockerfiles/debian-armel-cross.docker @@ -1,8 +1,4 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool dockerfile --layers all --cross armv6l debian-11 qemu -# -# https://gitlab.com/libvirt/libvirt-ci +# THIS FILE WAS AUTO-GENERATED BY tests/lcitool/refresh =20 FROM docker.io/library/debian:11-slim =20 diff --git a/tests/docker/dockerfiles/debian-armhf-cross.docker b/tests/doc= ker/dockerfiles/debian-armhf-cross.docker index 471444fcf489..dbb9cf21e99b 100644 --- a/tests/docker/dockerfiles/debian-armhf-cross.docker +++ b/tests/docker/dockerfiles/debian-armhf-cross.docker @@ -1,8 +1,4 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool dockerfile --layers all --cross armv7l debian-11 qemu -# -# https://gitlab.com/libvirt/libvirt-ci +# THIS FILE WAS AUTO-GENERATED BY tests/lcitool/refresh =20 FROM docker.io/library/debian:11-slim =20 diff --git a/tests/docker/dockerfiles/debian-mips64el-cross.docker b/tests/= docker/dockerfiles/debian-mips64el-cross.docker index 15b0224b76bf..712cf98388a1 100644 --- a/tests/docker/dockerfiles/debian-mips64el-cross.docker +++ b/tests/docker/dockerfiles/debian-mips64el-cross.docker @@ -1,8 +1,4 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool dockerfile --layers all --cross mips64el debian-11 qemu -# -# https://gitlab.com/libvirt/libvirt-ci +# THIS FILE WAS AUTO-GENERATED BY tests/lcitool/refresh =20 FROM docker.io/library/debian:11-slim =20 diff --git a/tests/docker/dockerfiles/debian-mipsel-cross.docker b/tests/do= cker/dockerfiles/debian-mipsel-cross.docker index a5d3ca6e2f7f..c746b7ca04aa 100644 --- a/tests/docker/dockerfiles/debian-mipsel-cross.docker +++ b/tests/docker/dockerfiles/debian-mipsel-cross.docker @@ -1,8 +1,4 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool dockerfile --layers all --cross mipsel debian-11 qemu -# -# https://gitlab.com/libvirt/libvirt-ci +# THIS FILE WAS AUTO-GENERATED BY tests/lcitool/refresh =20 FROM docker.io/library/debian:11-slim =20 diff --git a/tests/docker/dockerfiles/debian-ppc64el-cross.docker b/tests/d= ocker/dockerfiles/debian-ppc64el-cross.docker index d2954e61f678..5591062a8bf1 100644 --- a/tests/docker/dockerfiles/debian-ppc64el-cross.docker +++ b/tests/docker/dockerfiles/debian-ppc64el-cross.docker @@ -1,8 +1,4 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool dockerfile --layers all --cross ppc64le debian-11 qemu -# -# https://gitlab.com/libvirt/libvirt-ci +# THIS FILE WAS AUTO-GENERATED BY tests/lcitool/refresh =20 FROM docker.io/library/debian:11-slim =20 diff --git a/tests/docker/dockerfiles/debian-s390x-cross.docker b/tests/doc= ker/dockerfiles/debian-s390x-cross.docker index d43ce163172e..9c14f3faca40 100644 --- a/tests/docker/dockerfiles/debian-s390x-cross.docker +++ b/tests/docker/dockerfiles/debian-s390x-cross.docker @@ -1,8 +1,4 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool dockerfile --layers all --cross s390x debian-11 qemu -# -# https://gitlab.com/libvirt/libvirt-ci +# THIS FILE WAS AUTO-GENERATED BY tests/lcitool/refresh =20 FROM docker.io/library/debian:11-slim =20 diff --git a/tests/docker/dockerfiles/fedora-win32-cross.docker b/tests/doc= ker/dockerfiles/fedora-win32-cross.docker index aece4f55818d..d691e54d0c15 100644 --- a/tests/docker/dockerfiles/fedora-win32-cross.docker +++ b/tests/docker/dockerfiles/fedora-win32-cross.docker @@ -1,8 +1,4 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool dockerfile --layers all --cross mingw32 fedora-36 qemu -# -# https://gitlab.com/libvirt/libvirt-ci +# THIS FILE WAS AUTO-GENERATED BY tests/lcitool/refresh =20 FROM registry.fedoraproject.org/fedora:36 =20 diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker b/tests/doc= ker/dockerfiles/fedora-win64-cross.docker index 2d573e2505f2..9f5082e02b3b 100644 --- a/tests/docker/dockerfiles/fedora-win64-cross.docker +++ b/tests/docker/dockerfiles/fedora-win64-cross.docker @@ -1,8 +1,4 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool dockerfile --layers all --cross mingw64 fedora-36 qemu -# -# https://gitlab.com/libvirt/libvirt-ci +# THIS FILE WAS AUTO-GENERATED BY tests/lcitool/refresh =20 FROM registry.fedoraproject.org/fedora:36 =20 diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfi= les/fedora.docker index 901562bb8e5a..c8e99a6b8951 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -1,8 +1,4 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool dockerfile --layers all fedora-36 qemu -# -# https://gitlab.com/libvirt/libvirt-ci +# THIS FILE WAS AUTO-GENERATED BY tests/lcitool/refresh =20 FROM registry.fedoraproject.org/fedora:36 =20 diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/d= ockerfiles/opensuse-leap.docker index 4361b01464af..a98209c15803 100644 --- a/tests/docker/dockerfiles/opensuse-leap.docker +++ b/tests/docker/dockerfiles/opensuse-leap.docker @@ -1,8 +1,4 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool dockerfile --layers all opensuse-leap-153 qemu -# -# https://gitlab.com/libvirt/libvirt-ci +# THIS FILE WAS AUTO-GENERATED BY tests/lcitool/refresh =20 FROM registry.opensuse.org/opensuse/leap:15.3 =20 diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dock= erfiles/ubuntu2004.docker index 9417bca2fa23..077460916ade 100644 --- a/tests/docker/dockerfiles/ubuntu2004.docker +++ b/tests/docker/dockerfiles/ubuntu2004.docker @@ -1,8 +1,4 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool dockerfile --layers all ubuntu-2004 qemu -# -# https://gitlab.com/libvirt/libvirt-ci +# THIS FILE WAS AUTO-GENERATED BY tests/lcitool/refresh =20 FROM docker.io/library/ubuntu:20.04 =20 diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index ee55ee40ee5d..31a34dce7a33 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -12,61 +12,80 @@ # or (at your option) any later version. See the COPYING file in # the top-level directory. =20 -import sys -import subprocess - +from contextlib import contextmanager from pathlib import Path =20 +import sys + if len(sys.argv) !=3D 1: print("syntax: %s" % sys.argv[0], file=3Dsys.stderr) sys.exit(1) =20 -self_dir =3D Path(__file__).parent -src_dir =3D self_dir.parent.parent +script =3D Path(__file__) +script_dir =3D script.parent +src_dir =3D script_dir.parent.parent dockerfiles_dir =3D Path(src_dir, "tests", "docker", "dockerfiles") =20 -lcitool_path =3D Path(self_dir, "libvirt-ci", "bin", "lcitool") +sys.path.append(str(Path(script_dir, "libvirt-ci"))) =20 -lcitool_cmd =3D [lcitool_path, "--data-dir", self_dir] +from lcitool import LcitoolError +from lcitool.packages import Packages +from lcitool.projects import Projects +from lcitool.targets import BuildTarget, Targets +from lcitool.formatters import DockerfileFormatter, ShellVariablesFormatter +from lcitool.util import DataDir + +PREFIX =3D '' + +DATA_DIR =3D DataDir(script_dir) +PROJECTS =3D Projects(DATA_DIR) +PACKAGES =3D Packages() +TARGETS =3D Targets() =20 =20 -def atomic_write(filename, content): +@contextmanager +def atomic_write(filename): tmp =3D filename.with_suffix(filename.suffix + ".tmp") try: with tmp.open("w") as fp: - print(content, file=3Dfp, end=3D"") + yield fp tmp.rename(filename) - except Exception as ex: + except Exception: tmp.unlink() raise =20 =20 -def generate(filename, cmd, trailer): - print("Generate %s" % filename) - lcitool =3D subprocess.run(cmd, capture_output=3DTrue) - - if lcitool.returncode !=3D 0: - raise Exception("Failed to generate %s: %s" % (filename, lcitool.s= tderr)) - - content =3D lcitool.stdout.decode("utf8") - if trailer is not None: - content +=3D trailer - atomic_write(filename, content) +@contextmanager +def generate(filename): + print("Generating %s" % filename) + nonlocal PREFIX + try: + PREFIX =3D "Failed to generate %s: " % filename + with atomic_write(filename) as fp: + print('# THIS FILE WAS AUTO-GENERATED BY', + script.relative_to(src_dir), file=3Dfp) + print(file=3Dfp) + yield fp + finally: + PREFIX =3D '' =20 =20 def generate_dockerfile(host, target, cross=3DNone, trailer=3DNone): filename =3D Path(src_dir, "tests", "docker", "dockerfiles", host + ".= docker") - cmd =3D lcitool_cmd + ["dockerfile"] - if cross is not None: - cmd.extend(["--cross", cross]) - cmd.extend([target, "qemu"]) - generate(filename, cmd, trailer) + with generate(filename) as fp: + dockerfile =3D DockerfileFormatter(PROJECTS) + target =3D BuildTarget(TARGETS, PACKAGES, target, cross) + print(dockerfile.format(target, ["qemu"]), file=3Dfp) + if trailer is not None: + print(trailer, file=3Dfp, end=3D"") =20 =20 -def generate_cirrus(target, trailer=3DNone): +def generate_cirrus(target): filename =3D Path(src_dir, ".gitlab-ci.d", "cirrus", target + ".vars") - cmd =3D lcitool_cmd + ["variables", target, "qemu"] - generate(filename, cmd, trailer) + with generate(filename) as fp: + variables =3D ShellVariablesFormatter(PROJECTS) + target =3D BuildTarget(TARGETS, PACKAGES, target) + print(variables.format(target, ["qemu"]), file=3Dfp) =20 =20 ubuntu2004_tsanhack =3D [ @@ -98,11 +117,11 @@ def cross_build(prefix, targets): targets =3D "ENV DEF_TARGET_LIST %s\n" % (targets) return "".join([conf, targets]) =20 + # # Update all the various build configurations. # Please keep each group sorted alphabetically for easy reading. # - try: # # Standard native builds @@ -179,6 +198,6 @@ try: generate_cirrus("macos-12") =20 sys.exit(0) -except Exception as ex: - print(str(ex), file=3Dsys.stderr) +except LcitoolError as ex: + print(PREFIX + ex.module_prefix + " error: " + str(ex), file=3Dsys.std= err) sys.exit(1) --=20 2.38.1 From nobody Sun May 19 07:16:12 2024 Delivered-To: importer@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+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1673947079; cv=none; d=zohomail.com; s=zohoarc; b=gAcSLh0esqDa0mw71JgfIwCo3WOiquyiDfzVxxrIGwgHwvgrnIUT+9VVMtgMxY8D1bhZdSTP9ZwaJc1mCVP/OuUE7TY5kSxRf7JEqsgIWw0DpGdx0my5VMQlZNTXFkRGIZb/wq39+0deO7RHnwujOk22j+fp01mMAHf6LXsxdPg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1673947079; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=QSVAdIIdNqVo4AA8LPt5BH80KhR02XfHiG/wVwM8/48=; b=cl7O5JpN6FQoPyC0hHc8pMKqnhAG6HwYFLUNNXKMinZhz4MBkHFeSut8mbbChAEgG+u4aRcF2IY+NA4AuTvAOrtbBgqB7rv5ey+M33lKiWX5LNqz0EQ2ldkdPeH1m9Mj+QqHJ0SlIqXPhmG5d6q8ubd/aPUC+gXBS5y8kpY1bmA= 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+importer=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 16739470799642.560501890600108; Tue, 17 Jan 2023 01:17:59 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pHi5Q-0004p5-AG; Tue, 17 Jan 2023 04:16:56 -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 1pHi5N-0004jv-12 for qemu-devel@nongnu.org; Tue, 17 Jan 2023 04:16:53 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pHi5L-0005gz-C2 for qemu-devel@nongnu.org; Tue, 17 Jan 2023 04:16:52 -0500 Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-21-7wTJhaAlPF6_4TeqYH4TBA-1; Tue, 17 Jan 2023 04:16:49 -0500 Received: by mail-ed1-f70.google.com with SMTP id y21-20020a056402359500b0049e171c4ad0so3494138edc.6 for ; Tue, 17 Jan 2023 01:16:49 -0800 (PST) Received: from avogadro.local ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id x22-20020aa7dad6000000b0048789661fa2sm12384037eds.66.2023.01.17.01.16.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Jan 2023 01:16:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1673947010; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QSVAdIIdNqVo4AA8LPt5BH80KhR02XfHiG/wVwM8/48=; b=BF3iLloM3Q9j2HWZticGT5/OdrswaorUQkWVCSOx33E0VuY/Lr/jxltepVucdXj0odSxSr C58V9/TFSO2RtOM4GYVE2HyfkQ3lqNrmy+1RZkJlAo1IHTMg5DZ1KFMFnBQ1k76VAo4aGc eJMum7HS9BwuCjCnd/LPRZ+b5ix7bNE= X-MC-Unique: 7wTJhaAlPF6_4TeqYH4TBA-1 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=QSVAdIIdNqVo4AA8LPt5BH80KhR02XfHiG/wVwM8/48=; b=fxH7H374w9zvLU7+G0d7/wIIe46yOk4qnsWLDilnkY+kK5iXKqI4FS9LZRKYs919if dTh3xpWoj9XRtANEcu8hw5ZkhQ87vTId//MfC41sTAJ4X4ojSq3xuWjgBD7+F4W0tBhB 8iwhWu9uPfQd1fdhL5iWfezMA3e6miQU8brcH4xop2PtHCypOppk1g+uCSDKqMnYfvgs PVBexQL0GfCbbGSGvUSnBcxGrQZV9pmHHjug0CzH671kxHaAfYxGihdHO3dfUudMkRFH vD1EuAx428m6TuOOwoJ70c2hNOdiRfAfjyHdxe1kL75diFISsTZG0R745x9281ueCsuZ BqGQ== X-Gm-Message-State: AFqh2kpXtkgaJpOZTiY6IwzZdFvlep9M9l44Szza1p9foa2j38TS9BfQ nTgl2EpP18u4ZUBpDAANIp5DsdPTRBK3AjcOpsrodJEIIEK0ouMbsVxHkiItnt7+ofH1AiDI4rb DmgydFcnilarorsiJmZiAGFpshsRWPKQV+UIc8k+g+hNZ6u+Xe6rWF/uL8HidHcnPYCc= X-Received: by 2002:a05:6402:d64:b0:498:d121:6e02 with SMTP id ec36-20020a0564020d6400b00498d1216e02mr2147988edb.34.1673947008139; Tue, 17 Jan 2023 01:16:48 -0800 (PST) X-Google-Smtp-Source: AMrXdXtYkgs7nARCpo0daHwIuRNlUEOX9lEq70vRzPZqI9IYZq9+EiQLKaPBjvWGGlCWU8aaMDcPig== X-Received: by 2002:a05:6402:d64:b0:498:d121:6e02 with SMTP id ec36-20020a0564020d6400b00498d1216e02mr2147961edb.34.1673947007803; Tue, 17 Jan 2023 01:16:47 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: alex.bennee@linaro.org, berrange@redhat.com Subject: [RFC PATCH 3/4] lcitool: allow overriding package mappings and target facts Date: Tue, 17 Jan 2023 10:16:37 +0100 Message-Id: <20230117091638.50523-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230117091638.50523-1-pbonzini@redhat.com> References: <20230117091638.50523-1-pbonzini@redhat.com> MIME-Version: 1.0 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+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1673947081361100001 Content-Type: text/plain; charset="utf-8" lcitool has generally catered to the Libvirt's needs in terms of package versions, which are pretty conservative. For example, lcitool is hardcoding a version of Meson equal to 0.56. QEMU on the other hand has different needs since some features were added to Meson for the project's benefit in versions as recent as 0.63. Until now, QEMU has managed to avoid the problem by shipping its own version of Meson. However, the next release of QEMU will face a breaking point in that Meson 0.63 does not work with the 3.6 version of Python that is provided by CentOS Stream 8 and OpenSUSE LEAP 15.3. Implement locally the functionality provided by https://gitlab.com/libvirt/libvirt-ci/-/merge_requests/341, so that QEMU can override the mappings and target paths that are used for its CI. Signed-off-by: Paolo Bonzini --- tests/lcitool/refresh | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index 31a34dce7a33..ca36f3536f53 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -15,7 +15,9 @@ from contextlib import contextmanager from pathlib import Path =20 +import logging import sys +import yaml =20 if len(sys.argv) !=3D 1: print("syntax: %s" % sys.argv[0], file=3Dsys.stderr) @@ -33,14 +35,25 @@ from lcitool.packages import Packages from lcitool.projects import Projects from lcitool.targets import BuildTarget, Targets from lcitool.formatters import DockerfileFormatter, ShellVariablesFormatter -from lcitool.util import DataDir +from lcitool.util import DataDir, merge_dict + + +class MergeLocalFilesDataDir(DataDir): + def load_facts(self, resource_path, name): + result =3D {} + for file in self.search(resource_path, name + ".yml"): + logging.getLogger().debug(f"Loading facts from '{file}'") + with open(file, "r") as infile: + merge_dict(yaml.safe_load(infile), result) + return result + =20 PREFIX =3D '' =20 -DATA_DIR =3D DataDir(script_dir) +DATA_DIR =3D MergeLocalFilesDataDir(script_dir) PROJECTS =3D Projects(DATA_DIR) -PACKAGES =3D Packages() -TARGETS =3D Targets() +PACKAGES =3D Packages(DATA_DIR) +TARGETS =3D Targets(DATA_DIR) =20 =20 @contextmanager --=20 2.38.1 From nobody Sun May 19 07:16:12 2024 Delivered-To: importer@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+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1673947064; cv=none; d=zohomail.com; s=zohoarc; b=fbrgvoQz7Acf2VdKb4on1BdGhD+/WYZhxvvcqJX+3JGZKsmuGSHyg3c0AdWBn0pyFrZ8vR055YegHlKT9pJTMU53zypfoY21GuvRlCTQdLfrrkOhjHcYURVqMevAoxPjNkb7Xq8YoXwrw2dwFEz43FfaCmcZ49YAJnWnjPOqoYE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1673947064; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=6BiN+2nWCyXksO6VodvH0/myGf8wzFv623Y9KPr/HmU=; b=iEI4CDAqgCHsgjsWkff5B4tH/dl6md3cDMvGgHmFEfyXQUUovNhUkyqJ/icjX8VC72uYR3gdtJh9T1dRTsiByhlnvW4ZXNj/PfGDubacdKumUC/4fkQcvp6xwrBCdXdLryuzgkAToonLXnDsRrVmQc8EAHDzHKjsV/yEKc6/yjE= 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+importer=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 1673947064377571.9560510926178; Tue, 17 Jan 2023 01:17:44 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pHi5W-0004rA-7R; Tue, 17 Jan 2023 04:17:02 -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 1pHi5R-0004pT-Na for qemu-devel@nongnu.org; Tue, 17 Jan 2023 04:16:57 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pHi5P-0005hw-0g for qemu-devel@nongnu.org; Tue, 17 Jan 2023 04:16:57 -0500 Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-433-hr_tTf5fMPKRvv71lJfDzg-1; Tue, 17 Jan 2023 04:16:52 -0500 Received: by mail-ej1-f70.google.com with SMTP id hp2-20020a1709073e0200b0084d47e3fe82so17319521ejc.8 for ; Tue, 17 Jan 2023 01:16:52 -0800 (PST) Received: from avogadro.local ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id l4-20020a056402344400b004822681a671sm12505376edc.37.2023.01.17.01.16.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Jan 2023 01:16:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1673947014; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=6BiN+2nWCyXksO6VodvH0/myGf8wzFv623Y9KPr/HmU=; b=RMlxTG9fbx93HpLUBqOfrOv3hbXEdXJAvxTotxoxY3hBBRDh4QaEHEVCUsDVc4YaT1AK17 HCCxhsme8EW5oIE8c0P0dlWmIX9Njmt/6JJ7HwH/xYEJ7p6fU0wL1qYq/TeA4epLJy9Yx6 Z8OFGcWE1SNuWAxRxpqlVyRiv+Pxx0o= X-MC-Unique: hr_tTf5fMPKRvv71lJfDzg-1 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=6BiN+2nWCyXksO6VodvH0/myGf8wzFv623Y9KPr/HmU=; b=ltk08sLt7DdLR1ugmMB03uvqU0O7hWfdz8JBxr/2dD+ik5J4xCuqiKyMRvORB2ADAs yCF03sNl7R8IMXr5dwyGlpcmJqK3x9yWetgYx/qOmuk983pFsiIkAxBsaf9R6jPDI0ZA 4qcRldzohti6DB4Xnv4//AMaqBcLpna/6uAt42BtkStTxMpuwFPwDSuMrGZrzyA70HdU vG9VznNuirFw/CAAJXccY/lQKO2XW26YiXtJRcL/DxAwa67art1dBWuT9QbHn0dEeS8l vwp50MWuMroEByjpC/n5A5ORckxFJl1aLVOvqsLy8owitmkIWmF27eqpnZKcVtAg/6Ig 1j5w== X-Gm-Message-State: AFqh2kqZOHrrOF4XtJH+wD3R/vcJXLWbTy7ZOEAOD9mVr/dWdb0QOCmw 9GUuvN038ckjqTHqtJSOmieU4jF/Iv1orcEM3WNfY9zjSaIvNOz1jzZqVhJFD4zdoj9MCm2Ffx4 pcuHnsXa1BOr+MULGv41lCH+e5xyM7VkVDpMof1oWGc09PfyTmQnmgoAQZjmQNrhV/BU= X-Received: by 2002:a17:906:1e42:b0:7c1:458b:a946 with SMTP id i2-20020a1709061e4200b007c1458ba946mr1979648ejj.0.1673947011183; Tue, 17 Jan 2023 01:16:51 -0800 (PST) X-Google-Smtp-Source: AMrXdXvJEvs6KFh7fhpfMKLJ/ZyfdTBoaGcNAmPFZy+u7okqkNSXyjJ3DCNCNd5Tt9uP6BvoR2Q5JQ== X-Received: by 2002:a17:906:1e42:b0:7c1:458b:a946 with SMTP id i2-20020a1709061e4200b007c1458ba946mr1979623ejj.0.1673947010662; Tue, 17 Jan 2023 01:16:50 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: alex.bennee@linaro.org, berrange@redhat.com Subject: [RFC PATCH 4/4] ci, docker: update CentOS and OpenSUSE Python to non-EOL versions Date: Tue, 17 Jan 2023 10:16:38 +0100 Message-Id: <20230117091638.50523-5-pbonzini@redhat.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230117091638.50523-1-pbonzini@redhat.com> References: <20230117091638.50523-1-pbonzini@redhat.com> MIME-Version: 1.0 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+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1673947065334100001 Content-Type: text/plain; charset="utf-8" Python 3.6 is at end-of-life. Update the libvirt-ci module to a version that supports overrides for targets and package mappings; this way, QEMU can use the newer versions provided by CentOS 8 (Python 3.8) and OpenSUSE 15.3 (Python 3.9). One unexpected issue is that sphinx-rtd-theme does not want versions of docutils starting with 0.18. For distro-installed packages we can assume that the packager knew this, but when installing from PyPI the package version needs to be constrained by hand. In order to do this, add the docutils package explicitly to the qemu project file. Signed-off-by: Paolo Bonzini --- .gitlab-ci.d/cirrus/freebsd-12.vars | 2 +- .gitlab-ci.d/cirrus/freebsd-13.vars | 2 +- .gitlab-ci.d/cirrus/macos-12.vars | 2 +- scripts/ci/setup/build-environment.yml | 2 +- tests/docker/dockerfiles/alpine.docker | 1 + tests/docker/dockerfiles/centos8.docker | 23 +++--- .../dockerfiles/debian-amd64-cross.docker | 1 + tests/docker/dockerfiles/debian-amd64.docker | 1 + .../dockerfiles/debian-arm64-cross.docker | 1 + .../dockerfiles/debian-armel-cross.docker | 1 + .../dockerfiles/debian-armhf-cross.docker | 1 + .../dockerfiles/debian-mips64el-cross.docker | 1 + .../dockerfiles/debian-mipsel-cross.docker | 1 + .../dockerfiles/debian-ppc64el-cross.docker | 1 + .../dockerfiles/debian-s390x-cross.docker | 1 + .../dockerfiles/fedora-win32-cross.docker | 1 + .../dockerfiles/fedora-win64-cross.docker | 1 + tests/docker/dockerfiles/fedora.docker | 1 + tests/docker/dockerfiles/opensuse-leap.docker | 23 +++--- tests/docker/dockerfiles/ubuntu2004.docker | 3 +- tests/lcitool/mappings.yml | 80 +++++++++++++++++++ tests/lcitool/projects/qemu.yml | 1 + tests/lcitool/targets/centos-stream-8.yml | 3 + tests/lcitool/targets/opensuse-leap-153.yml | 3 + 24 files changed, 131 insertions(+), 26 deletions(-) create mode 100644 tests/lcitool/mappings.yml create mode 100644 tests/lcitool/targets/centos-stream-8.yml create mode 100644 tests/lcitool/targets/opensuse-leap-153.yml diff --git a/.gitlab-ci.d/cirrus/freebsd-12.vars b/.gitlab-ci.d/cirrus/free= bsd-12.vars index f395e56fc833..4f73f5097050 100644 --- a/.gitlab-ci.d/cirrus/freebsd-12.vars +++ b/.gitlab-ci.d/cirrus/freebsd-12.vars @@ -7,6 +7,6 @@ MAKE=3D'/usr/local/bin/gmake' NINJA=3D'/usr/local/bin/ninja' PACKAGING_COMMAND=3D'pkg' PIP3=3D'/usr/local/bin/pip-3.8' -PKGS=3D'alsa-lib bash bison bzip2 ca_root_nss capstone4 ccache cdrkit-geni= soimage cmocka ctags curl cyrus-sasl dbus diffutils dtc flex fusefs-libs3 g= ettext git glib gmake gnutls gsed gtk3 json-c libepoxy libffi libgcrypt lib= jpeg-turbo libnfs libslirp libspice-server libssh libtasn1 llvm lzo2 meson = ncurses nettle ninja opencv perl5 pixman pkgconf png py39-numpy py39-pillow= py39-pip py39-sphinx py39-sphinx_rtd_theme py39-yaml python3 rpm2cpio sdl2= sdl2_image snappy sndio spice-protocol tesseract texinfo usbredir virglren= derer vte3 zstd' +PKGS=3D'alsa-lib bash bison bzip2 ca_root_nss capstone4 ccache cdrkit-geni= soimage cmocka ctags curl cyrus-sasl dbus diffutils dtc flex fusefs-libs3 g= ettext git glib gmake gnutls gsed gtk3 json-c libepoxy libffi libgcrypt lib= jpeg-turbo libnfs libslirp libspice-server libssh libtasn1 llvm lzo2 meson = ncurses nettle ninja opencv perl5 pixman pkgconf png py39-docutils py39-num= py py39-pillow py39-pip py39-sphinx py39-sphinx_rtd_theme py39-yaml python3= rpm2cpio sdl2 sdl2_image snappy sndio spice-protocol tesseract texinfo usb= redir virglrenderer vte3 zstd' PYPI_PKGS=3D'' PYTHON=3D'/usr/local/bin/python3' diff --git a/.gitlab-ci.d/cirrus/freebsd-13.vars b/.gitlab-ci.d/cirrus/free= bsd-13.vars index f395e56fc833..4f73f5097050 100644 --- a/.gitlab-ci.d/cirrus/freebsd-13.vars +++ b/.gitlab-ci.d/cirrus/freebsd-13.vars @@ -7,6 +7,6 @@ MAKE=3D'/usr/local/bin/gmake' NINJA=3D'/usr/local/bin/ninja' PACKAGING_COMMAND=3D'pkg' PIP3=3D'/usr/local/bin/pip-3.8' -PKGS=3D'alsa-lib bash bison bzip2 ca_root_nss capstone4 ccache cdrkit-geni= soimage cmocka ctags curl cyrus-sasl dbus diffutils dtc flex fusefs-libs3 g= ettext git glib gmake gnutls gsed gtk3 json-c libepoxy libffi libgcrypt lib= jpeg-turbo libnfs libslirp libspice-server libssh libtasn1 llvm lzo2 meson = ncurses nettle ninja opencv perl5 pixman pkgconf png py39-numpy py39-pillow= py39-pip py39-sphinx py39-sphinx_rtd_theme py39-yaml python3 rpm2cpio sdl2= sdl2_image snappy sndio spice-protocol tesseract texinfo usbredir virglren= derer vte3 zstd' +PKGS=3D'alsa-lib bash bison bzip2 ca_root_nss capstone4 ccache cdrkit-geni= soimage cmocka ctags curl cyrus-sasl dbus diffutils dtc flex fusefs-libs3 g= ettext git glib gmake gnutls gsed gtk3 json-c libepoxy libffi libgcrypt lib= jpeg-turbo libnfs libslirp libspice-server libssh libtasn1 llvm lzo2 meson = ncurses nettle ninja opencv perl5 pixman pkgconf png py39-docutils py39-num= py py39-pillow py39-pip py39-sphinx py39-sphinx_rtd_theme py39-yaml python3= rpm2cpio sdl2 sdl2_image snappy sndio spice-protocol tesseract texinfo usb= redir virglrenderer vte3 zstd' PYPI_PKGS=3D'' PYTHON=3D'/usr/local/bin/python3' diff --git a/.gitlab-ci.d/cirrus/macos-12.vars b/.gitlab-ci.d/cirrus/macos-= 12.vars index 7fb182f93e16..4ff6919a2140 100644 --- a/.gitlab-ci.d/cirrus/macos-12.vars +++ b/.gitlab-ci.d/cirrus/macos-12.vars @@ -7,6 +7,6 @@ MAKE=3D'/opt/homebrew/bin/gmake' NINJA=3D'/opt/homebrew/bin/ninja' PACKAGING_COMMAND=3D'brew' PIP3=3D'/opt/homebrew/bin/pip3' -PKGS=3D'bash bc bison bzip2 capstone ccache cmocka ctags curl dbus diffuti= ls dtc flex gcovr gettext git glib gnu-sed gnutls gtk+3 jemalloc jpeg-turbo= json-c libepoxy libffi libgcrypt libiscsi libnfs libpng libslirp libssh li= btasn1 libusb llvm lzo make meson ncurses nettle ninja perl pixman pkg-conf= ig python3 rpm2cpio sdl2 sdl2_image snappy sparse spice-protocol tesseract = texinfo usbredir vde vte3 zlib zstd' +PKGS=3D'bash bc bison bzip2 capstone ccache cmocka ctags curl dbus diffuti= ls docutils dtc flex gcovr gettext git glib gnu-sed gnutls gtk+3 jemalloc j= peg-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 t= esseract texinfo usbredir vde vte3 zlib zstd' PYPI_PKGS=3D'PyYAML numpy pillow sphinx sphinx-rtd-theme' PYTHON=3D'/opt/homebrew/bin/python3' diff --git a/scripts/ci/setup/build-environment.yml b/scripts/ci/setup/buil= d-environment.yml index b04c2b7ceee9..fee11d1d0543 100644 --- a/scripts/ci/setup/build-environment.yml +++ b/scripts/ci/setup/build-environment.yml @@ -157,7 +157,7 @@ - nmap-ncat - perl-Test-Harness - pixman-devel - - python36 + - '@python:3.8/python38' - rdma-core-devel - spice-glib-devel - systemtap-sdt-devel diff --git a/tests/docker/dockerfiles/alpine.docker b/tests/docker/dockerfi= les/alpine.docker index 10f68f4e1e6d..84ead77a76ee 100644 --- a/tests/docker/dockerfiles/alpine.docker +++ b/tests/docker/dockerfiles/alpine.docker @@ -77,6 +77,7 @@ RUN apk update && \ pixman-dev \ pkgconf \ pulseaudio-dev \ + py3-docutils \ py3-numpy \ py3-pillow \ py3-pip \ diff --git a/tests/docker/dockerfiles/centos8.docker b/tests/docker/dockerf= iles/centos8.docker index 2318a95e9255..adc7fd483b29 100644 --- a/tests/docker/dockerfiles/centos8.docker +++ b/tests/docker/dockerfiles/centos8.docker @@ -78,7 +78,6 @@ RUN dnf distro-sync -y && \ lzo-devel \ make \ mesa-libgbm-devel \ - meson \ ncurses-devel \ nettle-devel \ ninja-build \ @@ -91,13 +90,12 @@ RUN dnf distro-sync -y && \ pixman-devel \ pkgconfig \ pulseaudio-libs-devel \ - python3 \ - python3-PyYAML \ - python3-numpy \ - python3-pillow \ - python3-pip \ - python3-sphinx \ - python3-sphinx_rtd_theme \ + python38 \ + python38-PyYAML \ + python38-numpy \ + python38-pip \ + python38-setuptools \ + python38-wheel \ rdma-core-devel \ rpm \ sed \ @@ -126,8 +124,15 @@ RUN dnf distro-sync -y && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc =20 +RUN /usr/bin/pip3.8 install \ + 'docutils<0.18' \ + meson=3D=3D0.63.2 \ + pillow \ + sphinx \ + sphinx-rtd-theme + ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" +ENV PYTHON "/usr/bin/python3.8" diff --git a/tests/docker/dockerfiles/debian-amd64-cross.docker b/tests/doc= ker/dockerfiles/debian-amd64-cross.docker index bfa88dc7285f..a91f5412ab49 100644 --- a/tests/docker/dockerfiles/debian-amd64-cross.docker +++ b/tests/docker/dockerfiles/debian-amd64-cross.docker @@ -39,6 +39,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ perl-base \ pkgconf \ python3 \ + python3-docutils \ python3-numpy \ python3-opencv \ python3-pillow \ diff --git a/tests/docker/dockerfiles/debian-amd64.docker b/tests/docker/do= ckerfiles/debian-amd64.docker index e09118c83b2f..14daef8bdaee 100644 --- a/tests/docker/dockerfiles/debian-amd64.docker +++ b/tests/docker/dockerfiles/debian-amd64.docker @@ -107,6 +107,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ perl-base \ pkgconf \ python3 \ + python3-docutils \ python3-numpy \ python3-opencv \ python3-pillow \ diff --git a/tests/docker/dockerfiles/debian-arm64-cross.docker b/tests/doc= ker/dockerfiles/debian-arm64-cross.docker index b20197d5b710..d89b7ca4e568 100644 --- a/tests/docker/dockerfiles/debian-arm64-cross.docker +++ b/tests/docker/dockerfiles/debian-arm64-cross.docker @@ -39,6 +39,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ perl-base \ pkgconf \ python3 \ + python3-docutils \ python3-numpy \ python3-opencv \ python3-pillow \ diff --git a/tests/docker/dockerfiles/debian-armel-cross.docker b/tests/doc= ker/dockerfiles/debian-armel-cross.docker index 792e098f273c..c3eee750db93 100644 --- a/tests/docker/dockerfiles/debian-armel-cross.docker +++ b/tests/docker/dockerfiles/debian-armel-cross.docker @@ -39,6 +39,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ perl-base \ pkgconf \ python3 \ + python3-docutils \ python3-numpy \ python3-opencv \ python3-pillow \ diff --git a/tests/docker/dockerfiles/debian-armhf-cross.docker b/tests/doc= ker/dockerfiles/debian-armhf-cross.docker index dbb9cf21e99b..d88123880680 100644 --- a/tests/docker/dockerfiles/debian-armhf-cross.docker +++ b/tests/docker/dockerfiles/debian-armhf-cross.docker @@ -39,6 +39,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ perl-base \ pkgconf \ python3 \ + python3-docutils \ python3-numpy \ python3-opencv \ python3-pillow \ diff --git a/tests/docker/dockerfiles/debian-mips64el-cross.docker b/tests/= docker/dockerfiles/debian-mips64el-cross.docker index 712cf98388a1..33a1f680b663 100644 --- a/tests/docker/dockerfiles/debian-mips64el-cross.docker +++ b/tests/docker/dockerfiles/debian-mips64el-cross.docker @@ -39,6 +39,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ perl-base \ pkgconf \ python3 \ + python3-docutils \ python3-numpy \ python3-opencv \ python3-pillow \ diff --git a/tests/docker/dockerfiles/debian-mipsel-cross.docker b/tests/do= cker/dockerfiles/debian-mipsel-cross.docker index c746b7ca04aa..e8b1ea928ff7 100644 --- a/tests/docker/dockerfiles/debian-mipsel-cross.docker +++ b/tests/docker/dockerfiles/debian-mipsel-cross.docker @@ -39,6 +39,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ perl-base \ pkgconf \ python3 \ + python3-docutils \ python3-numpy \ python3-opencv \ python3-pillow \ diff --git a/tests/docker/dockerfiles/debian-ppc64el-cross.docker b/tests/d= ocker/dockerfiles/debian-ppc64el-cross.docker index 5591062a8bf1..3e7317250d59 100644 --- a/tests/docker/dockerfiles/debian-ppc64el-cross.docker +++ b/tests/docker/dockerfiles/debian-ppc64el-cross.docker @@ -39,6 +39,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ perl-base \ pkgconf \ python3 \ + python3-docutils \ python3-numpy \ python3-opencv \ python3-pillow \ diff --git a/tests/docker/dockerfiles/debian-s390x-cross.docker b/tests/doc= ker/dockerfiles/debian-s390x-cross.docker index 9c14f3faca40..276f9422f833 100644 --- a/tests/docker/dockerfiles/debian-s390x-cross.docker +++ b/tests/docker/dockerfiles/debian-s390x-cross.docker @@ -39,6 +39,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ perl-base \ pkgconf \ python3 \ + python3-docutils \ python3-numpy \ python3-opencv \ python3-pillow \ diff --git a/tests/docker/dockerfiles/fedora-win32-cross.docker b/tests/doc= ker/dockerfiles/fedora-win32-cross.docker index d691e54d0c15..0938f1901775 100644 --- a/tests/docker/dockerfiles/fedora-win32-cross.docker +++ b/tests/docker/dockerfiles/fedora-win32-cross.docker @@ -41,6 +41,7 @@ exec "$@"' > /usr/bin/nosync && \ perl-base \ python3 \ python3-PyYAML \ + python3-docutils \ python3-numpy \ python3-opencv \ python3-pillow \ diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker b/tests/doc= ker/dockerfiles/fedora-win64-cross.docker index 9f5082e02b3b..d36a04d33551 100644 --- a/tests/docker/dockerfiles/fedora-win64-cross.docker +++ b/tests/docker/dockerfiles/fedora-win64-cross.docker @@ -41,6 +41,7 @@ exec "$@"' > /usr/bin/nosync && \ perl-base \ python3 \ python3-PyYAML \ + python3-docutils \ python3-numpy \ python3-opencv \ python3-pillow \ diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfi= les/fedora.docker index c8e99a6b8951..752f683cae76 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -100,6 +100,7 @@ exec "$@"' > /usr/bin/nosync && \ pulseaudio-libs-devel \ python3 \ python3-PyYAML \ + python3-docutils \ python3-numpy \ python3-opencv \ python3-pillow \ diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/d= ockerfiles/opensuse-leap.docker index a98209c15803..e51909496d2e 100644 --- a/tests/docker/dockerfiles/opensuse-leap.docker +++ b/tests/docker/dockerfiles/opensuse-leap.docker @@ -86,16 +86,9 @@ RUN zypper update -y && \ pcre-devel-static \ perl-base \ pkgconfig \ - python3-Pillow \ - python3-PyYAML \ - python3-Sphinx \ - python3-base \ - python3-numpy \ - python3-opencv \ - python3-pip \ - python3-setuptools \ - python3-sphinx_rtd_theme \ - python3-wheel \ + python39-base \ + python39-pip \ + python39-setuptools \ rdma-core-devel \ rpm \ sed \ @@ -127,10 +120,16 @@ RUN zypper update -y && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc =20 -RUN /usr/bin/pip3 install meson=3D=3D0.56.0 +RUN /usr/bin/pip3.9 install \ + PyYAML \ + 'docutils<0.18' \ + meson=3D=3D0.63.2 \ + pillow \ + sphinx \ + sphinx-rtd-theme =20 ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" +ENV PYTHON "/usr/bin/python3.9" diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dock= erfiles/ubuntu2004.docker index 077460916ade..13b5c4a766a1 100644 --- a/tests/docker/dockerfiles/ubuntu2004.docker +++ b/tests/docker/dockerfiles/ubuntu2004.docker @@ -104,6 +104,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ perl-base \ pkgconf \ python3 \ + python3-docutils \ python3-numpy \ python3-opencv \ python3-pillow \ @@ -136,7 +137,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc =20 -RUN /usr/bin/pip3 install meson=3D=3D0.56.0 +RUN /usr/bin/pip3 install meson=3D=3D0.63.2 =20 ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" ENV LANG "en_US.UTF-8" diff --git a/tests/lcitool/mappings.yml b/tests/lcitool/mappings.yml new file mode 100644 index 000000000000..4eef6f425896 --- /dev/null +++ b/tests/lcitool/mappings.yml @@ -0,0 +1,80 @@ +mappings: + flake8: + CentOSStream8: + OpenSUSELeap153: + + meson: + CentOSStream8: + OpenSUSELeap153: + + python3: + CentOSStream8: python38 + OpenSUSELeap153: python39-base + + python3-PyYAML: + CentOSStream8: python38-PyYAML + OpenSUSELeap153: + + python3-devel: + CentOSStream8: python38-devel + OpenSUSELeap153: python39-devel + + python3-docutils: + CentOSStream8: + OpenSUSELeap153: + + python3-numpy: + CentOSStream8: python38-numpy + OpenSUSELeap153: + + python3-opencv: + CentOSStream8: + OpenSUSELeap153: + + python3-pillow: + CentOSStream8: + OpenSUSELeap153: + + python3-pip: + CentOSStream8: python38-pip + OpenSUSELeap153: python39-pip + + python3-pillow: + CentOSStream8: + OpenSUSELeap153: + + python3-selinux: + CentOSStream8: + OpenSUSELeap153: + + python3-setuptools: + CentOSStream8: python38-setuptools + OpenSUSELeap153: python39-setuptools + + python3-sphinx: + CentOSStream8: + OpenSUSELeap153: + + python3-sphinx-rtd-theme: + CentOSStream8: + OpenSUSELeap153: + + python3-venv: + CentOSStream8: python38 + OpenSUSELeap153: python39-base + + python3-wheel: + CentOSStream8: python38-wheel + OpenSUSELeap153: python39-pip + +pypi_mappings: + # Request last version + meson: + default: meson=3D=3D0.63.2 + + python3-docutils: + default: docutils<0.18 + + # Drop packages that need devel headers + python3-numpy: + OpenSUSELeap153: diff --git a/tests/lcitool/projects/qemu.yml b/tests/lcitool/projects/qemu.= yml index c62dbc00f96b..e45e924639ec 100644 --- a/tests/lcitool/projects/qemu.yml +++ b/tests/lcitool/projects/qemu.yml @@ -89,6 +89,7 @@ packages: - pulseaudio - python3 - python3-PyYAML + - python3-docutils - python3-numpy - python3-opencv - python3-pillow diff --git a/tests/lcitool/targets/centos-stream-8.yml b/tests/lcitool/targ= ets/centos-stream-8.yml new file mode 100644 index 000000000000..6b11160fd1dc --- /dev/null +++ b/tests/lcitool/targets/centos-stream-8.yml @@ -0,0 +1,3 @@ +paths: + pip3: /usr/bin/pip3.8 + python: /usr/bin/python3.8 diff --git a/tests/lcitool/targets/opensuse-leap-153.yml b/tests/lcitool/ta= rgets/opensuse-leap-153.yml new file mode 100644 index 000000000000..683016e0077a --- /dev/null +++ b/tests/lcitool/targets/opensuse-leap-153.yml @@ -0,0 +1,3 @@ +paths: + pip3: /usr/bin/pip3.9 + python: /usr/bin/python3.9 --=20 2.38.1