From nobody Tue Feb 10 19:23:08 2026 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=1682066523; cv=none; d=zohomail.com; s=zohoarc; b=QGwD7K7J1JkdZHGaprwHZqayyq7D5g6EurueMmoW8fXHoZ9EwTuS+5a0HRZrh4yWwekztimS4RkUq+5RygU88rj9k+88YyVaHounMsObFDfWFLLlmkR5zVqX9pW9GA6X9DMP/T7Ejvt2Y863k2llz7qZn4zYPl9yg/vFQy+dD4Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1682066523; 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=HpiB6sxC3DohqxrKYpC94Jz3RHHqCyDuIsL7iXn2uv0=; b=Vq1aUTAWcQlM4hctvU9dodtaLrTWb0Z9OmoFohQut16a2Xe9eGhaFgg1d74R+U+9aYnrTk6VbuOjHXCdSbg4n7px2mHzfIVv6l/pS5V5v8+bFyhI4r1LdWqMeOb7Ecu5lx4a98Emj/vWMfkBGlyHoUCNz2BIsGkPP5JF1qR/hzg= 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 1682066523482128.40092467636896; Fri, 21 Apr 2023 01:42:03 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ppmKX-00032w-N1; Fri, 21 Apr 2023 04:41:21 -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 1ppmKV-00032N-MM for qemu-devel@nongnu.org; Fri, 21 Apr 2023 04:41:19 -0400 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 1ppmKK-0001sG-Ri for qemu-devel@nongnu.org; Fri, 21 Apr 2023 04:41:19 -0400 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_256_GCM_SHA384) id us-mta-497-b4Fuyhx4MfeIDtAtBPt8ng-1; Fri, 21 Apr 2023 04:41:06 -0400 Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-94a34e35f57so112369166b.3 for ; Fri, 21 Apr 2023 01:41:06 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id lh21-20020a170906f8d500b0094eeab34ad5sm1735202ejb.124.2023.04.21.01.41.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Apr 2023 01:41:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682066467; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HpiB6sxC3DohqxrKYpC94Jz3RHHqCyDuIsL7iXn2uv0=; b=YEYs8BJdgHlCmfJs6YMq3pYXF4JBbynyg1lnH8gOYA03q8ExFcSdwzbhX6GW/TJYKDYeig f0ZkyCO1H9Gn4Fe7U7fI7kwwOmd+St8+0oqMNrFhGRUBUDgwfQmRKWwyqjEcQBy80QIVf8 49XMsG93UdfPCaRC/6L3/CMEDmUR7eE= X-MC-Unique: b4Fuyhx4MfeIDtAtBPt8ng-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682066464; x=1684658464; 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=HpiB6sxC3DohqxrKYpC94Jz3RHHqCyDuIsL7iXn2uv0=; b=FvTkCDIuX8JY/Y0Mq2RIzV8sg2k5QnZKOP/AbbnU3C2mR2RSWNh2BZr0KpWvfx8Zu6 DCW85/VEWJHYC7ZuZtqcWnQGb0ZUpusie6ENOzFgUhY9ApR/i8cGb0KYfABsdPS4wrjf f9zgkT66PSrBGyNgvBJV9UG2ZIxvxM6zrknhkwUVlUV4sIFk379fgYfKZSsQPkFZwrml 1YY86qwT3ii7gt9kfL4Z0638HxnrtLGnceayYOVhD6QonXQRPdNztSm5Sn+nlDY7wjzN J1X0+oTL4Dab3ZnrgAW4kVEm7C5p1pxw94WOEdSBy4DH/tEiCz54QMGEkOQEOinXH7Yb ossg== X-Gm-Message-State: AAQBX9fnp1scLPTbAvJh3Q9f07RCCHD1j0cqZ/eyRuHema7o+onej9dw slwt31VbbtMan865uMM8TtL/uigbJ06TPdUjf8NokyTMtaxnxY0rbe/Hhd2PnWxHf6Ldab3N+yx 0uJjQZdXoIxKbXqeLqYa3QHmEoFAf0efX3tEWcruL+IuxytCpQzqd6eRVhSxq5eWUfbqT7yggBl IxMw== X-Received: by 2002:a17:906:16d5:b0:94f:1c90:cb71 with SMTP id t21-20020a17090616d500b0094f1c90cb71mr1423796ejd.65.1682066464648; Fri, 21 Apr 2023 01:41:04 -0700 (PDT) X-Google-Smtp-Source: AKy350aB60kBMqTbNK/eTkWtgc4vaA8y+XGLfxAR/sT7kKcAYfMRVENfVGCHg6+yS76++hYUccXQSw== X-Received: by 2002:a17:906:16d5:b0:94f:1c90:cb71 with SMTP id t21-20020a17090616d500b0094f1c90cb71mr1423773ejd.65.1682066464280; Fri, 21 Apr 2023 01:41:04 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: pkrempa@redhat.com, berrange@redhat.com Subject: [PATCH v3 2/2] tests: lcitool: Switch to OpenSUSE Leap 15.4 Date: Fri, 21 Apr 2023 10:40:59 +0200 Message-Id: <20230421084059.9142-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230421084059.9142-1-pbonzini@redhat.com> References: <20230421084059.9142-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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+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_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1682066525337100001 From: Peter Krempa Since OpenSUSE Leap 15 counts as a single major release of an LTS distribut= ion, lcitool has changed the target name to remove the minor version. Adjust the mappings and refresh script. This also updates the dockerfile to 15.4, since the 15.3 version is EOL now: https://get.opensuse.org/leap/15.3 Signed-off-by: Peter Krempa Reviewed-by: Daniel P. Berrang=C3=A9 Message-Id: [Adjust for target name change and reword commit message. - Paolo] Signed-off-by: Paolo Bonzini --- tests/docker/dockerfiles/opensuse-leap.docker | 4 +-- tests/lcitool/libvirt-ci | 2 +- tests/lcitool/mappings.yml | 36 +++++++++---------- tests/lcitool/refresh | 2 +- ...suse-leap-153.yml =3D> opensuse-leap-15.yml} | 0 5 files changed, 22 insertions(+), 22 deletions(-) rename tests/lcitool/targets/{opensuse-leap-153.yml =3D> opensuse-leap-15.= yml} (100%) diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/d= ockerfiles/opensuse-leap.docker index 28f153b77b56..afb9f5419f5c 100644 --- a/tests/docker/dockerfiles/opensuse-leap.docker +++ b/tests/docker/dockerfiles/opensuse-leap.docker @@ -1,10 +1,10 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile --layers all opensuse-leap-153 qemu +# $ lcitool dockerfile --layers all opensuse-leap-15 qemu # # https://gitlab.com/libvirt/libvirt-ci =20 -FROM registry.opensuse.org/opensuse/leap:15.3 +FROM registry.opensuse.org/opensuse/leap:15.4 =20 RUN zypper update -y && \ zypper install -y \ diff --git a/tests/lcitool/libvirt-ci b/tests/lcitool/libvirt-ci index 2fa24dce8bc2..85487e140415 160000 --- a/tests/lcitool/libvirt-ci +++ b/tests/lcitool/libvirt-ci @@ -1 +1 @@ -Subproject commit 2fa24dce8bc2d0d57b02b111dbdbd24e25d4ae95 +Subproject commit 85487e140415b2ac54b01a9a6b600fd7c21edc2f diff --git a/tests/lcitool/mappings.yml b/tests/lcitool/mappings.yml index e4719e45516c..454963f07b86 100644 --- a/tests/lcitool/mappings.yml +++ b/tests/lcitool/mappings.yml @@ -1,71 +1,71 @@ mappings: flake8: CentOSStream8: - OpenSUSELeap153: + OpenSUSELeap15: =20 meson: CentOSStream8: - OpenSUSELeap153: + OpenSUSELeap15: =20 python3: CentOSStream8: python38 - OpenSUSELeap153: python39-base + OpenSUSELeap15: python39-base =20 python3-PyYAML: CentOSStream8: python38-PyYAML - OpenSUSELeap153: + OpenSUSELeap15: =20 python3-devel: CentOSStream8: python38-devel - OpenSUSELeap153: python39-devel + OpenSUSELeap15: python39-devel =20 python3-docutils: CentOSStream8: - OpenSUSELeap153: + OpenSUSELeap15: =20 python3-numpy: CentOSStream8: python38-numpy - OpenSUSELeap153: + OpenSUSELeap15: =20 python3-opencv: CentOSStream8: - OpenSUSELeap153: + OpenSUSELeap15: =20 python3-pillow: CentOSStream8: - OpenSUSELeap153: + OpenSUSELeap15: =20 python3-pip: CentOSStream8: python38-pip - OpenSUSELeap153: python39-pip + OpenSUSELeap15: python39-pip =20 python3-pillow: CentOSStream8: - OpenSUSELeap153: + OpenSUSELeap15: =20 python3-selinux: CentOSStream8: - OpenSUSELeap153: + OpenSUSELeap15: =20 python3-setuptools: CentOSStream8: python38-setuptools - OpenSUSELeap153: python39-setuptools + OpenSUSELeap15: python39-setuptools =20 python3-sphinx: CentOSStream8: - OpenSUSELeap153: + OpenSUSELeap15: =20 python3-sphinx-rtd-theme: CentOSStream8: - OpenSUSELeap153: + OpenSUSELeap15: =20 python3-venv: CentOSStream8: python38 - OpenSUSELeap153: python39-base + OpenSUSELeap15: python39-base =20 python3-wheel: CentOSStream8: python38-wheel - OpenSUSELeap153: python39-pip + OpenSUSELeap15: python39-pip =20 pypi_mappings: # Request more recent version @@ -74,4 +74,4 @@ pypi_mappings: =20 # Drop packages that need devel headers python3-numpy: - OpenSUSELeap153: + OpenSUSELeap15: diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index c0d7ad551649..33ef1282dac4 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -120,7 +120,7 @@ try: generate_dockerfile("debian-amd64", "debian-11", trailer=3D"".join(debian11_extras)) generate_dockerfile("fedora", "fedora-37") - generate_dockerfile("opensuse-leap", "opensuse-leap-153") + generate_dockerfile("opensuse-leap", "opensuse-leap-15") generate_dockerfile("ubuntu2004", "ubuntu-2004") generate_dockerfile("ubuntu2204", "ubuntu-2204") =20 diff --git a/tests/lcitool/targets/opensuse-leap-153.yml b/tests/lcitool/ta= rgets/opensuse-leap-15.yml similarity index 100% rename from tests/lcitool/targets/opensuse-leap-153.yml rename to tests/lcitool/targets/opensuse-leap-15.yml --=20 2.40.0